From owner-svn-ports-head@FreeBSD.ORG Sun Sep 1 17:29:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 127979D2; Sun, 1 Sep 2013 17:29:01 +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 E4BB729F5; Sun, 1 Sep 2013 17:29:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r81HT0ck057703; Sun, 1 Sep 2013 17:29:00 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r81HSx4Z057688; Sun, 1 Sep 2013 17:28:59 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201309011728.r81HSx4Z057688@svn.freebsd.org> From: Mark Felder Date: Sun, 1 Sep 2013 17:28:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325891 - in head/dns/rbldnsd: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Sep 2013 17:29:01 -0000 Author: feld Date: Sun Sep 1 17:28:59 2013 New Revision: 325891 URL: http://svnweb.freebsd.org/changeset/ports/325891 Log: - Update to 0.997a - Port cleanup to pass rclint/portlint PR: ports/181288 Submitted by: alexey@renatasystems.org Approved by: crees (mentor) Modified: head/dns/rbldnsd/Makefile head/dns/rbldnsd/distinfo head/dns/rbldnsd/files/pkg-message.in head/dns/rbldnsd/files/rbldnsd.in head/dns/rbldnsd/pkg-plist Modified: head/dns/rbldnsd/Makefile ============================================================================== --- head/dns/rbldnsd/Makefile Sun Sep 1 17:28:00 2013 (r325890) +++ head/dns/rbldnsd/Makefile Sun Sep 1 17:28:59 2013 (r325891) @@ -1,29 +1,15 @@ -# New ports collection makefile for: rbldnsd -# Date created: Fri Jun 13 05:30:12 EDT 2003 -# Whom: Paul Chvostek -# +# Created by: Paul Chvostek # $FreeBSD$ -# PORTNAME= rbldnsd -PORTVERSION= 0.996b -PORTREVISION= 1 +PORTVERSION= 0.997a CATEGORIES= dns -MASTER_SITES= http://www.corpit.ru/mjt/rbldnsd/:0 \ - http://www.it.ca/~paul/src/:0 -DISTFILES= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}:0 +MASTER_SITES= http://www.corpit.ru/mjt/rbldnsd/ \ + ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/ MAINTAINER= alexey@renatasystems.org COMMENT= Small and fast DNS daemon especially for DNSBL zones -.if !defined(NOPORTDOCS) -EXTRACT_ONLY+= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX} -MASTER_SITES+= http://www.corpit.ru/mjt/:1 \ - http://www.it.ca/~paul/src/:1 -DISTFILES+= rbldnsd.html:1 -IGNOREFILES+= rbldnsd.html -.endif - RBLDNSUSER= rbldns RBLDNSGROUP= ${RBLDNSUSER} ROOTDIR= ${PREFIX}/etc/rbldnsd/ @@ -37,6 +23,8 @@ GROUPS= ${USERS} PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message +.include + do-install: @if [ ! -d ${ROOTDIR} ]; then \ ${MKDIR} ${ROOTDIR}; \ @@ -47,7 +35,7 @@ do-install: ${FILESDIR}/example ${PREFIX}/etc/rbldnsd/ @${INSTALL_PROGRAM} ${WRKSRC}/rbldnsd ${PREFIX}/sbin/ @${INSTALL_MAN} ${WRKSRC}/rbldnsd.8 ${PREFIX}/man/man8/ -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR}/ @${INSTALL_DATA} ${WRKSRC}/CHANGES-0.81 ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR} @@ -57,7 +45,6 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/debian/rbldnsd.default ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/debian/rbldnsd.init ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/rbldnsd.spec ${DOCSDIR} - @${INSTALL_DATA} ${DISTDIR}/rbldnsd.html ${DOCSDIR} .endif -.include +.include Modified: head/dns/rbldnsd/distinfo ============================================================================== --- head/dns/rbldnsd/distinfo Sun Sep 1 17:28:00 2013 (r325890) +++ head/dns/rbldnsd/distinfo Sun Sep 1 17:28:59 2013 (r325891) @@ -1,3 +1,2 @@ -SHA256 (rbldnsd_0.996b.tar.gz) = 475afe5be8729a76b7c23e2f3d5ce1c773775140406a58bfb7477fac5a528342 -SIZE (rbldnsd_0.996b.tar.gz) = 113128 -SHA256 (rbldnsd.html) = IGNORE +SHA256 (rbldnsd-0.997a.tar.gz) = 9c17c6bde6995058204a66805444039d31523a7d4ef40cec059e505a0882a8ef +SIZE (rbldnsd-0.997a.tar.gz) = 144771 Modified: head/dns/rbldnsd/files/pkg-message.in ============================================================================== --- head/dns/rbldnsd/files/pkg-message.in Sun Sep 1 17:28:00 2013 (r325890) +++ head/dns/rbldnsd/files/pkg-message.in Sun Sep 1 17:28:59 2013 (r325891) @@ -1,6 +1,4 @@ ======================================================================== - NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE -======================================================================== The rbldnsd port has been installed with an example zone file, located in %%PREFIX%%/etc/rbldnsd/. Modified: head/dns/rbldnsd/files/rbldnsd.in ============================================================================== --- head/dns/rbldnsd/files/rbldnsd.in Sun Sep 1 17:28:00 2013 (r325890) +++ head/dns/rbldnsd/files/rbldnsd.in Sun Sep 1 17:28:59 2013 (r325891) @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id$ +# $FreeBSD$ # # PROVIDE: rbldnsd @@ -19,25 +19,22 @@ name=rbldnsd rcvar=rbldnsd_enable +load_rc_config $name + +rbldnsd_enable=${rbldnsd_enable:-"NO"} +rbldnsd_flags=${rbldnsd_flags:-"-r %%PREFIX%%/etc/rbldnsd -b 127.0.0.1 bl.example.com:ip4set:example"} command=%%PREFIX%%/sbin/rbldnsd pidfile=/var/run/rbldnsd.pid -load_rc_config $name -extra_commands="reload" - -stop_postcmd=stop_postcmd +extra_commands=reload +start_precmd=prestart +stop_postcmd="rm -f ${pidfile}" -stop_postcmd() +prestart() { - rm -f $pidfile + # enforce pidfile as first argument + rc_flags="-p ${pidfile} ${rbldnsd_flags}" } -# set defaults, enforce pidfile by making it last option before db - -rbldnsd_enable=${rbldnsd_enable:-"NO"} -rbldnsd_flags=${rbldnsd_flags:-"-r /usr/local/etc/rbldnsd -b 127.0.0.1 bl.example.com:ip4set:example"} -rbldnsd_flags="-p $pidfile ${rbldnsd_flags}" - run_rc_command "$1" - Modified: head/dns/rbldnsd/pkg-plist ============================================================================== --- head/dns/rbldnsd/pkg-plist Sun Sep 1 17:28:00 2013 (r325890) +++ head/dns/rbldnsd/pkg-plist Sun Sep 1 17:28:59 2013 (r325891) @@ -8,6 +8,5 @@ etc/rbldnsd/example %%PORTDOCS%%%%DOCSDIR%%/rbldnsd.default %%PORTDOCS%%%%DOCSDIR%%/rbldnsd.init %%PORTDOCS%%%%DOCSDIR%%/rbldnsd.spec -%%PORTDOCS%%%%DOCSDIR%%/rbldnsd.html %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry etc/rbldnsd/