<!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>[126200] trunk/dports</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="https://trac.macports.org/changeset/126200">126200</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-10-05 02:30:31 -0700 (Sun, 05 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>thttpd: new port, version 2.26 (#45239)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwapache2Portfile">trunk/dports/www/apache2/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/net/thttpd/</li>
<li><a href="#trunkdportsnetthttpdPortfile">trunk/dports/net/thttpd/Portfile</a></li>
<li>trunk/dports/net/thttpd/files/</li>
<li><a href="#trunkdportsnetthttpdfilespatchMakefileindiff">trunk/dports/net/thttpd/files/patch-Makefile.in.diff</a></li>
<li><a href="#trunkdportsnetthttpdfilespatchcgisrcMakefileindiff">trunk/dports/net/thttpd/files/patch-cgi-src-Makefile.in.diff</a></li>
<li><a href="#trunkdportsnetthttpdfilespatchextrasMakefileindiff">trunk/dports/net/thttpd/files/patch-extras-Makefile.in.diff</a></li>
<li><a href="#trunkdportsnetthttpdfilespatchlibhttpdcdiff">trunk/dports/net/thttpd/files/patch-libhttpd.c.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetthttpdPortfile"></a>
<div class="addfile"><h4>Added: trunk/dports/net/thttpd/Portfile (0 => 126200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/thttpd/Portfile                                (rev 0)
+++ trunk/dports/net/thttpd/Portfile        2014-10-05 09:30:31 UTC (rev 126200)
</span><span class="lines">@@ -0,0 +1,45 @@
</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
+# $Id$
+
+PortSystem          1.0
+
+name                thttpd
+version             2.26
+categories          net
+license             BSD
+platforms           darwin
+maintainers         vt.edu:jpo openmaintainer
+
+description         simple, small, portable, fast, and secure HTTP server
+
+long_description    Thttpd handles only the minimum necessary to implement \
+                    HTTP/1.1, has a very small run-time size, supports CGI, \
+                    IPv6, and bandwidth throttling.
+
+homepage            http://acme.com/software/thttpd/
+master_sites        ${homepage}
+
+checksums           rmd160  5712c9b93da54c2a9c686f0ee908a397b5167906 \
+                    sha256  15b3f6c60f854061e333227e9ea9ff789d34a092c9365690a8c0d3ecfc85cbb7
+
+depends_build       port:libtool
+
+universal_variant   no
+
+patchfiles          patch-Makefile.in.diff \
+                    patch-cgi-src-Makefile.in.diff \
+                    patch-extras-Makefile.in.diff \
+                    patch-libhttpd.c.diff
+
+configure.args-append --mandir=${prefix}/share/man
+
+pre-configure {
+    foreach f {config.guess config.sub} {
+        file copy -force ${prefix}/share/libtool/config/${f} ${worksrcpath}
+    }
+}
+
+conflicts           apache2
+
+livecheck.type      regex
+livecheck.regex     ${name}-(\\d+(?:\\.\\d+)*)
</ins><span class="cx">Property changes on: trunk/dports/net/thttpd/Portfile
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkdportsnetthttpdfilespatchMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/thttpd/files/patch-Makefile.in.diff (0 => 126200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/thttpd/files/patch-Makefile.in.diff                                (rev 0)
+++ trunk/dports/net/thttpd/files/patch-Makefile.in.diff        2014-10-05 09:30:31 UTC (rev 126200)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+--- Makefile.in.orig        2005-05-20 15:10:24.000000000 -0400
++++ Makefile.in        2014-10-01 17:05:59.000000000 -0400
+@@ -103,6 +103,7 @@
+                 CGIBINDIR=$(CGIBINDIR) \
+                 MANDIR=$(MANDIR) \
+                 WEBGROUP=$(WEBGROUP) \
++                DESTDIR=$(DESTDIR) \
+         ) ; done


+@@ -110,11 +111,11 @@

+ installthis:
+         -mkdir -p $(DESTDIR)$(BINDIR)
+-        $(INSTALL) -m 555 -o bin -g bin thttpd $(DESTDIR)$(BINDIR)
++        $(INSTALL) -m 555 thttpd $(DESTDIR)$(BINDIR)

+ install-man:
+         -mkdir -p $(DESTDIR)$(MANDIR)/man8
+-        $(INSTALL) -m 444 -o bin -g bin thttpd.8 $(DESTDIR)$(MANDIR)/man8
++        $(INSTALL) -m 444 thttpd.8 $(DESTDIR)$(MANDIR)/man8

+ installsubdirs:
+         for i in $(SUBDIRS) ; do ( \
+@@ -125,6 +126,7 @@
+                 CGIBINDIR=$(CGIBINDIR) \
+                 MANDIR=$(MANDIR) \
+                 WEBGROUP=$(WEBGROUP) \
++                DESTDIR=$(DESTDIR) \
+                 install \
+         ) ; done

</ins></span></pre></div>
<a id="trunkdportsnetthttpdfilespatchcgisrcMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/thttpd/files/patch-cgi-src-Makefile.in.diff (0 => 126200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/thttpd/files/patch-cgi-src-Makefile.in.diff                                (rev 0)
+++ trunk/dports/net/thttpd/files/patch-cgi-src-Makefile.in.diff        2014-10-05 09:30:31 UTC (rev 126200)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+--- cgi-src/Makefile.in.orig        2005-05-20 15:10:25.000000000 -0400
++++ cgi-src/Makefile.in        2014-10-01 17:12:40.000000000 -0400
+@@ -67,17 +67,17 @@
+         cd .. ; $(MAKE) $(MFLAGS) strerror.o

+ install:        all
+-        -mkdir -p $(CGIBINDIR)
+-        rm -f $(CGIBINDIR)/redirect
+-        cp redirect $(CGIBINDIR)/redirect
+-        rm -f $(MANDIR)/man8/redirect.8
+-        cp redirect.8 $(MANDIR)/man8/redirect.8
+-        rm -f $(CGIBINDIR)/ssi
+-        cp ssi $(CGIBINDIR)/ssi
+-        rm -f $(MANDIR)/man8/ssi.8
+-        cp ssi.8 $(MANDIR)/man8/ssi.8
+-        rm -f $(CGIBINDIR)/phf
+-        cp phf $(CGIBINDIR)/phf
++        -mkdir -p $(DESTDIR)$(CGIBINDIR)
++        rm -f $(DESTDIR)$(CGIBINDIR)/redirect
++        cp redirect $(DESTDIR)$(CGIBINDIR)/redirect
++        rm -f $(DESTDIR)$(MANDIR)/man8/redirect.8
++        cp redirect.8 $(DESTDIR)$(MANDIR)/man8/redirect.8
++        rm -f $(DESTDIR)$(CGIBINDIR)/ssi
++        cp ssi $(DESTDIR)$(CGIBINDIR)/ssi
++        rm -f $(DESTDIR)$(MANDIR)/man8/ssi.8
++        cp ssi.8 $(DESTDIR)$(MANDIR)/man8/ssi.8
++        rm -f $(DESTDIR)$(CGIBINDIR)/phf
++        cp phf $(DESTDIR)$(CGIBINDIR)/phf

+ clean:
+         rm -f $(CLEANFILES)
</ins></span></pre></div>
<a id="trunkdportsnetthttpdfilespatchextrasMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/thttpd/files/patch-extras-Makefile.in.diff (0 => 126200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/thttpd/files/patch-extras-Makefile.in.diff                                (rev 0)
+++ trunk/dports/net/thttpd/files/patch-extras-Makefile.in.diff        2014-10-05 09:30:31 UTC (rev 126200)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+--- extras/Makefile.in.orig        2005-05-20 15:10:25.000000000 -0400
++++ extras/Makefile.in        2014-10-01 17:24:06.000000000 -0400
+@@ -66,18 +66,19 @@


+ install:        all
+-        rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern
+-        cp makeweb $(BINDIR)/makeweb
+-        chgrp $(WEBGROUP) $(BINDIR)/makeweb
+-        chmod 2755 $(BINDIR)/makeweb
+-        cp htpasswd $(BINDIR)/htpasswd
+-        cp syslogtocern $(BINDIR)/syslogtocern
+-        rm -f $(MANDIR)/man1/makeweb.1
+-        cp makeweb.1 $(MANDIR)/man1/makeweb.1
+-        rm -f $(MANDIR)/man1/htpasswd.1
+-        cp htpasswd.1 $(MANDIR)/man1/htpasswd.1
+-        rm -f $(MANDIR)/man8/syslogtocern.8
+-        cp syslogtocern.8 $(MANDIR)/man8/syslogtocern.8
++        rm -f $(DESTDIR)$(BINDIR)/makeweb $(DESTDIR)$(BINDIR)/htpasswd $(DESTDIR)$(BINDIR)/syslogtocern
++        cp makeweb $(DESTDIR)$(BINDIR)/makeweb
++        chgrp $(WEBGROUP) $(DESTDIR)$(BINDIR)/makeweb
++        chmod 2755 $(DESTDIR)$(BINDIR)/makeweb
++        cp htpasswd $(DESTDIR)$(BINDIR)/htpasswd
++        cp syslogtocern $(DESTDIR)$(BINDIR)/syslogtocern
++        -mkdir -p $(DESTDIR)$(MANDIR)/man1
++        rm -f $(DESTDIR)$(MANDIR)/man1/makeweb.1
++        cp makeweb.1 $(DESTDIR)$(MANDIR)/man1/makeweb.1
++        rm -f $(DESTDIR)$(MANDIR)/man1/htpasswd.1
++        cp htpasswd.1 $(DESTDIR)$(MANDIR)/man1/htpasswd.1
++        rm -f $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
++        cp syslogtocern.8 $(DESTDIR)$(MANDIR)/man8/syslogtocern.8

+ clean:
+         rm -f $(CLEANFILES)
</ins></span></pre></div>
<a id="trunkdportsnetthttpdfilespatchlibhttpdcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/thttpd/files/patch-libhttpd.c.diff (0 => 126200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/thttpd/files/patch-libhttpd.c.diff                                (rev 0)
+++ trunk/dports/net/thttpd/files/patch-libhttpd.c.diff        2014-10-05 09:30:31 UTC (rev 126200)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- libhttpd.c.orig        2014-10-01 18:13:08.000000000 -0400
++++ libhttpd.c        2014-10-01 18:15:06.000000000 -0400
+@@ -4122,7 +4122,7 @@
+         }
+     else if ( IN6_IS_ADDR_V4MAPPED( &amp;saP-&gt;sa_in6.sin6_addr ) &amp;&amp; strncmp( str, &quot;::ffff:&quot;, 7 ) == 0 )
+         /* Elide IPv6ish prefix for IPv4 addresses. */
+-        (void) strcpy( str, &amp;str[7] );
++        (void) memmove( str, &amp;str[7], strlen(&amp;str[7]) + 1 );

+     return str;

</ins></span></pre></div>
<a id="trunkdportswwwapache2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/apache2/Portfile (126199 => 126200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/apache2/Portfile        2014-10-05 07:59:46 UTC (rev 126199)
+++ trunk/dports/www/apache2/Portfile        2014-10-05 09:30:31 UTC (rev 126200)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">                     port:zlib
</span><span class="cx"> 
</span><span class="cx"> # Both apache and apache2 want to install dbmmanage.1 and other manpages.
</span><del>-conflicts           apache
</del><ins>+conflicts           apache thttpd
</ins><span class="cx"> 
</span><span class="cx"> patchfiles          patch-docs-cgi-examples-printenv.diff \
</span><span class="cx">                     libtool-tag.diff
</span></span></pre>
</div>
</div>

</body>
</html>