- respect NOPORTDOCS and NOPORTEXAMPLES

- fix plist
- use SF macro while here
- bump PORTREVISION

Prompted by:	QA Tindy run
Approved by:	maintainer timeout on BotMail

2 files changed, 13 insertions, 11 deletions

diff --git a/dns/dnswalk/Makefile b/dns/dnswalk/Makefile
index 830eec26c661..9a46aad85137 100644
--- a/dns/dnswalk/Makefile
+++ b/dns/dnswalk/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	dnswalk
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	dns
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	mark@foster.cc
 COMMENT=	DNS debugger - requests a zone transfer and analyzes the result
@@ -28,10 +28,12 @@ pre-configure:
 		 < ${WRKDIR}/dnswalk.orig > ${WRKDIR}/dnswalk
 
 do-install:
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/do-dnswalk ${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/makereports ${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/sendreports ${EXAMPLESDIR}
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/README ${DOCSDIR}
diff --git a/dns/dnswalk/pkg-plist b/dns/dnswalk/pkg-plist
index c0c2feefe2f3..c6823c54b8d8 100644
--- a/dns/dnswalk/pkg-plist
+++ b/dns/dnswalk/pkg-plist
@@ -1,10 +1,10 @@
 bin/dnswalk
-%%EXAMPLESDIR%%/do-dnswalk
-%%EXAMPLESDIR%%/makereports
-%%EXAMPLESDIR%%/sendreports
-%%DOCSDIR%%/README
-%%DOCSDIR%%/dnswalk.errors
-@exec mkdir -p %D/%%EXAMPLESDIR%%
-@exec mkdir -p %D/%%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/do-dnswalk
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makereports
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendreports
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/dnswalk.errors
+@comment @exec mkdir -p %D/%%EXAMPLESDIR%%
+@comment @exec mkdir -p %D/%%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%