8 files changed, 16 insertions, 22 deletions

diff --git a/net-mgmt/braa/Makefile b/net-mgmt/braa/Makefile
index e55c1b96b3be..bceed037f9f6 100644
--- a/net-mgmt/braa/Makefile
+++ b/net-mgmt/braa/Makefile
@@ -16,11 +16,13 @@ COMMENT=	Tool for making SNMP queries
 
 LIB_DEPENDS=	netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp
 
-USE_SIZE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 LDFLAGS+=	-lcompat
 
+PORTDOCS=	README
+PLIST_FILES=	bin/braa
+
 post-patch:
 .for file in Makefile
 	@${REINPLACE_CMD} -e \
diff --git a/net-mgmt/braa/pkg-plist b/net-mgmt/braa/pkg-plist
deleted file mode 100644
index eef16cb4e404..000000000000
--- a/net-mgmt/braa/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/braa
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/disco/Makefile b/net-mgmt/disco/Makefile
index 9ca3b45d13fd..e9241750141d 100644
--- a/net-mgmt/disco/Makefile
+++ b/net-mgmt/disco/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	http://www.altmode.com/disco/
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	IP discovery and fingerprinting utility
 
-USE_SIZE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -21,6 +20,9 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+PORTDOCS=	README
+PLIST_FILES=	bin/disco bin/disco.fp
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/net-mgmt/disco/pkg-plist b/net-mgmt/disco/pkg-plist
deleted file mode 100644
index eef894e808cc..000000000000
--- a/net-mgmt/disco/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/disco
-bin/disco.fp
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/fprobe/Makefile b/net-mgmt/fprobe/Makefile
index 298a2ac459c9..9d522ba01e3c 100644
--- a/net-mgmt/fprobe/Makefile
+++ b/net-mgmt/fprobe/Makefile
@@ -24,6 +24,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		 ${WRKSRC}/configure
 
+PORTDOCS=	ChangeLog README
+PLIST_FILES=	bin/fprobe
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/net-mgmt/fprobe/pkg-plist b/net-mgmt/fprobe/pkg-plist
deleted file mode 100644
index 199d523e5144..000000000000
--- a/net-mgmt/fprobe/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/fprobe
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/iftop/Makefile b/net-mgmt/iftop/Makefile
index c5e065dba0cc..9499208a282a 100644
--- a/net-mgmt/iftop/Makefile
+++ b/net-mgmt/iftop/Makefile
@@ -14,14 +14,15 @@ MASTER_SITES=	http://www.ex-parrot.com/~pdw/iftop/download/ \
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Network utility for real-time bandwidth usage information
 
-USE_SIZE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
-DOCFILES=	README
 
 MAN8=		iftop.8
 
+PORTDOCS=	README
+PLIST_FILES=	bin/iftop
+
 .include <bsd.port.pre.mk>
 
 post-patch:
@@ -30,13 +31,13 @@ post-patch:
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${PREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${MANPREFIX}/man/man8
 
 post-install:
 .ifndef (NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-.for doc in ${DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for i in README
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/net-mgmt/iftop/pkg-plist b/net-mgmt/iftop/pkg-plist
deleted file mode 100644
index 4198288675c7..000000000000
--- a/net-mgmt/iftop/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/iftop
-%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm %%PORTDOCS%%%%DOCSDIR%%