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

[bdwalton at users.sourceforge.net]

Revision: 11523
          http://gar.svn.sourceforge.net/gar/?rev=11523&view=rev
Author:   bdwalton
Date:     2010-11-08 01:35:26 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
apache2: update to use new semantics for AP2_MODS

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-11-08 01:34:48 UTC (rev 11522)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-11-08 01:35:26 UTC (rev 11523)
@@ -88,14 +88,9 @@
 RUNTIME_DEP_PKGS_CSWap2worker 	  += CSWbdb48 CSWapr-util CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2rt	   = CSWapache2
 
-CHECKPKG_OVERRIDES_CSWap2suexec   += dependency-listed-more-than-once|CSWapache2
-CHECKPKG_OVERRIDES_CSWap2suexec   += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWapache2-manual += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils
 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives
 CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2
 
@@ -111,7 +106,7 @@
 POSTMSG = /opt/csw/share/doc/apache2/README.CSW
 
 AP2_MODS = 1
-AP2_MODFILES = /opt/csw/apache2/libexec/.*suexec.*\.so
+AP2_MODFILES = *suexec*\.so
 
 ALTERNATIVES_CSWapache2 = prefork
 ALTERNATIVES_CSWap2worker = worker
@@ -198,6 +193,7 @@
 STRIP_DIRS    = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
 
 PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.*
+PKGFILES_CSWap2suexec += .*ap2mod.*suexec
 PKGFILES_CSWapache2-devel = .*include/.* .*\.(a|la)
 PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf
 PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.*


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