4 files changed, 50 insertions, 13 deletions

diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index 41bef240bc00..1373c07c874e 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -6,11 +6,10 @@
 #
 
 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/release-candidates/ \
+		http://homepages.uni-paderborn.de/mandree/
 
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Lightweight DNS forwarder, DHCP and TFTP server
@@ -20,14 +19,17 @@ MAN8=		dnsmasq.8
 PORTDOCS=	CHANGELOG CHANGELOG.archive FAQ doc.html setup.html
 
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+SUB_FILES=	pkg-message
 
-USE_GNOME=	pkgconfig
 MAKE_JOBS_SAFE=	yes
 MAKE_ENV=	LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}" COPTS="${CFLAGS}"
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}"
 
 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 +37,28 @@ OPTIONS+=	DBUS "DBUS support" off
 CFLAGS+=	-DNO_IPV6
 .endif
 
+.if !defined(WITHOUT_NLS)
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
+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
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
 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 +67,21 @@ do-install:
 	@${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/
+	if [ ! -f ${PREFIX}/etc/dnsmasq.conf ]; then \
+		${CP} -p ${PREFIX}/etc/dnsmasq.conf.example ${PREFIX}/etc/dnsmasq.conf; \
+	fi
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/dns/dnsmasq/distinfo b/dns/dnsmasq/distinfo
index 70c20efd6071..40a7fda05988 100644
--- a/dns/dnsmasq/distinfo
+++ b/dns/dnsmasq/distinfo
@@ -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 --git a/dns/dnsmasq/files/pkg-message.in b/dns/dnsmasq/files/pkg-message.in
new file mode 100644
index 000000000000..4d13bc7f4fcd
--- /dev/null
+++ b/dns/dnsmasq/files/pkg-message.in
@@ -0,0 +1,2 @@
+*** To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
+*** set dnsmasq_enable="YES" in /etc/rc.conf[.local]
diff --git a/dns/dnsmasq/pkg-plist b/dns/dnsmasq/pkg-plist
index 2d6c26ffabc4..a6881d038e9d 100644
--- a/dns/dnsmasq/pkg-plist
+++ b/dns/dnsmasq/pkg-plist
@@ -1,4 +1,6 @@
 sbin/dnsmasq
+@exec if [ ! -f %D/etc/dnsmasq.conf ]; then cp -p %D/%F %B/dnsmasq.conf; fi
+@unexec if cmp -s %D/etc/dnsmasq.conf %D/etc/dnsmasq.conf.example ; then rm -f %D/etc/dnsmasq.conf ; fi
 etc/dnsmasq.conf.example
 %%EXAMPLESDIR%%/dnslist/dhcp.css
 %%EXAMPLESDIR%%/dnslist/dnslist.pl
@@ -7,3 +9,13 @@ etc/dnsmasq.conf.example
 @dirrm %%EXAMPLESDIR%%/dnslist
 @dirrm %%EXAMPLESDIR%%/dynamic-dnsmasq
 @dirrm %%EXAMPLESDIR%%
+%%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