aboutsummaryrefslogtreecommitdiff
path: root/dns
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2009-06-05 23:14:58 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2009-06-05 23:14:58 +0000
commit128a470ec10d7e1d5c4ee8dc12bd9dff627205d4 (patch)
tree1e3614ac354661759e288e98833fe10657913de7 /dns
parent9f70682ab9e525b670d7acb59e560adc93eab373 (diff)
downloadports-128a470ec10d7e1d5c4ee8dc12bd9dff627205d4.tar.gz
ports-128a470ec10d7e1d5c4ee8dc12bd9dff627205d4.zip
Notes
Diffstat (limited to 'dns')
-rw-r--r--dns/dnsmasq/Makefile14
-rw-r--r--dns/dnsmasq/distinfo6
-rw-r--r--dns/dnsmasq/files/patch-rfc2131.c11
3 files changed, 9 insertions, 22 deletions
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index 24d43947a331..43f2b7fd562f 100644
--- a/dns/dnsmasq/Makefile
+++ b/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/
diff --git a/dns/dnsmasq/distinfo b/dns/dnsmasq/distinfo
index 3de63e79f0d2..20c48bb38ea2 100644
--- a/dns/dnsmasq/distinfo
+++ b/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
diff --git a/dns/dnsmasq/files/patch-rfc2131.c b/dns/dnsmasq/files/patch-rfc2131.c
deleted file mode 100644
index eb107d418191..000000000000
--- a/dns/dnsmasq/files/patch-rfc2131.c
+++ /dev/null
@@ -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