[csw-devel] SF.net SVN: gar:[13974] csw/mgar/pkg

theferret at users.sourceforge.net theferret at users.sourceforge.net
Mon Mar 28 07:01:12 CEST 2011


Revision: 13974
          http://gar.svn.sourceforge.net/gar/?rev=13974&view=rev
Author:   theferret
Date:     2011-03-28 05:01:11 +0000 (Mon, 28 Mar 2011)

Log Message:
-----------
retry: committing front-end side, of OBSOLETES_ rename to
OBSOLETED_BY_

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
    csw/mgar/pkg/audiofile/trunk/Makefile
    csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile
    csw/mgar/pkg/cpan/App-CLI/trunk/Makefile
    csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile
    csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile
    csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile
    csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile
    csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile
    csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile
    csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile
    csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile
    csw/mgar/pkg/cpan/DBI/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile
    csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile
    csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile
    csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile
    csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile
    csw/mgar/pkg/cpan/JSON/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile
    csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile
    csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile
    csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile
    csw/mgar/pkg/cpan/Params-Check/trunk/Makefile
    csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile
    csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile
    csw/mgar/pkg/cpan/Term-UI/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile
    csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile
    csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile
    csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile
    csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile
    csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile
    csw/mgar/pkg/cups/trunk/Makefile
    csw/mgar/pkg/gardev/trunk/Makefile
    csw/mgar/pkg/id3lib/trunk/Makefile
    csw/mgar/pkg/lang-python/docutils/trunk/Makefile
    csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile
    csw/mgar/pkg/lang-python/python/trunk/Makefile
    csw/mgar/pkg/libdbi/trunk/Makefile
    csw/mgar/pkg/libmad/trunk/Makefile
    csw/mgar/pkg/libvorbis/trunk/Makefile
    csw/mgar/pkg/libxslt/trunk/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
    csw/mgar/pkg/phpmode/trunk/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
    csw/mgar/pkg/ruby18/trunk/Makefile
    csw/mgar/pkg/sox/trunk/Makefile

Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -61,7 +61,7 @@
 # as various things depend on them currently
 PACKAGES += CSWap2prefork CSWapache2rt CSWapache2c
 
-OBSOLETES_CSWapache2-dev = CSWapache2-devel
+OBSOLETED_BY_CSWapache2-dev = CSWapache2-devel
 
 ARCHALL_CSWapache2-manual = 1
 ARCHALL_CSWap2prefork = 1

Modified: csw/mgar/pkg/audiofile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/audiofile/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/audiofile/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -22,14 +22,14 @@
 CATALOGNAME_CSWlibaudiofile0 = libaudiofile0
 SPKG_DESC_CSWlibaudiofile0 = Silican Graphics audio file library, libaudiofile.so.0
 PKGFILES_CSWlibaudiofile0 = $(call pkgfiles_lib,libaudiofile.so.0)
-OBSOLETES_CSWlibaudiofile0 = CSWaudiofile
+OBSOLETED_BY_CSWlibaudiofile0 = CSWaudiofile
 
 PACKAGES += CSWlibaudiofile-utils
 CATALOGNAME_CSWlibaudiofile-utils = libaudiofile_utils
 SPKG_DESC_CSWlibaudiofile-utils = Utility programs from Silicon Graphics audio file library
 PKGFILES_CSWlibaudiofile-utils = $(call baseisadirs,$(bindir),sf.*)
 RUNTIME_DEP_PKGS_CSWlibaudiofile-utils += CSWlibaudiofile0
-OBSOLETES_CSWlibaudiofile-utils = CSWaudiofile
+OBSOLETED_BY_CSWlibaudiofile-utils = CSWaudiofile
 
 PACKAGES += CSWlibaudiofile-dev
 CATALOGNAME_CSWlibaudiofile-dev = libaudiofile_dev

Modified: csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -14,7 +14,7 @@
 CATALOGNAME_CSWpm-algorithm-checkdigits = pm_algorithm_checkdigits
 SPKG_DESC_CSWpm-algorithm-checkdigits = $(DESCRIPTION)
 ARCHALL_CSWpm-algorithm-checkdigits = 1
-OBSOLETES_CSWpm-algorithm-checkdigits = CSWpmalgorithmchkdig
+OBSOLETED_BY_CSWpm-algorithm-checkdigits = CSWpmalgorithmchkdig
 CATALOGNAME_CSWpmalgorithmchkdig = pm_algorithmchkdig
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/App-CLI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/App-CLI/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/App-CLI/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -16,7 +16,7 @@
 CATALOGNAME = pm_app_cli
 SPKG_DESC_CSWpm-app-cli = $(DESCRIPTION)
 ARCHALL = 1
-OBSOLETES_CSWpm-app-cli = CSWpmappcli
+OBSOLETED_BY_CSWpm-app-cli = CSWpmappcli
 CATALOGNAME_CSWpmappcli = pm_appcli
 
 RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmpodsimple

Modified: csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -18,7 +18,7 @@
 CATALOGNAME = pm_archive_extract
 SPKG_DESC_CSWpm-archive-extract = $(DESCRIPTION)
 ARCHALL = 1
-OBSOLETES_CSWpm-archive-extract = CSWpmarchiveextract
+OBSOLETED_BY_CSWpm-archive-extract = CSWpmarchiveextract
 CATALOGNAME_CSWpmarchiveextract = pm_archiveextract
 
 RUNTIME_DEP_PKGS += CSWpmipccmd CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck

Modified: csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -15,7 +15,7 @@
 PACKAGES = CSWpm-authen-sasl
 CATALOGNAME = pm_authen_sasl
 SPKG_DESC_CSWpm-authen-sasl = $(DESCRIPTION)
-OBSOLETES_CSWpm-authen-sasl = CSWpmauthensasl
+OBSOLETED_BY_CSWpm-authen-sasl = CSWpmauthensasl
 CATALOGNAME_CSWpmauthensasl = pm_authensasl
 
 RUNTIME_DEP_PKGS = CSWpmgssapi CSWpmdigesthmac

Modified: csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -16,7 +16,7 @@
 PACKAGES = CSWpm-cgi-application
 CATALOGNAME_CSWpm-cgi-application = pm_cgi_application
 SPKG_DESC_CSWpm-cgi-application = $(DESCRIPTION)
-OBSOLETES_CSWpm-cgi-application = CSWpmcgiapp
+OBSOLETED_BY_CSWpm-cgi-application = CSWpmcgiapp
 CATALOGNAME_CSWpmcgiapp = pm_cgiapp
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -18,7 +18,7 @@
 CATALOGNAME = pm_cgi_session
 SPKG_DESC_CSWpm-cgi-session = $(DESCRIPTION)
 ARCHALL = 1
-OBSOLETES_CSWpm-cgi-session = CSWpmcgisession
+OBSOLETED_BY_CSWpm-cgi-session = CSWpmcgisession
 CATALOGNAME_CSWpmcgisession = pm_cgisession
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -14,7 +14,7 @@
 PACKAGES = CSWpm-cache-memcached
 CATALOGNAME_CSWpm-cache-memcached = pm_cache_memcached
 SPKG_DESC_CSWpm-cache-memcached = $(DESCRIPTION)
-OBSOLETES_CSWpm-cache-memcached = CSWpmcachememcached
+OBSOLETED_BY_CSWpm-cache-memcached = CSWpmcachememcached
 CATALOGNAME_CSWpmcachememcached = pm_cachememcached
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -13,7 +13,7 @@
 PACKAGES = CSWpm-class-accessor-chained
 CATALOGNAME = pm_class_accessor_chained
 SPKG_DESC_CSWpm-class-accessor-chained = $(DESCRIPTION)
-OBSOLETES_CSWpm-class-accessor-chained = CSWpmclsaccessorchnd
+OBSOLETED_BY_CSWpm-class-accessor-chained = CSWpmclsaccessorchnd
 CATALOGNAME_CSWpmclsaccessorchnd = pm_clsaccessorchnd
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -14,7 +14,7 @@
 PACKAGES = CSWpm-compress-raw-bzip2
 CATALOGNAME = pm_compress_raw_bzip2
 SPKG_DESC_CSWpm-compress-raw-bzip2 = $(DESCRIPTION)
-OBSOLETES_CSWpm-compress-raw-bzip2 = CSWpmcompressrawbz2
+OBSOLETED_BY_CSWpm-compress-raw-bzip2 = CSWpmcompressrawbz2
 CATALOGNAME_CSWpmcompressrawbz2 = pm_compressrawbz2
 
 EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.*

Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -14,7 +14,7 @@
 PACKAGES = CSWpm-compress-raw-zlib
 CATALOGNAME = pm_compress_raw_zlib
 SPKG_DESC_CSWpm-compress-raw-zlib = $(DESCRIPTION)
-OBSOLETES_CSWpm-compress-raw-zlib = CSWpmcompressrawzlib
+OBSOLETED_BY_CSWpm-compress-raw-zlib = CSWpmcompressrawzlib
 CATALOGNAME_CSWpmcompressrawzlib = pm_compressrawzlib
 
 EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.*

Modified: csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -16,7 +16,7 @@
 PACKAGES = CSWpm-config-inifiles
 CATALOGNAME_CSWpm-config-inifiles = pm_config_inifiles
 SPKG_DESC_CSWpm-config-inifiles = $(DESCRIPTION)
-OBSOLETES_CSWpm-config-inifiles = CSWpmcfginifls
+OBSOLETED_BY_CSWpm-config-inifiles = CSWpmcfginifls
 CATALOGNAME_CSWpmcfginifls = pm_configinifiles
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -14,7 +14,7 @@
 PACKAGES = CSWpm-dbd-sqlite
 CATALOGNAME = pm_dbd_sqlite
 SPKG_DESC_CSWpm-dbd-sqlite = $(DESCRIPTION)
-OBSOLETES_CSWpm-dbd-sqlite = CSWpmdbdsqlite
+OBSOLETED_BY_CSWpm-dbd-sqlite = CSWpmdbdsqlite
 CATALOGNAME_CSWpmdbdsqlite = pm_dbdsqlite
 
 RUNTIME_DEP_PKGS = CSWpmdbi

Modified: csw/mgar/pkg/cpan/DBI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/DBI/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/DBI/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -17,7 +17,7 @@
 PACKAGES = CSWpm-dbi
 CATALOGNAME = pm_dbi
 SPKG_DESC_CSWpm-dbi = $(DESCRIPTION)
-OBSOLETES_CSWpm-dbi = CSWpmdbi
+OBSOLETED_BY_CSWpm-dbi = CSWpmdbi
 CATALOGNAME_CSWpmdbi = pm_dbi_stub
 
 CHECKPKG_OVERRIDES_CSWpm-dbi += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/csw/DBD/File.pm

Modified: csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -13,7 +13,7 @@
 CATALOGNAME_CSWpm-devel-stacktrace = pm_devel_stacktrace
 SPKG_DESC_CSWpm-devel-stacktrace = $(DESCRIPTION)
 ARCHALL_CSWpm-devel-stacktrace = 1
-OBSOLETES_CSWpm-devel-stacktrace = CSWpmdevstacktrace
+OBSOLETED_BY_CSWpm-devel-stacktrace = CSWpmdevstacktrace
 CATALOGNAME_CSWpmdevstacktrace = pm_devstacktrace
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -15,7 +15,7 @@
 PACKAGES = CSWpm-file-fetch
 CATALOGNAME = pm_file_fetch
 SPKG_DESC_CSWpm-file-fetch = $(DESCRIPTION)
-OBSOLETES_CSWpm-file-fetch = CSWpmfilefetch
+OBSOLETED_BY_CSWpm-file-fetch = CSWpmfilefetch
 CATALOGNAME_CSWpmfilefetch = pm_filefetch
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -13,7 +13,7 @@
 PACKAGES = CSWpm-gssapi
 CATALOGNAME = pm_gssapi
 SPKG_DESC_CSWpm-gssapi = $(DESCRIPTION)
-OBSOLETES_CSWpm-gssapi = CSWpmgssapi
+OBSOLETED_BY_CSWpm-gssapi = CSWpmgssapi
 CATALOGNAME_CSWpmgssapi = pm_gssapi_stub
 
 RUNTIME_DEP_PKGS = CSWkrb5lib

Modified: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -17,7 +17,7 @@
 CATALOGNAME = pm_geo_ip_pureperl
 SPKG_DESC_CSWpm-geo-ip-pureperl = $(DESCRIPTION)
 ARCHALL = 1
-OBSOLETES_CSWpm-geo-ip-pureperl = CSWpmgeoippureperl
+OBSOLETED_BY_CSWpm-geo-ip-pureperl = CSWpmgeoippureperl
 CATALOGNAME_CSWpmgeoippureperl = pm_geoippureperl
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -16,7 +16,7 @@
 PACKAGES = CSWpm-html-parser
 CATALOGNAME = pm_html_parser
 SPKG_DESC_CSWpm-html-parser = $(DESCRIPTION)
-OBSOLETES_CSWpm-html-parser = CSWpmhtmlparser
+OBSOLETED_BY_CSWpm-html-parser = CSWpmhtmlparser
 CATALOGNAME_CSWpmhtmlparser = pm_htmlparser
 
 RUNTIME_DEP_PKGS = CSWpm-html-tagset

Modified: csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -14,7 +14,7 @@
 PACKAGES = CSWpm-html-tagset
 CATALOGNAME = pm_html_tagset
 SPKG_DESC_CSWpm-html-tagset = $(DESCRIPTION)
-OBSOLETES_CSWpm-html-tagset = CSWpmhtmltagset
+OBSOLETED_BY_CSWpm-html-tagset = CSWpmhtmltagset
 CATALOGNAME_CSWpmhtmltagset = pm_htmltagset
 
 # CONFIGURE_ARGS = -n

Modified: csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -25,7 +25,7 @@
 PACKAGES = CSWpm-io-compress
 CATALOGNAME = pm_io_compress
 SPKG_DESC_CSWpm-io-compress = $(DESCRIPTION)
-OBSOLETES_CSWpm-io-compress = CSWpmiocompress
+OBSOLETED_BY_CSWpm-io-compress = CSWpmiocompress
 CATALOGNAME_CSWpmiocompress = pm_iocompress
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -14,7 +14,7 @@
 CATALOGNAME = pm_io_socket_inet6
 ARCHALL = 1
 SPKG_DESC_CSWpm-io-socket-inet6 = $(DESCRIPTION)
-OBSOLETES_CSWpm-io-socket-inet6 = CSWpmiosocketinet6
+OBSOLETED_BY_CSWpm-io-socket-inet6 = CSWpmiosocketinet6
 CATALOGNAME_CSWpmiosocketinet6 = pm_iosocketinet6
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -18,7 +18,7 @@
 PACKAGES = CSWpm-io-socket-ssl
 CATALOGNAME = pm_io_socket_ssl
 SPKG_DESC_CSWpm-io-socket-ssl = $(DESCRIPTION)
-OBSOLETES_CSWpm-io-socket-ssl = CSWpmiosocketssl
+OBSOLETED_BY_CSWpm-io-socket-ssl = CSWpmiosocketssl
 CATALOGNAME_CSWpmiosocketssl = pm_iosocketssl
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -15,7 +15,7 @@
 CATALOGNAME = pm_ipc_cmd 
 SPKG_DESC_CSWpm-ipc-cmd = $(DESCRIPTION)
 ARCHALL = 1
-OBSOLETES_CSWpm-ipc-cmd = CSWpmipccmd
+OBSOLETED_BY_CSWpm-ipc-cmd = CSWpmipccmd
 CATALOGNAME_CSWpmipccmd = pm_ipccmd
 
 RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck

Modified: csw/mgar/pkg/cpan/JSON/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/JSON/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/JSON/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -14,7 +14,7 @@
 CATALOGNAME = pm_json
 SPKG_DESC_CSWpm-json = $(DESCRIPTION)
 ARCHALL = 1
-OBSOLETES_CSWpm-json = CSWpmjson
+OBSOLETED_BY_CSWpm-json = CSWpmjson
 CATALOGNAME_CSWpmjson = pm_json_stub
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -15,7 +15,7 @@
 CATALOGNAME = pm_log_message_simple 
 SPKG_DESC_CSWpm-log-message-simple = $(DESCRIPTION)
 ARCHALL = 1
-OBSOLETES_CSWpm-log-message-simple = CSWpmlogmsgsimple
+OBSOLETED_BY_CSWpm-log-message-simple = CSWpmlogmsgsimple
 CATALOGNAME_CSWpmlogmsgsimple = pm_logmsgsimple
 
 EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.*

Modified: csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -13,7 +13,7 @@
 PACKAGES = CSWpm-mime-base64
 CATALOGNAME = pm_mime_base64
 SPKG_DESC_CSWpm-mime-base64 = $(DESCRIPTION)
-OBSOLETES_CSWpm-mime-base64 = CSWpmmimebase64
+OBSOLETED_BY_CSWpm-mime-base64 = CSWpmmimebase64
 CATALOGNAME_CSWpmmimebase64 = pm_mimebase64
 
 EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*\/man\/.*

Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -15,7 +15,7 @@
 CATALOGNAME = pm_module_load_conditional
 SPKG_DESC_CSWpm-module-load-conditional = $(DESCRIPTION)
 ARCHALL = 1
-OBSOLETES_CSWpm-module-load-conditional = CSWpmmodloadcond
+OBSOLETED_BY_CSWpm-module-load-conditional = CSWpmmodloadcond
 CATALOGNAME_CSWpmmodloadcond = pm_modloadcond
 
 RUNTIME_DEP_PKGS = CSWpmprmscheck CSWpmmodload CSWpmlclemktxtsimple

Modified: csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -15,7 +15,7 @@
 CATALOGNAME = pm_module_signature
 SPKG_DESC_CSWpm-module-signature = $(DESCRIPTION)
 ARCHALL = 1
-OBSOLETES_CSWpm-module-signature = CSWpmmodulesign
+OBSOLETED_BY_CSWpm-module-signature = CSWpmmodulesign
 CATALOGNAME_CSWpmmodulesign = pm_modulesign
 
 RUNTIME_DEP_PKGS += CSWgnupg

Modified: csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -16,7 +16,7 @@
 PACKAGES = CSWpm-net-cidr
 CATALOGNAME = pm_net_cidr
 SPKG_DESC_CSWpm-net-cidr = $(DESCRIPTION)
-OBSOLETES_CSWpm-net-cidr = CSWpmnetcidr
+OBSOLETED_BY_CSWpm-net-cidr = CSWpmnetcidr
 CATALOGNAME_CSWpmnetcidr = pm_netcidr
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -11,7 +11,7 @@
 PACKAGES = CSWpm-net-idn-encode
 CATALOGNAME = pm_net_idn_encode
 SPKG_DESC_CSWpm-net-idn-encode = $(DESCRIPTION)
-OBSOLETES_CSWpm-net-idn-encode = CSWpmnetidnencode
+OBSOLETED_BY_CSWpm-net-idn-encode = CSWpmnetidnencode
 CATALOGNAME_CSWpmnetidnencode = pm_netidnencode
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -13,7 +13,7 @@
 PACKAGES = CSWpm-netaddr-ip
 CATALOGNAME = pm_netaddr_ip
 SPKG_DESC_CSWpm-netaddr-ip = $(DESCRIPTION)
-OBSOLETES_CSWpm-netaddr-ip = CSWpmnetaddrip
+OBSOLETED_BY_CSWpm-netaddr-ip = CSWpmnetaddrip
 CATALOGNAME_CSWpmnetaddrip = pm_netaddrip
 
 # One IPv6 related test fails, make sure to check all others

Modified: csw/mgar/pkg/cpan/Params-Check/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Params-Check/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Params-Check/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -15,7 +15,7 @@
 PACKAGES = CSWpm-params-check 
 CATALOGNAME = pm_params_check 
 SPKG_DESC_CSWpm-params-check = $(DESCRIPTION)
-OBSOLETES_CSWpm-params-check = CSWpmprmscheck
+OBSOLETED_BY_CSWpm-params-check = CSWpmprmscheck
 CATALOGNAME_CSWpmprmscheck = pm_prmscheck
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -20,7 +20,7 @@
 PACKAGES = CSWpm-pod-pom
 CATALOGNAME_CSWpm-pod-pom = pm_pod_pom
 SPKG_DESC_CSWpm-pod-pom = $(DESCRIPTION)
-OBSOLETES_CSWpm-pod-pom = CSWpmpodpom
+OBSOLETED_BY_CSWpm-pod-pom = CSWpmpodpom
 CATALOGNAME_CSWpmpodpom = pm_podpom
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -16,7 +16,7 @@
 PACKAGES = CSWpm-pod-simple
 CATALOGNAME = pm_pod_simple
 SPKG_DESC_CSWpm-pod-simple = $(DESCRIPTION)
-OBSOLETES_CSWpm-pod-simple = CSWpmpodsimple
+OBSOLETED_BY_CSWpm-pod-simple = CSWpmpodsimple
 CATALOGNAME_CSWpmpodsimple = pm_podsimple
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -13,7 +13,7 @@
 PACKAGES = CSWpm-schedule-at
 CATALOGNAME = pm_schedule_at
 SPKG_DESC_CSWpm-schedule-at = $(DESCRIPTION)
-OBSOLETES_CSWpm-schedule-at = CSWpmscheduleat
+OBSOLETED_BY_CSWpm-schedule-at = CSWpmscheduleat
 CATALOGNAME_CSWpmscheduleat = pm_scheduleat
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/Term-UI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Term-UI/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Term-UI/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -15,7 +15,7 @@
 PACKAGES = CSWpm-term-ui
 CATALOGNAME = pm_term_ui
 SPKG_DESC_CSWpm-term-ui = $(DESCRIPTION)
-OBSOLETES_CSWpm-term-ui = CSWpmtermui
+OBSOLETED_BY_CSWpm-term-ui = CSWpmtermui
 CATALOGNAME_CSWpmtermui = pm_termui
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -13,7 +13,7 @@
 PACKAGES = CSWpm-test-deep
 CATALOGNAME = pm_test_deep
 SPKG_DESC_CSWpm-test-deep = $(DESCRIPTION)
-OBSOLETES_CSWpm-test-deep = CSWpmtestdeep
+OBSOLETED_BY_CSWpm-test-deep = CSWpmtestdeep
 CATALOGNAME_CSWpmtestdeep = pm_testdeep
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -11,7 +11,7 @@
 PACKAGES = CSWpm-test-nowarnings
 CATALOGNAME = pm_test_nowarnings
 SPKG_DESC_CSWpm-test-nowarnings = $(DESCRIPTION)
-OBSOLETES_CSWpm-test-nowarnings = CSWpmtestnowarnings
+OBSOLETED_BY_CSWpm-test-nowarnings = CSWpmtestnowarnings
 CATALOGNAME_CSWpmtestnowarnings = pm_testnowarnings
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -13,7 +13,7 @@
 PACKAGES = CSWpm-text-vfile-asdata
 CATALOGNAME = pm_text_vfile_asdata
 SPKG_DESC_CSWpm-text-vfile-asdata = $(DESCRIPTION)
-OBSOLETES_CSWpm-text-vfile-asdata = CSWpmtextvfileasdata
+OBSOLETED_BY_CSWpm-text-vfile-asdata = CSWpmtextvfileasdata
 CATALOGNAME_CSWpmtextvfileasdata = pm_textvfileasdata
 
 ARCHALL = 1

Modified: csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -13,7 +13,7 @@
 PACKAGES = CSWpm-www-curl
 CATALOGNAME = pm_www_curl
 SPKG_DESC_CSWpm-www-curl = $(DESCRIPTION)
-OBSOLETES_CSWpm-www-curl = CSWpmwwwcurl
+OBSOLETED_BY_CSWpm-www-curl = CSWpmwwwcurl
 CATALOGNAME_CSWpmwwwcurl = pm_wwwcurl
 
 RUNTIME_DEP_PKGS += CSWcurlrt

Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -17,7 +17,7 @@
 CATALOGNAME = pm_libwww_perl
 SPKG_DESC_CSWpm-libwww-perl = $(DESCRIPTION)
 ARCHALL = 1
-OBSOLETES_CSWpm-libwww-perl = CSWpmlibwww
+OBSOLETED_BY_CSWpm-libwww-perl = CSWpmlibwww
 CATALOGNAME_CSWpmlibwww = pm_libwww
 
 RUNTIME_DEP_PKGS = CSWpmhtmltagset CSWpmuri CSWpmhtmlparser CSWpmiocompress CSWpmhtmlfmt CSWpmmimebase64

Modified: csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -17,7 +17,7 @@
 CATALOGNAME = pm_ldap
 SPKG_DESC_CSWpm-ldap = $(DESCRIPTION)
 ARCHALL = 1
-OBSOLETES_CSWpm-ldap = CSWpmldap
+OBSOLETED_BY_CSWpm-ldap = CSWpmldap
 CATALOGNAME_CSWpmldap = pm_ldap_stub
 
 # Harmless /usr/local references

Modified: csw/mgar/pkg/cups/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cups/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/cups/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -194,8 +194,8 @@
 RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsimage2
 RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupscgi1
 
-OBSOLETES_CSWcups-dev += CSWcups-devel
-OBSOLETES_CSWcups-dev += CSWcupsdev
+OBSOLETED_BY_CSWcups-dev += CSWcups-devel
+OBSOLETED_BY_CSWcups-dev += CSWcupsdev
 
 # Former devel package
 PACKAGES += CSWcupsdev

Modified: csw/mgar/pkg/gardev/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gardev/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/gardev/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -14,7 +14,7 @@
 PACKAGES = CSWgar-dev
 CATALOGNAME_CSWgar-dev = gar_dev
 SPKG_DESC_CSWgar-dev = $(DESCRIPTION)
-OBSOLETES_CSWgar-dev = CSWgardevel
+OBSOLETED_BY_CSWgar-dev = CSWgardevel
 
 # git and netcat are required if a GAR repo is tracking a git repo instead
 # of upstream tarballs.  svn is required for commiting gar recipes

Modified: csw/mgar/pkg/id3lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/id3lib/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/id3lib/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -34,7 +34,7 @@
 RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWlibid3-3-8-3
 RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWiconv
 RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWzlib
-OBSOLETES_CSWlibid3-utils = CSWid3lib
+OBSOLETED_BY_CSWlibid3-utils = CSWid3lib
 
 EXTRA_LDFLAGS = -norunpath
 

Modified: csw/mgar/pkg/lang-python/docutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/docutils/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/lang-python/docutils/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -16,7 +16,7 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 INCOMPATIBLE_PKGS_CSWpy-docutils = CSWzope
-OBSOLETES_CSWpy-docutils = CSWpydocutils
+OBSOLETED_BY_CSWpy-docutils = CSWpydocutils
 CATALOGNAME_CSWpydocutils = pydocutils
 ARCHALL_CSWpy-docutils = 1
 CHECKPKG_OVERRIDES_CSWpydocutils += surplus-dependency|CSWpython

Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -20,7 +20,7 @@
 
 SPKG_DESC_CSWpy-mysql = MySQL Support for Python
 
-OBSOLETES_CSWpy-mysql = CSWpymysql
+OBSOLETED_BY_CSWpy-mysql = CSWpymysql
 CATALOGNAME_CSWpymysql = pymysql
 
 mysql_prefix = $(prefix)/mysql5

Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/lang-python/python/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -95,7 +95,7 @@
 PACKAGES += CSWlibpython$(DVER)-1-0
 
 INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils
-OBSOLETES_CSWpython$(CVER)-dev = CSWpython$(CVER)-devel
+OBSOLETED_BY_CSWpython$(CVER)-dev = CSWpython$(CVER)-devel
 
 PKGFILES_CSWidle$(CVER)  = $(libdir)/.*/idlelib/.*
 PKGFILES_CSWidle$(CVER) += $(bindir)/idle

Modified: csw/mgar/pkg/libdbi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdbi/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/libdbi/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -25,7 +25,7 @@
 CATALOGNAME_CSWlibdbi-dev = libdbi_dev
 SPKG_DESC_CSWlibdbi-dev = Development files for libdbi.so.1
 RUNTIME_DEP_PKGS_CSWlibdbi-dev = CSWlibdbi1
-OBSOLETES_CSWlibdbi-dev = CSWlibdbi-devel
+OBSOLETED_BY_CSWlibdbi-dev = CSWlibdbi-devel
 
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)

Modified: csw/mgar/pkg/libmad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmad/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/libmad/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -23,7 +23,7 @@
 CATALOGNAME_CSWlibmad0 = libmad0
 SPKG_DESC_CSWlibmad0 = MPEG audio decoder library, libmad.so.0
 PKGFILES_CSWlibmad0 += $(call pkgfiles_lib,libmad.so.0)
-OBSOLETES_CSWlibmad0 = CSWlibmad
+OBSOLETED_BY_CSWlibmad0 = CSWlibmad
 
 PACKAGES += CSWlibmad-dev
 CATALOGNAME_CSWlibmad-dev = libmad_dev

Modified: csw/mgar/pkg/libvorbis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libvorbis/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/libvorbis/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -22,7 +22,7 @@
 PKGFILES_CSWlibvorbis0 += $(call baseisadirs,$(libdir),libvorbis\.so\.0(\.\d+)*)
 RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWlibogg0
 RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWsunmath
-OBSOLETES_CSWlibvorbis0 = CSWvorbis
+OBSOLETED_BY_CSWlibvorbis0 = CSWvorbis
 
 PACKAGES += CSWlibvorbisenc2
 CATALOGNAME_CSWlibvorbisenc2 = libvorbisenc2
@@ -31,7 +31,7 @@
 RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWlibogg0
 RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWlibvorbis0
 RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWsunmath
-OBSOLETES_CSWlibvorbisenc2 = CSWvorbis
+OBSOLETED_BY_CSWlibvorbisenc2 = CSWvorbis
 
 PACKAGES += CSWlibvorbisfile3
 CATALOGNAME_CSWlibvorbisfile3 = libvorbisfile3
@@ -40,7 +40,7 @@
 RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWlibogg0
 RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWlibvorbis0
 RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWsunmath
-OBSOLETES_CSWlibvorbisfile3 = CSWvorbis
+OBSOLETED_BY_CSWlibvorbisfile3 = CSWvorbis
 
 PACKAGES += CSWlibvorbis-dev
 CATALOGNAME_CSWlibvorbis-dev = libvorbis_dev

Modified: csw/mgar/pkg/libxslt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxslt/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/libxslt/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -23,7 +23,7 @@
 PACKAGES += CSWlibxslt-dev
 CATALOGNAME_CSWlibxslt-dev = libxslt_dev
 SPKG_DESC_CSWlibxslt-dev = XSLT engine development package
-OBSOLETES_CSWlibxslt-dev = CSWlibxsltdevel
+OBSOLETED_BY_CSWlibxslt-dev = CSWlibxsltdevel
 RUNTIME_DEP_PKGS_CSWlibxslt-dev = CSWlibxslt
 RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibxslt1
 RUNTIME_DEP_PKGS_CSWlibxslt-dev += CSWlibexslt0
@@ -35,7 +35,7 @@
 PACKAGES += CSWpy-libxslt
 CATALOGNAME_CSWpy-libxslt = py_libxslt
 SPKG_DESC_CSWpy-libxslt = XSLT engine python package
-OBSOLETES_CSWpy-libxslt = CSWpylibxslt
+OBSOLETED_BY_CSWpy-libxslt = CSWpylibxslt
 RUNTIME_DEP_PKGS_CSWpy-libxslt  = CSWpython
 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1
 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -53,13 +53,13 @@
 PKGFILES_CSWlibmysqlclient15 += $(call baseisadirs,$(libdir),libmysqlclient\.so\.15(\.\d+)*)
 SPKG_DESC_CSWlibmysqlclient15 += MySQL $(BASE_VERSION) client library, libmysqlclient.so.15
 RUNTIME_DEP_PKGS_CSWlibmysqlclient15 += CSWzlib
-OBSOLETES_CSWlibmysqlclient15 += CSWmysql5rt
+OBSOLETED_BY_CSWlibmysqlclient15 += CSWmysql5rt
 
 PACKAGES += CSWlibmysqlclient-r15
 PKGFILES_CSWlibmysqlclient-r15 += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.15(\.\d+)*)
 SPKG_DESC_CSWlibmysqlclient-r15 += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.15
 RUNTIME_DEP_PKGS_CSWlibmysqlclient-r15 += CSWzlib
-OBSOLETES_CSWlibmysqlclient-r15 += CSWmysql5rt
+OBSOLETED_BY_CSWlibmysqlclient-r15 += CSWmysql5rt
 
 PACKAGES += CSW$(NAME)client
 SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries

Modified: csw/mgar/pkg/phpmode/trunk/Makefile
===================================================================
--- csw/mgar/pkg/phpmode/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/phpmode/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -20,7 +20,7 @@
 CATALOGNAME_CSWphp-mode = php_mode
 RUNTIME_DEP_PKGS_CSWphp-mode = CSWemacscommon CSWemacssitestart
 CHECKPKG_OVERRIDES_CSWphp-mode += surplus-dependency|CSWemacssitestart
-OBSOLETES_CSWphp-mode = CSWphpmode
+OBSOLETED_BY_CSWphp-mode = CSWphpmode
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -207,7 +207,7 @@
 SPKG_DESC_CSWlibpq5 += PostgreSQL C client library (built from $(BASE_VERSION).x sources), libpq.so.5
 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt
 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWkrb5lib
-OBSOLETES_CSWlibpq5 += CSWlibpq
+OBSOLETED_BY_CSWlibpq5 += CSWlibpq
 
 PACKAGES += CSWlibecpg6
 CATALOGNAME_CSWlibecpg6 = libecpg6
@@ -215,7 +215,7 @@
 SPKG_DESC_CSWlibecpg6 += Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources), libecpg.so.6
 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3
 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5
-OBSOLETES_CSWlibecpg6 += CSWlibpq
+OBSOLETED_BY_CSWlibecpg6 += CSWlibpq
 
 PACKAGES += CSWlibecpg-compat3
 CATALOGNAME_CSWlibecpg-compat3 = libecpg_compat3
@@ -224,14 +224,14 @@
 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibecpg6
 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3
 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5
-OBSOLETES_CSWlibecpg-compat3 = CSWlibpq
+OBSOLETED_BY_CSWlibecpg-compat3 = CSWlibpq
 
 PACKAGES += CSWlibpgtypes3
 CATALOGNAME_CSWlibpgtypes3 = libpgtypes3
 PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3\.0)
 PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3(\.\d+)*)
 SPKG_DESC_CSWlibpgtypes3 += Used by programs built with ecpg (Embedded PostgreSQL for C, from $(BASE_VERSION).x sources), libpgtypes.so.3
-OBSOLETES_CSWlibpgtypes3 = CSWlibpq
+OBSOLETED_BY_CSWlibpgtypes3 = CSWlibpq
 
 PACKAGES += CSWlibpq-dev
 CATALOGNAME_CSWlibpq-dev = libpq_dev
@@ -266,26 +266,26 @@
 PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*)
 SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3
 RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt
-OBSOLETES_CSWlibpq3 = CSWlibpq
+OBSOLETED_BY_CSWlibpq3 = CSWlibpq
 
 PACKAGES += CSWlibpq4
 CATALOGNAME_CSWlibpq4 = libpq4
 PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*)
 SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4
 RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt
-OBSOLETES_CSWlibpq4 = CSWlibpq
+OBSOLETED_BY_CSWlibpq4 = CSWlibpq
 
 PACKAGES += CSWlibpgtypes1
 CATALOGNAME_CSWlibpgtypes1 = libpgtypes1
 PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*)
 SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1
-OBSOLETES_CSWlibpgtypes1 = CSWlibpq
+OBSOLETED_BY_CSWlibpgtypes1 = CSWlibpq
 
 PACKAGES += CSWlibpgtypes2
 CATALOGNAME_CSWlibpgtypes2 = libpgtypes2
 PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*)
 SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2
-OBSOLETES_CSWlibpgtypes2 = CSWlibpq
+OBSOLETED_BY_CSWlibpgtypes2 = CSWlibpq
 
 PACKAGES += CSWlibecpg4
 CATALOGNAME_CSWlibecpg4 = libecpg4
@@ -294,7 +294,7 @@
 RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1
 RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWosslrt
 RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpq3
-OBSOLETES_CSWlibecpg4 += CSWlibpq
+OBSOLETED_BY_CSWlibecpg4 += CSWlibpq
 
 PACKAGES += CSWlibecpg5
 CATALOGNAME_CSWlibecpg5 = libecpg5
@@ -302,7 +302,7 @@
 SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5
 RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2
 RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpq5
-OBSOLETES_CSWlibecpg5 += CSWlibpq
+OBSOLETED_BY_CSWlibecpg5 += CSWlibpq
 
 PACKAGES += CSWlibecpg-compat2
 CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2
@@ -311,7 +311,7 @@
 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2
 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibecpg5
 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5
-OBSOLETES_CSWlibecpg-compat2 = CSWlibpq
+OBSOLETED_BY_CSWlibecpg-compat2 = CSWlibpq
 
 
 # This occurrence is okay.

Modified: csw/mgar/pkg/ruby18/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby18/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/ruby18/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -18,12 +18,12 @@
 MERGE_SCRIPTS_isa-default-compiler-sun = copy-all
 MERGE_SCRIPTS_isa-default-compiler-gcc4 = copy-custom
 
-OBSOLETES_CSWruby18 = CSWruby
-OBSOLETES_CSWruby18-doc = CSWrubydoc
-OBSOLETES_CSWruby18-tk = CSWrubytk
-OBSOLETES_CSWruby18-dev = CSWrubydev
-OBSOLETES_CSWruby18-mode = CSWrubymode
-OBSOLETES_CSWruby18-mode-el = CSWrubymodeel
+OBSOLETED_BY_CSWruby18 = CSWruby
+OBSOLETED_BY_CSWruby18-doc = CSWrubydoc
+OBSOLETED_BY_CSWruby18-tk = CSWrubytk
+OBSOLETED_BY_CSWruby18-dev = CSWrubydev
+OBSOLETED_BY_CSWruby18-mode = CSWrubymode
+OBSOLETED_BY_CSWruby18-mode-el = CSWrubymodeel
 
 ALTERNATIVES_CSWruby18 = ruby rbconfig18
 ALTERNATIVE_ruby = $(bindir)/ruby ruby $(bindir)/ruby18 10 $(bindir)/irb irb $(bindir)/irb18 $(bindir)/erb erb $(bindir)/erb18 $(bindir)/rdoc rdoc $(bindir)/rdoc18 $(bindir)/ri ri $(bindir)/ri18 $(bindir)/testrb testrb $(bindir)/testrb18 $(mandir)/man1/ruby.1 ruby.1 $(mandir)/man1/ruby18.1

Modified: csw/mgar/pkg/sox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sox/trunk/Makefile	2011-03-28 04:55:29 UTC (rev 13973)
+++ csw/mgar/pkg/sox/trunk/Makefile	2011-03-28 05:01:11 UTC (rev 13974)
@@ -61,7 +61,7 @@
 PKGFILES_CSWlibsox-dev += $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWlibsox-dev = CSWlibsox1
 
-OBSOLETES_CSWlibsox-dev = CSWlibsoxdevel
+OBSOLETED_BY_CSWlibsox-dev = CSWlibsoxdevel
 CATALOGNAME_CSWlibsoxdevel = libsox_devel
 
 BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWsox)


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


More information about the devel mailing list