Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Jan 2019 13:30:05 +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: r489862 - head/security/vpnc
Message-ID:  <201901101330.x0ADU58b003200@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Jan 10 13:30:05 2019
New Revision: 489862
URL: https://svnweb.freebsd.org/changeset/ports/489862

Log:
  - Fix license
  - Simplify installation
  - Convert to options helpers
  - Correctly set installed files permissions in pkg-plist
  
  PR:		234787
  Submitted by:	amdmi3
  Approved by:	ehaupt (maintainer)

Modified:
  head/security/vpnc/Makefile
  head/security/vpnc/pkg-plist

Modified: head/security/vpnc/Makefile
==============================================================================
--- head/security/vpnc/Makefile	Thu Jan 10 13:01:00 2019	(r489861)
+++ head/security/vpnc/Makefile	Thu Jan 10 13:30:05 2019	(r489862)
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpn
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Client for Cisco 3000 VPN Concentrator
 
-LICENSE=	GPLv2 BSD2CLAUSE
+LICENSE=	GPLv2+ BSD2CLAUSE
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
@@ -29,60 +29,45 @@ ALL_TARGET=	all
 SHEBANG_FILES=	makeman.pl
 
 PORTDOCS=	README TODO
-MANPAGE8=	vpnc.8
 
-MAKE_ENV+=	BINS="${EXTRABUILDS}"
+MAKE_ENV=	BINS="${EXTRABUILDS}"
 
 OPTIONS_DEFINE=	DECRYPT SSL CISCOVERSION DOCS
+OPTIONS_DEFAULT=DECRYPT
+OPTIONS_SUB=	yes
 
-DECRYPT_DESC=		cisco-decypt password decrypt utility
 CISCOVERSION_DESC=	Mask linux presentation string
+CISCOVERSION_CFLAGS=	-DCISCO_PATCH_VERSION
 
-OPTIONS_DEFAULT=DECRYPT
+DECRYPT_DESC=	cisco-decypt password decrypt utility
+DECRYPT_VARS=	EXTRABUILDS+=cisco-decrypt
 
-.include <bsd.port.options.mk>
+SSL_VARS=	NO_PACKAGE="binary linked against OpenSSL must not be redistributed"
+SSL_CFLAGS=	-DOPENSSL_GPL_VIOLATION
+SSL_LDFLAGS=	-lcrypto
 
-.if ${PORT_OPTIONS:MDECRYPT}
-MANPAGE1=	cisco-decrypt.1
-EXTRABUILDS+=	cisco-decrypt
-PLIST_SUB+=	DECRYPT=""
-.else
-PLIST_SUB+=	DECRYPT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSSL}
-NO_PACKAGE=	binary linked against OpenSSL must not be redistributed
-CFLAGS+=	-DOPENSSL_GPL_VIOLATION
-LDFLAGS+=	-lcrypto
-.endif
-
-.if ${PORT_OPTIONS:MCISCOVERSION}
-CFLAGS+=	-DCISCO_PATCH_VERSION
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|.*%%FREEBSD_IPLEN_FIX%%.*|#define NEED_IPLEN_FIX 1|' \
 		${WRKSRC}/sysdep.h
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/config.c
 	@${REINPLACE_CMD} -e 's|\(/etc/vpnc\)|${PREFIX}\1|' \
-		${WRKSRC}/${MANPAGE8}.template
+		${WRKSRC}/vpnc.8.template
 
 do-install:
-	${INSTALL_PROGRAM} -m 751 ${WRKSRC}/vpnc ${STAGEDIR}${PREFIX}/sbin/vpnc
-.if ${PORT_OPTIONS:MDECRYPT}
-	${INSTALL_PROGRAM} ${WRKSRC}/cisco-decrypt ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MANPAGE1} ${STAGEDIR}${MANPREFIX}/man/man1
-.endif
-	${INSTALL_SCRIPT} -m 751 ${WRKSRC}/vpnc-disconnect \
+	${INSTALL_PROGRAM} ${WRKSRC}/vpnc ${STAGEDIR}${PREFIX}/sbin/vpnc
+	${INSTALL_SCRIPT} ${WRKSRC}/vpnc-disconnect \
 		${STAGEDIR}${PREFIX}/sbin/vpnc-disconnect
-	${INSTALL_DATA} -m 600 ${WRKSRC}/vpnc.conf \
+	${INSTALL_DATA} ${WRKSRC}/vpnc.conf \
 		${STAGEDIR}${PREFIX}/etc/vpnc.conf.sample
-.if !exists(${STAGEDIR}${PREFIX}/etc/vpnc.conf)
-	${INSTALL_DATA} -m 600 ${WRKSRC}/vpnc.conf ${STAGEDIR}${PREFIX}/etc
-.endif
-	${INSTALL_MAN} ${WRKSRC}/${MANPAGE8} ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/vpnc.8 ${STAGEDIR}${MANPREFIX}/man/man8
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+do-install-DECRYPT-on:
+	${INSTALL_PROGRAM} ${WRKSRC}/cisco-decrypt ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/cisco-decrypt.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/security/vpnc/pkg-plist
==============================================================================
--- head/security/vpnc/pkg-plist	Thu Jan 10 13:01:00 2019	(r489861)
+++ head/security/vpnc/pkg-plist	Thu Jan 10 13:30:05 2019	(r489862)
@@ -3,4 +3,4 @@ sbin/vpnc-disconnect
 man/man8/vpnc.8.gz
 %%DECRYPT%%bin/cisco-decrypt
 %%DECRYPT%%man/man1/cisco-decrypt.1.gz
-@sample etc/vpnc.conf.sample
+@sample(,,700) etc/vpnc.conf.sample



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