[csw-devel] SF.net SVN: gar:[13803] csw/mgar/pkg/apache2/branches/open-bug-squash/ Makefile

[bdwalton at users.sourceforge.net]

Revision: 13803
          http://gar.svn.sourceforge.net/gar/?rev=13803&view=rev
Author:   bdwalton
Date:     2011-03-15 01:55:47 +0000 (Tue, 15 Mar 2011)

Log Message:
-----------
apache2/branches/open-bug-squash: a rearrangement of the apache2c depend ordering to see if pkg-get can cope

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile

Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-03-14 23:35:05 UTC (rev 13802)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-03-15 01:55:47 UTC (rev 13803)
@@ -58,8 +58,8 @@
 PACKAGES  = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2-suexec
 PACKAGES += CSWap2-worker
 # These packages are dummy versions to make dependencies nicer
-# as various things depend on CSWap2prefork currently
-PACKAGES += CSWap2-prefork CSWapache2rt
+# as various things depend on them currently
+PACKAGES += CSWap2-prefork CSWapache2rt CSWapache2c
 
 OBSOLETES_CSWap2-suexec = CSWap2suexec
 OBSOLETES_CSWap2-prefork = CSWap2prefork
@@ -69,9 +69,8 @@
 ARCHALL_CSWapache2-manual = 1
 ARCHALL_CSWap2-prefork = 1
 ARCHALL_CSWapache2rt = 1
+ARCHALL_CSWapache2c = 1
 
-OBSOLETES_CSWapache2 = CSWapache2c
-
 CATALOGNAME_CSWapache2 = apache2
 CATALOGNAME_CSWapache2-dev = apache2_dev
 CATALOGNAME_CSWapache2-manual = apache2_manual
@@ -87,10 +86,12 @@
 SPKG_DESC_CSWap2-worker = The apache worker mpm.
 SPKG_DESC_CSWap2-prefork = A stub for the old prefork mpm package.
 SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package.
+SPKG_DESC_CSWapache2c = A stub for the old apache2c package.
 
 RUNTIME_DEP_PKGS_CSWapache2       += CSWexpat CSWiconv CSWosslutils
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
 RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util CSWbdb48
+RUNTIME_DEP_PKGS_CSWapache2       += CSWapache2c
 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2-dev  = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2-suexec	   = CSWapache2
@@ -214,6 +215,7 @@
 PKGFILES_CSWap2-prefork = .*share/doc/ap2_prefork.*
 PKGFILES_CSWap2-worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker
 PKGFILES_CSWapache2rt = .*share/doc/apache2rt.*
+PKGFILES_CSWapache2c = .*share/doc/apache2c.*
 
 #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.