- Update to 2.16 - this fixes various bugs and adds random query IDs

  to prevent cache poisoning.

PR:		ports/72522
Submitted by:	Natanael Copa <ncopa@users.sourceforge.net>

While I'm here:
- Rework installation mechanism - use do-install target
- Respect NOPORTDOCS
- Install samples into EXAMPLESDIR
- Use DOCSDIR and EXAMPLESDIR macros in pkg-plist

3 files changed, 32 insertions, 18 deletions

diff --git a/dns/dnrd/Makefile b/dns/dnrd/Makefile
index 280cf1929b1f..15a7c1e847b0 100644
--- a/dns/dnrd/Makefile
+++ b/dns/dnrd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		dnrd
-PORTVERSION=		2.15
+PORTVERSION=		2.16
 CATEGORIES=		dns
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dnrd
@@ -21,24 +21,36 @@ GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 
-MAN8=			dnrd.8
-
 .if defined(WITH_TCP)
-CONFIGURE_ARGS+=        --enable-tcp
+CONFIGURE_ARGS+=	--enable-tcp
 .endif
 
 .if defined(WITHOUT_MASTER)
 CONFIGURE_ARGS+=	--disable-master
 .endif
 
+MAN8=			dnrd.8
+DOCS=			AUTHORS ChangeLog INSTALL README \
+			doc/README-cache doc/README-master  doc/TODO
+EXAMPLES=		doc/master.sample
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/dnrd|${PREFIX}/etc/dnrd|g' ${WRKSRC}/doc/dnrd.8 \
-		${WRKSRC}/doc/master.sample ${WRKSRC}/doc/README-master ${WRKSRC}/src/common.h \
+	@${REINPLACE_CMD} -e 's|/etc/dnrd|${PREFIX}/etc/dnrd|g' \
+		${WRKSRC}/doc/dnrd.8 ${WRKSRC}/doc/master.sample \
+		${WRKSRC}/doc/README-master ${WRKSRC}/src/common.h \
 		${WRKSRC}/src/master.c ${WRKSRC}/src/main.c
 	@${SED} -e 's|%%RC_SUBR%%|${RC_SUBR}|g' -e 's|%%PREFIX%%|${PREFIX}|' \
 		${FILESDIR}/dnrd.sh > ${WRKDIR}/dnrd.sh
 
-post-install:
+do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/dnrd.sh ${PREFIX}/etc/rc.d/dnrd.sh
+	${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${MAN8PREFIX}/man/man8
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/dns/dnrd/distinfo b/dns/dnrd/distinfo
index 8ea54098603a..a39d480dd69b 100644
--- a/dns/dnrd/distinfo
+++ b/dns/dnrd/distinfo
@@ -1,2 +1,2 @@
-MD5 (dnrd-2.15.tar.gz) = dcb6d06a66ffd9481e7f123527b90b42
-SIZE (dnrd-2.15.tar.gz) = 140496
+MD5 (dnrd-2.16.tar.gz) = 8509a4fd6f2318ab1984aeb3caf8ef10
+SIZE (dnrd-2.16.tar.gz) = 142657
diff --git a/dns/dnrd/pkg-plist b/dns/dnrd/pkg-plist
index 13d26d4353f7..39db0dae6af6 100644
--- a/dns/dnrd/pkg-plist
+++ b/dns/dnrd/pkg-plist
@@ -1,11 +1,13 @@
+@comment $FreeBSD$
 etc/rc.d/dnrd.sh
 sbin/dnrd
-share/doc/dnrd/AUTHORS
-share/doc/dnrd/COPYING
-share/doc/dnrd/ChangeLog
-share/doc/dnrd/NEWS
-share/doc/dnrd/README
-share/doc/dnrd/README-cache
-share/doc/dnrd/README-master
-share/doc/dnrd/master.sample
-@dirrm share/doc/dnrd
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-cache
+%%PORTDOCS%%%%DOCSDIR%%/README-master
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/master.sample
+@dirrm %%EXAMPLESDIR%%