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

[cgrzemba at users.sourceforge.net]

Revision: 25073
          http://sourceforge.net/p/gar/code/25073
Author:   cgrzemba
Date:     2015-06-10 14:42:05 +0000 (Wed, 10 Jun 2015)
Log Message:
-----------
apache24/trunk: fix merging

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

Modified: csw/mgar/pkg/apache24/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache24/trunk/Makefile	2015-06-10 12:25:47 UTC (rev 25072)
+++ csw/mgar/pkg/apache24/trunk/Makefile	2015-06-10 14:42:05 UTC (rev 25073)
@@ -46,8 +46,9 @@
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWapache24 += CSWopenldap
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlighttpd
-EXTRA_MERGE_DIRS_isa-extra += /etc/opt/csw/64/apache2/extra
 
+EXTRA_MERGE_SCRIPTS_isa-default64 += copy-apache-modules
+
 # 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
 
@@ -119,6 +120,7 @@
 # CONFIGURE_ARGS += --with-mpm=prefork
 CONFIGURE_ARGS += --enable-layout=OpenCSW
 CONFIGURE_ARGS += --enable-mods-shared=all
+# 389-admin needs the legacy mod_cgi
 CONFIGURE_ARGS += --enable-cgi
 CONFIGURE_ARGS += --enable-privileges
 CONFIGURE_ARGS += --enable-vhost-alias
@@ -165,3 +167,10 @@
 	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)
+
+merge-copy-apache-modules:
+	$(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pcopy \
+ 		-m $(foreach C,$(sysconfdir)/64/apache2/extra/.*,-s ",^\(\.$C\)\$$,\1,p" ) \
+		. $(PKGROOT) \
+	)
+	@$(MAKECOOKIE)

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