10 files changed, 30 insertions, 30 deletions

diff --git a/net/sntop/Makefile b/net/sntop/Makefile
index 1d83d542af61..a1263975f201 100644
--- a/net/sntop/Makefile
+++ b/net/sntop/Makefile
@@ -22,6 +22,6 @@ MAN1=		sntop.1
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/sntop
-	@cat ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 568bca98fa07..a81d1faa9f1c 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -39,10 +39,10 @@ CONFIGURE_ENV=	LIBS=-lcrypt
 
 .if !defined(NOPORTDOCS)
 post-install:
-	@${MKDIR} ${PREFIX}/share/examples/socks5
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/socks5
-	@${MKDIR} ${PREFIX}/share/doc/socks5
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/socks5
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/net/socks5/pkg-plist b/net/socks5/pkg-plist
index a2e73a15cf39..3ee9d11bbfe3 100644
--- a/net/socks5/pkg-plist
+++ b/net/socks5/pkg-plist
@@ -11,18 +11,18 @@ bin/rwhois
 include/socks.h
 lib/libsocks5.a
 lib/libsocks5_sh.so
-%%PORTDOCS%%share/examples/socks5/README
-%%PORTDOCS%%share/examples/socks5/multiple_server.example
-%%PORTDOCS%%share/examples/socks5/server_2_multiple_server.example
-%%PORTDOCS%%share/examples/socks5/single_homed_host.example
-%%PORTDOCS%%share/examples/socks5/socks5.conf.dualhomed
-%%PORTDOCS%%share/examples/socks5/socks5.conf.gssapi
-%%PORTDOCS%%share/examples/socks5/socks5.conf.multipleservers
-%%PORTDOCS%%share/examples/socks5/socks5.conf.server2server
-%%PORTDOCS%%share/examples/socks5/socks5.conf.singlehomed
-%%PORTDOCS%%@dirrm share/examples/socks5
-%%PORTDOCS%%share/doc/socks5/rfc1928.txt
-%%PORTDOCS%%share/doc/socks5/rfc1929.txt
-%%PORTDOCS%%share/doc/socks5/rfc1961.txt
-%%PORTDOCS%%share/doc/socks5/socks.faq
-%%PORTDOCS%%@dirrm share/doc/socks5
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/multiple_server.example
+%%PORTDOCS%%%%EXAMPLESDIR%%/server_2_multiple_server.example
+%%PORTDOCS%%%%EXAMPLESDIR%%/single_homed_host.example
+%%PORTDOCS%%%%EXAMPLESDIR%%/socks5.conf.dualhomed
+%%PORTDOCS%%%%EXAMPLESDIR%%/socks5.conf.gssapi
+%%PORTDOCS%%%%EXAMPLESDIR%%/socks5.conf.multipleservers
+%%PORTDOCS%%%%EXAMPLESDIR%%/socks5.conf.server2server
+%%PORTDOCS%%%%EXAMPLESDIR%%/socks5.conf.singlehomed
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/rfc1928.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc1929.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc1961.txt
+%%PORTDOCS%%%%DOCSDIR%%/socks.faq
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/ssldump/Makefile b/net/ssldump/Makefile
index 5667748e8c1e..f52eda4ae75c 100644
--- a/net/ssldump/Makefile
+++ b/net/ssldump/Makefile
@@ -22,7 +22,7 @@ USE_AUTOCONF=	YES
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE} \
-		--sbindir=${PREFIX}/bin	
+		--sbindir=${PREFIX}/bin
 
 MAN1=		ssldump.1
 PLIST_FILES=	bin/ssldump
diff --git a/net/thcrut/Makefile b/net/thcrut/Makefile
index 55a8682c60d9..79a4bf328c32 100644
--- a/net/thcrut/Makefile
+++ b/net/thcrut/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Local network discovery tool
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+= --with-libnet=${LOCALBASE} \
-		 --sysconfdir=${PREFIX}/share/thcrut
+CONFIGURE_ARGS+=	--with-libnet=${LOCALBASE} \
+		 	--sysconfdir=${PREFIX}/share/thcrut
 
 .include <bsd.port.mk>
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 7f3948f06f60..e7c06f0eddb6 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -51,8 +51,8 @@ post-patch:
 
 do-install:
 	@(cd ${WRKSRC}; ./vncinstall ${PREFIX}/bin ${PREFIX}/man)
-.for file in Xvnc vncviewer vncpasswd vncconnect
-	@${STRIP_CMD} ${PREFIX}/bin/${file}
+.for FILE in Xvnc vncviewer vncpasswd vncconnect
+	@${STRIP_CMD} ${PREFIX}/bin/${FILE}
 .endfor
 	@${MKDIR} ${DATADIR}/classes
 	${INSTALL_DATA} ${WRKSRC}/classes/*.* ${DATADIR}/classes
diff --git a/net/wakeonlan/Makefile b/net/wakeonlan/Makefile
index 7b800515f465..1f9308736000 100644
--- a/net/wakeonlan/Makefile
+++ b/net/wakeonlan/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Sends magic packets to WOL enabled NIC to switch on the called PC
 
 PERL_CONFIGURE=	yes
 
-MAN1=           wakeonlan.1
+MAN1=		wakeonlan.1
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
diff --git a/net/wakeonlan/pkg-plist b/net/wakeonlan/pkg-plist
index 54f74c5e4dc9..a6b3447b6ab3 100644
--- a/net/wakeonlan/pkg-plist
+++ b/net/wakeonlan/pkg-plist
@@ -1,5 +1,5 @@
 bin/wakeonlan
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/wakeonlan/.packlist
-share/examples/wakeonlan/lab001.wol
+%%EXAMPLESDIR%%%/lab001.wol
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/wakeonlan
-@dirrm share/examples/wakeonlan
+@dirrm %%EXAMPLESDIR%%%
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 70f8d7d1600f..b772f61e7d2c 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -37,7 +37,7 @@ BROKEN=		"Does not compile"
 pre-patch:
 	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/lib/abyss/src/data.c \
-		${WRKSRC}/tools/turbocharger/mod_gzip.c 
+		${WRKSRC}/tools/turbocharger/mod_gzip.c
 
 post-install:
 	@${RM} -f ${PREFIX}/lib/*.la
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 70f8d7d1600f..b772f61e7d2c 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -37,7 +37,7 @@ BROKEN=		"Does not compile"
 pre-patch:
 	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/lib/abyss/src/data.c \
-		${WRKSRC}/tools/turbocharger/mod_gzip.c 
+		${WRKSRC}/tools/turbocharger/mod_gzip.c
 
 post-install:
 	@${RM} -f ${PREFIX}/lib/*.la