4 files changed, 11 insertions, 77 deletions

diff --git a/dns/dnrd/Makefile b/dns/dnrd/Makefile
index 9c799018bd67..7048dc1686b6 100644
--- a/dns/dnrd/Makefile
+++ b/dns/dnrd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dnrd
 PORTVERSION=	2.20.3
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	SF
 
@@ -26,42 +27,20 @@ RANDOM_DESC=	Random source port
 
 USERS=		dnrd
 GROUPS=		dnrd
-DNRD_DIR?=	${ETCDIR}
 
-SUB_FILES=	pkg-install
-SUB_LIST+=	DNRD_DIR=${DNRD_DIR}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTCP}
-CONFIGURE_ARGS+=	--enable-tcp
-.endif
-
-.if ${PORT_OPTIONS:MMASTER}
-CONFIGURE_ARGS+=	--disable-master
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MRANDOM}
-CONFIGURE_ARGS+=	--enable-random-src
-.endif
+TCP_CONFIGURE_ENABLE=		tcp
+MASTER_CONFIGURE_ENABLE=	master
+DEBUG_CONFIGURE_ENABLE=		enable-debug
+RANDOM_CONFIGURE_ENABLE=	random-src
 
 do-install:
-	@${ECHO} "==>  Creating dnrd directory"
-	@${SETENV} DESTDIR="${STAGEDIR}" PKG_PREFIX="${STAGEDIR}${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${STAGEDIR}${PREFIX}/sbin/
-	@${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
-	@${INSTALL_DATA} ${WRKSRC}/doc/master.sample ${STAGEDIR}${ETCDIR}/
-.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/dnrd ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/doc/dnrd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
+	${INSTALL_DATA} ${WRKSRC}/doc/master.sample ${STAGEDIR}${ETCDIR}/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${EXAMPLESDIR}/
-.endif
+	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/dns/dnrd/files/pkg-install.in b/dns/dnrd/files/pkg-install.in
deleted file mode 100644
index 7aad7cb1cfd4..000000000000
--- a/dns/dnrd/files/pkg-install.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/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} ${DESTDIR}${DNRD_DIR}
-	fi
-  ;;
-esac
diff --git a/dns/dnrd/pkg-install b/dns/dnrd/pkg-install
deleted file mode 100644
index 950332819e14..000000000000
--- a/dns/dnrd/pkg-install
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-
-SYSCONF_DIR=${SYSCONF_DIR:-${PKG_PREFIX}/etc/dnrd}
-
-case $2 in
-	POST-INSTALL)
-		if [ ! -d ${SYSCONF_DIR} ]; then
-			mkdir -p ${SYSCONF_DIR}
-			if [ ! -d ${SYSCONF_DIR} ]; then
-				echo "Creating \"${SYSCONF_DIR}\" failed."
-				exit 1
-			fi
-		fi
-		;;
-esac
-exit 0
diff --git a/dns/dnrd/pkg-plist b/dns/dnrd/pkg-plist
index f277880a6342..002630d9d14d 100644
--- a/dns/dnrd/pkg-plist
+++ b/dns/dnrd/pkg-plist
@@ -1,6 +1,3 @@
 sbin/dnrd
 %%ETCDIR%%/master.sample
 man/man8/dnrd.8.gz
-@unexec echo ""
-@unexec echo "If you are permanently removing dnrd, remove user/group 'dnrd'" | /usr/bin/fmt
-@unexec echo ""