upgrade to 5.7

take over maintainership

PR:		36825
Submitted by:	Oliver Braun <obraun@informatik.unibw-muenchen.de>

4 files changed, 11 insertions, 35 deletions

diff --git a/www/swish++/Makefile b/www/swish++/Makefile
index 550b165519f..0451ba0f8ea 100644
--- a/www/swish++/Makefile
+++ b/www/swish++/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	swish++
-PORTVERSION=	5.6
+PORTVERSION=	5.7
 CATEGORIES=	www textproc
 MASTER_SITES=	http://homepage.mac.com/pauljlucas/software/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	obraun@informatik.unibw-muenchen.de
 
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
@@ -31,7 +31,7 @@ post-patch:
 	  ${SED} '/^#error/d' config.h > config.h.tmp ; \
 	  ${MV} -f config.h.tmp config.h)
 .for file in searchd searchmonitor
-	@${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${file}
+	@${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${file}.in
 .endfor
 
 post-install:
diff --git a/www/swish++/distinfo b/www/swish++/distinfo
index 9f64363eadd..0f1d9146490 100644
--- a/www/swish++/distinfo
+++ b/www/swish++/distinfo
@@ -1 +1 @@
-MD5 (swish++-5.6.tar.gz) = 788811eea199c239931583bca1dc88d6
+MD5 (swish++-5.7.tar.gz) = 6666adfd023eead15fae04386b987b6e
diff --git a/www/swish++/files/patch-GNUmakefile b/www/swish++/files/patch-GNUmakefile
index aeebede8162..ab51424a11a 100644
--- a/www/swish++/files/patch-GNUmakefile
+++ b/www/swish++/files/patch-GNUmakefile
@@ -1,6 +1,6 @@
---- GNUmakefile.orig	Wed Dec 19 12:24:07 2001
-+++ GNUmakefile	Sun Jan 13 12:04:59 2002
-@@ -192,13 +192,13 @@
+--- GNUmakefile.orig	Sun Apr  7 00:01:09 2002
++++ GNUmakefile	Sun Apr  7 00:02:15 2002
+@@ -193,7 +193,7 @@
  	cd $(I_BIN) && $(STRIP) $(CPP_TARGET)
  
  install_lib: $(I_LIB)
@@ -9,10 +9,3 @@
  
  install_man:
  	@$(MAKE) -C man install
- 
- install_conf:
--	$(INSTALL) $(I_OWNER) $(I_GROUP) $(I_MODE) swish++.conf /etc
-+	$(INSTALL) $(I_OWNER) $(I_GROUP) $(I_MODE) swish++.conf ${PREFIX}/etc
- 
- $(I_BIN) $(I_LIB):
- 	$(MKDIR) $@
diff --git a/www/swish++/files/patch-config::config.mk b/www/swish++/files/patch-config::config.mk
index a07fea25670..21c60f02818 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	Sun Jan 13 11:38:36 2002
-+++ config/config.mk	Sun Jan 13 11:41:51 2002
+--- config/config.mk.orig	Sun Apr  7 00:04:51 2002
++++ config/config.mk	Sun Apr  7 00:07:14 2002
 @@ -35,8 +35,8 @@
  #
  ###############################################################################
@@ -19,24 +19,7 @@
  else
  PTHREAD_LIB:=	-lpthread
  endif
-@@ -118,7 +117,6 @@
- #		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.  You need this only if you intend on using
-@@ -145,15 +143,14 @@
- #
- ###############################################################################
- 
--#CC:=		g++
--CC:=		/usr/local/bin/g++
-+CC:=		g++
- #		The C++ compiler you are using; usually "CC" or "g++".
- 
- #DEBUG:=		true
+@@ -152,7 +151,7 @@
  ifdef DEBUG
  OPTIM:=		-g
  else
@@ -45,7 +28,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
-@@ -196,7 +193,7 @@
+@@ -195,7 +194,7 @@
  INSTALL:=	$(ROOT)/install-sh
  #		Install command; usually "$(ROOT)/install-sh".