26 files changed, 6 insertions, 34 deletions

diff --git a/sysutils/amrstat/Makefile b/sysutils/amrstat/Makefile
index a363965c7e72..b99ded8b15ff 100644
--- a/sysutils/amrstat/Makefile
+++ b/sysutils/amrstat/Makefile
@@ -12,8 +12,6 @@ COMMENT=	Utility for LSI Logic's MegaRAID RAID controllers
 
 LICENSE=	BSD2CLAUSE
 
-PLIST_DIRSTRY=	etc/periodic/daily \
-		etc/periodic
 PLIST_FILES=	etc/periodic/daily/407.status-amr-raid \
 		sbin/amrstat
 
diff --git a/sysutils/autojump/Makefile b/sysutils/autojump/Makefile
index a4c3e331d956..7ac1dbb59799 100644
--- a/sysutils/autojump/Makefile
+++ b/sysutils/autojump/Makefile
@@ -25,7 +25,6 @@ PLIST_FILES=	bin/autojump \
 		share/autojump/autojump.bash \
 		share/autojump/autojump.zsh \
 		share/autojump/icon.png
-PLIST_DIRS=	share/autojump
 
 OPTIONS_DEFINE=		ZSH
 OPTIONS_DEFAULT=	ZSH
diff --git a/sysutils/cciss_vol_status/Makefile b/sysutils/cciss_vol_status/Makefile
index fa0903947056..75185bb0910c 100644
--- a/sysutils/cciss_vol_status/Makefile
+++ b/sysutils/cciss_vol_status/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/cciss_vol_status etc/periodic/daily/cciss_vol_status man/man8/cciss_vol_status.8.gz
-PLIST_DIRS=	etc/periodic/daily etc/periodic
 SUB_FILES=	cciss_vol_status
 
 .if !exists(${SRC_BASE}/sys/dev/ciss/cissio.h)
diff --git a/sysutils/daemontools-encore/Makefile b/sysutils/daemontools-encore/Makefile
index eb89f3185fd1..8e68a5e97624 100644
--- a/sysutils/daemontools-encore/Makefile
+++ b/sysutils/daemontools-encore/Makefile
@@ -58,8 +58,6 @@ PLIST_FILES=	\
 	%%DOCSDIR%%/CHANGES.djb \
 	${MANFILES:S,^,man/man8/,:S,$,.gz,}
 
-PLIST_DIRSTRY=	%%DOCSDIR%%
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/svscanboot.sh ${STAGEDIR}${PREFIX}/bin/svscanboot
 .for binfile in envdir envuidgid fghack multilog pgrphack readproctitle setlock setuidgid softlimit supervise svc svok svscan svstat svup tai64n tai64nlocal
diff --git a/sysutils/dunst/Makefile b/sysutils/dunst/Makefile
index fc291467e843..18be5be7df89 100644
--- a/sysutils/dunst/Makefile
+++ b/sysutils/dunst/Makefile
@@ -34,6 +34,5 @@ PLIST_FILES=	bin/dunst \
 		share/dunst/dunstrc \
 		man/man1/dunst.1.gz \
 		share/dbus-1/services/org.knopwob.dunst.service
-PLIST_DIRS=	share/dunst
 
 .include <bsd.port.mk>
diff --git a/sysutils/duply/Makefile b/sysutils/duply/Makefile
index 1e4c2c9c2d8b..f6a19268e95e 100644
--- a/sysutils/duply/Makefile
+++ b/sysutils/duply/Makefile
@@ -21,7 +21,6 @@ NO_BUILD=	yes
 
 PORTDOCS=	INSTALL.txt gpl-2.0.txt
 PLIST_FILES=	bin/duply ${PERIODICDIR}/${PERIODICFILE}
-PLIST_DIRSTRY=	etc/periodic ${PERIODICDIR}
 PERIODICFILE?=	300.duply
 PERIODICDIR?=	${PREFIX}/etc/periodic/backup
 SUB_FILES=	pkg-message periodic_duply
diff --git a/sysutils/gkrellfire/Makefile b/sysutils/gkrellfire/Makefile
index 1a065c26c73f..1c474fe892ee 100644
--- a/sysutils/gkrellfire/Makefile
+++ b/sysutils/gkrellfire/Makefile
@@ -16,7 +16,6 @@ BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkre
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 PLIST_FILES=	libexec/gkrellm2/plugins/${PORTNAME}.so
-PLIST_DIRSTRY=	libexec/gkrellm2/plugins libexec/gkrellm2
 
 USES=		gmake pkgconfig tar:tgz
 MAKE_ARGS=	CC="${CC}"
diff --git a/sysutils/gkrelltop/Makefile b/sysutils/gkrelltop/Makefile
index 84fe7ee95c8f..b8e63b609d1f 100644
--- a/sysutils/gkrelltop/Makefile
+++ b/sysutils/gkrelltop/Makefile
@@ -26,9 +26,6 @@ MAKE_ARGS=	CC="${CC} ${CFLAGS} $$(pkg-config gtk+-2.0 --cflags)" \
 CFLAGS+=	-fPIC -DFREEBSD -DGKRELLM2
 
 PLIST_FILES=	libexec/gkrellm2/plugins-gkrellmd/gkrelltopd.so
-PLIST_DIRS=	libexec/gkrellm2/plugins-gkrellmd \
-		libexec/gkrellm2/plugins \
-		libexec/gkrellm2
 
 .if defined(GKRELLM_SERVER_ONLY)
 ALL_TARGET=	server
diff --git a/sysutils/graffer/Makefile b/sysutils/graffer/Makefile
index 7c81742ef04c..86820c4b289b 100644
--- a/sysutils/graffer/Makefile
+++ b/sysutils/graffer/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 PLIST_FILES=	bin/graffer \
 		etc/graffer/graffer.conf.example \
 		man/man8/graffer.8.gz
-PLIST_DIRS=	etc/graffer
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
diff --git a/sysutils/iograph/Makefile b/sysutils/iograph/Makefile
index 57873fc7e87f..aa9fbe2e0bba 100644
--- a/sysutils/iograph/Makefile
+++ b/sysutils/iograph/Makefile
@@ -17,7 +17,6 @@ PLIST_FILES=	bin/iograph \
 		%%DATADIR%%/in.gif \
 		%%DATADIR%%/out.gif \
 		%%DATADIR%%/iograph.gif
-PLIST_DIRS=	%%DATADIR%%
 
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index f09c9d31d952..30d0f3ce8d87 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -21,8 +21,6 @@ CONFIGURE_ARGS+=--enable-intf-lan --enable-intf-lanplus \
 PLIST_FILES=	bin/ipmitool man/man1/ipmitool.1.gz man/man8/ipmievd.8.gz \
 		sbin/ipmievd share/ipmitool/oem_ibm_sel_map \
 		${PERIODIC_DIR}/400.status-ipmi
-PLIST_DIRS=	share/ipmitool
-PLIST_DIRSTRY=	${PERIODIC_DIR} etc/periodic
 SUB_FILES=	status-ipmi.sh
 PORTDOCS=	AUTHORS COPYING ChangeLog README
 
diff --git a/sysutils/ldapvi/Makefile b/sysutils/ldapvi/Makefile
index 1fdfe8ae97c9..75623447e874 100644
--- a/sysutils/ldapvi/Makefile
+++ b/sysutils/ldapvi/Makefile
@@ -27,7 +27,6 @@ LIBS+=		-L${LOCALBASE}/lib
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz \
 		${DOCSDIR_REL}/manual.css ${DOCSDIR_REL}/manual.xml \
 		${DOCSDIR_REL}/bg.png ${DOCSDIR_REL}/html.xsl
-PLIST_DIRS=	${DOCSDIR_REL}
 
 # XXX should probably be converted to OptionsNG
 .if !defined(WANT_OPENLDAP_SASL) || defined(WITHOUT_SASL)
diff --git a/sysutils/mcollective-nrpe-agent/Makefile b/sysutils/mcollective-nrpe-agent/Makefile
index c98ccc859080..0491f8f08793 100644
--- a/sysutils/mcollective-nrpe-agent/Makefile
+++ b/sysutils/mcollective-nrpe-agent/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	share/mcollective/agent/nrpe.ddl \
 		share/mcollective/data/nrpe_data.ddl \
 		share/mcollective/data/nrpe_data.rb \
 		sbin/check-mc-nrpe
-PLIST_DIRSTRY=	share/mcollective/agent \
+PLIST_DIRS=	share/mcollective/agent \
 		share/mcollective/aggregate \
 		share/mcollective/application \
 		share/mcollective/data
@@ -30,7 +30,7 @@ NO_BUILD=	yes
 
 do-install:
 
-.for dir in ${PLIST_DIRSTRY}
+.for dir in ${PLIST_DIRS}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${dir}
 .endfor
 
diff --git a/sysutils/mcollective-shell-agent/Makefile b/sysutils/mcollective-shell-agent/Makefile
index 79500b315a6e..657ea54bb5e6 100644
--- a/sysutils/mcollective-shell-agent/Makefile
+++ b/sysutils/mcollective-shell-agent/Makefile
@@ -21,13 +21,13 @@ GH_COMMIT=	9fb27d5
 PLIST_FILES=	share/mcollective/agent/shell/job.rb \
 		share/mcollective/agent/shell.rb \
 		share/mcollective/agent/shell.ddl
-PLIST_DIRSTRY=	share/mcollective/agent/shell
+PLIST_DIRS=	share/mcollective/agent/shell
 
 NO_BUILD=	yes
 
 do-install:
 
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_DIRSTRY}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_DIRS}
 	${INSTALL_DATA} ${WRKSRC}/lib/mcollective/agent/shell/job.rb ${STAGEDIR}${PREFIX}/share/mcollective/agent/shell/
 	${INSTALL_DATA} ${WRKSRC}/lib/mcollective/agent/shell.rb ${STAGEDIR}${PREFIX}/share/mcollective/agent/
 	${INSTALL_DATA} ${WRKSRC}/lib/mcollective/agent/shell.ddl ${STAGEDIR}${PREFIX}/share/mcollective/agent/
diff --git a/sysutils/mcollective-shell-client/Makefile b/sysutils/mcollective-shell-client/Makefile
index c795d50957e6..e0c535a25e1c 100644
--- a/sysutils/mcollective-shell-client/Makefile
+++ b/sysutils/mcollective-shell-client/Makefile
@@ -24,12 +24,12 @@ GH_COMMIT=	9fb27d5
 PLIST_FILES=	share/mcollective/application/shell/watcher.rb \
 		share/mcollective/application/shell/prefix_stream_buf.rb \
 		share/mcollective/application/shell.rb
-PLIST_DIRSTRY=	share/mcollective/application/shell
+PLIST_DIRS=	share/mcollective/application/shell
 
 NO_BUILD=	yes
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_DIRSTRY}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_DIRS}
 	${INSTALL_DATA} ${WRKSRC}/lib/mcollective/application/shell/watcher.rb ${STAGEDIR}${PREFIX}/share/mcollective/application/shell/
 	${INSTALL_DATA} ${WRKSRC}/lib/mcollective/application/shell/prefix_stream_buf.rb ${STAGEDIR}${PREFIX}/share/mcollective/application/shell/
 	${INSTALL_DATA} ${WRKSRC}/lib/mcollective/application/shell.rb ${STAGEDIR}${PREFIX}/share/mcollective/application/
diff --git a/sysutils/memtest86/Makefile b/sysutils/memtest86/Makefile
index cd6794d0864d..db00adce210a 100644
--- a/sysutils/memtest86/Makefile
+++ b/sysutils/memtest86/Makefile
@@ -20,7 +20,6 @@ ISODEST=	Memtest86_${PORTVERSION:S/b//}.iso
 PORTDOCS=	README
 PLIST_FILES=	%%DATADIR%%/floppy.bin \
 		%%DATADIR%%/${ISODEST}
-PLIST_DIRS=	%%DATADIR%%
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
diff --git a/sysutils/pbimaker/Makefile b/sysutils/pbimaker/Makefile
index 6b845b268c2b..6538c41819ba 100644
--- a/sysutils/pbimaker/Makefile
+++ b/sysutils/pbimaker/Makefile
@@ -16,7 +16,6 @@ WRKSRC=		${WRKDIR}/PBIMaker
 
 PLIST_FILES=	bin/pbimaker \
 		share/pbimaker/defaulticon.png
-PLIST_DIRS=	share/pbimaker
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CC=gcc|CC?=gcc|' \
diff --git a/sysutils/rubygem-fluentd/Makefile b/sysutils/rubygem-fluentd/Makefile
index 1f8afaa66765..18334b02a8c2 100644
--- a/sysutils/rubygem-fluentd/Makefile
+++ b/sysutils/rubygem-fluentd/Makefile
@@ -20,7 +20,6 @@ USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 PLIST_FILES=	bin/fluent-cat bin/fluent-debug bin/fluent-gem bin/fluentd \
 		"@sample etc/fluentd/fluent.conf.sample"
-PLIST_DIRS=	etc/fluentd/plugin etc/fluentd
 RUBYGEM_AUTOPLIST=	yes
 USE_RC_SUBR=	fluentd
 USERS=		fluentd
diff --git a/sysutils/sec/Makefile b/sysutils/sec/Makefile
index 14135a73a79a..6574a1b9233d 100644
--- a/sysutils/sec/Makefile
+++ b/sysutils/sec/Makefile
@@ -24,7 +24,6 @@ PORTDOCS=	ChangeLog README
 PLIST_FILES=	bin/sec man/man8/sec.8.gz
 PORTCONTRIB=	convert.pl itostream.c swatch2sec.pl
 PLIST_FILES+=	${PORTCONTRIB:S|^|%%DATADIR%%/|}
-PLIST_DIRS+=	%%DATADIR%%
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/tclsyslog/Makefile b/sysutils/tclsyslog/Makefile
index c4e98fec3749..c6d4d34b184a 100644
--- a/sysutils/tclsyslog/Makefile
+++ b/sysutils/tclsyslog/Makefile
@@ -17,7 +17,6 @@ WRKSRC=		${WRKDIR}/tclsyslog
 PLIST_FILES=	lib/syslog/libsyslog.so.2.1 \
 		lib/syslog/pkgIndex.tcl \
 		man/mann/syslog.n.gz
-PLIST_DIRS=	lib/syslog
 
 post-patch:
 	@${REINPLACE_CMD} -E \
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index dcb870b8adf7..8004de2a976c 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -20,7 +20,6 @@ CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc
 PLIST_FILES=	bin/tmux \
 		man/man1/tmux.1.gz \
 		etc/bash_completion.d/tmux
-PLIST_DIRSTRY=	etc/bash_completion.d
 
 PORTDOCS=	CHANGES FAQ README TODO
 PORTEXAMPLES=	*
diff --git a/sysutils/torsmo/Makefile b/sysutils/torsmo/Makefile
index 2844505732a4..0ad06216a220 100644
--- a/sysutils/torsmo/Makefile
+++ b/sysutils/torsmo/Makefile
@@ -17,7 +17,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_FILES=	bin/torsmo \
 		man/man1/torsmo.1.gz \
 		%%EXAMPLESDIR%%/torsmorc.sample
-PLIST_DIRS=	%%EXAMPLESDIR%%
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
 OPTIONS_DEFINE=	XFT DOUBLE_BUFFER DOCS
diff --git a/sysutils/u-boot-beaglebone/Makefile b/sysutils/u-boot-beaglebone/Makefile
index 18df93336829..8cec4289cd1e 100644
--- a/sysutils/u-boot-beaglebone/Makefile
+++ b/sysutils/u-boot-beaglebone/Makefile
@@ -20,7 +20,6 @@ USES=		gmake tar:bzip2
 SSP_UNSAFE=	yes # cross-LD does not support -fstack-protector
 
 U_BOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
-PLIST_DIRS=	${U_BOOT_DIR} share/u-boot
 PLIST_FILES=	${U_BOOT_DIR}/bb-uboot.img \
 		${U_BOOT_DIR}/MLO \
 		${U_BOOT_DIR}/README
diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile
index 619702ea176d..7c4ec3ad5ebc 100644
--- a/sysutils/u-boot-rpi/Makefile
+++ b/sysutils/u-boot-rpi/Makefile
@@ -27,7 +27,6 @@ USES=		gmake
 SSP_UNSAFE=	yes # cross-build static linking dies with -fstack-protector
 
 U_BOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
-PLIST_DIRS=	${U_BOOT_DIR} share/u-boot
 PLIST_FILES=	${U_BOOT_DIR}/uboot.img \
 		${U_BOOT_DIR}/README
 
diff --git a/sysutils/u-boot-wandboard/Makefile b/sysutils/u-boot-wandboard/Makefile
index 38e0382fc764..787f5fca2b88 100644
--- a/sysutils/u-boot-wandboard/Makefile
+++ b/sysutils/u-boot-wandboard/Makefile
@@ -25,7 +25,6 @@ USES=		gmake
 SSP_UNSAFE=	yes # cross-build static linking dies with -fstack-protector
 
 U_BOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
-PLIST_DIRS=	${U_BOOT_DIR} share/u-boot
 PLIST_FILES=	${U_BOOT_DIR}/u-boot.imx \
 		${U_BOOT_DIR}/README
 
diff --git a/sysutils/zfs-periodic/Makefile b/sysutils/zfs-periodic/Makefile
index 18bf4f3e2deb..098f3f17cc9e 100644
--- a/sysutils/zfs-periodic/Makefile
+++ b/sysutils/zfs-periodic/Makefile
@@ -25,7 +25,6 @@ PERIODIC_FILES=	etc/periodic/hourly/000.zfs-snapshot \
 		etc/periodic/monthly/000.zfs-snapshot
 
 PLIST_FILES=	${PERIODIC_FILES} bin/zfs-snapshot
-PLIST_DIRSTRY=	${PERIODIC_DIRS}
 
 post-patch:
 .for _file in ${PERIODIC_FILES}