4 files changed, 23 insertions, 23 deletions

diff --git a/www/swish++/Makefile b/www/swish++/Makefile
index 08d6c61db3bb..306de66145bf 100644
--- a/www/swish++/Makefile
+++ b/www/swish++/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	swish++
-PORTVERSION=	5.12.1
+PORTVERSION=	5.13.5
 CATEGORIES=	www textproc
 MASTER_SITES=	http://homepage.mac.com/pauljlucas/software/
 
@@ -20,7 +20,7 @@ USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
-MAKE_ENV=	PTHREAD_LIB=${PTHREAD_LIBS} \
+MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} \
 		PERL=${PERL} PERL_VER=${PERL_VER}
 
 MAN1=	extract.1 httpindex.1 index.1 search.1 splitmail.1
diff --git a/www/swish++/distinfo b/www/swish++/distinfo
index c0a1ed985446..48704503e935 100644
--- a/www/swish++/distinfo
+++ b/www/swish++/distinfo
@@ -1 +1 @@
-MD5 (swish++-5.12.1.tar.gz) = 60794739dfde309a3f80e6c08c6139da
+MD5 (swish++-5.13.5.tar.gz) = a400a2165e8ec435d97f86c6ad82f3bb
diff --git a/www/swish++/files/patch-GNUmakefile b/www/swish++/files/patch-GNUmakefile
index af86a4a86b18..442c710b4e75 100644
--- a/www/swish++/files/patch-GNUmakefile
+++ b/www/swish++/files/patch-GNUmakefile
@@ -1,15 +1,6 @@
---- GNUmakefile.orig	Sat Jun  1 01:19:02 2002
-+++ GNUmakefile	Sun Jul 21 11:53:01 2002
-@@ -159,7 +159,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 @@
+--- GNUmakefile.orig	Tue Mar 11 03:33:13 2003
++++ GNUmakefile	Tue Apr 15 13:42:35 2003
+@@ -229,7 +229,7 @@
  	cd $(I_BIN) && $(STRIP) $(CPP_TARGET)
  
  install_lib: $(I_LIB)
diff --git a/www/swish++/files/patch-config::config.mk b/www/swish++/files/patch-config::config.mk
index 0c8e94b3e80a..cfc0513a4398 100644
--- a/www/swish++/files/patch-config::config.mk
+++ b/www/swish++/files/patch-config::config.mk
@@ -1,5 +1,5 @@
---- config/config.mk.orig	Thu Oct 31 23:24:59 2002
-+++ config/config.mk	Thu Oct 31 23:27:02 2002
+--- 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 @@
  #
  ###############################################################################
@@ -11,15 +11,16 @@
  #MAC_OS_X:=	-DMacOSX
  #SOLARIS:=	-DSolaris
  #WIN32:=		-DWIN32
-@@ -99,7 +99,6 @@
+@@ -112,7 +112,7 @@
  ifdef SEARCH_DAEMON
  
  ifdef FREE_BSD
--PTHREAD_LIB:=	-pthread
+-PTHREAD_LINK:=	-pthread
++PTHREAD_LINK:=	${PTHREAD_LIBS}
  else
- PTHREAD_LIB:=	-lpthread
+ PTHREAD_LINK:=	-lpthread
  endif
-@@ -130,7 +129,7 @@
+@@ -149,7 +149,7 @@
  #		The command to remove files recursively and ignore errors;
  #		usually "rm -fr" for Unix or "erase" for Windows.
  
@@ -28,7 +29,15 @@
  #		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
-@@ -164,7 +163,7 @@
+@@ -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
@@ -37,7 +46,7 @@
  #		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
-@@ -208,7 +207,7 @@
+@@ -227,7 +227,7 @@
  INSTALL:=	$(ROOT)/install-sh
  #		Install command; usually "$(ROOT)/install-sh".