3 files changed, 62 insertions, 60 deletions

diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index f48726909bfe..483555640ab4 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smokeping
-PORTVERSION=	1.21
+PORTVERSION=	1.23
 CATEGORIES=	net www
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
@@ -31,7 +31,7 @@ MAN1=		Curl.pm.1 DNS.pm.1 EchoPing.pm.1 EchoPingChargen.pm.1 EchoPingDiscard.pm.
 		smokeping.cgi.1 smokeping_config.1 smokeping_install.1 telnetIOSPing.pm.1
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
-DOCDIR=		${PREFIX}/share/doc/smokeping
+
 DOC1=		CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
 DOC2=		Curl.pm DNS.pm EchoPing.pm EchoPingChargen.pm EchoPingDiscard.pm \
 		EchoPingHttp.pm EchoPingHttps.pm EchoPingIcp.pm EchoPingSmtp.pm \
@@ -71,17 +71,19 @@ pre-install:
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
 .for file in ${MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/doc/${file} ${PREFIX}/man/man1
 .endfor
-	@${MKDIR} ${DOCDIR}
+	@${MKDIR} ${DOCSDIR}
 .for file in ${DOC1}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .for file in ${DOC2}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.txt  ${DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.txt  ${DOCSDIR}
 .endfor
+.endif
 	@${MKDIR} ${PREFIX}/etc/smokeping
 .for file in ${ETC1}
 	@${INSTALL_DATA} ${WRKSRC}/etc/${file}.dist ${PREFIX}/etc/smokeping
diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo
index 2c04795e050e..2887f03d790f 100644
--- a/net/smokeping/distinfo
+++ b/net/smokeping/distinfo
@@ -1 +1 @@
-MD5 (smokeping-1.21.tar.gz) = ae33364826cec30610e1e5dc930bd1bf
+MD5 (smokeping-1.23.tar.gz) = 12161de246e5a6aabed3a54c0fb26b2e
diff --git a/net/smokeping/pkg-plist b/net/smokeping/pkg-plist
index 975ba9bb22fa..bbd6ea4cdd73 100644
--- a/net/smokeping/pkg-plist
+++ b/net/smokeping/pkg-plist
@@ -12,58 +12,58 @@ etc/smokeping/smokemail.dist
 @unexec if cmp -s %D/etc/smokeping/config-echoping %D/etc/smokeping/config-echoping.dist; then rm -f %D/etc/smokeping/config-echoping; fi
 etc/smokeping/config-echoping.dist
 @exec [ -f %B/config-echoping ] || cp %B/%f %B/config-echoping
-share/doc/smokeping/CHANGES
-share/doc/smokeping/CONTRIBUTORS
-share/doc/smokeping/COPYING
-share/doc/smokeping/COPYRIGHT
-share/doc/smokeping/README
-share/doc/smokeping/TODO
-share/doc/smokeping/Curl.pm.html
-share/doc/smokeping/Curl.pm.txt
-share/doc/smokeping/DNS.pm.html
-share/doc/smokeping/DNS.pm.txt
-share/doc/smokeping/EchoPing.pm.html
-share/doc/smokeping/EchoPing.pm.txt
-share/doc/smokeping/EchoPingChargen.pm.html
-share/doc/smokeping/EchoPingChargen.pm.txt
-share/doc/smokeping/EchoPingDiscard.pm.html
-share/doc/smokeping/EchoPingDiscard.pm.txt
-share/doc/smokeping/EchoPingHttp.pm.html
-share/doc/smokeping/EchoPingHttp.pm.txt
-share/doc/smokeping/EchoPingHttps.pm.html
-share/doc/smokeping/EchoPingHttps.pm.txt
-share/doc/smokeping/EchoPingIcp.pm.html
-share/doc/smokeping/EchoPingIcp.pm.txt
-share/doc/smokeping/EchoPingSmtp.pm.html
-share/doc/smokeping/EchoPingSmtp.pm.txt
-share/doc/smokeping/FPing.pm.html
-share/doc/smokeping/FPing.pm.txt
-share/doc/smokeping/FPing6.pm.html
-share/doc/smokeping/FPing6.pm.txt
-share/doc/smokeping/IOSPing.pm.html
-share/doc/smokeping/IOSPing.pm.txt
-share/doc/smokeping/ParseConfig.pm.html
-share/doc/smokeping/ParseConfig.pm.txt
-share/doc/smokeping/RemoteFPing.pm.html
-share/doc/smokeping/RemoteFPing.pm.txt
-share/doc/smokeping/Smokeping.pm.html
-share/doc/smokeping/Smokeping.pm.txt
-share/doc/smokeping/base.pm.html
-share/doc/smokeping/base.pm.txt
-share/doc/smokeping/basefork.pm.html
-share/doc/smokeping/basefork.pm.txt
-share/doc/smokeping/basevars.pm.html
-share/doc/smokeping/basevars.pm.txt
-share/doc/smokeping/smokeping.cgi.html
-share/doc/smokeping/smokeping.cgi.txt
-share/doc/smokeping/smokeping.html
-share/doc/smokeping/smokeping.txt
-share/doc/smokeping/smokeping_config.html
-share/doc/smokeping/smokeping_config.txt
-share/doc/smokeping/smokeping_install.html
-share/doc/smokeping/smokeping_install.txt
-share/doc/smokeping/telnetIOSPing.pm.html
-share/doc/smokeping/telnetIOSPing.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/Curl.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/Curl.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/DNS.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/DNS.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/EchoPing.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/EchoPing.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingChargen.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingChargen.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingDiscard.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingDiscard.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingHttp.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingHttp.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingHttps.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingHttps.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingIcp.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingIcp.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingSmtp.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/EchoPingSmtp.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/FPing.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/FPing.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/FPing6.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/FPing6.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/IOSPing.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/IOSPing.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/ParseConfig.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/ParseConfig.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/RemoteFPing.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/RemoteFPing.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/base.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/base.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/basefork.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/basefork.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/basevars.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/basevars.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.html
+%%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.txt
+%%PORTDOCS%%%%DOCSDIR%%/smokeping.html
+%%PORTDOCS%%%%DOCSDIR%%/smokeping.txt
+%%PORTDOCS%%%%DOCSDIR%%/smokeping_config.html
+%%PORTDOCS%%%%DOCSDIR%%/smokeping_config.txt
+%%PORTDOCS%%%%DOCSDIR%%/smokeping_install.html
+%%PORTDOCS%%%%DOCSDIR%%/smokeping_install.txt
+%%PORTDOCS%%%%DOCSDIR%%/telnetIOSPing.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/telnetIOSPing.pm.txt
 smokeping/htdocs/smokeping.cgi
 smokeping/lib/ISG/ParseConfig.pm
 smokeping/lib/ISG/VppGateway.pm
@@ -95,5 +95,5 @@ smokeping/lib/probes/telnetIOSPing.pm
 @dirrm smokeping/lib/probes
 @dirrm smokeping/lib/ISG
 @dirrm smokeping/lib
-@dirrm share/doc/smokeping
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/smokeping 2>/dev/null || true