Attachment #48539 for bug #74274

View | Details | Raw Unified | Return to bug 74274
Collapse All | Expand All




#

PORTNAME=	swish++
PORTVERSION=	6.0.4
PORTREVISION=	1
CATEGORIES=	www textproc
MASTER_SITES=	http://homepage.mac.com/pauljlucas/software/



.include <bsd.port.pre.mk>

.if ${OSVERSION} < 500000
USE_GCC=	3.4
.endif

post-patch:
	@${REINPLACE_CMD} -e '/^#error/d' ${WRKSRC}/config.h
.for file in scripts/searchd scripts/searchmonitor
	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${file}.in
.endfor


	@${MKDIR} ${SITE_PERL}

post-install:
	${INSTALL_SCRIPT} ${FILESDIR}/swish++.sh ${PREFIX}/etc/rc.d/swish++.sh.sample

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)/usr/ports/www/swish++/distinfo (-2 / +2 lines)
1	MD5 (swish++-5.15.3.tar.gz) = 5d480381946c4ee6764c449083360282	1	MD5 (swish++-6.0.4.tar.gz) = 3a81a1ca59addd6198f89e680bc77bff
2	SIZE (swish++-5.15.3.tar.gz) = 279128	2	SIZE (swish++-6.0.4.tar.gz) = 292826

Lines 1-7 Link Here

(-)/usr/ports/www/swish++/files/patch-GNUmakefile (-4 / +4 lines)
1	--- GNUmakefile.orig Tue Mar 11 03:33:13 2003	1	--- GNUmakefile.orig Mon Nov 22 23:41:54 2004
2	+++ GNUmakefile Tue Apr 15 13:42:35 2003	2	+++ GNUmakefile Mon Nov 22 23:43:19 2004
3	@@ -229,7 +229,7 @@	3	@@ -236,7 +236,7 @@
4	cd $(I_BIN) && $(STRIP) $(CPP_TARGET)	4	@$(MAKE) -C scripts $@
5		5
6	install_lib: $(I_LIB)	6	install_lib: $(I_LIB)
7	- $(INSTALL) $(I_OWNER) $(I_GROUP) $(I_MODE) $(LIB_TARGET) $(I_LIB)	7	- $(INSTALL) $(I_OWNER) $(I_GROUP) $(I_MODE) $(LIB_TARGET) $(I_LIB)




--- config/config.mk.orig	Mon Nov 22 23:44:48 2004
+++ config/config.mk	Mon Nov 22 23:48:27 2004
@@ -34,8 +34,8 @@
 #
 ###############################################################################
 
-#FREE_BSD:=1
-LINUX:=1
+FREE_BSD:=1
+#LINUX:=1
 #MAC_OS_X:=1
 #SOLARIS:=1
 #WIN32:=1
@@ -118,7 +118,7 @@
 ifdef SEARCH_DAEMON
 
 ifdef FREE_BSD

 else
 PTHREAD_LINK:=	-lpthread
 endif
@@ -159,7 +159,7 @@
 #		The command to remove files recursively and ignore errors;
 #		usually "rm -fr" for Unix or "erase" for Windows.
 

+#PERL:=		/usr/local/bin/perl
 #		The full path to the Perl 5 executable; usually "/bin/perl" or
 #		"/usr/local/bin/perl" for Unix or "\Perl\bin\perl" for
 #		Windows.
@@ -185,14 +185,14 @@
 #
 ###############################################################################
 
-CC:=		g++
+CC:=       ${CXX}
 #		The C++ compiler you are using; usually "CC" or "g++".
 
 #DEBUG:=		true

 #		The optimization level.  Many compilers allow a digit after the
 #		O to specify the level of optimization; if so, set yours to the
 #		highest number your compiler allows without eliciting problems
@@ -254,7 +254,7 @@
 INSTALL:=	$(ROOT)/install-sh
 #		Install command; usually "$(ROOT)/install-sh".
 

Lines 1-5 Link Here

(-)/usr/ports/www/swish++/files/patch-scripts::searchd.in (-2 / +2 lines)
1	--- scripts/searchd.in.orig Sun Sep 26 10:11:44 2004	1	--- scripts/searchd.in.orig Mon Nov 22 23:52:13 2004
2	+++ scripts/searchd.in Sun Sep 26 10:12:28 2004	2	+++ scripts/searchd.in Mon Nov 22 23:52:27 2004
3	@@ -29,7 +29,7 @@	3	@@ -29,7 +29,7 @@
4	SEARCH="search"	4	SEARCH="search"
5	SEARCH_PATH="%%I_BIN%%/$SEARCH"	5	SEARCH_PATH="%%I_BIN%%/$SEARCH"

Lines 1-5 Link Here

(-)/usr/ports/www/swish++/files/patch-scripts::searchmonitor.in (-2 / +2 lines)
1	--- scripts/searchmonitor.in.orig Sun Sep 26 10:14:05 2004	1	--- scripts/searchmonitor.in.orig Mon Nov 22 23:53:08 2004
2	+++ scripts/searchmonitor.in Sun Sep 26 10:15:03 2004	2	+++ scripts/searchmonitor.in Mon Nov 22 23:54:09 2004
3	@@ -63,7 +63,7 @@	3	@@ -63,7 +63,7 @@
4	CONF_FILE="swish++.conf"	4	CONF_FILE="swish++.conf"
5	if [ ! -f "$CONF_FILE" ]	5	if [ ! -f "$CONF_FILE" ]

Lines 1-11 Link Here

(-)/usr/ports/www/swish++/files/patch-searchd.in (-11 lines)
1	--- searchd.in.orig Sun Jan 13 12:00:35 2002
2	+++ searchd.in Sun Jan 13 12:00:53 2002
3	@@ -27,7 +27,7 @@
4	SEARCH="search"
5	SEARCH_PATH="%%I_BIN%%/$SEARCH"
6	SEARCHMONITOR="%%I_BIN%%/searchmonitor"
7	-CONF_FILE="/etc/swish++.conf"
8	+CONF_FILE="%%PREFIX%%/etc/swish++.conf"
9	PID_FILE_DEFAULT="/var/run/search.pid"
10
11	##

Lines 1-11 Link Here

(-)/usr/ports/www/swish++/files/patch-searchmonitor.in (-11 lines)
1	--- searchmonitor.in.orig Sun Jan 13 12:01:32 2002
2	+++ searchmonitor.in Sun Jan 13 12:01:47 2002
3	@@ -63,7 +63,7 @@
4	CONF_FILE="swish++.conf"
5	if [ ! -f "$CONF_FILE" ]
6	then
7	- CONF_FILE="/etc/$CONF_FILE"
8	+ CONF_FILE="%%PREFIX%%/etc/$CONF_FILE"
9	[ -f "$CONF_FILE" ] \|\|
10	{ echo "$ME: no configuration file found" >&2; exit 3; }
11	fi

Lines 3-10 Link Here

(-)/usr/ports/www/swish++/pkg-plist (-1 / +2 lines)
3	bin/index	3	bin/index
4	bin/search	4	bin/search
5	bin/searchc	5	bin/searchc
		6	bin/searchd
6	bin/searchmonitor	7	bin/searchmonitor
7	bin/splitmail	8	bin/splitmail
		9	etc/rc.d/swish++.sh.sample
8	etc/swish++.conf	10	etc/swish++.conf
9	etc/rc.d/swish++.sh
10	%%SITE_PERL%%/WWW.pm	11	%%SITE_PERL%%/WWW.pm

Return to bug 74274

Lines 7-14 Link Here

(-)/usr/ports/www/swish++/Makefile (-6 / +5 lines)
7	#	7	#
8		8
9	PORTNAME= swish++	9	PORTNAME= swish++
10	PORTVERSION= 5.15.3	10	PORTVERSION= 6.0.4
11	PORTREVISION= 1
12	CATEGORIES= www textproc	11	CATEGORIES= www textproc
13	MASTER_SITES= http://homepage.mac.com/pauljlucas/software/	12	MASTER_SITES= http://homepage.mac.com/pauljlucas/software/
14		13
Lines 31-43 Link Here
31		30
32	.include <bsd.port.pre.mk>	31	.include <bsd.port.pre.mk>
33		32
34	.if ${OSVERSION} >= 502126	33	.if ${OSVERSION} < 500000
35	BROKEN= "Does not compile on FreeBSD >= 5.x"	34	USE_GCC= 3.4
36	.endif	35	.endif
37		36
38	post-patch:	37	post-patch:
39	@${REINPLACE_CMD} -e '/^#error/d' ${WRKSRC}/config.h	38	@${REINPLACE_CMD} -e '/^#error/d' ${WRKSRC}/config.h
40	.for file in searchd searchmonitor	39	.for file in scripts/searchd scripts/searchmonitor
41	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${file}.in	40	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${file}.in
42	.endfor	41	.endfor
43		42
Lines 45-50 Link Here
45	@${MKDIR} ${SITE_PERL}	44	@${MKDIR} ${SITE_PERL}
46		45
47	post-install:	46	post-install:
48	${INSTALL_SCRIPT} ${FILESDIR}/swish++.sh ${PREFIX}/etc/rc.d	47	${INSTALL_SCRIPT} ${FILESDIR}/swish++.sh ${PREFIX}/etc/rc.d/swish++.sh.sample
49		48
50	.include <bsd.port.post.mk>	49	.include <bsd.port.post.mk>

Lines 1-17 Link Here

(-)/usr/ports/www/swish++/files/patch-config::config.mk (-16 / +16 lines)
1	--- config/config.mk.orig Tue Dec 24 15:59:08 2002	1	--- config/config.mk.orig Mon Nov 22 23:44:48 2004
2	+++ config/config.mk Tue Apr 15 13:40:16 2003	2	+++ config/config.mk Mon Nov 22 23:48:27 2004
3	@@ -33,8 +33,8 @@	3	@@ -34,8 +34,8 @@
4	#	4	#
5	###############################################################################	5	###############################################################################
6		6
7	-#FREE_BSD:= -DFreeBSD	7	-#FREE_BSD:=1
8	-LINUX:= -DLinux -D_BSD_SOURCE	8	-LINUX:=1
9	+FREE_BSD:= -DFreeBSD	9	+FREE_BSD:=1
10	+#LINUX:= -DLinux -D_BSD_SOURCE	10	+#LINUX:=1
11	#MAC_OS_X:= -DMacOSX	11	#MAC_OS_X:=1
12	#SOLARIS:= -DSolaris	12	#SOLARIS:=1
13	#WIN32:= -DWIN32	13	#WIN32:=1
14	@@ -112,7 +112,7 @@	14	@@ -118,7 +118,7 @@
15	ifdef SEARCH_DAEMON	15	ifdef SEARCH_DAEMON
16		16
17	ifdef FREE_BSD	17	ifdef FREE_BSD
Lines 20-26 Link Here
20	else	20	else
21	PTHREAD_LINK:= -lpthread	21	PTHREAD_LINK:= -lpthread
22	endif	22	endif
23	@@ -149,7 +149,7 @@	23	@@ -159,7 +159,7 @@
24	# The command to remove files recursively and ignore errors;	24	# The command to remove files recursively and ignore errors;
25	# usually "rm -fr" for Unix or "erase" for Windows.	25	# usually "rm -fr" for Unix or "erase" for Windows.
26		26
Lines 28-40 Link Here
28	+#PERL:= /usr/local/bin/perl	28	+#PERL:= /usr/local/bin/perl
29	# The full path to the Perl 5 executable; usually "/bin/perl" or	29	# The full path to the Perl 5 executable; usually "/bin/perl" or
30	# "/usr/local/bin/perl" for Unix or "\Perl\bin\perl" for	30	# "/usr/local/bin/perl" for Unix or "\Perl\bin\perl" for
31	# Windows. You need this only if you intend on using	31	# Windows.
32	@@ -176,14 +176,14 @@	32	@@ -185,14 +185,14 @@
33	#	33	#
34	###############################################################################	34	###############################################################################
35		35
36	-CC:= g++	36	-CC:= g++
37	+CC:= ${CXX}	37	+CC:= ${CXX}
38	# The C++ compiler you are using; usually "CC" or "g++".	38	# The C++ compiler you are using; usually "CC" or "g++".
39		39
40	#DEBUG:= true	40	#DEBUG:= true
Lines 46-52 Link Here
46	# The optimization level. Many compilers allow a digit after the	46	# The optimization level. Many compilers allow a digit after the
47	# O to specify the level of optimization; if so, set yours to the	47	# O to specify the level of optimization; if so, set yours to the
48	# highest number your compiler allows without eliciting problems	48	# highest number your compiler allows without eliciting problems
49	@@ -227,7 +227,7 @@	49	@@ -254,7 +254,7 @@
50	INSTALL:= $(ROOT)/install-sh	50	INSTALL:= $(ROOT)/install-sh
51	# Install command; usually "$(ROOT)/install-sh".	51	# Install command; usually "$(ROOT)/install-sh".
52		52