[csw-devel] SF.net SVN: gar:[2887] csw/mgar/pkg/expat/trunk

[dmichelsen at users.sourceforge.net]

Revision: 2887
          http://gar.svn.sourceforge.net/gar/?rev=2887&view=rev
Author:   dmichelsen
Date:     2009-01-22 21:59:25 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
expat: Make combined package with 1.95.8 and 2.0.1 for apps binding to libexpat.so.0

Modified Paths:
--------------
    csw/mgar/pkg/expat/trunk/Makefile
    csw/mgar/pkg/expat/trunk/checksums

Modified: csw/mgar/pkg/expat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/expat/trunk/Makefile	2009-01-22 21:52:00 UTC (rev 2886)
+++ csw/mgar/pkg/expat/trunk/Makefile	2009-01-22 21:59:25 UTC (rev 2887)
@@ -2,6 +2,9 @@
 GARVERSION = 2.0.1
 CATEGORIES = lib
 
+EXTRA_MODULATORS = GARVERSION
+MODULATIONS_GARVERSION = 1.95.8 2.0.1
+
 DESCRIPTION = XML Parser Toolkit
 define BLURB
 	This is James Clark's Expat XML parser library in C. It is a stream oriented
@@ -10,7 +13,8 @@
 endef
 
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+SOURCEFILES  = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)-$(VERSION).tar.gz)
+DISTFILES    = $(SOURCEFILES)
 DISTFILES += $(call admfiles,CSWexpat,)
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -28,6 +32,26 @@
 TEST_TARGET = check
 TEST_SCRIPTS =
 
-PKGFILES_CSWexpat-devel = $(PKGFILES_DEVEL)
+ifeq ($(GARVERSION),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/expat/trunk/checksums
===================================================================
--- csw/mgar/pkg/expat/trunk/checksums	2009-01-22 21:52:00 UTC (rev 2886)
+++ csw/mgar/pkg/expat/trunk/checksums	2009-01-22 21:59:25 UTC (rev 2887)
@@ -1,3 +1,3 @@
+aff487543845a82fe262e6e2922b4c8e  download/expat-1.95.8.tar.gz
 ee8b492592568805593f81f8cdf2a04c  download/expat-2.0.1.tar.gz
 7547f56dfe29c7f8a29983ba60da41a1  download/CSWexpat.gspec
-4542a961d5540f2c0b0328f7a5675005  download/CSWexpat-devel.gspec


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