Thu Feb 17 09:45:00 2011 UTC ()
fix build with gcc4.3


(markd)
diff -r1.10 -r1.11 pkgsrc/sysutils/strigi/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/strigi/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/strigi/patches/patch-src_daemon_strigithread.cpp
diff -r0 -r1.1 pkgsrc/sysutils/strigi/patches/patch-src_luceneindexer_jsgzipcompressstream.h
cvs diff -r1.10 -r1.11 pkgsrc/sysutils/strigi/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/strigi/Makefile 2011/01/13 13:39:26 1.10
+++ pkgsrc/sysutils/strigi/Makefile 2011/02/17 09:45:00 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.10 2011/01/13 13:39:26 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2011/02/17 09:45:00 markd Exp $
2 2
3DISTNAME= strigi-0.6.4 3DISTNAME= strigi-0.6.4
4PKGREVISION= 6 4PKGREVISION= 6
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=strigi/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=strigi/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= markd@NetBSD.org 9MAINTAINER= markd@NetBSD.org
10HOMEPAGE= http://strigi.sourceforge.net/ 10HOMEPAGE= http://strigi.sourceforge.net/
11COMMENT= Small fast desktop searching program 11COMMENT= Small fast desktop searching program
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -17,26 +17,27 @@ USE_LANGUAGES= c c++ @@ -17,26 +17,27 @@ USE_LANGUAGES= c c++
17USE_TOOLS+= gmake pkg-config perl 17USE_TOOLS+= gmake pkg-config perl
18USE_CMAKE= yes 18USE_CMAKE= yes
19 19
20PKGCONFIG_OVERRIDE+= src/streamanalyzer/libstreamanalyzer.pc.cmake 20PKGCONFIG_OVERRIDE+= src/streamanalyzer/libstreamanalyzer.pc.cmake
21PKGCONFIG_OVERRIDE+= src/streams/libstreams.pc.cmake 21PKGCONFIG_OVERRIDE+= src/streams/libstreams.pc.cmake
22 22
23.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
24.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h) 24.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h)
25RT_LIB_SCHED= -lrt 25RT_LIB_SCHED= -lrt
26.else 26.else
27RT_LIB_SCHED= # empty 27RT_LIB_SCHED= # empty
28.endif 28.endif
29 29
 30CMAKE_ARGS+= -DENABLE_CPPUNIT=OFF
30.if !empty(RT_LIB_SCHED) 31.if !empty(RT_LIB_SCHED)
31# these use sched_setscheduler 32# these use sched_setscheduler
32CMAKE_ARGS+= -Dstrigidaemon_LIBS=${RT_LIB_SCHED} 33CMAKE_ARGS+= -Dstrigidaemon_LIBS=${RT_LIB_SCHED}
33CMAKE_ARGS+= -Dtest_LIBS=${RT_LIB_SCHED} 34CMAKE_ARGS+= -Dtest_LIBS=${RT_LIB_SCHED}
34.endif 35.endif
35 36
36pre-configure: 37pre-configure:
37 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ 38 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
38 39
39.include "../../archivers/bzip2/buildlink3.mk" 40.include "../../archivers/bzip2/buildlink3.mk"
40.include "../../converters/libiconv/buildlink3.mk" 41.include "../../converters/libiconv/buildlink3.mk"
41.include "../../devel/zlib/buildlink3.mk" 42.include "../../devel/zlib/buildlink3.mk"
42.include "../../textproc/libclucene/buildlink3.mk" 43.include "../../textproc/libclucene/buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/strigi/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/strigi/distinfo 2009/07/23 09:07:11 1.4
+++ pkgsrc/sysutils/strigi/distinfo 2011/02/17 09:45:00 1.5
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1$NetBSD: distinfo,v 1.4 2009/07/23 09:07:11 markd Exp $ 1$NetBSD: distinfo,v 1.5 2011/02/17 09:45:00 markd Exp $
2 2
3SHA1 (strigi-0.6.4.tar.bz2) = e91f31cc59fdfc303b662a8af899efe1365643bf 3SHA1 (strigi-0.6.4.tar.bz2) = e91f31cc59fdfc303b662a8af899efe1365643bf
4RMD160 (strigi-0.6.4.tar.bz2) = 4b72de166b077778caa2b3ff31c2168a62155bd1 4RMD160 (strigi-0.6.4.tar.bz2) = 4b72de166b077778caa2b3ff31c2168a62155bd1
5Size (strigi-0.6.4.tar.bz2) = 895552 bytes 5Size (strigi-0.6.4.tar.bz2) = 895552 bytes
6SHA1 (patch-aa) = 96bf66b656731db79f0a52e90e294afef010b252 6SHA1 (patch-aa) = 96bf66b656731db79f0a52e90e294afef010b252
 7SHA1 (patch-src_daemon_strigithread.cpp) = 0356c1cbe6ca490e7a916d65e6b7113c26c4d511
 8SHA1 (patch-src_luceneindexer_jsgzipcompressstream.h) = 04a6cf7c2291fc9cd62d7595cda1b0528273ce75
File Added: pkgsrc/sysutils/strigi/patches/Attic/patch-src_daemon_strigithread.cpp
$NetBSD: patch-src_daemon_strigithread.cpp,v 1.1 2011/02/17 09:45:00 markd Exp $

Fix build with gcc4.3

--- src/daemon/strigithread.cpp.orig	2009-02-01 19:56:01.000000000 +0000
+++ src/daemon/strigithread.cpp
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <cstring>
+#include <cstdio>
 #include <errno.h>
 #include <signal.h>
 #include <vector>
File Added: pkgsrc/sysutils/strigi/patches/Attic/patch-src_luceneindexer_jsgzipcompressstream.h
$NetBSD: patch-src_luceneindexer_jsgzipcompressstream.h,v 1.1 2011/02/17 09:45:00 markd Exp $

Fix build with gcc4.3

--- src/luceneindexer/jsgzipcompressstream.h.orig	2009-02-01 19:55:38.000000000 +0000
+++ src/luceneindexer/jsgzipcompressstream.h
@@ -21,6 +21,7 @@
 #define GZIPCOMPRESSSTREAM_H
 
 #include <strigi/strigiconfig.h>   // (u)int64_t
+#include <cstdio>
 #include <CLucene/util/streambase.h>
 #include <CLucene/util/bufferedstream.h>