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

[bdwalton at users.sourceforge.net]

Revision: 11166
          http://gar.svn.sourceforge.net/gar/?rev=11166&view=rev
Author:   bdwalton
Date:     2010-10-06 02:00:49 +0000 (Wed, 06 Oct 2010)

Log Message:
-----------
apache2: change file inclusion instead of making ap2_apxs

If we simply leave the build/* files out of the -devel package
we can have everything required for apxs to function in the primary
apache2 package.  This is simpler dependency wise.  Having apache2
depend on apxs meant that apxs didn't function when apache2 was
removed...apxs required httpd.

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-10-06 01:35:41 UTC (rev 11165)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-10-06 02:00:49 UTC (rev 11166)
@@ -50,7 +50,7 @@
 
 # The PACKAGES variable tell GAR which packages to build
 PACKAGES  = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2suexec
-PACKAGES += CSWap2worker CSWap2apxs
+PACKAGES += CSWap2worker
 # These packages are dummy versions to make dependencies nicer
 # as various things depend on CSWap2prefork currently
 PACKAGES += CSWap2prefork CSWapache2rt
@@ -66,7 +66,6 @@
 CATALOGNAME_CSWap2prefork = ap2_prefork
 CATALOGNAME_CSWap2worker = ap2_worker
 CATALOGNAME_CSWapache2rt = apache2rt
-CATALOGNAME_CSWap2apxs = ap2_apxs
 
 SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
 SPKG_DESC_CSWapache2-devel = The development files for Apache2.
@@ -75,34 +74,28 @@
 SPKG_DESC_CSWap2worker = The apache worker mpm.
 SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package.
 SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package.
-SPKG_DESC_CSWap2apxs = The apxs configuration tool for Apache2.
 
 INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2c
 
 RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
 RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util CSWbdb48
-RUNTIME_DEP_PKGS_CSWapache2	  += CSWap2apxs
 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
-RUNTIME_DEP_PKGS_CSWapache2-devel  = CSWapache2 CSWap2apxs
+RUNTIME_DEP_PKGS_CSWapache2-devel  = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2suexec	   = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2prefork     = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2worker      = CSWapache2 CSWapr CSWexpat
 RUNTIME_DEP_PKGS_CSWap2worker 	  += CSWbdb48 CSWapr-util CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2rt	   = CSWapache2
-RUNTIME_DEP_PKGS_CSWap2apxs	   = CSWperl
 
 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|CSWap2apxs
 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives
 CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWap2apxs += surplus-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWapache2-devel += surplus-dependency|CSWap2apxs
 
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib
@@ -208,7 +201,6 @@
 PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.*
 PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker
 PKGFILES_CSWapache2rt = .*share/doc/apache2rt.*
-PKGFILES_CSWap2apxs = .*share/build/.* .*/sbin/apxs
 
 PROTOTYPE_FILTER  = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }'
 


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