From owner-svn-ports-head@FreeBSD.ORG  Tue Sep  3 14:21:10 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id EE7C3DC9;
 Tue,  3 Sep 2013 14:21:09 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BB04520DE;
 Tue,  3 Sep 2013 14:21:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r83EL9O3071134;
 Tue, 3 Sep 2013 14:21:09 GMT (envelope-from feld@svn.freebsd.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r83EL9WA071131;
 Tue, 3 Sep 2013 14:21:09 GMT (envelope-from feld@svn.freebsd.org)
Message-Id: <201309031421.r83EL9WA071131@svn.freebsd.org>
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 3 Sep 2013 14:21:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r326153 - head/dns/rbldnsd
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Sep 2013 14:21:10 -0000

Author: feld
Date: Tue Sep  3 14:21:09 2013
New Revision: 326153
URL: http://svnweb.freebsd.org/changeset/ports/326153

Log:
  Further cleanup
  
  Approved by:	crees (mentor)

Modified:
  head/dns/rbldnsd/Makefile
  head/dns/rbldnsd/pkg-plist

Modified: head/dns/rbldnsd/Makefile
==============================================================================
--- head/dns/rbldnsd/Makefile	Tue Sep  3 14:16:20 2013	(r326152)
+++ head/dns/rbldnsd/Makefile	Tue Sep  3 14:21:09 2013	(r326153)
@@ -12,39 +12,38 @@ COMMENT=	Small and fast DNS daemon espec
 
 RBLDNSUSER=	rbldns
 RBLDNSGROUP=	${RBLDNSUSER}
-ROOTDIR=	${PREFIX}/etc/rbldnsd/
+ROOTDIR=	${PREFIX}/etc/rbldnsd
 
-MAN8=		rbldnsd.8
+MAN8=	rbldnsd.8
 
 HAS_CONFIGURE=	yes
 USE_RC_SUBR=	rbldnsd
-USERS=		rbldns
-GROUPS=		${USERS}
+USERS=	rbldns
+GROUPS=	${USERS}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 do-install:
-		@if [ ! -d ${ROOTDIR} ]; then \
-			${MKDIR} ${ROOTDIR}; \
-			${CHMOD} 710 ${ROOTDIR}; \
-			${CHOWN} ${RBLDNSUSER}:${RBLDNSGROUP} ${ROOTDIR}; \
-		fi
-		@${INSTALL_DATA} -o ${RBLDNSUSER} -g ${RBLDNSGROUP} -m 640 \
-			${FILESDIR}/example ${PREFIX}/etc/rbldnsd/
-		@${INSTALL_PROGRAM} ${WRKSRC}/rbldnsd ${PREFIX}/sbin/
-		@${INSTALL_MAN} ${WRKSRC}/rbldnsd.8 ${PREFIX}/man/man8/
+	if [ ! -d ${ROOTDIR} ]; then \
+		${INSTALL} -d -o ${RBLDNSUSER} -g ${RBLDNSGROUP} \
+		-m 710 ${ROOTDIR}; \
+	fi
+	${INSTALL_DATA} -o ${RBLDNSUSER} -g ${RBLDNSGROUP} -m 640 \
+		${FILESDIR}/example ${ROOTDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/rbldnsd ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/${MAN8} ${MAN8PREFIX}/man/man8
 .if ${PORT_OPTIONS:MDOCS}
-		@${MKDIR} ${DOCSDIR}/
-		@${INSTALL_DATA} ${WRKSRC}/CHANGES-0.81 ${DOCSDIR}
-		@${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
-		@${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
-		@${INSTALL_DATA} ${WRKSRC}/debian/changelog ${DOCSDIR}
-		@${INSTALL_DATA} ${WRKSRC}/debian/copyright ${DOCSDIR}
-		@${INSTALL_DATA} ${WRKSRC}/debian/rbldnsd.default ${DOCSDIR}
-		@${INSTALL_DATA} ${WRKSRC}/debian/rbldnsd.init ${DOCSDIR}
-		@${INSTALL_DATA} ${WRKSRC}/rbldnsd.spec ${DOCSDIR}
+	${INSTALL} -d ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES-0.81 ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/debian/changelog ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/debian/copyright ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/debian/rbldnsd.default ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/debian/rbldnsd.init ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/rbldnsd.spec ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/dns/rbldnsd/pkg-plist
==============================================================================
--- head/dns/rbldnsd/pkg-plist	Tue Sep  3 14:16:20 2013	(r326152)
+++ head/dns/rbldnsd/pkg-plist	Tue Sep  3 14:21:09 2013	(r326153)
@@ -9,4 +9,4 @@ etc/rbldnsd/example
 %%PORTDOCS%%%%DOCSDIR%%/rbldnsd.init
 %%PORTDOCS%%%%DOCSDIR%%/rbldnsd.spec
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry etc/rbldnsd/
+@dirrmtry etc/rbldnsd