Date: Thu, 20 Aug 2015 18:52:02 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394906 - head/ports-mgmt/portmaster Message-ID: <201508201852.t7KIq2X2087085@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Thu Aug 20 18:52:02 2015 New Revision: 394906 URL: https://svnweb.freebsd.org/changeset/ports/394906 Log: Use OPTIONS helpers, add a newline to quiet a half dozen portlint fatal messages, and make the installation commands more consistent. Modified: head/ports-mgmt/portmaster/Makefile Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Thu Aug 20 18:30:28 2015 (r394905) +++ head/ports-mgmt/portmaster/Makefile Thu Aug 20 18:52:02 2015 (r394906) @@ -6,6 +6,7 @@ CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ GH + MAINTAINER= ports@FreeBSD.org COMMENT= Manage your ports without external databases or languages @@ -21,15 +22,8 @@ PLIST_FILES= sbin/portmaster \ etc/portmaster.rc.sample \ man/man8/portmaster.8.gz -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MBASH} -PLIST_FILES+= etc/bash_completion.d/portmaster.sh -.endif - -.if ${PORT_OPTIONS:MZSH} -PLIST_FILES+= share/zsh/site-functions/_portmaster -.endif +BASH_PLIST_FILES= etc/bash_completion.d/portmaster.sh +ZSH_PLIST_FILES= share/zsh/site-functions/_portmaster verify: checksum @@ -38,24 +32,23 @@ do-build: ${SED} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/${file} \ > ${WRKDIR}/${file:T} .endfor + do-install: ${INSTALL_SCRIPT} ${WRKDIR}/portmaster \ - ${STAGEDIR}${PREFIX}/sbin/portmaster + ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKDIR}/portmaster.rc.sample \ ${STAGEDIR}${PREFIX}/etc ${INSTALL_MAN} ${WRKSRC}/files/portmaster.8 \ ${STAGEDIR}${MAN8PREFIX}/man/man8 -post-install: -.if ${PORT_OPTIONS:MBASH} +post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC}/files/bash-completions \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d/portmaster.sh -.endif -.if ${PORT_OPTIONS:MZSH} + +post-install-ZSH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/files/zsh-completions \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_portmaster -.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508201852.t7KIq2X2087085>