svn commit: r306338 - in head/dns/maradns: . files

[Bernhard Froehlich]

Author: decke
Date: Wed Oct 24 08:01:21 2012
New Revision: 306338
URL: http://svn.freebsd.org/changeset/ports/306338

Log:
  - Convert to OptionsNG
  - Shrink pkg-desc to make portlint happy
  - Trim Makefile headers
  - Cleanup CLANG patch
  - Drop maintainership
  
  PR:		ports/172949
  Submitted by:	Takefu <takefu at airport.fm>
  Feature safe:	yes

Modified:
  head/dns/maradns/Makefile
  head/dns/maradns/files/patch-build_Makefile.freebsd
  head/dns/maradns/pkg-descr

Modified: head/dns/maradns/Makefile
==============================================================================
--- head/dns/maradns/Makefile	Wed Oct 24 07:35:35 2012	(r306337)
+++ head/dns/maradns/Makefile	Wed Oct 24 08:01:21 2012	(r306338)
@@ -1,16 +1,12 @@
-# New ports collection makefile for:	maradns
-# Date created:				26 May 2001
-# Whom:					Anders Nordby <anders at fix.no>
-#
+# Created by: Anders Nordby <anders at fix.no>
 # $FreeBSD$
-#
 
 PORTNAME=	maradns
 PORTVERSION=	1.4.12
 CATEGORIES=	dns
 MASTER_SITES=	http://www.maradns.org/download/1.4/
 
-MAINTAINER=	decke at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	DNS server with focus on security and simplicity
 
 LICENSE=	BSD
@@ -29,6 +25,8 @@ MAN1=		askmara.1 getzone.1 fetchzone.1
 MAN5=		mararc.5 csv1.5 csv2.5 csv2_txt.5
 MAN8=		maradns.8 zoneserver.8 duende.8
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g'
@@ -62,11 +60,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${ETCDIR}/example_csv2
 	${MKDIR} ${ETCDIR}/logger
 
-.ifndef(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/* ${EXAMPLESDIR}/
 .endif
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}/en
 	${INSTALL_DATA} ${WRKSRC}/doc/en/*.* ${DOCSDIR}/en
 	${INSTALL_DATA} ${WRKSRC}/doc/en/QuickStart ${DOCSDIR}/en

Modified: head/dns/maradns/files/patch-build_Makefile.freebsd
==============================================================================
--- head/dns/maradns/files/patch-build_Makefile.freebsd	Wed Oct 24 07:35:35 2012	(r306337)
+++ head/dns/maradns/files/patch-build_Makefile.freebsd	Wed Oct 24 08:01:21 2012	(r306338)
@@ -1,15 +1,12 @@
---- /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd 1970-01-01 09:00:00.000000000 +0900
-+++ dns/maradns1/files/patch-build_Makefile.freebsd 2012-01-17 15:13:25.000000000 +0900
-@@ -0,0 +1,12 @@
-+--- build/Makefile.freebsd.orig   2006-01-22 14:22:01.000000000 +0900
-++++ build/Makefile.freebsd 2012-01-17 15:13:16.000000000 +0900
-+@@ -27,8 +27,7 @@
-+ Q="DEFINES=-DSELECT_PROBLEM"
-+
-+ # FreeBSD needs some special flags to compile MaraDNS
-+-CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
-+-M=CC=$(CC)
-++M="CC=$(CC) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
-+ V="VERSION=$(VERSION)"
-+
-+ # Debug
+--- build/Makefile.freebsd.orig	2006-01-22 06:22:01.000000000 +0100
++++ build/Makefile.freebsd	2012-10-23 16:10:31.188976256 +0200
+@@ -27,8 +27,7 @@
+ Q="DEFINES=-DSELECT_PROBLEM"
+ 
+ # FreeBSD needs some special flags to compile MaraDNS
+-CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
+-M=CC=$(CC) 
++M="CC=$(CC) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
+ V="VERSION=$(VERSION)"
+ 
+ # Debug

Modified: head/dns/maradns/pkg-descr
==============================================================================
--- head/dns/maradns/pkg-descr	Wed Oct 24 07:35:35 2012	(r306337)
+++ head/dns/maradns/pkg-descr	Wed Oct 24 08:01:21 2012	(r306338)
@@ -5,22 +5,18 @@ o Secure. MaraDNS has a security history
   server. For example, MaraDNS has always randomized, using a secure random
   number generator, the Query ID and source port of DNS queries; and was never
   vulnerable to the "new" cache poisoning attack.
-
 o Supported. MaraDNS has a long history of being maintained and updated.
   Actively developed since 2001, MaraDNS continues to be fully supported: The
   most recent release was done on August 4, 2009. Deadwood, the code that will
   become part of MaraDNS 2.0, is frequently updated.
-
 o Easy to use. A basic recursive configuration needs only a single three-line
   configuration file. A basic authoritative configuration needs only a four-line
   configuration file and a one-line zone file. MaraDNS is fully documented, with
   both easy-to-follow tutorials and a complete and up-to-date reference manual.
-
 o Small. MaraDNS is well suited for embedded applications and other environments
   where the server must use the absolute minimum number of resources possible.
   MaraDNS' binary is smaller than that of any other currently maintained
   recursive DNS server.
-
 o Open Source. MaraDNS is fully open-source, The license is a two-clause BSD
   license that is almost identical to the FreeBSD license.