svn commit: r407174 - head/sysutils/password-store

Dmitry Marakasov amdmi3 at FreeBSD.org
Sun Jan 24 20:02:47 UTC 2016


Author: amdmi3
Date: Sun Jan 24 20:02:45 2016
New Revision: 407174
URL: https://svnweb.freebsd.org/changeset/ports/407174

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Add NO_ARCH
  - Use NO_BUILD instead of empty do-build target
  - Switch to options helpers

Modified:
  head/sysutils/password-store/Makefile

Modified: head/sysutils/password-store/Makefile
==============================================================================
--- head/sysutils/password-store/Makefile	Sun Jan 24 20:01:54 2016	(r407173)
+++ head/sysutils/password-store/Makefile	Sun Jan 24 20:02:45 2016	(r407174)
@@ -9,7 +9,8 @@ MASTER_SITES=	http://git.zx2c4.com/passw
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Stores, retrieves, generates, and synchronizes passwords securely
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		getopt>=0:${PORTSDIR}/misc/getopt \
@@ -17,23 +18,21 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bas
 		pwgen>=0:${PORTSDIR}/sysutils/pwgen \
 		tree>=1.7:${PORTSDIR}/sysutils/tree
 
+NO_ARCH=	yes
+NO_BUILD=	yes
+
 OPTIONS_DEFINE=		GIT XCLIP CONTRIB DOCS EXAMPLES
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 GIT_DESC=		Enable git storage
 XCLIP_DESC=		Enable xclip feature
-CONTRIB_DESC=	Include shell completions, import scripts, related projects
-
-.include <bsd.port.options.mk>
+CONTRIB_DESC=		Include shell completions, import scripts, related projects
 
-.if ${PORT_OPTIONS:MGIT}
-RUN_DEPENDS+=	git>=0:${PORTSDIR}/devel/git
-.endif
+GIT_RUN_DEPENDS=	git>=0:${PORTSDIR}/devel/git
+XCLIP_RUN_DEPENDS=	base64>=0:${PORTSDIR}/converters/base64 \
+			xclip>=0:${PORTSDIR}/x11/xclip
 
-.if ${PORT_OPTIONS:MXCLIP}
-RUN_DEPENDS+=	base64>=0:${PORTSDIR}/converters/base64 \
-		xclip>=0:${PORTSDIR}/x11/xclip
-.endif
+.include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MGIT} && ! ${PORT_OPTIONS:MXCLIP}
 EXTRA_PATCHES=	${PATCHDIR}/git+xclip.patch:-p1
@@ -47,21 +46,18 @@ post-patch:
 	@${REINPLACE_CMD} -Ee 's|GETOPT="getopt"|GETOPT="${LOCALBASE}/bin/getopt"|' ${WRKSRC}/src/password-store.sh
 	@${REINPLACE_CMD} -Ee 's|SHRED="shred -f -z"|SHRED="rm -P -f"|' ${WRKSRC}/src/password-store.sh
 
-# empty to skip make
-do-build:
-
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/pass
 	@${LN} -s ${PREFIX}/libexec/pass ${STAGEDIR}${PREFIX}/bin/pass
 
-.if ${PORT_OPTIONS:MCONTRIB}
+do-install-CONTRIB-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@(cd ${WRKSRC}/src/completion && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
-.endif
 
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_MAN} ${WRKSRC}/man/example-filter.sh ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${MANPREFIX}/man/man1/pass.1
+	${INSTALL_SCRIPT} ${WRKSRC}/man/example-filter.sh ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${MANPREFIX}/man/man1/pass.1
 
 .include <bsd.port.mk>


More information about the svn-ports-head mailing list