Index: head/ports-mgmt/portmaster/Makefile
===================================================================
--- head/ports-mgmt/portmaster/Makefile	(revision 394905)
+++ head/ports-mgmt/portmaster/Makefile	(revision 394906)
@@ -1,61 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	portmaster
 PORTVERSION=	3.17.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
 
 LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_TAGNAME=	94ed670
 
 OPTIONS_DEFINE=	BASH ZSH
 
 PLIST_FILES=	sbin/portmaster \
 		etc/portmaster.rc.sample \
 		man/man8/portmaster.8.gz
 
-.include <bsd.port.options.mk>
+BASH_PLIST_FILES=	etc/bash_completion.d/portmaster.sh
+ZSH_PLIST_FILES=	share/zsh/site-functions/_portmaster
 
-.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
-
 verify: checksum
 
 do-build:
 .for file in portmaster files/portmaster.rc.sample files/portmaster.8
 	${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>