[csw-devel] SF.net SVN: gar:[11186] csw/mgar/pkg/apache2/trunk/Makefile

[bdwalton at users.sourceforge.net]

Revision: 11186
          http://gar.svn.sourceforge.net/gar/?rev=11186&view=rev
Author:   bdwalton
Date:     2010-10-07 01:35:27 +0000 (Thu, 07 Oct 2010)

Log Message:
-----------
apache2: clean up httpd.conf processing; enable 2 includes to match previous package version defaults

Modified Paths:
--------------
    csw/mgar/pkg/apache2/trunk/Makefile

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-10-06 19:52:21 UTC (rev 11185)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-10-07 01:35:27 UTC (rev 11186)
@@ -275,8 +275,14 @@
 post-merge:
 	@(cd $(PKGROOT)/$(prefix)/apache2/etc/; \
 		for f in httpd.conf extra/httpd-ssl.conf; do \
-			perl -pi -e 's/User.*daemon.*/User \@USER\@/; s/Group.*daemon.*/Group \@GROUP\@/; s/#ServerName www.example.com:80/ServerName \@HOSTNAME\@:80/; s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; s/^(LoadModule.*suexec.*)/#$$1/' $$f; \
-			mv $$f $$f.CSW; \
+		perl -pi -e 's/User.*daemon.*/User \@USER\@/; \
+		s/Group.*daemon.*/Group \@GROUP\@/; \
+		s/#ServerName www.example.com:80/ServerName \@HOSTNAME\@:80/; \
+		s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; \
+		s/^(LoadModule.*suexec.*)/#$$1/; \
+		s/^#(Include.*httpd-mpm.conf)/$$1/; \
+		s/^#(Include.*httpd-ssl.conf)/$$1/' $$f; \
+		mv $$f $$f.CSW; \
 		done )
 	@$(MAKECOOKIE)
 


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