[90473] trunk/dports/net/dnsmasq

[snc at macports.org]

Revision: 90473
          http://trac.macports.org/changeset/90473
Author:   snc at macports.org
Date:     2012-03-06 09:42:15 -0800 (Tue, 06 Mar 2012)
Log Message:
-----------
dnsmasq: update to 2.60

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

Removed Paths:
-------------
    trunk/dports/net/dnsmasq/files/patch-Makefile.diff

Modified: trunk/dports/net/dnsmasq/Portfile
===================================================================
--- trunk/dports/net/dnsmasq/Portfile	2012-03-06 17:40:16 UTC (rev 90472)
+++ trunk/dports/net/dnsmasq/Portfile	2012-03-06 17:42:15 UTC (rev 90473)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                dnsmasq
-version             2.59
-revision            2
+version             2.60
 categories          net
 license             GPL
 maintainers         snc openmaintainer
@@ -34,12 +33,11 @@
 master_sites        http://www.thekelleys.org.uk/dnsmasq/
 use_lzma            yes
 
-checksums           rmd160  ca7b841d97e0ef7ab5a8c2c099ecb79de28633b3 \
-                    sha256  3bba1f637d04145e756ffc31a5076961a0aaf4716d097fa0d4a9a24dc8869391
+checksums           rmd160  fb898487a4bac06e725b4182b04e196e3c5c92e0 \
+                    sha256  aa5ada47e71a1fc83050d7e8569f03bc060c6a506ecc27a30832ef888e6d4c92
 
 patchfiles          patch-src-config.h.diff \
-                    patch-src-network.c.diff \
-                    patch-Makefile.diff
+                    patch-src-network.c.diff
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/config.h
     reinplace s|#resolv-file=|resolv-file=/etc/resolv.conf| \
@@ -76,11 +74,7 @@
 }
 
 post-destroot {
-    # copy configuration file if not previously created
-    if {![file exists ${prefix}/etc/dnsmasq.conf]} {
-        copy ${destroot}${prefix}/etc/dnsmasq.conf.sample \
-            ${destroot}${prefix}/etc/dnsmasq.conf
-    }
+    copy ${worksrcpath}/dnsmasq.conf.example ${destroot}${prefix}/etc/dnsmasq.conf.example
 
     # Create the directory that dnsmasq likes to store its pid in.
     xinstall -d -m 777 ${destroot}${prefix}/var/run/${name}
@@ -127,3 +121,11 @@
     file mkdir "${destroot}/Library/${daemondest}"
     ln -sf "${itemdir}/${plistname}" "${destroot}/Library/${daemondest}"
 }
+
+post-activate {
+    # copy configuration file if not previously created
+    if {![file exists ${prefix}/etc/dnsmasq.conf]} {
+        copy ${destroot}${prefix}/etc/dnsmasq.conf.example \
+            ${destroot}${prefix}/etc/dnsmasq.conf
+    }
+}

Deleted: trunk/dports/net/dnsmasq/files/patch-Makefile.diff
===================================================================
--- trunk/dports/net/dnsmasq/files/patch-Makefile.diff	2012-03-06 17:40:16 UTC (rev 90472)
+++ trunk/dports/net/dnsmasq/files/patch-Makefile.diff	2012-03-06 17:42:15 UTC (rev 90473)
@@ -1,18 +0,0 @@
---- Makefile.orig	2009-05-23 01:26:37.000000000 -0400
-+++ Makefile	2009-05-23 01:27:22.000000000 -0400
-@@ -17,6 +17,7 @@
- BINDIR = ${PREFIX}/sbin
- MANDIR = ${PREFIX}/share/man
- LOCALEDIR = ${PREFIX}/share/locale
-+CONFDIR = ${PREFIX}/etc
- 
- SRC = src
- PO = po
-@@ -53,6 +54,7 @@
- 	$(INSTALL) -d $(DESTDIR)$(BINDIR) -d $(DESTDIR)$(MANDIR)/man8
- 	$(INSTALL) -m 644 $(MAN)/dnsmasq.8 $(DESTDIR)$(MANDIR)/man8 
- 	$(INSTALL) -m 755 $(SRC)/dnsmasq $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 644 dnsmasq.conf.example $(DESTDIR)$(CONFDIR)/dnsmasq.conf.sample
- 
- all-i18n :
- 	cd $(SRC) && $(MAKE) \

Modified: trunk/dports/net/dnsmasq/files/patch-src-config.h.diff
===================================================================
--- trunk/dports/net/dnsmasq/files/patch-src-config.h.diff	2012-03-06 17:40:16 UTC (rev 90472)
+++ trunk/dports/net/dnsmasq/files/patch-src-config.h.diff	2012-03-06 17:42:15 UTC (rev 90473)
@@ -1,27 +1,24 @@
---- src/config.h.orig	2009-05-23 01:49:58.000000000 -0400
-+++ src/config.h	2009-05-23 01:50:48.000000000 -0400
-@@ -35,9 +35,9 @@
- #ifdef __uClinux__
- #  define RESOLVFILE "/etc/config/resolv.conf"
- #else
--#  define RESOLVFILE "/etc/resolv.conf"
-+#  define RESOLVFILE "@PREFIX@/etc/resolv.conf"
- #endif
+--- src/config.h.orig	2012-03-04 15:04:22.000000000 -0500
++++ src/config.h	2012-03-06 11:00:17.000000000 -0500
+@@ -32,7 +32,7 @@
+ #define SMALLDNAME 40 /* most domain names are smaller than this */
+ #define HOSTSFILE "/etc/hosts"
+ #define ETHERSFILE "/etc/ethers"
 -#define RUNFILE "/var/run/dnsmasq.pid"
-+#define RUNFILE "@PREFIX@/var/run/dnsmasq/dnsmasq.pid"
- 
- #ifndef LEASEFILE
- #   if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
-@@ -45,7 +45,7 @@
- #   elif defined(__sun__) || defined (__sun)
- #      define LEASEFILE "/var/cache/dnsmasq.leases"
++#define RUNFILE "@PREFIX@/var/run/dnsmasq.pid"
+ #define DEFLEASE 3600 /* default lease time, 1 hour */
+ #define CHUSER "nobody"
+ #define CHGRP "dip"
+@@ -137,7 +137,7 @@
+ #   elif defined(__ANDROID__)
+ #      define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
  #   else
 -#      define LEASEFILE "/var/lib/misc/dnsmasq.leases"
 +#      define LEASEFILE "@PREFIX@/var/lib/misc/dnsmasq.leases"
  #   endif
  #endif
  
-@@ -53,7 +53,7 @@
+@@ -145,7 +145,7 @@
  #   if defined(__FreeBSD__)
  #      define CONFFILE "/usr/local/etc/dnsmasq.conf"
  #   else
@@ -30,3 +27,12 @@
  #   endif
  #endif
  
+@@ -153,7 +153,7 @@
+ #   if defined(__uClinux__)
+ #      define RESOLVFILE "/etc/config/resolv.conf"
+ #   else
+-#      define RESOLVFILE "/etc/resolv.conf"
++#      define RESOLVFILE "@PREFIX@/etc/resolv.conf"
+ #   endif
+ #endif
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120306/d68a4e0c/attachment.html>