[csw-devel] SF.net SVN: gar:[19429] csw/mgar/pkg/apache2/branches/apache24

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Fri Oct 12 12:17:37 CEST 2012 

Revision: 19429
          http://gar.svn.sourceforge.net/gar/?rev=19429&view=rev
Author:   bdwalton
Date:     2012-10-12 10:17:37 +0000 (Fri, 12 Oct 2012)
Log Message:
-----------
apache2/branches/apache24: use apache2 instead of apache24 for directory naming layout (should be better forward compatibility)

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/apache24/Makefile
    csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch

Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/Makefile	2012-10-12 08:15:37 UTC (rev 19428)
+++ csw/mgar/pkg/apache2/branches/apache24/Makefile	2012-10-12 10:17:37 UTC (rev 19429)
@@ -55,25 +55,25 @@
 
 INITSMF = /etc/opt/csw/init.d/cswapache24
 
-PRESERVECONF += $(sysconfdir)/apache24/envvars
-PRESERVECONF += $(sysconfdir)/apache24/mime.types
-PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-manual.conf
-PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-userdir.conf
-PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-languages.conf
-PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-vhosts.conf
-PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-info.conf
-PRESERVECONF += $(sysconfdir)/apache24/extra/proxy-html.conf
-PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-dav.conf
-PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-multilang-errordoc.conf
-PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-autoindex.conf
-PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-mpm.conf
-PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-default.conf
-PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-ssl.conf
-PRESERVECONF += $(sysconfdir)/apache24/envvars-std
-PRESERVECONF += $(sysconfdir)/apache24/magic
-PRESERVECONF += $(sysconfdir)/apache24/httpd.conf
+PRESERVECONF += $(sysconfdir)/apache2/envvars
+PRESERVECONF += $(sysconfdir)/apache2/mime.types
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-manual.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-userdir.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-languages.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-vhosts.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-info.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/proxy-html.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-dav.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-multilang-errordoc.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-autoindex.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-mpm.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-default.conf
+PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-ssl.conf
+PRESERVECONF += $(sysconfdir)/apache2/envvars-std
+PRESERVECONF += $(sysconfdir)/apache2/magic
+PRESERVECONF += $(sysconfdir)/apache2/httpd.conf
 
-SSLCERT = /etc/opt/csw/apache24/server
+SSLCERT = /etc/opt/csw/apache2/server
 
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib
@@ -104,20 +104,20 @@
 post-install-modulated:
 	@(cd $(DESTDIR)/$(sbindir); \
 	   for f in envvars*; do \
-		mv $$f $(DESTDIR)/$(sysconfdir)/apache24/; \
-		ln -s $(sysconfdir)/apache24/$$f $$f; \
+		mv $$f $(DESTDIR)/$(sysconfdir)/apache2/; \
+		ln -s $(sysconfdir)/apache2/$$f $$f; \
 	   done )
 
 post-merge:
-	@(cd $(PKGROOT)/$(sysconfdir)/apache24; \
+	@(cd $(PKGROOT)/$(sysconfdir)/apache2; \
 		rm -rf original; \
-		perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|g' httpd.conf.CSW ; \
+		perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' httpd.conf.CSW ; \
 	  cd $(PKGROOT)/$(mandir); \
-		perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache24|g' man1/*; \
+		perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache2|g' man1/*; \
 		perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' man8/* )
 	@( ginstall -d $(PKGROOT)/etc/opt/csw/init.d; \
 	    ginstall $(WORKSRC_FIRSTMOD)/../cswapache24 $(PKGROOT)/etc/opt/csw/init.d )
 
-	@(cd $(PKGROOT)/$(sysconfdir)/apache24; \
+	@(cd $(PKGROOT)/$(sysconfdir)/apache2; \
 		echo "# create server.(crt|csr)/server.key" > server )
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch	2012-10-12 08:15:37 UTC (rev 19428)
+++ csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch	2012-10-12 10:17:37 UTC (rev 19429)
@@ -1,4 +1,4 @@
-From 6625eb4c5833cbee96ccb143f6d4e3d4f367b4b3 Mon Sep 17 00:00:00 2001
+From ecd25ab11aa44a21fae227740ac8fb58c0892e69 Mon Sep 17 00:00:00 2001
 From: Ben Walton <bwalton at opencsw.org>
 Date: Tue, 2 Oct 2012 11:08:04 +0200
 Subject: [PATCH] Add an OpenCSW option to config.layout
@@ -9,7 +9,7 @@
  1 file changed, 24 insertions(+)
 
 diff --git a/config.layout b/config.layout
-index 35a325a..b21a3d4 100644
+index 35a325a..acf6efb 100644
 --- a/config.layout
 +++ b/config.layout
 @@ -370,3 +370,27 @@
@@ -23,22 +23,22 @@
 +    exec_prefix:     ${prefix}
 +    bindir:          ${prefix}/bin
 +    sbindir:         ${prefix}/sbin
-+    libdir:          ${prefix}/lib/apache24
++    libdir:          ${prefix}/lib/apache2
 +    libexecdir:	     ${libdir}/modules
 +    installbuilddir: ${libdir}/build
-+    sysconfdir:      /etc/${prefix}/apache24
++    sysconfdir:      /etc/${prefix}/apache2
 +    mandir:          ${prefix}/share/man
-+    datadir:         /var/${prefix}/apache24
++    datadir:         /var/${prefix}/apache2
 +    errordir:        ${datadir}/error
 +    iconsdir:        ${datadir}/icons
 +    htdocsdir:       ${datadir}/htdocs
 +    manualdir:       ${datadir}/manual
 +    cgidir:          ${datadir}/cgi-bin
-+    includedir:      ${prefix}/include/apache24
++    includedir:      ${prefix}/include/apache2
 +    localstatedir:   /var/${prefix}
 +    runtimedir:      /var/run
-+    logfiledir:      ${localstatedir}/log/apache24
-+    proxycachedir:   ${localstatedir}/apache24/proxy
++    logfiledir:      ${localstatedir}/log/apache2
++    proxycachedir:   ${localstatedir}/apache2/proxy
 +</Layout>
 -- 
 1.7.12

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