Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Sep 2015 17:02:59 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r397626 - head/net/ssltunnel-server
Message-ID:  <201509231702.t8NH2xjL036482@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Sep 23 17:02:59 2015
New Revision: 397626
URL: https://svnweb.freebsd.org/changeset/ports/397626

Log:
  - Switch to @sample, fix stage-qa
  - Use options helpers
  
  PR:		203282
  Submitted by:	amdmi3
  Approved by:	crees (maintainer)

Modified:
  head/net/ssltunnel-server/Makefile
  head/net/ssltunnel-server/pkg-plist

Modified: head/net/ssltunnel-server/Makefile
==============================================================================
--- head/net/ssltunnel-server/Makefile	Wed Sep 23 16:56:05 2015	(r397625)
+++ head/net/ssltunnel-server/Makefile	Wed Sep 23 17:02:59 2015	(r397626)
@@ -17,18 +17,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 OPTIONS_DEFINE=	TCPWRAPPERS DOCS
 TCPWRAPPERS_DESC=	libwrap support
 
+TCPWRAPPERS_CONFIGURE_ON=	--with-libwrap
+
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES+=	pkg-message
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-client
 USE_OPENSSL=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTCPWRAPPERS}
-CONFIGURE_ARGS+=--with-libwrap
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's^#include <utmp.h>^/*utmp.h not for FreeBSD*/^' \
 		${WRKSRC}/server/main.c \
@@ -40,6 +36,7 @@ post-patch:
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MV} ${STAGEDIR}${ETCDIR}/tunnel.conf.default ${STAGEDIR}${ETCDIR}/tunnel.conf.sample
 	${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

Modified: head/net/ssltunnel-server/pkg-plist
==============================================================================
--- head/net/ssltunnel-server/pkg-plist	Wed Sep 23 16:56:05 2015	(r397625)
+++ head/net/ssltunnel-server/pkg-plist	Wed Sep 23 17:02:59 2015	(r397626)
@@ -1,6 +1,5 @@
-@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
+@sample %%ETCDIR%%/tunnel.conf.sample
 %%ETCDIR%%/users.sample
 libexec/pppserver
 sbin/pppwho



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509231702.t8NH2xjL036482>