[39895] trunk/dports/net/dnsmasq

[ryandesign at macports.org]

Revision: 39895
          http://trac.macports.org/changeset/39895
Author:   ryandesign at macports.org
Date:     2008-09-10 14:33:39 -0700 (Wed, 10 Sep 2008)
Log Message:
-----------
dnsmasq: update to 2.45; closes #16158

Modified Paths:
--------------
    trunk/dports/net/dnsmasq/Portfile
    trunk/dports/net/dnsmasq/files/patch-Makefile.diff
    trunk/dports/net/dnsmasq/files/patch-config.h.diff

Modified: trunk/dports/net/dnsmasq/Portfile
===================================================================
--- trunk/dports/net/dnsmasq/Portfile	2008-09-10 21:19:30 UTC (rev 39894)
+++ trunk/dports/net/dnsmasq/Portfile	2008-09-10 21:33:39 UTC (rev 39895)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		dnsmasq
-version		2.42
+version		2.45
 categories	net
 platforms	darwin
 maintainers	nomaintainer
@@ -20,7 +20,7 @@
 			and BOOTP for network booting of diskless machines.
 homepage	http://www.thekelleys.org.uk/dnsmasq/doc.html
 master_sites	http://www.thekelleys.org.uk/dnsmasq/
-checksums	sha1 85c371ab8951715fbdab01e337e5649705f0b221
+checksums	sha1 12f8cffd657f674fbf4bf4f670a0dcb65ea4a5ae
 patchfiles	patch-config.h.diff patch-Makefile.diff
 
 configure	{
@@ -28,6 +28,7 @@
 }
 
 destroot.args	PREFIX=${prefix}
+destroot.keepdirs   ${destroot}${prefix}/var/run
 
 platform darwin 8 {
 	build.args-append CC=/usr/bin/gcc-4.0

Modified: trunk/dports/net/dnsmasq/files/patch-Makefile.diff
===================================================================
--- trunk/dports/net/dnsmasq/files/patch-Makefile.diff	2008-09-10 21:19:30 UTC (rev 39894)
+++ trunk/dports/net/dnsmasq/files/patch-Makefile.diff	2008-09-10 21:33:39 UTC (rev 39895)
@@ -1,6 +1,6 @@
---- Makefile.orig	2008-06-08 00:22:47.000000000 -0500
-+++ Makefile	2008-06-08 00:24:34.000000000 -0500
-@@ -17,6 +17,7 @@
+--- Makefile.orig	2008-06-06 07:04:47.000000000 -0400
++++ Makefile	2008-07-16 23:56:35.000000000 -0400
+@@ -17,13 +17,14 @@
  BINDIR = ${PREFIX}/sbin
  MANDIR = ${PREFIX}/share/man
  LOCALEDIR = ${PREFIX}/share/locale
@@ -8,6 +8,14 @@
  
  SRC = src
  PO = po
+ MAN = man
+ 
+ PKG_CONFIG = pkg-config
+-AWK = nawk
++AWK = awk
+ INSTALL = install
+ 
+ DBUS_MINOR=" `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --modversion dbus-1 | $(AWK) -F . -- '{ if ($$(NF-1)) print \"-DDBUS_MINOR=\"$$(NF-1) }'`" 
 @@ -53,6 +54,7 @@
  	$(INSTALL) -d $(DESTDIR)$(BINDIR) -d $(DESTDIR)$(MANDIR)/man8
  	$(INSTALL) -m 644 $(MAN)/dnsmasq.8 $(DESTDIR)$(MANDIR)/man8 

Modified: trunk/dports/net/dnsmasq/files/patch-config.h.diff
===================================================================
--- trunk/dports/net/dnsmasq/files/patch-config.h.diff	2008-09-10 21:19:30 UTC (rev 39894)
+++ trunk/dports/net/dnsmasq/files/patch-config.h.diff	2008-09-10 21:33:39 UTC (rev 39895)
@@ -1,27 +1,21 @@
---- ./src/config.h.orig	2008-06-08 00:25:15.000000000 -0500
-+++ ./src/config.h	2008-06-15 21:58:11.000000000 -0500
-@@ -32,22 +32,30 @@
- #define HOSTSFILE "/etc/hosts"
- #define ETHERSFILE "/etc/ethers"
- #ifdef __uClinux__
--#  define RESOLVFILE "/etc/config/resolv.conf"
-+#  define RESOLVFILE "__PREFIX__/etc/config/resolv.conf"
+--- src/config.h.old	2008-08-01 00:43:35.000000000 -0400
++++ src/config.h	2008-08-01 00:44:07.000000000 -0400
+@@ -37,18 +37,26 @@
  #else
--#  define RESOLVFILE "/etc/resolv.conf"
-+#  define RESOLVFILE "__PREFIX__/etc/resolv.conf"
-+#endif
+ #  define RESOLVFILE "/etc/resolv.conf"
+ #endif
+-#define RUNFILE "/var/run/dnsmasq.pid"
 +#ifdef __APPLE__
 +#  define RUNFILE "__PREFIX__/var/run/dnsmasq.pid"
 +#else
-+#  define RUNFILE "__PREFIX__/var/run/dnsmasq.pid"
- #endif
--#define RUNFILE "/var/run/dnsmasq.pid"
++#define RUNFILE "__PREFIX__/var/run/dnsmasq.pid"
++#endif
  #if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
 -#   define LEASEFILE "/var/db/dnsmasq.leases"
 +#   define LEASEFILE "__PREFIX__/var/db/dnsmasq.leases"
 +#elif __APPLE__
 +#   define LEASEFILE "__PREFIX__/var/db/dnsmasq.leases"
- #elif defined(__sun__)
+ #elif defined(__sun__) || defined (__sun)
 -#   define LEASEFILE "/var/cache/dnsmasq.leases"
 +#   define LEASEFILE "__PREFIX__/var/cache/dnsmasq.leases"
  #else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080910/21a4d71f/attachment.html