3 files changed, 39 insertions, 47 deletions

diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile
index f1f9d3845836..8115cd528349 100644
--- a/ports-mgmt/poudriere/Makefile
+++ b/ports-mgmt/poudriere/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-PORTVERSION=	3.0.15
+PORTVERSION=	3.0.16
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://fossil.etoilebsd.net/poudriere/tarball/ \
 		LOCAL/bdrewery/${PORTNAME}/
@@ -13,57 +13,14 @@ COMMENT=	Port build and test system
 LICENSE=	BSD2CLAUSE
 
 OPTIONS_DEFINE=	ZSH
+OPTIONS_SUB=	yes
 
 CONFLICTS_INSTALL=	poudriere-devel
 
-PLIST_FILES=	etc/poudriere.conf.sample \
-		bin/poudriere \
-		man/man8/poudriere.8.gz \
-		libexec/poudriere/cpdup \
-		libexec/poudriere/dirwatch \
-		libexec/poudriere/dirempty \
-		libexec/poudriere/make_index \
-		share/poudriere/awk/dependency_loop.awk \
-		share/poudriere/awk/humanize.awk \
-		share/poudriere/awk/json.awk \
-		share/poudriere/awk/make_index.awk \
-		share/poudriere/awk/siginfo_buildtime.awk \
-		share/poudriere/html/index.html \
-		share/poudriere/html/jquery-1.9.1.min.js \
-		share/poudriere/html/logo.jpg \
-		share/poudriere/html/poudriere.css \
-		share/poudriere/html/poudriere.js \
-		share/poudriere/bulk.sh \
-		share/poudriere/clean.sh \
-		share/poudriere/common.sh \
-		share/poudriere/daemon.sh \
-		share/poudriere/distclean.sh \
-		share/poudriere/jail.sh \
-		share/poudriere/options.sh \
-		share/poudriere/ports.sh \
-		share/poudriere/queue.sh \
-		share/poudriere/status.sh \
-		share/poudriere/testport.sh
-
-PLIST_DIRS=	libexec/poudriere \
-		share/poudriere/awk \
-		share/poudriere/html \
-		share/poudriere
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MZSH}
-PLIST_FILES+=	share/zsh/site-functions/_poudriere
-PLIST_DIRSTRY+=	share/zsh/site-functions
-PLIST_DIRSTRY+=	share/zsh/
-.endif
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/poudriere/*
-.if ${PORT_OPTIONS:MZSH}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	@${INSTALL_DATA} ${WRKSRC}/zsh-completions \
 	    ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_poudriere
-.endif
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/poudriere/distinfo b/ports-mgmt/poudriere/distinfo
index a83e954830de..3d3b4ca3787f 100644
--- a/ports-mgmt/poudriere/distinfo
+++ b/ports-mgmt/poudriere/distinfo
@@ -1,2 +1,2 @@
-SHA256 (poudriere-3.0.15.tar.gz?uuid=3.0.15) = ec1fe72479bb1fe5f4e220621499b665a3f9aa20bce28a7cff209d9c2603355b
-SIZE (poudriere-3.0.15.tar.gz?uuid=3.0.15) = 155345
+SHA256 (poudriere-3.0.16.tar.gz?uuid=3.0.16) = 52e48b19d436ba29df4411e187cbf02b83226945e4099ff0c30e01426d5919ae
+SIZE (poudriere-3.0.16.tar.gz?uuid=3.0.16) = 156112
diff --git a/ports-mgmt/poudriere/pkg-plist b/ports-mgmt/poudriere/pkg-plist
new file mode 100644
index 000000000000..1744b62c1495
--- /dev/null
+++ b/ports-mgmt/poudriere/pkg-plist
@@ -0,0 +1,35 @@
+bin/poudriere
+@sample etc/poudriere.conf.sample
+libexec/poudriere/cpdup
+libexec/poudriere/dirempty
+libexec/poudriere/dirwatch
+libexec/poudriere/make_index
+man/man8/poudriere.8.gz
+%%DATADIR%%/awk/dependency_loop.awk
+%%DATADIR%%/awk/humanize.awk
+%%DATADIR%%/awk/json.awk
+%%DATADIR%%/awk/make_index.awk
+%%DATADIR%%/awk/siginfo_buildtime.awk
+%%DATADIR%%/bulk.sh
+%%DATADIR%%/clean.sh
+%%DATADIR%%/common.sh
+%%DATADIR%%/daemon.sh
+%%DATADIR%%/distclean.sh
+%%DATADIR%%/html/index.html
+%%DATADIR%%/html/jquery-1.9.1.min.js
+%%DATADIR%%/html/logo.jpg
+%%DATADIR%%/html/poudriere.css
+%%DATADIR%%/html/poudriere.js
+%%DATADIR%%/jail.sh
+%%DATADIR%%/options.sh
+%%DATADIR%%/ports.sh
+%%DATADIR%%/queue.sh
+%%DATADIR%%/status.sh
+%%DATADIR%%/testport.sh
+%%ZSH%%share/zsh/site-functions/_poudriere
+%%ZSH%%@dirrmtry share/zsh/site-functions
+%%ZSH%%@dirrmtry share/zsh/
+@dirrmtry libexec/poudriere
+@dirrmtry %%DATADIR%%/awk
+@dirrmtry %%DATADIR%%/html
+@dirrmtry %%DATADIR%%