[csw-devel] SF.net SVN: gar:[15061] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Jul 15 14:49:23 CEST 2011
Revision: 15061
http://gar.svn.sourceforge.net/gar/?rev=15061&view=rev
Author: dmichelsen
Date: 2011-07-15 12:49:23 +0000 (Fri, 15 Jul 2011)
Log Message:
-----------
expat: Split into sseparate library packages
Modified Paths:
--------------
csw/mgar/pkg/libexpat0/trunk/Makefile
csw/mgar/pkg/libexpat0/trunk/checksums
csw/mgar/pkg/libexpat1/trunk/Makefile
csw/mgar/pkg/libexpat1/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libexpat0/
csw/mgar/pkg/libexpat1/
Removed Paths:
-------------
csw/mgar/pkg/expat/
csw/mgar/pkg/libexpat0/trunk/files/CSWexpat.gspec
csw/mgar/pkg/libexpat1/trunk/files/CSWexpat.gspec
Modified: csw/mgar/pkg/libexpat0/trunk/Makefile
===================================================================
--- csw/mgar/pkg/expat/trunk/Makefile 2011-07-14 14:03:13 UTC (rev 15056)
+++ csw/mgar/pkg/libexpat0/trunk/Makefile 2011-07-15 12:49:23 UTC (rev 15061)
@@ -1,57 +1,23 @@
NAME = expat
-VERSION = 2.0.1
+VERSION = 1.95.8
CATEGORIES = lib
-EXTRA_MODULATORS = VERSION
-MODULATIONS_VERSION = 1.95.8 2.0.1
-
-DESCRIPTION = XML Parser Toolkit
+DESCRIPTION = XML parser toolkit
define BLURB
- This is James Clark's Expat XML parser library in C. It is a stream oriented
- parser that requires setting handlers to deal with the structure that the
- parser discovers in the document.
+ This is James Clark's Expat XML parser library in C. It is a stream oriented
+ parser that requires setting handlers to deal with the structure that the
+ parser discovers in the document.
endef
MASTER_SITES = $(SF_MIRRORS)
-SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(NAME)-$(VERSION).tar.gz)
-DISTFILES = $(SOURCEFILES)
-DISTFILES += $(call admfiles,CSWexpat,)
+DISTFILES += $(DISTNAME).tar.gz
-# We define upstream file regex so we can be notifed of new upstream software release
-UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10127
-UPSTREAM_USE_SF = 1
-UFILES_REGEX = (\d+(?:\.\d+)*)
+PACKAGES += CSWlibexpat0
+SPKG_DESC_CSWlibexpat0 = XML parser toolkit, libexpat.so.0
+PKGFILES_CSWlibexpat0 += $(call pkgfiles_lib,libexpat.so.0)
BUILD64 = 1
-NOISAEXEC = 1
-CONFIGURE_ARGS = $(DIRPATHS)
-
-# The expat 'check' target tries to compile tests that use GCC
-# constructs -- won't compile under Forte without hackery.
-TEST_TARGET = check
-TEST_SCRIPTS =
-
-ifeq ($(VERSION),1.95.8)
INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir man1dir
-endif
-MERGE_SCRIPTS_isa-i386-garversion-1.95.8 = copy-only
-MERGE_DIRS_isa-i386-garversion-1.95.8 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-garversion-1.95.8 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.95.8 = $(libdir)
-
-MERGE_SCRIPTS_isa-i386-garversion-2.0.1 = copy-all
-MERGE_SCRIPTS_isa-amd64-garversion-2.0.1 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-2.0.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
-
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.95.8 = copy-only
-MERGE_DIRS_isa-sparcv8-garversion-1.95.8 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.95.8 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.95.8 = $(libdir)
-
-MERGE_SCRIPTS_isa-sparcv8-garversion-2.0.1 = copy-all
-MERGE_SCRIPTS_isa-sparcv9-garversion-2.0.1 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-2.0.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
-
include gar/category.mk
Modified: csw/mgar/pkg/libexpat0/trunk/checksums
===================================================================
--- csw/mgar/pkg/expat/trunk/checksums 2011-07-14 14:03:13 UTC (rev 15056)
+++ csw/mgar/pkg/libexpat0/trunk/checksums 2011-07-15 12:49:23 UTC (rev 15061)
@@ -1,3 +1 @@
-aff487543845a82fe262e6e2922b4c8e download/expat-1.95.8.tar.gz
-ee8b492592568805593f81f8cdf2a04c download/expat-2.0.1.tar.gz
-7547f56dfe29c7f8a29983ba60da41a1 download/CSWexpat.gspec
+aff487543845a82fe262e6e2922b4c8e expat-1.95.8.tar.gz
Deleted: csw/mgar/pkg/libexpat0/trunk/files/CSWexpat.gspec
===================================================================
--- csw/mgar/pkg/expat/trunk/files/CSWexpat.gspec 2011-07-14 14:03:13 UTC (rev 15056)
+++ csw/mgar/pkg/libexpat0/trunk/files/CSWexpat.gspec 2011-07-15 12:49:23 UTC (rev 15061)
@@ -1,4 +0,0 @@
-%var bitname expat
-%var pkgname CSWexpat
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
Modified: csw/mgar/pkg/libexpat1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/expat/trunk/Makefile 2011-07-14 14:03:13 UTC (rev 15056)
+++ csw/mgar/pkg/libexpat1/trunk/Makefile 2011-07-15 12:49:23 UTC (rev 15061)
@@ -2,56 +2,38 @@
VERSION = 2.0.1
CATEGORIES = lib
-EXTRA_MODULATORS = VERSION
-MODULATIONS_VERSION = 1.95.8 2.0.1
-
-DESCRIPTION = XML Parser Toolkit
+DESCRIPTION = XML parser toolkit
define BLURB
- This is James Clark's Expat XML parser library in C. It is a stream oriented
- parser that requires setting handlers to deal with the structure that the
- parser discovers in the document.
+ This is James Clark's Expat XML parser library in C. It is a stream oriented
+ parser that requires setting handlers to deal with the structure that the
+ parser discovers in the document.
endef
MASTER_SITES = $(SF_MIRRORS)
-SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(NAME)-$(VERSION).tar.gz)
-DISTFILES = $(SOURCEFILES)
-DISTFILES += $(call admfiles,CSWexpat,)
+DISTFILES = $(DISTNAME).tar.gz
-# We define upstream file regex so we can be notifed of new upstream software release
-UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10127
-UPSTREAM_USE_SF = 1
-UFILES_REGEX = (\d+(?:\.\d+)*)
+FOREIGN_PACKAGES += CSWlibexpat0
-BUILD64 = 1
-NOISAEXEC = 1
+PACKAGES += CSWlibexpat1
+SPKG_DESC_CSWlibexpat1 = XML parser toolkit, libexpat.so.1
+PKGFILES_CSWlibexpat1 += $(call pkgfiles_lib,libexpat.so.1)
-CONFIGURE_ARGS = $(DIRPATHS)
+PACKAGES += CSWlibexpat-dev
+SPKG_DESC_CSWlibexpat-dev += Development files for libexpat.so.1
+PKGFILES_CSWlibexpat-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibexpat-dev += CSWlibexpat1
-# The expat 'check' target tries to compile tests that use GCC
-# constructs -- won't compile under Forte without hackery.
-TEST_TARGET = check
-TEST_SCRIPTS =
+PACKAGES += CSWexpat
+SPKG_DESC_CSWexpat = XML parser toolkit utility
+RUNTIME_DEP_PKGS_CSWexpat += CSWlibexpat1
+# This is for legacy packages depending on CSWexpat to use libexpat.so.0
+RUNTIME_DEP_PKGS_CSWexpat += CSWlibexpat0
+CHECKPKG_OVERRIDES_CSWexpat += surplus-dependency|CSWlibexpat0
-ifeq ($(VERSION),1.95.8)
-INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir man1dir
-endif
+# Testsuite needs __func__
+EXTRA_CXXFLAGS = -features=extensions
-MERGE_SCRIPTS_isa-i386-garversion-1.95.8 = copy-only
-MERGE_DIRS_isa-i386-garversion-1.95.8 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-garversion-1.95.8 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.95.8 = $(libdir)
+BUILD64 = 1
+ISAEXEC = 1
-MERGE_SCRIPTS_isa-i386-garversion-2.0.1 = copy-all
-MERGE_SCRIPTS_isa-amd64-garversion-2.0.1 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-2.0.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
-
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.95.8 = copy-only
-MERGE_DIRS_isa-sparcv8-garversion-1.95.8 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.95.8 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.95.8 = $(libdir)
-
-MERGE_SCRIPTS_isa-sparcv8-garversion-2.0.1 = copy-all
-MERGE_SCRIPTS_isa-sparcv9-garversion-2.0.1 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-2.0.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
-
include gar/category.mk
Modified: csw/mgar/pkg/libexpat1/trunk/checksums
===================================================================
--- csw/mgar/pkg/expat/trunk/checksums 2011-07-14 14:03:13 UTC (rev 15056)
+++ csw/mgar/pkg/libexpat1/trunk/checksums 2011-07-15 12:49:23 UTC (rev 15061)
@@ -1,3 +1 @@
-aff487543845a82fe262e6e2922b4c8e download/expat-1.95.8.tar.gz
-ee8b492592568805593f81f8cdf2a04c download/expat-2.0.1.tar.gz
-7547f56dfe29c7f8a29983ba60da41a1 download/CSWexpat.gspec
+ee8b492592568805593f81f8cdf2a04c expat-2.0.1.tar.gz
Deleted: csw/mgar/pkg/libexpat1/trunk/files/CSWexpat.gspec
===================================================================
--- csw/mgar/pkg/expat/trunk/files/CSWexpat.gspec 2011-07-14 14:03:13 UTC (rev 15056)
+++ csw/mgar/pkg/libexpat1/trunk/files/CSWexpat.gspec 2011-07-15 12:49:23 UTC (rev 15061)
@@ -1,4 +0,0 @@
-%var bitname expat
-%var pkgname CSWexpat
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
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