summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2011-02-05 22:54:02 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2011-02-05 22:54:02 +0000
commit0905e4911e0a81d2a9d990dc78733753c7200e58 (patch)
treee9ee0a78f6d474d8883d1be766c014d3c6cf1ba0
parent- Avoid CONFLICTS between ssltunnel-client and ssltunnel-server (diff)
- Avoid CONFLICTS between ssltunnel-client and ssltunnel-server
- Add OPTIONS: TCPWRAPPERS - Use ETCDIR - Use bsd.port.options.mk - Cosmetic changes PR: ports/154537 Submitted by: sunpoet (myself) Approved by: Chris Rees <utisoft@gmail.com> (maintainer) Feature safe: yes
Notes
Notes: svn path=/head/; revision=268697
-rw-r--r--net/ssltunnel-server/Makefile18
-rw-r--r--net/ssltunnel-server/pkg-plist14
2 files changed, 18 insertions, 14 deletions
diff --git a/net/ssltunnel-server/Makefile b/net/ssltunnel-server/Makefile
index 3c6fa5535c3b..f35a1f919c23 100644
--- a/net/ssltunnel-server/Makefile
+++ b/net/ssltunnel-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ssltunnel
PORTVERSION= 1.18
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.hsc.fr/ressources/outils/ssltunnel/download/
PKGNAMESUFFIX= -server
@@ -15,13 +16,16 @@ MAINTAINER= utisoft@gmail.com
COMMENT= PPP over SSL virtual private networking (server part)
LICENSE= BSD
+
+OPTIONS= TCPWRAPPERS "libwrap support" off
+
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-client
+CONFIGURE_ARGS= --disable-client
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if defined(WITH_TCPWRAPPERS)
-CONFIGURE_ARGS+= --with-libwrap
+CONFIGURE_ARGS+=--with-libwrap
.endif
post-patch:
@@ -36,11 +40,11 @@ post-patch:
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI ${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 ${PREFIX}/etc/ssltunnel/users.sample
+ ${INSTALL_DATA} ${WRKSRC}/server/users.new ${ETCDIR}/users.sample
@${CAT} ${PKGMESSAGE} | ${SED} "s|PREFIX|${PREFIX}|g"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/ssltunnel-server/pkg-plist b/net/ssltunnel-server/pkg-plist
index 7c4291b8c2c1..91afc3d9fe34 100644
--- a/net/ssltunnel-server/pkg-plist
+++ b/net/ssltunnel-server/pkg-plist
@@ -1,11 +1,11 @@
etc/rc.d/ssltunnel.sh.sample
-@unexec if cmp -s %D/etc/ssltunnel/tunnel.conf %D/etc/ssltunnel/tunnel.conf.default; then rm -f %D/etc/ssltunnel/tunnel.conf; fi
-@unexec if cmp -s %D/etc/ssltunnel/users %D/etc/ssltunnel/users.sample; then rm -f %D/etc/ssltunnel/users; fi
-etc/ssltunnel/tunnel.conf.default
-etc/ssltunnel/users.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
+%%ETCDIR%%/users.sample
libexec/pppserver
sbin/pppwho
-%%PORTDOCS%%%%DOCSDIR%%/LISEZ-MOI
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/server.LISEZ-MOI
+%%PORTDOCS%%%%DOCSDIR%%/server.README
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/ssltunnel
+@dirrmtry %%ETCDIR%%