ports/135270: [MAINTAINER] dns/dnsmasq: update to 2.48

[Matthias Andree]

>Number:         135270
>Category:       ports
>Synopsis:       [MAINTAINER] dns/dnsmasq: update to 2.48
>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:   Fri Jun 05 00:00:12 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Andree
>Release:        FreeBSD 6.4-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD vmfreebsd6.emma.line.org 6.4-RELEASE-p1 FreeBSD 6.4-RELEASE-p1 #0: Sun Dec 21 07:56:41 UTC 2008
>Description:
- Update to 2.48 (CHANGELOG.archive was split out of CHANGELOG)
- Drop patch-rfc2131.c, apparently unneeded
- Drop USE_GMAKE, apparently unneeded
- Only patch thread libraries into DBUS_LIBRARIES if dbus is enabled, to
  avoid bogus libpthread dependency if DBUS isn't enabled.
- Enable IPv6 by default

Removed file(s):
- files/patch-rfc2131.c

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

--- dnsmasq-2.48.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/dns/dnsmasq/Makefile /root/ports/dns/dnsmasq/Makefile
--- /usr/ports/dns/dnsmasq/Makefile	2009-05-04 20:44:45.000000000 +0200
+++ /root/ports/dns/dnsmasq/Makefile	2009-06-05 01:39:02.000000000 +0200
@@ -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,18 @@
 
 MAN8=		dnsmasq.8
 
-docs=		CHANGELOG FAQ doc.html setup.html
+docs=		CHANGELOG CHANGELOG.archive FAQ doc.html setup.html
 PORTDOCS=	${docs:T}
 
 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 +44,7 @@
 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
 
diff -ruN --exclude=CVS /usr/ports/dns/dnsmasq/distinfo /root/ports/dns/dnsmasq/distinfo
--- /usr/ports/dns/dnsmasq/distinfo	2009-02-09 23:58:45.000000000 +0100
+++ /root/ports/dns/dnsmasq/distinfo	2009-06-05 01:24:26.000000000 +0200
@@ -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
diff -ruN --exclude=CVS /usr/ports/dns/dnsmasq/files/patch-rfc2131.c /root/ports/dns/dnsmasq/files/patch-rfc2131.c
--- /usr/ports/dns/dnsmasq/files/patch-rfc2131.c	2007-02-10 12:39:21.000000000 +0100
+++ /root/ports/dns/dnsmasq/files/patch-rfc2131.c	1970-01-01 01:00:00.000000000 +0100
@@ -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
--- dnsmasq-2.48.patch ends here ---

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