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

[bdwalton at users.sourceforge.net]

Revision: 14002
          http://gar.svn.sourceforge.net/gar/?rev=14002&view=rev
Author:   bdwalton
Date:     2011-03-29 02:51:52 +0000 (Tue, 29 Mar 2011)

Log Message:
-----------
geos/trunk: drop manual definition of CSWgeos and replace it with OBSOLETED_BY  declarations

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

Modified: csw/mgar/pkg/geos/trunk/Makefile
===================================================================
--- csw/mgar/pkg/geos/trunk/Makefile	2011-03-29 02:38:28 UTC (rev 14001)
+++ csw/mgar/pkg/geos/trunk/Makefile	2011-03-29 02:51:52 UTC (rev 14002)
@@ -15,22 +15,17 @@
 
 GARCOMPILER = GNU
 
-PACKAGES += CSWgeos
-PACKAGES += CSWlibgeos3-2-2
+PACKAGES = CSWlibgeos3-2-2
 PACKAGES += CSWlibgeos-c1
 PACKAGES += CSWgeos-dev
 
-CATALOGNAME_CSWgeos = geos
-SPKG_DESC_CSWgeos = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWgeos += CSWlibgeos3-2-2
-RUNTIME_DEP_PKGS_CSWgeos += CSWlibgeos-c1
-
 CATALOGNAME_CSWlibgeos3-2-2 = libgeos3_2_2
 SPKG_DESC_CSWlibgeos3-2-2 += $(DESCRIPTION), libgeos-3.2.2.so
 PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so)
 PKGFILES_CSWlibgeos3-2-2 += $(call baseisadirs,$(libdir),libgeos-3\.2\.2\.so(\.\d+)*)
 RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWgcc4g++rt
 RUNTIME_DEP_PKGS_CSWlibgeos3-2-2 += CSWgcc4corert
+OBSOLETED_BY_CSWlibgeos3-2-2 = CSWgeos
 
 CATALOGNAME_CSWlibgeos-c1 = libgeos_c1
 SPKG_DESC_CSWlibgeos-c1 += Geometry Engine, Open Source, libgeos_c.so.1
@@ -39,6 +34,7 @@
 RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWlibgeos3-2-2
 RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWgcc4g++rt
 RUNTIME_DEP_PKGS_CSWlibgeos-c1 += CSWgcc4corert
+OBSOLETED_BY_CSWlibgeos-c1 = CSWgeos
 
 CATALOGNAME_CSWgeos-dev = geos_dev
 SPKG_DESC_CSWgeos-dev = $(DESCRIPTION), development files
@@ -52,5 +48,6 @@
 PKGFILES_CSWgeos-dev += $(PKGFILES_DEVEL_MAN3_MANPAGE)
 PKGFILES_CSWgeos-dev += .*libgeos.so .*libgeos_c.so
 RUNTIME_DEP_PKGS_CSWgeos-dev = CSWlibgeos3-2-2 CSWlibgeos-c1
+OBSOLETED_BY_CSWlibgeos-dev = CSWgeos
 
 include gar/category.mk


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