From owner-svn-ports-head@freebsd.org Sun Jan 24 20:02:46 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB780A1D34E; Sun, 24 Jan 2016 20:02:46 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8924BD81; Sun, 24 Jan 2016 20:02:46 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0OK2j4Z090672; Sun, 24 Jan 2016 20:02:45 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0OK2jMS090671; Sun, 24 Jan 2016 20:02:45 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201601242002.u0OK2jMS090671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 24 Jan 2016 20:02:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407174 - head/sysutils/password-store X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2016 20:02:47 -0000 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@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 +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 .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