[csw-devel] SF.net SVN: gar:[18522] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Jun 25 13:27:18 CEST 2012


Revision: 18522
          http://gar.svn.sourceforge.net/gar/?rev=18522&view=rev
Author:   dmichelsen
Date:     2012-06-25 11:27:17 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
thttpd/trunk: Initial commit, install stil broken

Added Paths:
-----------
    csw/mgar/pkg/thttpd/
    csw/mgar/pkg/thttpd/Makefile
    csw/mgar/pkg/thttpd/branches/
    csw/mgar/pkg/thttpd/tags/
    csw/mgar/pkg/thttpd/trunk/
    csw/mgar/pkg/thttpd/trunk/Makefile
    csw/mgar/pkg/thttpd/trunk/checksums
    csw/mgar/pkg/thttpd/trunk/files/
    csw/mgar/pkg/thttpd/trunk/files/0001-Honour-DESTDIR.patch

Added: csw/mgar/pkg/thttpd/Makefile
===================================================================
--- csw/mgar/pkg/thttpd/Makefile	                        (rev 0)
+++ csw/mgar/pkg/thttpd/Makefile	2012-06-25 11:27:17 UTC (rev 18522)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/thttpd/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/thttpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/thttpd/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/thttpd/trunk/Makefile	2012-06-25 11:27:17 UTC (rev 18522)
@@ -0,0 +1,47 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = thttpd
+VERSION = 2.25b
+GARTYPE = v2
+CATEGORIES = server
+
+DESCRIPTION = The tiny/turbo/throttling HTTP server
+
+MASTER_SITES = http://www.acme.com/software/thttpd/
+DISTFILES  = $(DISTNAME).tar.gz
+
+PATCHFILES += 0001-Honour-DESTDIR.patch
+
+PACKAGES += CSWmypkg
+SPKG_DESC_CSWmypkg = My package
+PKGFILES_CSWmypkg += $(call pkgfiles_lib,libabc.so.1)
+PKGFILES_CSWmypkg += $(call baseisadirs,$(bindir),myexec)
+PKGFILES_CSWmypkg += $(sysconfdir)/myconf
+
+REINPLACEMENTS += nochown
+REINPLACE_MATCH_nochown = -o bin -g bin
+REINPLACE_WITH_nochown =
+REINPLACE_FILES_nochown += Makefile.in
+
+REINPLACEMENTS += nochgrp
+REINPLACE_MATCH_nochgrp = chown.*|chgrp.*
+REINPLACE_WITH_nochgrp = #
+REINPLACE_FILES_nochgrp += extras/Makefile.in
+
+# There is no testsuite
+TEST_SCRIPTS =
+
+INSTALL_OVERRIDE_VARS += prefix
+INSTALL_OVERRIDE_VAR_prefix = $(DESTDIR)$(prefix)
+INSTALL_OVERRIDE_VARS += MANDIR
+INSTALL_OVERRIDE_VAR_MANDIR = $(DESTDIR)$(mandir)
+INSTALL_OVERRIDE_VARS += DESTDIR
+INSTALL_OVERRIDE_VAR_DESTDIR =
+
+include gar/category.mk
+
+pre-install-modulated:
+	ginstall -d $(DESTDIR)$(mandir)/man1
+	ginstall -d $(DESTDIR)$(mandir)/man8
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/thttpd/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/thttpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/thttpd/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/thttpd/trunk/checksums	2012-06-25 11:27:17 UTC (rev 18522)
@@ -0,0 +1 @@
+156b249b3b0bcd48b06badd2db0d56c5  thttpd-2.25b.tar.gz

Added: csw/mgar/pkg/thttpd/trunk/files/0001-Honour-DESTDIR.patch
===================================================================
--- csw/mgar/pkg/thttpd/trunk/files/0001-Honour-DESTDIR.patch	                        (rev 0)
+++ csw/mgar/pkg/thttpd/trunk/files/0001-Honour-DESTDIR.patch	2012-06-25 11:27:17 UTC (rev 18522)
@@ -0,0 +1,70 @@
+From 952c968ae325f27c9ebb1309a6d2210f4e11b75c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da\xC2m at opencsw.org>
+Date: Mon, 25 Jun 2012 13:07:58 +0200
+Subject: [PATCH] Honour DESTDIR
+
+---
+ cgi-src/Makefile.in |   22 +++++++++++-----------
+ extras/Makefile.in  |    8 ++++----
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+ mode change 100644 => 100755 extras/Makefile.in
+
+diff --git a/cgi-src/Makefile.in b/cgi-src/Makefile.in
+index 6e4e9ba..ac2f354 100644
+--- a/cgi-src/Makefile.in
++++ b/cgi-src/Makefile.in
+@@ -67,17 +67,17 @@ strerror.o:
+ 	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)
+diff --git a/extras/Makefile.in b/extras/Makefile.in
+old mode 100644
+new mode 100755
+index a29780f..0759269
+--- a/extras/Makefile.in
++++ b/extras/Makefile.in
+@@ -24,12 +24,12 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ 
+-prefix =	@prefix@
+-exec_prefix =	@exec_prefix@
+-BINDIR =	@sbindir@
++prefix =	$(DESTDIR)@prefix@
++exec_prefix =	$(DESTDIR)@exec_prefix@
++BINDIR =	$(DESTDIR)@sbindir@
+ WEBDIR =	$(prefix)/www
+ CGIBINDIR =	$(WEBDIR)/cgi-bin
+-MANDIR =	@mandir@
++MANDIR =	$(DESTDIR)@mandir@
+ 
+ CC =		@CC@
+ CCOPT =		@V_CCOPT@
+-- 
+1.7.10.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list