<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[51337] trunk/dports/net/dnsmasq</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/51337">51337</a></dd>
<dt>Author</dt> <dd>snc@macports.org</dd>
<dt>Date</dt> <dd>2009-05-22 22:59:08 -0700 (Fri, 22 May 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>updated version, modified patches, added self as openmaintainer, added dependency of nawk</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetdnsmasqPortfile">trunk/dports/net/dnsmasq/Portfile</a></li>
<li><a href="#trunkdportsnetdnsmasqfilespatchMakefilediff">trunk/dports/net/dnsmasq/files/patch-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetdnsmasqPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/dnsmasq/Portfile (51336 => 51337)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+# -*- 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
</ins><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="lines">@@ -3,8 +4,8 @@
</span><span class="cx">
</span><span class="cx"> name dnsmasq
</span><del>-version 2.45
</del><ins>+version 2.47
</ins><span class="cx"> categories net
</span><span class="cx"> platforms darwin
</span><del>-maintainers nomaintainer
</del><ins>+maintainers snc openmaintainer
</ins><span class="cx"> description lightweight DNS forwarder and DHCP server
</span><span class="cx"> long_description Dnsmasq is lightweight, easy to configure DNS \
</span><span class="lines">@@ -20,27 +21,20 @@
</span><span class="cx"> and BOOTP for network booting of diskless machines.
</span><span class="cx"> homepage http://www.thekelleys.org.uk/dnsmasq/doc.html
</span><span class="cx"> master_sites http://www.thekelleys.org.uk/dnsmasq/
</span><del>-checksums sha1 12f8cffd657f674fbf4bf4f670a0dcb65ea4a5ae
-patchfiles patch-config.h.diff patch-Makefile.diff
</del><ins>+checksums md5 4524081e56d0b935717d493e8e8d3e11 \
+ sha1 a01ae622410636c5cdad9b789e69fb4bbc3a5d6a \
+ rmd160 79c7c4f2fac483f237401294747dfda93921ab1d
+patchfiles patch-src-config.h.diff patch-Makefile.diff
</ins><span class="cx">
</span><del>-configure {
- reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/src/config.h
-}
</del><ins>+depends_build port:nawk
</ins><span class="cx">
</span><del>-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
- }
</del><ins>+post-patch {
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/config.h
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+use_configure no
</ins><span class="cx">
</span><del>-startupitem.create yes
-startupitem.name dnsmasq
-startupitem.executable ${prefix}/sbin/dnsmasq -k
</del><ins>+destroot.args PREFIX=${prefix}
+
+#startupitem.create yes
+#startupitem.type launchd
</ins></span></pre></div>
<a id="trunkdportsnetdnsmasqfilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/dnsmasq/files/patch-Makefile.diff (51336 => 51337)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Makefile.orig 2008-06-06 07:04:47.000000000 -0400
-+++ Makefile 2008-07-16 23:56:35.000000000 -0400
-@@ -17,13 +17,14 @@
</del><ins>+--- Makefile.orig 2009-05-23 01:26:37.000000000 -0400
++++ Makefile 2009-05-23 01:27:22.000000000 -0400
+@@ -17,6 +17,7 @@
</ins><span class="cx"> BINDIR = ${PREFIX}/sbin
</span><span class="cx"> MANDIR = ${PREFIX}/share/man
</span><span class="cx"> LOCALEDIR = ${PREFIX}/share/locale
</span><span class="lines">@@ -8,14 +8,6 @@
</span><span class="cx">
</span><span class="cx"> SRC = src
</span><span class="cx"> PO = po
</span><del>- 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) }'`"
</del><span class="cx"> @@ -53,6 +54,7 @@
</span><span class="cx"> $(INSTALL) -d $(DESTDIR)$(BINDIR) -d $(DESTDIR)$(MANDIR)/man8
</span><span class="cx"> $(INSTALL) -m 644 $(MAN)/dnsmasq.8 $(DESTDIR)$(MANDIR)/man8
</span></span></pre>
</div>
</div>
</body>
</html>