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

[bdwalton at users.sourceforge.net]

Revision: 11073
          http://gar.svn.sourceforge.net/gar/?rev=11073&view=rev
Author:   bdwalton
Date:     2010-09-28 15:09:15 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
apache2: add ap2_{prefork,worker} as dummy packages with easy kill switch

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 15:07:57 UTC (rev 11072)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-09-28 15:09:15 UTC (rev 11073)
@@ -42,20 +42,39 @@
 # 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 CSWap2worker
+endif
+
 ARCHALL_CSWapache2-manual = 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
+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_CSWap2worker = A dummy stub for the old worker mpm package
+endif
 
-INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2rt CSWap2worker CSWap2perfork
-INCOMPATIBLE_PKGS_CSWapache2 += CSWapache2c
+INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2rt CSWapache2c
+ifneq ($(NEED_DUMMY_AP2), 1)
+INCOMPATIBLE_PKGS_CSWapache2 += CSWap2prefork CSWap2worker
+endif
 
 RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
@@ -63,11 +82,19 @@
 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
+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)
+CHECPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
+CHECPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2
+endif
 
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib


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