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

[bdwalton at users.sourceforge.net]

Revision: 19380
          http://gar.svn.sourceforge.net/gar/?rev=19380&view=rev
Author:   bdwalton
Date:     2012-10-04 19:41:00 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
apache2/branches/apache24: setup config preservation

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/apache24/Makefile

Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/Makefile	2012-10-04 19:27:28 UTC (rev 19379)
+++ csw/mgar/pkg/apache2/branches/apache24/Makefile	2012-10-04 19:41:00 UTC (rev 19380)
@@ -70,6 +70,24 @@
 
 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
+
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib
 
@@ -99,7 +117,7 @@
 post-merge:
 	@(cd $(PKGROOT)/$(sysconfdir)/apache24; \
 		rm -rf original; \
-		perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|g' httpd.conf ; \
+		perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|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/apache2|/etc/opt/csw/apache2|g' man8/* )

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