[37899] trunk/dports/net/dnsmasq

simon at macports.org simon at macports.org
Sat Jun 28 03:07:51 PDT 2008 

Revision: 37899
          http://trac.macosforge.org/projects/macports/changeset/37899
Author:   simon at macports.org
Date:     2008-06-28 03:07:51 -0700 (Sat, 28 Jun 2008)
Log Message:
-----------
net/dnsmasq: Updated to version 2.42, closes #15551. Thanks to davidgilman1 at gmail.com.

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-06-28 09:38:54 UTC (rev 37898)
+++ trunk/dports/net/dnsmasq/Portfile	2008-06-28 10:07:51 UTC (rev 37899)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		dnsmasq
-version		2.32
+version		2.42
 categories	net
 platforms	darwin
 maintainers	nomaintainer
@@ -18,10 +18,9 @@
 			either in each host or in a central configuration \
 			file. Dnsmasq supports static and dynamic DHCP leases \
 			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 f07c090922777f061fbe52aea464b1e43b3988d3
+checksums	sha1 85c371ab8951715fbdab01e337e5649705f0b221
 patchfiles	patch-config.h.diff patch-Makefile.diff
 
 configure	{
@@ -34,3 +33,15 @@
 	build.args-append CC=/usr/bin/gcc-4.0
 }
 
+post-activate {
+	# Make sure initial conf files are present and setup correctly
+	if {![file exists ${prefix}/etc/dnsmasq.conf]} {
+			file copy ${prefix}/etc/dnsmasq.conf.sample \
+				${prefix}/etc/dnsmasq.conf
+	  }
+}
+
+
+startupitem.create	yes
+startupitem.name	dnsmasq
+startupitem.executable	${prefix}/sbin/dnsmasq -k

Modified: trunk/dports/net/dnsmasq/files/patch-Makefile.diff
===================================================================
--- trunk/dports/net/dnsmasq/files/patch-Makefile.diff	2008-06-28 09:38:54 UTC (rev 37898)
+++ trunk/dports/net/dnsmasq/files/patch-Makefile.diff	2008-06-28 10:07:51 UTC (rev 37899)
@@ -1,6 +1,6 @@
---- Makefile	2006-01-16 20:34:04.000000000 +0100
-+++ Makefile.new	2006-02-11 13:52:07.000000000 +0100
-@@ -2,6 +2,7 @@
+--- Makefile.orig	2008-06-08 00:22:47.000000000 -0500
++++ Makefile	2008-06-08 00:24:34.000000000 -0500
+@@ -17,6 +17,7 @@
  BINDIR = ${PREFIX}/sbin
  MANDIR = ${PREFIX}/share/man
  LOCALEDIR = ${PREFIX}/share/locale
@@ -8,11 +8,11 @@
  
  SRC = src
  PO = po
-@@ -22,6 +23,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
+@@ -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 :
- 	$(MAKE) I18N=-DLOCALEDIR='\"$(LOCALEDIR)\"' -f ../bld/Makefile -C $(SRC) dnsmasq
+ 	cd $(SRC) && $(MAKE) \

Modified: trunk/dports/net/dnsmasq/files/patch-config.h.diff
===================================================================
--- trunk/dports/net/dnsmasq/files/patch-config.h.diff	2008-06-28 09:38:54 UTC (rev 37898)
+++ trunk/dports/net/dnsmasq/files/patch-config.h.diff	2008-06-28 10:07:51 UTC (rev 37899)
@@ -1,26 +1,41 @@
---- src/config.h	2006-01-22 14:12:15.000000000 +0100
-+++ src/config.h.new	2006-02-11 13:51:31.000000000 +0100
-@@ -31,14 +31,22 @@
+--- ./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"
  #else
- #  define RESOLVFILE "/etc/resolv.conf"
- #endif
--#define RUNFILE "/var/run/dnsmasq.pid"
+-#  define RESOLVFILE "/etc/resolv.conf"
++#  define RESOLVFILE "__PREFIX__/etc/resolv.conf"
++#endif
 +#ifdef __APPLE__
 +#  define RUNFILE "__PREFIX__/var/run/dnsmasq.pid"
 +#else
-+#  define RUNFILE "/var/run/dnsmasq.pid"
-+#endif
- #if defined(__FreeBSD__) || defined (__OpenBSD__)
- #   define LEASEFILE "/var/db/dnsmasq.leases"
++#  define RUNFILE "__PREFIX__/var/run/dnsmasq.pid"
+ #endif
+-#define RUNFILE "/var/run/dnsmasq.pid"
+ #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__)
+-#   define LEASEFILE "/var/cache/dnsmasq.leases"
++#   define LEASEFILE "__PREFIX__/var/cache/dnsmasq.leases"
  #else
- #   define LEASEFILE "/var/lib/misc/dnsmasq.leases"
+-#   define LEASEFILE "/var/lib/misc/dnsmasq.leases"
++#   define LEASEFILE "__PREFIX__/var/lib/misc/dnsmasq.leases"
  #endif
  #if defined(__FreeBSD__)
- #   define CONFFILE "/usr/local/etc/dnsmasq.conf"
+-#   define CONFFILE "/usr/local/etc/dnsmasq.conf"
++#   define CONFFILE "__PREFIX__/usr/local/etc/dnsmasq.conf"
 +#elif __APPLE__
 +#   define CONFFILE "__PREFIX__/etc/dnsmasq.conf"
  #else
- #   define CONFFILE "/etc/dnsmasq.conf"
+-#   define CONFFILE "/etc/dnsmasq.conf"
++#   define CONFFILE "__PREFIX__/etc/dnsmasq.conf"
  #endif
+ #define DEFLEASE 3600 /* default lease time, 1 hour */
+ #define CHUSER "nobody"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080628/e2d3a24b/attachment.html

More information about the macports-changes mailing list