Bug 181288 - [maintainer update] dns/rbldnsd - update to 0.997a
Summary: [maintainer update] dns/rbldnsd - update to 0.997a
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Mark Felder
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-08-14 14:00 UTC by Alexey Degtyarev
Modified: 2013-09-01 19:04 UTC (History)
0 users

See Also:


Attachments
rbldnsd-0.997a.diff (4.01 KB, patch)
2013-08-14 14:00 UTC, Alexey Degtyarev
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alexey Degtyarev 2013-08-14 14:00:00 UTC
	
This will update dns/rbldnsd to latest version: 0.997a.

Full changelog: http://www.corpit.ru/mjt/rbldnsd/changelog

Also small fixes in port's structure:

1.  Do not install .html document (actually this is not a single document but
    rather manpage converted to HTML).

2.  Convert to new options markup.

3.  Set my FTP as slave mirror.

4.  Convert port's options names to OptionsNG.

5.  Cosmetic fixes.
Comment 1 Mark Felder freebsd_committer freebsd_triage 2013-08-31 20:19:24 UTC
Responsible Changed
From-To: freebsd-ports-bugs->feld

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-09-01 18:29:08 UTC
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 <paul@it.ca>
-#
+# Created by: Paul Chvostek <paul@it.ca>
 # $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 <bsd.port.pre.mk>
+
 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 <bsd.port.mk>
+.include <bsd.port.post.mk>

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/
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Mark Felder freebsd_committer freebsd_triage 2013-09-01 19:04:42 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!