net/sslh: update to 1.15

- Update to 1.15
- Convert lib depends to new format
- Remove MANPAGES option
- Allow staging

PR:		ports/183700
Submitted by:	Olivier Cochard-Labbe <olivier cochard.me> (maintainer)

6 files changed, 29 insertions, 85 deletions

diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index 1c42e576338e..9092a57ebdb8 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -2,52 +2,41 @@
 # $FreeBSD$
 
 PORTNAME=	sslh
-PORTVERSION=	1.13
-PORTREVISION=	1
+PORTVERSION=	1.15
 CATEGORIES=	net
 MASTER_SITES=	http://www.rutschle.net/tech/
 
 MAINTAINER=	olivier@cochard.me
-COMMENT=	A ssl/ssh multiplexer
+COMMENT=	SSL/SSH multiplexer
 
-LICENSE=    GPLv2
+LICENSE=	GPLv2
 
-DISTFILES=	${PORTNAME}-${PORTVERSION}b.tar.gz
-
-LIB_DEPENDS=	config:${PORTSDIR}/devel/libconfig
+LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig
 
 USES=		gmake perl5
 USE_PERL5=	build
 
-OPTIONS_DEFINE=	MANPAGES EXAMPLES
-OPTIONS_DEFAULT=	MANPAGES EXAMPLES
-
-CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_DEFAULT=	EXAMPLES
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+CFLAGS=		-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
-.if ${PORT_OPTIONS:MMANPAGES}
-MAN8=		sslh.8
-.endif
+PLIST_FILES=	sbin/sslh-fork \
+		sbin/sslh-select \
+		etc/sslh.conf.sample \
+		man/man8/sslh.8.gz
 
 USE_RC_SUBR=	sslh
 
 PORTEXAMPLES=	example.cfg
-MANCOMPRESSED=	yes
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/sslh-fork ${PREFIX}/sbin
-	@${INSTALL_PROGRAM} ${WRKSRC}/sslh-select ${PREFIX}/sbin
-	#@${MKDIR} ${VARDIR}/run/${PORTNAME}
-	#@${CHOWN} -R nobody:nobody ${VARDIR}/run/${PORTNAME}
-.if ${PORT_OPTIONS:MMANPAGES}
-	@${INSTALL_MAN} ${WRKSRC}/sslh.8.gz ${MANPREFIX}/man/man8
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${EXAMPLESDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/sslh-fork ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/sslh-select ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/basic.cfg ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/sslh.8.gz ${STAGEDIR}${MANPREFIX}/man/man8
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/net/sslh/distinfo b/net/sslh/distinfo
index 5b3ba269c692..4301aafa38f0 100644
--- a/net/sslh/distinfo
+++ b/net/sslh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sslh-1.13b.tar.gz) = e6493b53767b542652e99e64a1bceeded1d01a5e7a083fde9d67e7550f9c0eec
-SIZE (sslh-1.13b.tar.gz) = 30986
+SHA256 (sslh-1.15.tar.gz) = fc854cc5d95be2c50293e655b7427032ece74ebef1f7f0119c0fc3e207109ccd
+SIZE (sslh-1.15.tar.gz) = 33241
diff --git a/net/sslh/files/patch-Makefile b/net/sslh/files/patch-Makefile
deleted file mode 100644
index df629b2f6e54..000000000000
--- a/net/sslh/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./Makefile.orig	2012-06-03 02:10:16.959537483 +0200
-+++ ./Makefile	2012-06-03 02:10:20.312769958 +0200
-@@ -4,7 +4,7 @@
- USELIBCONFIG=1	# Use libconfig? (necessary to use configuration files)
- USELIBWRAP=	# Use libwrap?
- COV_TEST= 	# Perform test coverage?
--PREFIX=/usr/local
-+PREFIX ?=/usr/local
- 
- MAN=sslh.8.gz	# man page name
- 
-@@ -15,10 +15,9 @@
-     CFLAGS_COV=-fprofile-arcs -ftest-coverage
- endif
- 
--CC = gcc
--CFLAGS=-Wall -g $(CFLAGS_COV)
-+CC ?= gcc
-+CFLAGS ?=-Wall -g $(CFLAGS_COV)
- 
--LIBS=
- OBJS=common.o sslh-main.o probe.o
- 
- ifneq ($(strip $(USELIBWRAP)),)
diff --git a/net/sslh/files/sslh.in b/net/sslh/files/sslh.in
index 16afac2d4bcf..e83dc677b242 100644
--- a/net/sslh/files/sslh.in
+++ b/net/sslh/files/sslh.in
@@ -7,23 +7,17 @@
 # PROVIDE: sslh
 # REQUIRE: login
 # KEYWORD: shutdown
-
 #
 # Add the following to /etc/rc.conf[.local] to enable this service
 #
 # sslh_enable="YES"
 #
 # You can fine tune others variables too:
+# You can fine tune others variables too:
 # sslh_mode="fork | select"
 # fork: stable but slow performance
 # select: new but high performance
-# sslh_pidfile="/var/run/sslh.pid"
-# sslh_ssltarget="localhost:443"
-# sslh_sshtarget="localhost:22"
-# sslh_sshtimeout="2"
-# sslh_listening="0.0.0.0:8443"	
-# sslh_uid="nobody"
-# sslh_flags
+# sslh_fib: Routing table number
 
 sslh_precmd() {
 	if command -v check_namevarlist > /dev/null 2>&1; then
@@ -47,30 +41,17 @@ name="sslh"
 rcvar=sslh_enable
 
 start_precmd="sslh_precmd"
-stop_postcmd="sslh_postcmd"
 
 load_rc_config $name
-
 sslh_enable=${sslh_enable:-"NO"}
 sslh_mode=${sslh_mode:-"fork"}
-sslh_listening=${sslh_listening:-"0.0.0.0:443"}
-sslh_sshtarget=${sslh_sshtarget:-"localhost:22"}
-sslh_ssltarget=${sslh_ssltarget:-"localhost:8443"}
-sslh_sshtimeout=${sslh_sshtimeout:-"2"}
-sslh_openvpntarget=${sslh_openvpntarget:-"localhost:1193"}
-sslh_xmpptarget=${sslh_xmpptarget:-"localhost:5222"}
-sslh_tinctarget=${sslh_tinctarget:-"localhost:655"}
 
-pidfile=${sslh_pidfile:-"/var/run/sslh.pid"}
-command="%%PREFIX%%/sbin/${name}-${sslh_mode}"
-command_args="-t ${sslh_sshtimeout} -p ${sslh_listening} \
-	--ssh ${sslh_sshtarget} --ssl ${sslh_ssltarget} -P ${pidfile} \
-	--user nobody --openvpn ${sslh_openvpntarget} \
-	--xmpp ${sslh_xmpptarget} --tinc ${sslh_tinctarget}"
+required_files="%%PREFIX%%/etc/${name}.conf"
+for value in listening sshtarget ssltarget sshtimeout openvpntarget xmpptarget tinctarget;do
+	eval "[ -n \"\${sslh_${value}}\" ]" && warn "${name}_${value} no more used: Configuration file available"
+done
 
-sslh_postcmd()
-{
-    rm -f ${pidfile}
-}
+command="%%PREFIX%%/sbin/${name}-${sslh_mode}"
+command_args="-F %%PREFIX%%/etc/${name}.conf"
 
 run_rc_command "$1"
diff --git a/net/sslh/pkg-descr b/net/sslh/pkg-descr
index f08393bb0ce0..dae85d1109a1 100644
--- a/net/sslh/pkg-descr
+++ b/net/sslh/pkg-descr
@@ -2,4 +2,4 @@ sslh accepts HTTPS, SSH, OpenVPN, tinc and XMPP connections on the same port.
 This makes it possible to connect to any of these servers on port 443 while
 still serving HTTPS on that port.
 
-WWW:	http://www.rutschle.net/tech/sslh.shtml
+WWW: http://www.rutschle.net/tech/sslh.shtml
diff --git a/net/sslh/pkg-plist b/net/sslh/pkg-plist
deleted file mode 100644
index 9ab418f34bfa..000000000000
--- a/net/sslh/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-sbin/sslh-fork
-sbin/sslh-select