4 files changed, 81 insertions, 25 deletions

diff --git a/dns/dnrd/Makefile b/dns/dnrd/Makefile
index d1f551b8d51c..076da8904a88 100644
--- a/dns/dnrd/Makefile
+++ b/dns/dnrd/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=		dnrd
-PORTVERSION=		2.20.1
+PORTVERSION=		2.20.3
 CATEGORIES=		dns
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	dnrd
+MASTER_SITES=		SF
 
-MAINTAINER=		ncopa@users.sourceforge.net
+MAINTAINER=		natanael.copa@gmail.com
 COMMENT=		A proxy DNS daemon
 
 USE_GMAKE=		yes
@@ -19,19 +18,25 @@ USE_RC_SUBR=		${PORTNAME}.sh
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_ARGS+=	--disable-dependency-tracking
 
 MAN8=		dnrd.8
-DOCS=		AUTHORS ChangeLog INSTALL README \
-		doc/README-cache doc/README-master  doc/TODO
-EXAMPLES=	doc/master.sample
-
-PORTDOCS=	*
-PLIST_FILES=	sbin/dnrd %%EXAMPLESDIR%%/master.sample
-PLIST_DIRS=	%%EXAMPLESDIR%% etc/dnrd
+DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README
+EXAMPLES=	README-cache README-cygwin README-master TODO \
+		master.sample
 
 OPTIONS=	TCP "Enable TCP support" off \
-		MASTER "Enable master file support" on
+		MASTER "Enable master file support" on \
+		DEBUG "Enable debugging" off \
+		RANDOM "Enable random source port" off
+
+DNRD_USER?=	dnrd
+DNRD_GROUP?=	dnrd
+DNRD_DIR?=	${ETCDIR}
+
+SUB_FILES=	pkg-install
+SUB_LIST+=	DNRD_USER=${DNRD_USER} \
+		DNRD_GROUP=${DNRD_GROUP} \
+		DNRD_DIR=${DNRD_DIR}
 
 .include <bsd.port.pre.mk>
 
@@ -39,26 +44,33 @@ OPTIONS=	TCP "Enable TCP support" off \
 CONFIGURE_ARGS+=	--enable-tcp
 .endif
 
-.if defined(WITHOUT_MASTER)
+.if !defined(WITH_MASTER)
 CONFIGURE_ARGS+=	--disable-master
 .endif
 
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
+.if defined(WITH_RANDOM)
+CONFIGURE_ARGS+=	--enable-random-src
+.endif
+
 pre-install:
 	@${ECHO} "==>  Creating custom user to run dnrd..."
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-post-install:
+do-install:
 	@${ECHO} "==>  Creating dnrd directory"
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${MAN8PREFIX}/man/man8
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${PREFIX}/sbin/
+	@${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${MAN8PREFIX}/man/man8/
+	@${INSTALL_DATA} ${WRKSRC}/doc/master.sample ${ETCDIR}/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/dns/dnrd/distinfo b/dns/dnrd/distinfo
index e826c6f838cf..1bef90f67aa3 100644
--- a/dns/dnrd/distinfo
+++ b/dns/dnrd/distinfo
@@ -1,3 +1,3 @@
-MD5 (dnrd-2.20.1.tar.gz) = cbd3657617ecb92e0fd19c5c9f1ccfd7
-SHA256 (dnrd-2.20.1.tar.gz) = 698acae5a0de7e6694dec441d63dbf68d1c9b83c6f43b1b086da11d270ffd40e
-SIZE (dnrd-2.20.1.tar.gz) = 157804
+MD5 (dnrd-2.20.3.tar.gz) = 41c9b070aae8ed403fc8c2aac7ab157c
+SHA256 (dnrd-2.20.3.tar.gz) = aa46e7f8736b88c1d752cf606b3990041221ce91d014e955c6b02eb2167db015
+SIZE (dnrd-2.20.3.tar.gz) = 161887
diff --git a/dns/dnrd/files/pkg-install.in b/dns/dnrd/files/pkg-install.in
new file mode 100644
index 000000000000..98bd6bee13c7
--- /dev/null
+++ b/dns/dnrd/files/pkg-install.in
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+PW="/usr/sbin/pw"
+CHOWN="/usr/sbin/chown"
+CHMOD="/bin/chmod"
+MKDIR="/bin/mkdir -p"
+NOLOGIN="/usr/sbin/nologin"
+
+DNRD_USER=%%DNRD_USER%%
+DNRD_GROUP=%%DNRD_GROUP%%
+DNRD_DIR=%%DNRD_DIR%%
+
+case "$2" in
+PRE-INSTALL)
+	${PW} groupshow -n ${DNRD_USER} >/dev/null 2>&1 \
+	|| ${PW} groupadd -n ${DNRD_USER}
+	${PW} usershow -n ${DNRD_USER} >/dev/null 2>&1 \
+	|| ${PW} useradd ${DNRD_USER} -g ${DNRD_GROUP} -s ${NOLOGIN}
+  ;;
+POST-INSTALL)
+	if [ ! -d ${DNRD_DIR} ]; then
+		${MKDIR} ${DNRD_DIR}
+	fi
+  ;;
+esac
diff --git a/dns/dnrd/pkg-plist b/dns/dnrd/pkg-plist
new file mode 100644
index 000000000000..3d57df621605
--- /dev/null
+++ b/dns/dnrd/pkg-plist
@@ -0,0 +1,19 @@
+sbin/dnrd
+%%ETCDIR%%/master.sample
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/README-cache
+%%PORTDOCS%%%%EXAMPLESDIR%%/README-cygwin
+%%PORTDOCS%%%%EXAMPLESDIR%%/README-master
+%%PORTDOCS%%%%EXAMPLESDIR%%/TODO
+%%PORTDOCS%%%%EXAMPLESDIR%%/master.sample
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%ETCDIR%%
+@unexec echo ""
+@unexec echo "If you are permanently removing dnrd, remove user/group 'dnrd'" | /usr/bin/fmt
+@unexec echo ""