From 0f89153b966352f62f7f16a4216f86ba27da8907 Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Thu, 20 Aug 2015 18:52:02 +0000
Subject: Use OPTIONS helpers, add a newline to quiet a half dozen portlint
 fatal messages, and make the installation commands more consistent.

---
 ports-mgmt/portmaster/Makefile | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'ports-mgmt/portmaster')

diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile
index f4f369f05e22..822a9f6e192f 100644
--- a/ports-mgmt/portmaster/Makefile
+++ b/ports-mgmt/portmaster/Makefile
@@ -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>
-- 
cgit v1.2.3