ports/139273: [MAINTAINER] dns/dnsmasq: update to 2.51 rc1

Thu Oct 1 08:30:04 UTC 2009

>Number:         139273
>Category:       ports
>Synopsis:       [MAINTAINER] dns/dnsmasq: update to 2.51 rc1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 01 08:30:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Andree
>Release:        FreeBSD 6.4-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD vmfreebsd6.emma.line.org 6.4-RELEASE-p5 FreeBSD 6.4-RELEASE-p5 #0: Wed Jun 10 06:39:45 UTC 2009
>Description:
- update to 2.51.rc1
- install default configuration unless one already exists
- remove configuration if unchanged from default
- enable IDN/NLS in the build, enable by default
  note: these are currently tied together in the upstream dnsmasq and
  cannot be selected individually. This was reported to the upstream
  maintainer.
- add a tiny post-install message to help rookies, suggested by
  Sylvio Cesar scjamorim(a)bsd.com.br in ports/138514.

Added file(s):
- pkg-install

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- dnsmasq-2.51.r1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/dns/dnsmasq/Makefile /usr/home/ma/ports/dns/dnsmasq/Makefile
--- /usr/ports/dns/dnsmasq/Makefile	2009-09-02 14:18:10.000000000 +0200
+++ /usr/home/ma/ports/dns/dnsmasq/Makefile	2009-10-01 10:12:40.000000000 +0200
@@ -6,11 +6,13 @@
 #
 
 PORTNAME=	dnsmasq
-PORTVERSION=	2.50
+DISTVERSION=	2.51rc1
 CATEGORIES=	dns ipv6
-MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+#MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \
+#		${MASTER_SITE_GENTOO}
+#MASTER_SITE_SUBDIR=	distfiles
+MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/release-candidates/ \
+		http://homepages.uni-paderborn.de/mandree/
 
 MAINTAINER=	matthias.andree at gmx.de
 COMMENT=	Lightweight DNS forwarder, DHCP and TFTP server
@@ -28,6 +30,9 @@
 
 OPTIONS=	IPV6 "IPv6 support" on
 OPTIONS+=	DBUS "DBUS support" off
+OPTIONS+=	NLS  "NLS and IDN support" on
+# unfortunately, NLS and IDN are inseparable in dnsmasq 2.51rc1, this
+# has been reported to Simon Kelley on 2009-10-01 by the port maintainer.
 
 .include <bsd.port.pre.mk>
 
@@ -35,18 +40,26 @@
 CFLAGS+=	-DNO_IPV6
 .endif
 
+.if !defined(WITHOUT_NLS)
+LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
+PLIST_SUB+=	NLS=""
+ALL_TARGET=	all-i18n
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .if defined(WITH_DBUS)
 LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
 CFLAGS+=	-DHAVE_DBUS
+.if ${OSVERSION} < 700000
+LDFLAGS+=	${PTHREAD_LIBS}
+.endif
 .endif
 
 USE_RC_SUBR=	dnsmasq.sh
 
-post-patch:
-.if ${OSVERSION} < 700000 && defined(WITH_DBUS)
-	@${REINPLACE_CMD} -e 's|DBUS_LIBS="|DBUS_LIBS="${PTHREAD_LIBS} |' ${WRKSRC}/Makefile
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${PREFIX}/etc
@@ -55,10 +68,18 @@
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
+.if !defined(WITHOUT_NLS)
+.for i in de es fi fr id it no pl pt_BR ro
+	${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/src/${i}.mo \
+		${PREFIX}/share/locale/${i}/LC_MESSAGES/${PORTNAME}.mo
+.endfor
+.endif
 	${MKDIR} ${EXAMPLESDIR}/dynamic-dnsmasq ${EXAMPLESDIR}/dnslist
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl ${EXAMPLESDIR}/dynamic-dnsmasq/
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/dnslist/dnslist.pl ${EXAMPLESDIR}/dnslist/
 	${INSTALL_DATA} ${WRKSRC}/contrib/dnslist/dhcp.css ${EXAMPLESDIR}/dnslist/
 	${INSTALL_DATA} ${WRKSRC}/contrib/dnslist/dnslist.tt2 ${EXAMPLESDIR}/dnslist/
+	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/dns/dnsmasq/distinfo /usr/home/ma/ports/dns/dnsmasq/distinfo
--- /usr/ports/dns/dnsmasq/distinfo	2009-09-02 14:18:10.000000000 +0200
+++ /usr/home/ma/ports/dns/dnsmasq/distinfo	2009-10-01 09:04:26.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (dnsmasq-2.50.tar.gz) = f7b1e17c590e493039537434c57c9de7
-SHA256 (dnsmasq-2.50.tar.gz) = 43cb239cc10803fbc39fe1424b7481e7e1e553476a88c6d691b60da44762a60f
-SIZE (dnsmasq-2.50.tar.gz) = 402668
+MD5 (dnsmasq-2.51rc1.tar.gz) = 15eb437b56799e18c6e63fec008d2f9d
+SHA256 (dnsmasq-2.51rc1.tar.gz) = 491c5041e8a2323efe80b967e7bd42274373733618e41630c8ce0621b239029c
+SIZE (dnsmasq-2.51rc1.tar.gz) = 426811
diff -ruN --exclude=CVS /usr/ports/dns/dnsmasq/pkg-install /usr/home/ma/ports/dns/dnsmasq/pkg-install
--- /usr/ports/dns/dnsmasq/pkg-install	1970-01-01 01:00:00.000000000 +0100
+++ /usr/home/ma/ports/dns/dnsmasq/pkg-install	2009-10-01 10:12:02.000000000 +0200
@@ -0,0 +1,8 @@
+if [ "$2" = "POST-INSTALL" ] ; then
+test -e ${PKG_PREFIX}/etc/dnsmasq.conf \
+|| cp ${PKG_PREFIX}/etc/dnsmasq.conf.example ${PKG_PREFIX}/etc/dnsmasq.conf
+cat <<_EOF
+*** To enable dnsmasq, edit ${PKG_PREFIX}/etc/dnsmasq.conf and
+*** set dnsmasq_enable="YES" in /etc/rc.conf[.local]
+_EOF
+fi
diff -ruN --exclude=CVS /usr/ports/dns/dnsmasq/pkg-plist /usr/home/ma/ports/dns/dnsmasq/pkg-plist
--- /usr/ports/dns/dnsmasq/pkg-plist	2006-02-22 21:16:25.000000000 +0100
+++ /usr/home/ma/ports/dns/dnsmasq/pkg-plist	2009-10-01 10:13:50.000000000 +0200
@@ -7,3 +7,14 @@
 @dirrm %%EXAMPLESDIR%%/dnslist
 @dirrm %%EXAMPLESDIR%%/dynamic-dnsmasq
 @dirrm %%EXAMPLESDIR%%
+ at unexec if cmp -s %D/etc/dnsmasq.conf %D/etc/dnsmasq.conf.example ; then rm -f %D/etc/dnsmasq.conf ; fi
+%%NLS%%share/locale/de/LC_MESSAGES/dnsmasq.mo
+%%NLS%%share/locale/es/LC_MESSAGES/dnsmasq.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/dnsmasq.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/dnsmasq.mo
+%%NLS%%share/locale/id/LC_MESSAGES/dnsmasq.mo
+%%NLS%%share/locale/it/LC_MESSAGES/dnsmasq.mo
+%%NLS%%share/locale/no/LC_MESSAGES/dnsmasq.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/dnsmasq.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/dnsmasq.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/dnsmasq.mo
--- dnsmasq-2.51.r1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

