o Upgrade to 7.2.7.

o Apply a patch to install etc/conserver.rc as etc/rc.d/conserver.sh.

5 files changed, 14 insertions, 29 deletions

diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index 189c2d260e37..49121fbe1746 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	conserver
-PORTVERSION=	7.2.4
+PORTVERSION=	7.2.7
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.conserver.com/conserver/
 PKGNAMESUFFIX=	-com
@@ -35,9 +35,6 @@ CONFIGURE_ARGS+=--with-64bit
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's@/usr/local/bin@${PREFIX}/sbin@' \
-		${WRKSRC}/conserver/conserver.rc
-
-post-install:
-	${LN} -sf ../conserver.rc ${PREFIX}/etc/rc.d/conserver.sh-
+		${WRKSRC}/conserver/conserver.rc.in
 
 .include <bsd.port.post.mk>
diff --git a/comms/conserver-com/distinfo b/comms/conserver-com/distinfo
index 6d3d952876f9..82ce50eb4629 100644
--- a/comms/conserver-com/distinfo
+++ b/comms/conserver-com/distinfo
@@ -1 +1 @@
-MD5 (conserver-7.2.4.tar.gz) = 6431e1b26fff4773486048a345dee140
+MD5 (conserver-7.2.7.tar.gz) = ff22779c9cc53406e948204109879820
diff --git a/comms/conserver-com/files/patch-conserver.rc b/comms/conserver-com/files/patch-conserver.rc
deleted file mode 100644
index 04446b2d6c2c..000000000000
--- a/comms/conserver-com/files/patch-conserver.rc
+++ /dev/null
@@ -1,20 +0,0 @@
---- conserver/conserver.rc.orig	Sun Jul  8 04:54:09 2001
-+++ conserver/conserver.rc	Sun Dec  9 16:32:01 2001
-@@ -3,7 +3,7 @@
- # Startup for conserver
- #
- 
--PATH=/usr/bin:/usr/local/bin
-+PATH=/bin:/usr/bin:/usr/local/bin
- 
- case "$1" in
- 	'start')
-@@ -12,7 +12,7 @@
- 		;;
- 
- 	'stop')
--		master=`ps -ef | grep conserver | awk '$3 == "1"{print $2}'`
-+		master=`ps ax | grep conserver | awk '$3~/s/ {print $1}'`
- 		[ "$master" ] && kill -TERM $master
- 		;;
- 
diff --git a/comms/conserver-com/files/patch-conserver:Makefile.in b/comms/conserver-com/files/patch-conserver:Makefile.in
new file mode 100644
index 000000000000..156edb2bd1f5
--- /dev/null
+++ b/comms/conserver-com/files/patch-conserver:Makefile.in
@@ -0,0 +1,10 @@
+--- conserver/Makefile.in.orig	Sun Aug 24 23:09:39 2003
++++ conserver/Makefile.in	Sun Aug 24 23:09:51 2003
+@@ -54,6 +54,6 @@
+ 	$(MKDIR) $(DESTDIR)$(mandir)/man8
+ 	$(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
+ 	$(MKDIR) $(DESTDIR)$(sysconfdir)
+-	[ -f $(DESTDIR)$(sysconfdir)/conserver.rc ] || $(INSTALL) conserver.rc $(DESTDIR)$(sysconfdir)
++	[ -f $(DESTDIR)$(sysconfdir)/conserver.rc ] || $(INSTALL) conserver.rc $(DESTDIR)$(sysconfdir)/rc.d/conserver.sh
+ 
+ .PHONY: clean distclean install
diff --git a/comms/conserver-com/pkg-plist b/comms/conserver-com/pkg-plist
index 7dcd9d07168a..daac8c80fd6f 100644
--- a/comms/conserver-com/pkg-plist
+++ b/comms/conserver-com/pkg-plist
@@ -1,5 +1,3 @@
 sbin/conserver
-etc/conserver.rc
+etc/rc.d/conserver.sh
 bin/console
-@exec ln -s ../conserver.rc %D/etc/rc.d/conserver.sh-
-@unexec rm %D/etc/rc.d/conserver.sh-