From matthias.andree@gmx.de  Thu Oct  1 08:24:10 2009
Return-Path: <matthias.andree@gmx.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B76FD1065692
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Oct 2009 08:24:10 +0000 (UTC)
	(envelope-from matthias.andree@gmx.de)
Received: from mail.gmx.net (mail.gmx.net [213.165.64.20])
	by mx1.freebsd.org (Postfix) with SMTP id 34D9E8FC1E
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Oct 2009 08:24:09 +0000 (UTC)
Received: (qmail invoked by alias); 01 Oct 2009 08:24:08 -0000
Received: from f055246007.adsl.alicedsl.de (EHLO mandree.no-ip.org) [78.55.246.7]
  by mail.gmx.net (mp045) with SMTP; 01 Oct 2009 10:24:08 +0200
Received: from vmfreebsd6.emma.line.org (vmfreebsd6 [192.168.0.106])
	by merlin.emma.line.org (Postfix) with ESMTP id E553794761;
	Thu,  1 Oct 2009 10:24:06 +0200 (CEST)
Received: by vmfreebsd6.emma.line.org (Postfix, from userid 1001)
	id 358F43F49C; Thu,  1 Oct 2009 10:24:04 +0200 (CEST)
Message-Id: <20091001082404.358F43F49C@vmfreebsd6.emma.line.org>
Date: Thu,  1 Oct 2009 10:24:04 +0200 (CEST)
From: Matthias Andree <matthias.andree@gmx.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] dns/dnsmasq: update to 2.51 rc1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         139273
>Category:       ports
>Synopsis:       [MAINTAINER] dns/dnsmasq: update to 2.51 rc1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 01 08:30:03 UTC 2009
>Closed-Date:    Tue Oct 13 16:35:42 UTC 2009
>Last-Modified:  Mon Jan 25 23:20:06 UTC 2010
>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@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%%
+@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:

From: "Matthias Andree" <matthias.andree@gmx.de>
To: bug-followup@freebsd.org, matthias.andree@gmx.de
Cc:  
Subject: Re: ports/139273: [MAINTAINER] dns/dnsmasq: update to 2.51 rc1
Date: Mon, 12 Oct 2009 01:09:43 +0200

 ------------8CB3rsWbMM68xXTuD5B8wC
 Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes
 Content-Transfer-Encoding: 8bit
 
 Please use the attached newer patch instead,
 - it makes sure pkg-config is only build-time, not run-time dependency.
 - it makes sure we depend on pkg-config only if really needed
 - it moves the @unexec up in the pkg-plist so that we have something to  
 compare the config file against and will actually delete it if unaltered.
 
 -- 
 Matthias Andree
 ------------8CB3rsWbMM68xXTuD5B8wC
 Content-Disposition: attachment; filename=dnsmasq-newer.patch
 Content-Type: application/octet-stream; name=dnsmasq-newer.patch
 Content-Transfer-Encoding: Base64
 
 PT09PiBHZW5lcmF0aW5nIHBhdGNoCj09PT4gVmlld2luZyBkaWZmIHdpdGggbW9y
 ZQpkaWZmIC1ydU4gLS1leGNsdWRlPUNWUyAvdXNyL3BvcnRzL2Rucy9kbnNtYXNx
 L01ha2VmaWxlIC91c3IvaG9tZS9tYW5kcmVlL3BvcnRzL2Rucy9kbnNtYXNxL01h
 a2VmaWxlCi0tLSAvdXNyL3BvcnRzL2Rucy9kbnNtYXNxL01ha2VmaWxlCTIwMDkt
 MDktMDIgMTQ6MTg6MTAuMDAwMDAwMDAwICswMjAwCisrKyAvdXNyL2hvbWUvbWFu
 ZHJlZS9wb3J0cy9kbnMvZG5zbWFzcS9NYWtlZmlsZQkyMDA5LTEwLTEyIDAwOjM4
 OjI3LjAxMjQzNDQxMSArMDIwMApAQCAtNiwxMSArNiwxMyBAQAogIwogCiBQT1JU
 TkFNRT0JZG5zbWFzcQotUE9SVFZFUlNJT049CTIuNTAKK0RJU1RWRVJTSU9OPQky
 LjUxcmMxCiBDQVRFR09SSUVTPQlkbnMgaXB2NgotTUFTVEVSX1NJVEVTPQlodHRw
 Oi8vd3d3LnRoZWtlbGxleXMub3JnLnVrL2Ruc21hc3EvIFwKLQkJJHtNQVNURVJf
 U0lURV9HRU5UT099Ci1NQVNURVJfU0lURV9TVUJESVI9CWRpc3RmaWxlcworI01B
 U1RFUl9TSVRFUz0JaHR0cDovL3d3dy50aGVrZWxsZXlzLm9yZy51ay9kbnNtYXNx
 LyBcCisjCQkke01BU1RFUl9TSVRFX0dFTlRPT30KKyNNQVNURVJfU0lURV9TVUJE
 SVI9CWRpc3RmaWxlcworTUFTVEVSX1NJVEVTPQlodHRwOi8vd3d3LnRoZWtlbGxl
 eXMub3JnLnVrL2Ruc21hc3EvcmVsZWFzZS1jYW5kaWRhdGVzLyBcCisJCWh0dHA6
 Ly9ob21lcGFnZXMudW5pLXBhZGVyYm9ybi5kZS9tYW5kcmVlLwogCiBNQUlOVEFJ
 TkVSPQltYXR0aGlhcy5hbmRyZWVAZ214LmRlCiBDT01NRU5UPQlMaWdodHdlaWdo
 dCBETlMgZm9yd2FyZGVyLCBESENQIGFuZCBURlRQIHNlcnZlcgpAQCAtMjEsMTMg
 KzIzLDE1IEBACiAKIFJDX1NDUklQVFNfU1VCPQlQUkVGSVg9JHtQUkVGSVh9IFJD
 X1NVQlI9JHtSQ19TVUJSfQogCi1VU0VfR05PTUU9CXBrZ2NvbmZpZwogTUFLRV9K
 T0JTX1NBRkU9CXllcwogTUFLRV9FTlY9CUxJQlM9IiR7TERGTEFHU30iIFJQTV9P
 UFRfRkxBR1M9IiR7Q1BQRkxBR1N9IiBDT1BUUz0iJHtDRkxBR1N9IgogTUFLRV9B
 UkdTPQlDQz0iJHtDQ30iIENGTEFHUz0iJHtDRkxBR1N9IiBQUkVGSVg9IiR7UFJF
 RklYfSIKIAogT1BUSU9OUz0JSVBWNiAiSVB2NiBzdXBwb3J0IiBvbgogT1BUSU9O
 Uys9CURCVVMgIkRCVVMgc3VwcG9ydCIgb2ZmCitPUFRJT05TKz0JTkxTICAiTkxT
 IGFuZCBJRE4gc3VwcG9ydCIgb24KKyMgdW5mb3J0dW5hdGVseSwgTkxTIGFuZCBJ
 RE4gYXJlIGluc2VwYXJhYmxlIGluIGRuc21hc3EgMi41MXJjMSwgdGhpcworIyBo
 YXMgYmVlbiByZXBvcnRlZCB0byBTaW1vbiBLZWxsZXkgb24gMjAwOS0xMC0wMSBi
 eSB0aGUgcG9ydCBtYWludGFpbmVyLgogCiAuaW5jbHVkZSA8YnNkLnBvcnQucHJl
 Lm1rPgogCkBAIC0zNSwxOCArMzksMzIgQEAKIENGTEFHUys9CS1ETk9fSVBWNgog
 LmVuZGlmCiAKKy5pZiAhZGVmaW5lZChXSVRIT1VUX05MUykKK0xJQl9ERVBFTkRT
 Kz0JaWRuOiR7UE9SVFNESVJ9L2Rucy9saWJpZG4KK1BMSVNUX1NVQis9CU5MUz0i
 IgorQUxMX1RBUkdFVD0JYWxsLWkxOG4KK1VTRV9HRVRURVhUPQl5ZXMKK1VTRV9H
 TUFLRT0JeWVzCitfbmVlZF9wa2djb25maWc9eWVzCisuZWxzZQorUExJU1RfU1VC
 Kz0JTkxTPSJAY29tbWVudCAiCisuZW5kaWYKKwogLmlmIGRlZmluZWQoV0lUSF9E
 QlVTKQogTElCX0RFUEVORFMrPQlkYnVzLTE6JHtQT1JUU0RJUn0vZGV2ZWwvZGJ1
 cwogQ0ZMQUdTKz0JLURIQVZFX0RCVVMKK19uZWVkX3BrZ2NvbmZpZz15ZXMKKy5p
 ZiAke09TVkVSU0lPTn0gPCA3MDAwMDAKK0xERkxBR1MrPQkke1BUSFJFQURfTElC
 U30KKy5lbmRpZgogLmVuZGlmCiAKLVVTRV9SQ19TVUJSPQlkbnNtYXNxLnNoCi0K
 LXBvc3QtcGF0Y2g6Ci0uaWYgJHtPU1ZFUlNJT059IDwgNzAwMDAwICYmIGRlZmlu
 ZWQoV0lUSF9EQlVTKQotCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfERCVVNfTElC
 Uz0ifERCVVNfTElCUz0iJHtQVEhSRUFEX0xJQlN9IHwnICR7V1JLU1JDfS9NYWtl
 ZmlsZQorLmlmIGRlZmluZWQoX25lZWRfcGtnY29uZmlnKQorQlVJTERfREVQRU5E
 Uz0JcGtnLWNvbmZpZzoke1BPUlRTRElSfS9kZXZlbC9wa2ctY29uZmlnCiAuZW5k
 aWYKIAorVVNFX1JDX1NVQlI9CWRuc21hc3Euc2gKKwogZG8taW5zdGFsbDoKIAkk
 e0lOU1RBTExfUFJPR1JBTX0gJHtXUktTUkN9L3NyYy9kbnNtYXNxICR7UFJFRklY
 fS9zYmluCiAJJHtJTlNUQUxMX0RBVEF9ICR7V1JLU1JDfS9kbnNtYXNxLmNvbmYu
 ZXhhbXBsZSAke1BSRUZJWH0vZXRjCkBAIC01NSwxMCArNzMsMTggQEAKIAlAJHtN
 S0RJUn0gJHtET0NTRElSfQogCWNkICR7V1JLU1JDfSAmJiAke0lOU1RBTExfREFU
 QX0gJHtQT1JURE9DU30gJHtET0NTRElSfQogLmVuZGlmCisuaWYgIWRlZmluZWQo
 V0lUSE9VVF9OTFMpCisuZm9yIGkgaW4gZGUgZXMgZmkgZnIgaWQgaXQgbm8gcGwg
 cHRfQlIgcm8KKwkke01LRElSfSAke1BSRUZJWH0vc2hhcmUvbG9jYWxlLyR7aX0v
 TENfTUVTU0FHRVMKKwkke0lOU1RBTExfREFUQX0gJHtXUktTUkN9L3NyYy8ke2l9
 Lm1vIFwKKwkJJHtQUkVGSVh9L3NoYXJlL2xvY2FsZS8ke2l9L0xDX01FU1NBR0VT
 LyR7UE9SVE5BTUV9Lm1vCisuZW5kZm9yCisuZW5kaWYKIAkke01LRElSfSAke0VY
 QU1QTEVTRElSfS9keW5hbWljLWRuc21hc3EgJHtFWEFNUExFU0RJUn0vZG5zbGlz
 dAogCSR7SU5TVEFMTF9TQ1JJUFR9ICR7V1JLU1JDfS9jb250cmliL2R5bmFtaWMt
 ZG5zbWFzcS9keW5hbWljLWRuc21hc3EucGwgJHtFWEFNUExFU0RJUn0vZHluYW1p
 Yy1kbnNtYXNxLwogCSR7SU5TVEFMTF9TQ1JJUFR9ICR7V1JLU1JDfS9jb250cmli
 L2Ruc2xpc3QvZG5zbGlzdC5wbCAke0VYQU1QTEVTRElSfS9kbnNsaXN0LwogCSR7
 SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vY29udHJpYi9kbnNsaXN0L2RoY3AuY3Nz
 ICR7RVhBTVBMRVNESVJ9L2Ruc2xpc3QvCiAJJHtJTlNUQUxMX0RBVEF9ICR7V1JL
 U1JDfS9jb250cmliL2Ruc2xpc3QvZG5zbGlzdC50dDIgJHtFWEFNUExFU0RJUn0v
 ZG5zbGlzdC8KKwkke1NFVEVOVn0gUEtHX1BSRUZJWD0iJHtQUkVGSVh9IiAke1NI
 fSAke1BLR0lOU1RBTEx9ICR7UEtHTkFNRX0gUE9TVC1JTlNUQUxMCiAKIC5pbmNs
 dWRlIDxic2QucG9ydC5wb3N0Lm1rPgpkaWZmIC1ydU4gLS1leGNsdWRlPUNWUyAv
 dXNyL3BvcnRzL2Rucy9kbnNtYXNxL2Rpc3RpbmZvIC91c3IvaG9tZS9tYW5kcmVl
 L3BvcnRzL2Rucy9kbnNtYXNxL2Rpc3RpbmZvCi0tLSAvdXNyL3BvcnRzL2Rucy9k
 bnNtYXNxL2Rpc3RpbmZvCTIwMDktMDktMDIgMTQ6MTg6MTAuMDAwMDAwMDAwICsw
 MjAwCisrKyAvdXNyL2hvbWUvbWFuZHJlZS9wb3J0cy9kbnMvZG5zbWFzcS9kaXN0
 aW5mbwkyMDA5LTEwLTEyIDAwOjM0OjU5LjQxNDMzNTIxMSArMDIwMApAQCAtMSwz
 ICsxLDMgQEAKLU1ENSAoZG5zbWFzcS0yLjUwLnRhci5neikgPSBmN2IxZTE3YzU5
 MGU0OTMwMzk1Mzc0MzRjNTdjOWRlNwotU0hBMjU2IChkbnNtYXNxLTIuNTAudGFy
 Lmd6KSA9IDQzY2IyMzljYzEwODAzZmJjMzlmZTE0MjRiNzQ4MWU3ZTFlNTUzNDc2
 YTg4YzZkNjkxYjYwZGE0NDc2MmE2MGYKLVNJWkUgKGRuc21hc3EtMi41MC50YXIu
 Z3opID0gNDAyNjY4CitNRDUgKGRuc21hc3EtMi41MXJjMS50YXIuZ3opID0gMTVl
 YjQzN2I1Njc5OWUxOGM2ZTYzZmVjMDA4ZDJmOWQKK1NIQTI1NiAoZG5zbWFzcS0y
 LjUxcmMxLnRhci5neikgPSA0OTFjNTA0MWU4YTIzMjNlZmU4MGI5NjdlN2JkNDIy
 NzQzNzM3MzM2MThlNDE2MzBjOGNlMDYyMWIyMzkwMjljCitTSVpFIChkbnNtYXNx
 LTIuNTFyYzEudGFyLmd6KSA9IDQyNjgxMQpkaWZmIC1ydU4gLS1leGNsdWRlPUNW
 UyAvdXNyL3BvcnRzL2Rucy9kbnNtYXNxL3BrZy1pbnN0YWxsIC91c3IvaG9tZS9t
 YW5kcmVlL3BvcnRzL2Rucy9kbnNtYXNxL3BrZy1pbnN0YWxsCi0tLSAvdXNyL3Bv
 cnRzL2Rucy9kbnNtYXNxL3BrZy1pbnN0YWxsCTE5NzAtMDEtMDEgMDE6MDA6MDAu
 MDAwMDAwMDAwICswMTAwCisrKyAvdXNyL2hvbWUvbWFuZHJlZS9wb3J0cy9kbnMv
 ZG5zbWFzcS9wa2ctaW5zdGFsbAkyMDA5LTEwLTEyIDAwOjM0OjU5LjQxNDMzNTIx
 MSArMDIwMApAQCAtMCwwICsxLDggQEAKK2lmIFsgIiQyIiA9ICJQT1NULUlOU1RB
 TEwiIF0gOyB0aGVuCit0ZXN0IC1lICR7UEtHX1BSRUZJWH0vZXRjL2Ruc21hc3Eu
 Y29uZiBcCit8fCBjcCAke1BLR19QUkVGSVh9L2V0Yy9kbnNtYXNxLmNvbmYuZXhh
 bXBsZSAke1BLR19QUkVGSVh9L2V0Yy9kbnNtYXNxLmNvbmYKK2NhdCA8PF9FT0YK
 KyoqKiBUbyBlbmFibGUgZG5zbWFzcSwgZWRpdCAke1BLR19QUkVGSVh9L2V0Yy9k
 bnNtYXNxLmNvbmYgYW5kCisqKiogc2V0IGRuc21hc3FfZW5hYmxlPSJZRVMiIGlu
 IC9ldGMvcmMuY29uZlsubG9jYWxdCitfRU9GCitmaQpkaWZmIC1ydU4gLS1leGNs
 dWRlPUNWUyAvdXNyL3BvcnRzL2Rucy9kbnNtYXNxL3BrZy1wbGlzdCAvdXNyL2hv
 bWUvbWFuZHJlZS9wb3J0cy9kbnMvZG5zbWFzcS9wa2ctcGxpc3QKLS0tIC91c3Iv
 cG9ydHMvZG5zL2Ruc21hc3EvcGtnLXBsaXN0CTIwMDYtMDItMjIgMjE6MTY6MjUu
 MDAwMDAwMDAwICswMTAwCisrKyAvdXNyL2hvbWUvbWFuZHJlZS9wb3J0cy9kbnMv
 ZG5zbWFzcS9wa2ctcGxpc3QJMjAwOS0xMC0xMiAwMTowMToyNS4wNTQ1OTExNDQg
 KzAyMDAKQEAgLTEsNCArMSw1IEBACiBzYmluL2Ruc21hc3EKK0B1bmV4ZWMgaWYg
 Y21wIC1zICVEL2V0Yy9kbnNtYXNxLmNvbmYgJUQvZXRjL2Ruc21hc3EuY29uZi5l
 eGFtcGxlIDsgdGhlbiBybSAtZiAlRC9ldGMvZG5zbWFzcS5jb25mIDsgZmkKIGV0
 Yy9kbnNtYXNxLmNvbmYuZXhhbXBsZQogJSVFWEFNUExFU0RJUiUlL2Ruc2xpc3Qv
 ZGhjcC5jc3MKICUlRVhBTVBMRVNESVIlJS9kbnNsaXN0L2Ruc2xpc3QucGwKQEAg
 LTcsMyArOCwxMyBAQAogQGRpcnJtICUlRVhBTVBMRVNESVIlJS9kbnNsaXN0CiBA
 ZGlycm0gJSVFWEFNUExFU0RJUiUlL2R5bmFtaWMtZG5zbWFzcQogQGRpcnJtICUl
 RVhBTVBMRVNESVIlJQorJSVOTFMlJXNoYXJlL2xvY2FsZS9kZS9MQ19NRVNTQUdF
 Uy9kbnNtYXNxLm1vCislJU5MUyUlc2hhcmUvbG9jYWxlL2VzL0xDX01FU1NBR0VT
 L2Ruc21hc3EubW8KKyUlTkxTJSVzaGFyZS9sb2NhbGUvZmkvTENfTUVTU0FHRVMv
 ZG5zbWFzcS5tbworJSVOTFMlJXNoYXJlL2xvY2FsZS9mci9MQ19NRVNTQUdFUy9k
 bnNtYXNxLm1vCislJU5MUyUlc2hhcmUvbG9jYWxlL2lkL0xDX01FU1NBR0VTL2Ru
 c21hc3EubW8KKyUlTkxTJSVzaGFyZS9sb2NhbGUvaXQvTENfTUVTU0FHRVMvZG5z
 bWFzcS5tbworJSVOTFMlJXNoYXJlL2xvY2FsZS9uby9MQ19NRVNTQUdFUy9kbnNt
 YXNxLm1vCislJU5MUyUlc2hhcmUvbG9jYWxlL3BsL0xDX01FU1NBR0VTL2Ruc21h
 c3EubW8KKyUlTkxTJSVzaGFyZS9sb2NhbGUvcHRfQlIvTENfTUVTU0FHRVMvZG5z
 bWFzcS5tbworJSVOTFMlJXNoYXJlL2xvY2FsZS9yby9MQ19NRVNTQUdFUy9kbnNt
 YXNxLm1vCj09PT4gRG9uZQo=
 
 ------------8CB3rsWbMM68xXTuD5B8wC--
 
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Mon Oct 12 17:33:00 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139273 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Tue Oct 13 16:35:41 UTC 2009 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139273 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139273: commit references a PR
Date: Tue, 13 Oct 2009 16:35:46 +0000 (UTC)

 wxs         2009-10-13 16:35:32 UTC
 
   FreeBSD ports repository
 
   Modified files:
     dns/dnsmasq          Makefile distinfo pkg-plist 
   Added files:
     dns/dnsmasq/files    pkg-message.in 
   Log:
   - Update to 2.51rc1
   - Add pkg-message
   - Add NLS and IDN option (currently linked together in one option, this will
     be changed in future releases hopefully)
   - Properly handle example configuration files
   
   PR:             ports/139273
   Submitted by:   Matthias Andree <matthias.andree@gmx.de> (maintainer)
   
   Revision  Changes    Path
   1.57      +33 -10    ports/dns/dnsmasq/Makefile
   1.41      +3 -3      ports/dns/dnsmasq/distinfo
   1.1       +2 -0      ports/dns/dnsmasq/files/pkg-message.in (new)
   1.5       +12 -0     ports/dns/dnsmasq/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: Petar Bogdanovic <petar@smokva.net>
To: bug-followup@FreeBSD.org, matthias.andree@gmx.de
Cc:  
Subject: Re: ports/139273: [MAINTAINER] dns/dnsmasq: update to 2.51 rc1
Date: Tue, 26 Jan 2010 00:03:11 +0100

 Hi,
 
 > --- ports/dns/dnsmasq/pkg-plist	2006/02/22 20:16:25	1.4
 > +++ ports/dns/dnsmasq/pkg-plist	2009/10/13 16:35:32	1.5
 > @@ -1,4 +1,6 @@
 >  sbin/dnsmasq
 > +@exec if [ ! -f %D/etc/dnsmasq.conf ]; then cp -p %D/%F %B/dnsmasq.conf; fi
 
 I couldn't figure out what %F and %B exactly mean but the result kind of
 narrows it down:
 
    $ ls -la /usr/local/sbin/dnsmasq*
    -r-xr-xr-x  1 root  wheel  141940 Jan 26 00:26 /usr/local/sbin/dnsmasq
    -r-xr-xr-x  1 root  wheel  141940 Jan 26 00:26 /usr/local/sbin/dnsmasq.conf
 
    $ md5 /usr/local/sbin/dnsmasq*
    MD5 (/usr/local/sbin/dnsmasq) = 99fc4505f0c72a8a00bc3d483ee400cd
    MD5 (/usr/local/sbin/dnsmasq.conf) = 99fc4505f0c72a8a00bc3d483ee400cd
 
 Thanks,
 
 		Petar Bogdanovic
>Unformatted:
