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

[bdwalton at users.sourceforge.net]

Revision: 18184
          http://gar.svn.sourceforge.net/gar/?rev=18184&view=rev
Author:   bdwalton
Date:     2012-06-01 02:27:08 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
apache2/trunk: move envvars to etc/ so we can make it a preservable config file

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

Added Paths:
-----------
    csw/mgar/pkg/apache2/trunk/files/0004-Move-the-envvars-files-to-sysconfdir.patch

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2012-05-31 11:49:31 UTC (rev 18183)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2012-06-01 02:27:08 UTC (rev 18184)
@@ -49,9 +49,9 @@
 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork
 DISTFILES += README.CSW.apache2rt
 
-#PATCHFILES += 0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch
 PATCHFILES += 0002-Adjust-a-few-usr-local-paths-in-the-man-pages.patch
 PATCHFILES += 0003-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch
+PATCHFILES += 0004-Move-the-envvars-files-to-sysconfdir.patch
 
 # The PACKAGES variable tell GAR which packages to build
 PACKAGES  = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2suexec
@@ -349,5 +349,8 @@
 	@echo Fixing usr/local reference in the cgi-bin scripts
 	@(cd $(PKGROOT)/$(prefix)/apache2/share/cgi-bin; \
 		perl -pi -e 's@/usr/local/bin@/opt/csw/bin at g' *)
+	@echo Adding link from original envvars location
+	@(cd $(PKGROOT)/$(prefix)/apache2/sbin; \
+		ln -s ../etc/envvars envvars )
 	@$(MAKECOOKIE)
 

Added: csw/mgar/pkg/apache2/trunk/files/0004-Move-the-envvars-files-to-sysconfdir.patch
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/0004-Move-the-envvars-files-to-sysconfdir.patch	                        (rev 0)
+++ csw/mgar/pkg/apache2/trunk/files/0004-Move-the-envvars-files-to-sysconfdir.patch	2012-06-01 02:27:08 UTC (rev 18184)
@@ -0,0 +1,89 @@
+From b92c24bc2546043669e45d818606e36fff61ec83 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Fri, 1 Jun 2012 03:11:50 +0200
+Subject: [PATCH] Move the envvars files to sysconfdir
+
+We want to treat the envvars files as configuration so we need to
+ensure they live in etc/.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ Makefile.in          |    6 +++---
+ support/Makefile.in  |    7 ++++---
+ support/apachectl.in |    4 ++--
+ support/apxs.in      |    2 +-
+ 4 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c2346c3..9d14234 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -82,9 +82,9 @@ install-conf:
+ 	    done ; \
+ 	done ; \
+ 	if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
++	    cp -p envvars-std $(DESTDIR)$(sysconfdir); \
++	    if test ! -f $(DESTDIR)$(sysconfdir)/envvars; then \
++	        cp -p envvars-std $(DESTDIR)$(sysconfdir)/envvars ; \
+ 	    fi ; \
+ 	fi
+ 
+diff --git a/support/Makefile.in b/support/Makefile.in
+index 85aff34..d2b00f9 100644
+--- a/support/Makefile.in
++++ b/support/Makefile.in
+@@ -15,6 +15,7 @@ install:
+ 	@test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+ 	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+ 	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
++	@test -d $(DESTDIR)$(sysconfdir) || $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
+ 	@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
+ 	@for i in apxs apachectl dbmmanage; do \
+ 	    if test -f "$(builddir)/$$i"; then \
+@@ -23,9 +24,9 @@ install:
+ 	    fi ; \
+ 	done
+ 	@if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
++	    cp -p envvars-std $(DESTDIR)$(sysconfdir); \
++	    if test ! -f $(DESTDIR)$(sysconfdir)/envvars; then \
++	        cp -p envvars-std $(DESTDIR)$(sysconfdir)/envvars ; \
+ 	    fi ; \
+ 	fi
+ 
+diff --git a/support/apachectl.in b/support/apachectl.in
+index d4dff38..2589779 100644
+--- a/support/apachectl.in
++++ b/support/apachectl.in
+@@ -44,8 +44,8 @@ ARGV="$@"
+ HTTPD='@exp_sbindir@/@progname@'
+ #
+ # pick up any necessary environment variables
+-if test -f @exp_sbindir@/envvars; then
+-  . @exp_sbindir@/envvars
++if test -f @exp_sysconfdir@/envvars; then
++  . @exp_sysconfdir@/envvars
+ fi
+ #
+ # a command that outputs a formatted text version of the HTML at the
+diff --git a/support/apxs.in b/support/apxs.in
+index 1900a78..5442dc0 100644
+--- a/support/apxs.in
++++ b/support/apxs.in
+@@ -189,7 +189,7 @@ if (@opt_S) {
+ my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
+ $httpd = eval qq("$httpd");
+ $httpd = eval qq("$httpd");
+-my $envvars = get_vars("sbindir") . "/envvars";
++my $envvars = get_vars("sysconfdir") . "/envvars";
+ $envvars = eval qq("$envvars");
+ $envvars = eval qq("$envvars");
+ 
+-- 
+1.7.10
+

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