More staging and minor improvements

4 files changed, 35 insertions, 12 deletions

diff --git a/net/ssltunnel-server/Makefile b/net/ssltunnel-server/Makefile
index 1d2ae2085965..e63e8706d26e 100644
--- a/net/ssltunnel-server/Makefile
+++ b/net/ssltunnel-server/Makefile
@@ -11,15 +11,17 @@ PKGNAMESUFFIX=	-server
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	PPP over SSL virtual private networking (server part)
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	TCPWRAPPERS
 TCPWRAPPERS_DESC=	libwrap support
 
+USE_RC_SUBR=	${PORTNAME}
+SUB_FILES+=	pkg-message
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-client
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTCPWRAPPERS}
@@ -36,13 +38,9 @@ post-patch:
 		${WRKSRC}/server/users > ${WRKSRC}/server/users.new
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}/server.README
-	${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI ${DOCSDIR}/server.LISEZ-MOI
-.endif
-	${INSTALL_SCRIPT} ${WRKSRC}/server/pppserver.sh ${PREFIX}/etc/rc.d/ssltunnel.sh.sample
-	${INSTALL_DATA} ${WRKSRC}/server/users.new ${ETCDIR}/users.sample
-	@${CAT} ${PKGMESSAGE} | ${SED} "s|PREFIX|${PREFIX}|g"
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/server.README
+	${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI ${STAGEDIR}${DOCSDIR}/server.LISEZ-MOI
+	${INSTALL_DATA} ${WRKSRC}/server/users.new ${STAGEDIR}${ETCDIR}/users.sample
 
 .include <bsd.port.mk>
diff --git a/net/ssltunnel-server/pkg-message b/net/ssltunnel-server/files/pkg-message.in
index cf637f41f7ff..6b0c2880bd5c 100644
--- a/net/ssltunnel-server/pkg-message
+++ b/net/ssltunnel-server/files/pkg-message.in
@@ -1,4 +1,4 @@
-All ppp parameters that were to go into PREFIX/etc/ssltunnel/users should
+All ppp parameters that were to go into %%ETCDIR%%/users should
 go to /etc/ppp/ppp.conf for example:
 
 default:
diff --git a/net/ssltunnel-server/files/ssltunnel.in b/net/ssltunnel-server/files/ssltunnel.in
new file mode 100644
index 000000000000..4438846e54fd
--- /dev/null
+++ b/net/ssltunnel-server/files/ssltunnel.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: ssltunnel
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# To enable ssltunnel, add the following line to rc.conf:
+#	ssltunnel_enable=yes
+
+. /etc/rc.subr
+
+name=ssltunnel
+rcvar=ssltunnel_enable
+
+load_rc_config ssltunnel
+
+: ${ssltunnel_enable:=yes}
+
+command="%%PREFIX%%/libexec/pppserver"
+command_args="%%ETCDIR%%/tunnel.conf"
+required_files="%%ETCDIR%%/tunnel.conf"
+pidfile=/var/run/pppserver.pid
+
+run_rc_command $1
diff --git a/net/ssltunnel-server/pkg-plist b/net/ssltunnel-server/pkg-plist
index 91afc3d9fe34..5c94a1e7d78d 100644
--- a/net/ssltunnel-server/pkg-plist
+++ b/net/ssltunnel-server/pkg-plist
@@ -1,4 +1,3 @@
-etc/rc.d/ssltunnel.sh.sample
 @unexec if cmp -s %D/%%ETCDIR%%/tunnel.conf %D/%%ETCDIR%%/tunnel.conf.default; then rm -f %D/%%ETCDIR%%/tunnel.conf; fi
 @unexec if cmp -s %D/%%ETCDIR%%/users %D/%%ETCDIR%%/users.sample; then rm -f %D/%%ETCDIR%%/users; fi
 %%ETCDIR%%/tunnel.conf.default