Attachment #30283 for bug #51064

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

Lines 7-13 Link Here

(-)www/swish++/Makefile (-2 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= swish++	9	PORTNAME= swish++
10	PORTVERSION= 5.12.1	10	PORTVERSION= 5.13.5
11	CATEGORIES= www textproc	11	CATEGORIES= www textproc
12	MASTER_SITES= http://homepage.mac.com/pauljlucas/software/	12	MASTER_SITES= http://homepage.mac.com/pauljlucas/software/
13		13
Lines 20-26 Link Here
20	USE_REINPLACE= yes	20	USE_REINPLACE= yes
21	USE_GMAKE= yes	21	USE_GMAKE= yes
22	MAKEFILE= GNUmakefile	22	MAKEFILE= GNUmakefile
23	MAKE_ENV= PTHREAD_LIB=${PTHREAD_LIBS} \	23	MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} \
24	PERL=${PERL} PERL_VER=${PERL_VER}	24	PERL=${PERL} PERL_VER=${PERL_VER}
25		25
26	MAN1= extract.1 httpindex.1 index.1 search.1 splitmail.1	26	MAN1= extract.1 httpindex.1 index.1 search.1 splitmail.1

Line 1 Link Here

(-)www/swish++/distinfo (-1 / +1 lines)
1	MD5 (swish++-5.12.1.tar.gz) = 60794739dfde309a3f80e6c08c6139da	1	MD5 (swish++-5.13.5.tar.gz) = a400a2165e8ec435d97f86c6ad82f3bb




--- GNUmakefile.orig	Tue Mar 11 03:33:13 2003
+++ GNUmakefile	Tue Apr 15 13:42:35 2003
@@ -229,7 +229,7 @@
 ##
 
 extract: $(E_OBJECTS)
-	$(CC) $(CFLAGS) -o $@ $^ $(E_LINK)
+	$(CC) $(CFLAGS) -o $@ $^ $(PTHREAD_LIB)
 
 index: $(I_OBJECTS) $(CHARSET_LIB) $(ENCODING_LIB) $(MOD_LIBS)
 	$(CC) $(CFLAGS) $(CHARSET_LIB_PATH) $(ENCODING_LIB_PATH) \
@@ -208,7 +208,7 @@
 	cd $(I_BIN) && $(STRIP) $(CPP_TARGET)
 
 install_lib: $(I_LIB)




--- config/config.mk.orig	Tue Dec 24 15:59:08 2002
+++ config/config.mk	Tue Apr 15 13:40:16 2003
@@ -33,8 +33,8 @@
 #
 ###############################################################################

 #MAC_OS_X:=	-DMacOSX
 #SOLARIS:=	-DSolaris
 #WIN32:=		-DWIN32
@@ -112,7 +112,7 @@
 ifdef SEARCH_DAEMON
 
 ifdef FREE_BSD
-PTHREAD_LINK:=	-pthread
+PTHREAD_LINK:=	${PTHREAD_LIBS}
 else
 PTHREAD_LINK:=	-lpthread
 endif
@@ -149,7 +149,7 @@
 #		The command to remove files recursively and ignore errors;
 #		usually "rm -fr" for Unix or "erase" for Windows.
 

 #		The full path to the Perl 5 executable; usually "/bin/perl" or
 #		"/usr/local/bin/perl" for Unix or "\Perl\bin\perl" for
 #		Windows.  You need this only if you intend on using
@@ -176,14 +176,14 @@
 #
 ###############################################################################
 
-CC:=		g++
+CC:=		${CXX}
 #		The C++ compiler you are using; usually "CC" or "g++".
 
 #DEBUG:=		true
 ifdef DEBUG
 OPTIM:=		-g
 else

 #		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
@@ -227,7 +227,7 @@
 INSTALL:=	$(ROOT)/install-sh
 #		Install command; usually "$(ROOT)/install-sh".

Return to bug 51064

Lines 1-15 Link Here

(-)www/swish++/files/patch-GNUmakefile (-12 / +3 lines)
1	--- GNUmakefile.orig Sat Jun 1 01:19:02 2002	1	--- GNUmakefile.orig Tue Mar 11 03:33:13 2003
2	+++ GNUmakefile Sun Jul 21 11:53:01 2002	2	+++ GNUmakefile Tue Apr 15 13:42:35 2003
3	@@ -159,7 +159,7 @@	3	@@ -229,7 +229,7 @@
4	##
5
6	extract: $(E_OBJECTS)
7	- $(CC) $(CFLAGS) -o $@ $^ $(E_LINK)
8	+ $(CC) $(CFLAGS) -o $@ $^ $(PTHREAD_LIB)
9
10	index: $(I_OBJECTS) $(CHARSET_LIB) $(ENCODING_LIB) $(MOD_LIBS)
11	$(CC) $(CFLAGS) $(CHARSET_LIB_PATH) $(ENCODING_LIB_PATH) \
12	@@ -208,7 +208,7 @@
13	cd $(I_BIN) && $(STRIP) $(CPP_TARGET)	4	cd $(I_BIN) && $(STRIP) $(CPP_TARGET)
14		5
15	install_lib: $(I_LIB)	6	install_lib: $(I_LIB)

Lines 1-5 Link Here

(-)www/swish++/files/patch-config::config.mk (-8 / +17 lines)
1	--- config/config.mk.orig Thu Oct 31 23:24:59 2002	1	--- config/config.mk.orig Tue Dec 24 15:59:08 2002
2	+++ config/config.mk Thu Oct 31 23:27:02 2002	2	+++ config/config.mk Tue Apr 15 13:40:16 2003
3	@@ -33,8 +33,8 @@	3	@@ -33,8 +33,8 @@
4	#	4	#
5	###############################################################################	5	###############################################################################
Lines 11-25 Link Here
11	#MAC_OS_X:= -DMacOSX	11	#MAC_OS_X:= -DMacOSX
12	#SOLARIS:= -DSolaris	12	#SOLARIS:= -DSolaris
13	#WIN32:= -DWIN32	13	#WIN32:= -DWIN32
14	@@ -99,7 +99,6 @@	14	@@ -112,7 +112,7 @@
15	ifdef SEARCH_DAEMON	15	ifdef SEARCH_DAEMON
16		16
17	ifdef FREE_BSD	17	ifdef FREE_BSD
18	-PTHREAD_LIB:= -pthread	18	-PTHREAD_LINK:= -pthread
		19	+PTHREAD_LINK:= ${PTHREAD_LIBS}
19	else	20	else
20	PTHREAD_LIB:= -lpthread	21	PTHREAD_LINK:= -lpthread
21	endif	22	endif
22	@@ -130,7 +129,7 @@	23	@@ -149,7 +149,7 @@
23	# The command to remove files recursively and ignore errors;	24	# The command to remove files recursively and ignore errors;
24	# usually "rm -fr" for Unix or "erase" for Windows.	25	# usually "rm -fr" for Unix or "erase" for Windows.
25		26
Lines 28-34 Link Here
28	# 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
29	# "/usr/local/bin/perl" for Unix or "\Perl\bin\perl" for	30	# "/usr/local/bin/perl" for Unix or "\Perl\bin\perl" for
30	# Windows. You need this only if you intend on using	31	# Windows. You need this only if you intend on using
31	@@ -164,7 +163,7 @@	32	@@ -176,14 +176,14 @@
		33	#
		34	###############################################################################
		35
		36	-CC:= g++
		37	+CC:= ${CXX}
		38	# The C++ compiler you are using; usually "CC" or "g++".
		39
		40	#DEBUG:= true
32	ifdef DEBUG	41	ifdef DEBUG
33	OPTIM:= -g	42	OPTIM:= -g
34	else	43	else
Lines 37-43 Link Here
37	# The optimization level. Many compilers allow a digit after the	46	# The optimization level. Many compilers allow a digit after the
38	# 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
39	# highest number your compiler allows without eliciting problems	48	# highest number your compiler allows without eliciting problems
40	@@ -208,7 +207,7 @@	49	@@ -227,7 +227,7 @@
41	INSTALL:= $(ROOT)/install-sh	50	INSTALL:= $(ROOT)/install-sh
42	# Install command; usually "$(ROOT)/install-sh".	51	# Install command; usually "$(ROOT)/install-sh".