- Update to 2.48

PR:		135270
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)

dns/dnsmasq/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dnsmasq
-PORTVERSION=	2.47
+PORTVERSION=	2.48
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \
 		${MASTER_SITE_GENTOO}
@@ -17,19 +17,17 @@ COMMENT=	Lightweight, easy to configure DNS forwarder and DHCP server
 
 MAN8=		dnsmasq.8
 
-docs=		CHANGELOG FAQ doc.html setup.html
-PORTDOCS=	${docs:T}
+PORTDOCS=	CHANGELOG CHANGELOG.archive FAQ doc.html setup.html
 
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
-USE_GMAKE=	yes
 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" off
-OPTIONS+=	DBUS "D_BUS support" off
+OPTIONS=	IPV6 "IPv6 support" on
+OPTIONS+=	DBUS "DBUS support" off
 
 .include <bsd.port.pre.mk>
 
@@ -45,7 +43,7 @@ CFLAGS+=	-DHAVE_DBUS
 USE_RC_SUBR=	dnsmasq.sh
 
 post-patch:
-.if ${OSVERSION} < 700000
+.if ${OSVERSION} < 700000 && defined(WITH_DBUS)
 	@${REINPLACE_CMD} -e 's|DBUS_LIBS="|DBUS_LIBS="${PTHREAD_LIBS} |' ${WRKSRC}/Makefile
 .endif
 
@@ -55,7 +53,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.8 ${PREFIX}/man/man8
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 	${MKDIR} ${EXAMPLESDIR}/dynamic-dnsmasq ${EXAMPLESDIR}/dnslist
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl ${EXAMPLESDIR}/dynamic-dnsmasq/

dns/dnsmasq/distinfo

@@ -1,3 +1,3 @@
-MD5 (dnsmasq-2.47.tar.gz) = 4524081e56d0b935717d493e8e8d3e11
-SHA256 (dnsmasq-2.47.tar.gz) = f2716a43eb05b232c640a4ad647fd0fc21dd0c4f4ad20c9f5303568742399e5d
-SIZE (dnsmasq-2.47.tar.gz) = 396967
+MD5 (dnsmasq-2.48.tar.gz) = 8e12a386831b0b597c8a078f31d3fbd5
+SHA256 (dnsmasq-2.48.tar.gz) = fd926e9cff1adb550a10d2685228ffe7479476d724274ab0c213bd5d6f72d85e
+SIZE (dnsmasq-2.48.tar.gz) = 406078

dns/dnsmasq/files/patch-rfc2131.c

@@ -1,11 +0,0 @@
---- src/rfc2131.c.orig	Fri Feb  9 14:35:14 2007
-+++ src/rfc2131.c	Fri Feb  9 14:35:46 2007
-@@ -16,6 +16,8 @@
- #define BOOTREPLY                2
- #define DHCP_COOKIE              0x63825363
- 
-+#define ARPHRD_EUI64             27
-+
- /* The Linux in-kernel DHCP client silently ignores any packet 
-    smaller than this. Sigh...........   */
- #define MIN_PACKETSZ             300