[126200] trunk/dports

ryandesign at macports.org ryandesign at macports.org
Sun Oct 5 02:30:31 PDT 2014 

Revision: 126200
          https://trac.macports.org/changeset/126200
Author:   ryandesign at macports.org
Date:     2014-10-05 02:30:31 -0700 (Sun, 05 Oct 2014)
Log Message:
-----------
thttpd: new port, version 2.26 (#45239)

Modified Paths:
--------------
    trunk/dports/www/apache2/Portfile

Added Paths:
-----------
    trunk/dports/net/thttpd/
    trunk/dports/net/thttpd/Portfile
    trunk/dports/net/thttpd/files/
    trunk/dports/net/thttpd/files/patch-Makefile.in.diff
    trunk/dports/net/thttpd/files/patch-cgi-src-Makefile.in.diff
    trunk/dports/net/thttpd/files/patch-extras-Makefile.in.diff
    trunk/dports/net/thttpd/files/patch-libhttpd.c.diff

Added: trunk/dports/net/thttpd/Portfile
===================================================================
--- trunk/dports/net/thttpd/Portfile	                        (rev 0)
+++ trunk/dports/net/thttpd/Portfile	2014-10-05 09:30:31 UTC (rev 126200)
@@ -0,0 +1,45 @@
+# -*- 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+)*)


Property changes on: trunk/dports/net/thttpd/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/net/thttpd/files/patch-Makefile.in.diff
===================================================================
--- 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)
@@ -0,0 +1,32 @@
+--- 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
+ 

Added: trunk/dports/net/thttpd/files/patch-cgi-src-Makefile.in.diff
===================================================================
--- 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)
@@ -0,0 +1,31 @@
+--- 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)

Added: trunk/dports/net/thttpd/files/patch-extras-Makefile.in.diff
===================================================================
--- 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)
@@ -0,0 +1,34 @@
+--- 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)

Added: trunk/dports/net/thttpd/files/patch-libhttpd.c.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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( &saP->sa_in6.sin6_addr ) && strncmp( str, "::ffff:", 7 ) == 0 )
+ 	/* Elide IPv6ish prefix for IPv4 addresses. */
+-	(void) strcpy( str, &str[7] );
++	(void) memmove( str, &str[7], strlen(&str[7]) + 1 );
+ 
+     return str;
+ 

Modified: trunk/dports/www/apache2/Portfile
===================================================================
--- 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)
@@ -36,7 +36,7 @@
                     port:zlib
 
 # Both apache and apache2 want to install dbmmanage.1 and other manpages.
-conflicts           apache
+conflicts           apache thttpd
 
 patchfiles          patch-docs-cgi-examples-printenv.diff \
                     libtool-tag.diff
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141005/1cf06066/attachment.html>

More information about the macports-changes mailing list