[51337] trunk/dports/net/dnsmasq

[snc at macports.org]

Revision: 51337
          http://trac.macports.org/changeset/51337
Author:   snc at macports.org
Date:     2009-05-22 22:59:08 -0700 (Fri, 22 May 2009)
Log Message:
-----------
updated version, modified patches, added self as openmaintainer, added dependency of nawk

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

Modified: trunk/dports/net/dnsmasq/Portfile
===================================================================
--- trunk/dports/net/dnsmasq/Portfile	2009-05-23 05:53:13 UTC (rev 51336)
+++ trunk/dports/net/dnsmasq/Portfile	2009-05-23 05:59:08 UTC (rev 51337)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem 1.0
@@ -3,8 +4,8 @@
 
 name		dnsmasq
-version		2.45
+version		2.47
 categories	net
 platforms	darwin
-maintainers	nomaintainer
+maintainers	snc openmaintainer
 description	lightweight DNS forwarder and DHCP server
 long_description	Dnsmasq is lightweight, easy to configure DNS \
@@ -20,27 +21,20 @@
 			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 12f8cffd657f674fbf4bf4f670a0dcb65ea4a5ae
-patchfiles	patch-config.h.diff patch-Makefile.diff
+checksums	md5    4524081e56d0b935717d493e8e8d3e11 \
+            sha1   a01ae622410636c5cdad9b789e69fb4bbc3a5d6a \
+            rmd160 79c7c4f2fac483f237401294747dfda93921ab1d
+patchfiles	patch-src-config.h.diff patch-Makefile.diff
 
-configure	{
-	reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/src/config.h
-}
+depends_build   port:nawk
 
-build.args CC=${configure.cc}
-
-destroot.args	PREFIX=${prefix}
-destroot.keepdirs   ${destroot}${prefix}/var/run
-
-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
-	  }
+post-patch {
+	reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/config.h
 }
 
+use_configure   no
 
-startupitem.create	yes
-startupitem.name	dnsmasq
-startupitem.executable	${prefix}/sbin/dnsmasq -k
+destroot.args   PREFIX=${prefix}
+
+#startupitem.create	yes
+#startupitem.type    launchd

Modified: trunk/dports/net/dnsmasq/files/patch-Makefile.diff
===================================================================
--- trunk/dports/net/dnsmasq/files/patch-Makefile.diff	2009-05-23 05:53:13 UTC (rev 51336)
+++ trunk/dports/net/dnsmasq/files/patch-Makefile.diff	2009-05-23 05:59:08 UTC (rev 51337)
@@ -1,6 +1,6 @@
---- Makefile.orig	2008-06-06 07:04:47.000000000 -0400
-+++ Makefile	2008-07-16 23:56:35.000000000 -0400
-@@ -17,13 +17,14 @@
+--- 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
@@ -8,14 +8,6 @@
  
  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 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090522/e1ce36f0/attachment.html>