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

[bdwalton at users.sourceforge.net]

Revision: 11122
          http://gar.svn.sourceforge.net/gar/?rev=11122&view=rev
Author:   bdwalton
Date:     2010-10-02 01:02:27 +0000 (Sat, 02 Oct 2010)

Log Message:
-----------
apache2: remove the dummy ap2 stuff (confusing, not needed)

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-10-01 15:15:32 UTC (rev 11121)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-10-02 01:02:27 UTC (rev 11122)
@@ -51,43 +51,32 @@
 
 # The PACKAGES variable tell GAR which packages to build
 PACKAGES  = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2suexec
-
-NEED_DUMMY_AP2 = 1
-
-ifeq ($(NEED_DUMMY_AP2), 1)
 # These packages are dummy versions to make dependencies nicer
 # as various things depend on CSWap2prefork currently
-PACKAGES += CSWap2prefork CSWapache2rt
-endif
+PACKAGES += CSWap2prefork CSWapache2rt CSWap2worker
 
 ARCHALL_CSWapache2-manual = 1
-ifeq ($(NEED_DUMMY_AP2), 1)
 ARCHALL_CSWap2prefork = 1
 ARCHALL_CSWapache2rt = 1
-endif
+ARCHALL_CSWap2worker = 1
 
 CATALOGNAME_CSWapache2 = apache2
 CATALOGNAME_CSWapache2-devel = apache2_devel
 CATALOGNAME_CSWapache2-manual = apache2_manual
 CATALOGNAME_CSWap2suexec = ap2_suexec
-ifeq ($(NEED_DUMMY_AP2), 1)
 CATALOGNAME_CSWap2prefork = ap2_prefork
+CATALOGNAME_CSWap2worker = ap2_worker
 CATALOGNAME_CSWapache2rt = apache2rt
-endif
 
 SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
 SPKG_DESC_CSWapache2-devel = The development files for Apache2.
 SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
 SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2.
-ifeq ($(NEED_DUMMY_AP2), 1)
-SPKG_DESC_CSWap2prefork = A dummy stub for the old prefork mpm package
-SPKG_DESC_CSWapache2rt = A dummy stub for the old apache2rt package
-endif
+SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package
+SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package
+SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package
 
-INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2c CSWap2worker
-ifneq ($(NEED_DUMMY_AP2), 1)
-INCOMPATIBLE_PKGS_CSWapache2 += CSWap2prefork CSWapache2rt
-endif
+INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2c
 
 RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
@@ -95,19 +84,17 @@
 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2-devel  = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2suexec	   = CSWapache2
-ifeq ($(NEED_DUMMY_AP2), 1)
 RUNTIME_DEP_PKGS_CSWap2prefork     = CSWapache2
+RUNTIME_DEP_PKGS_CSWap2worker      = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2rt	   = CSWapache2
-endif
 
 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
-ifeq ($(NEED_DUMMY_AP2), 1)
 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2
-endif
 
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib
@@ -181,10 +168,9 @@
 PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.*
 PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL)
 PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf
-ifeq ($(NEED_DUMMY_AP2), 1)
 PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.*
+PKGFILES_CSWap2worker = .*share/doc/ap2_worker.*
 PKGFILES_CSWapache2rt = .*share/doc/apache2rt.*
-endif
 
 PROTOTYPE_FILTER  = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; { print }'
 


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