SF.net SVN: gar:[25025] csw/mgar/pkg/apache24/trunk

[cgrzemba at users.sourceforge.net]

Revision: 25025
          http://sourceforge.net/p/gar/code/25025
Author:   cgrzemba
Date:     2015-05-27 12:02:45 +0000 (Wed, 27 May 2015)
Log Message:
-----------
apache24/trunk: redefine EXTRA_MERGE_DIRS

Modified Paths:
--------------
    csw/mgar/pkg/apache24/trunk/Makefile
    csw/mgar/pkg/apache24/trunk/files/cswapache24

Modified: csw/mgar/pkg/apache24/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache24/trunk/Makefile	2015-05-27 11:41:47 UTC (rev 25024)
+++ csw/mgar/pkg/apache24/trunk/Makefile	2015-05-27 12:02:45 UTC (rev 25025)
@@ -45,7 +45,7 @@
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWapache24 += CSWopenldap
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlighttpd
-EXTRA_MERGE_DIRS_isa-amd64 += /etc/opt/csw/64/apache2/extra
+EXTRA_MERGE_DIRS_isa-extra += /etc/opt/csw/64/apache2/extra
 
 # This is because /opt/csw/sbin/sparcv9 is missing, most certainly an checkpkg issue
 CHECKPKG_OVERRIDES_CSWapache24 += missing-dependency|CSWbonnie++|or|CSWcollectd|or|CSWleafnode|or|CSWlighttpd|or|CSWlogrotate|or|CSWopenldap|or|CSWproftpd|or|CSWsysstat|or|CSWzabbix-agent|or|CSWzabbix-server
@@ -161,8 +161,6 @@
 		gsed -e '/# LoadModule/a <IfDefine 64bit>\n\Include $(sysconfdir)/64/apache2/extra/modules.load\n\</IfDefine>\n\<IfDefine !64bit>\n\Include $(sysconfdir)/apache2/extra/modules.load\n\</IfDefine>' -i httpd.conf; \
 	)
 	ginstall -D -m 0755 $(WORKDIR)/cswapache24 $(DESTDIR)/etc/opt/csw/init.d/cswapache24
-	gsed -e '/#FMRI/a [ \$${ENABLE64} = "true" ] && MM=/64' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
-	gsed -e '/#FMRI/a ENABLE64=\$$(/usr/bin/svcprop -p config/enable_64bit ${SMF_FMRI})' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
 	gsed -e '/APACHECTL=/s/sbin/sbin\$${MM}/' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
 	echo "# create server.(crt|csr)/server.key" > $(DESTDIR)$(sysconfdir)/apache2/server
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/apache24/trunk/files/cswapache24
===================================================================
--- csw/mgar/pkg/apache24/trunk/files/cswapache24	2015-05-27 11:41:47 UTC (rev 25024)
+++ csw/mgar/pkg/apache24/trunk/files/cswapache24	2015-05-27 12:02:45 UTC (rev 25025)
@@ -1,4 +1,4 @@
-#!/sbin/sh
+#!/sbin/ksh
 #
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -11,6 +11,8 @@
 #RC_KLEV 0,1,2,S
 #RC_SLEV 3
 #FMRI network
+ENABLE64=$(/usr/bin/svcprop -p config/enable_64bit ${SMF_FMRI})
+[ ${ENABLE64} = "true" ] && MM=/64
 
 APACHE_HOME=@prefix@
 CONF_FILE=@sysconfdir@/apache2/httpd.conf

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