5 files changed, 40 insertions, 24 deletions

diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index 49121fbe1746..d5405f58cac8 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	conserver
-PORTVERSION=	7.2.7
+PORTVERSION=	8.0.4
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.conserver.com/conserver/
 PKGNAMESUFFIX=	-com
@@ -15,9 +15,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Application that allows multiple users to watch serial consoles
 
 GNU_CONFIGURE=	YES
-USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-master=${DEFAULTHOST} --with-port=${DEFAULTPORT} \
 		--with-libwrap
+USE_RC_SUBR=	yes
 
 MAN1=	console.1
 MAN5=	conserver.cf.5 conserver.passwd.5
@@ -26,15 +26,13 @@ MAN8=	conserver.8
 DEFAULTPORT?=	782
 DEFAULTHOST?=	localhost
 
-.include <bsd.port.pre.mk>
+SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
+		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
 
-.if ${ARCH} != "i386"
-CONFIGURE_ARGS+=--with-64bit
-.endif
+post-build:
+	${SED} ${SED_SCRIPT} ${FILESDIR}/conserver.sh >${WRKDIR}/conserver.sh
 
-post-patch:
-	${REINPLACE_CMD} \
-		-e 's@/usr/local/bin@${PREFIX}/sbin@' \
-		${WRKSRC}/conserver/conserver.rc.in
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/conserver.sh ${PREFIX}/etc/rc.d/conserver.sh
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/conserver-com/distinfo b/comms/conserver-com/distinfo
index 82ce50eb4629..e534bd01f954 100644
--- a/comms/conserver-com/distinfo
+++ b/comms/conserver-com/distinfo
@@ -1 +1 @@
-MD5 (conserver-7.2.7.tar.gz) = ff22779c9cc53406e948204109879820
+MD5 (conserver-8.0.4.tar.gz) = 262483c609bc1f534a1590aead1b3479
diff --git a/comms/conserver-com/files/conserver.sh b/comms/conserver-com/files/conserver.sh
new file mode 100644
index 000000000000..6a524744c926
--- /dev/null
+++ b/comms/conserver-com/files/conserver.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: conserver
+# KEYWORD: FreeBSD
+
+. %%RC_SUBR%%
+
+name=conserver
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/conserver
+pidfile=/var/run/conserver.pid
+required_files=%%PREFIX%%/etc/conserver.cf
+
+# set defaults
+[ -z "$conserver_enable" ]	&& conserver_enable=NO
+[ -z "$conserver_flags" ]	&& conserver_flags="-d"
+
+load_rc_config $name
+
+run_rc_command "$1"
diff --git a/comms/conserver-com/files/patch-conserver:Makefile.in b/comms/conserver-com/files/patch-conserver:Makefile.in
deleted file mode 100644
index 156edb2bd1f5..000000000000
--- a/comms/conserver-com/files/patch-conserver:Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 daac8c80fd6f..529a4641df85 100644
--- a/comms/conserver-com/pkg-plist
+++ b/comms/conserver-com/pkg-plist
@@ -1,3 +1,7 @@
-sbin/conserver
-etc/rc.d/conserver.sh
 bin/console
+etc/rc.d/conserver.sh
+%%EXAMPLESDIR%%/conserver.cf
+%%EXAMPLESDIR%%/conserver.passwd
+%%EXAMPLESDIR%%/conserver.rc
+sbin/conserver
+@dirrm %%EXAMPLESDIR%%