[csw-devel] SF.net SVN: gar:[9185] csw/mgar/pkg/glib/trunk

[dmichelsen at users.sourceforge.net]

Revision: 9185
          http://gar.svn.sourceforge.net/gar/?rev=9185&view=rev
Author:   dmichelsen
Date:     2010-03-15 13:48:52 +0000 (Mon, 15 Mar 2010)

Log Message:
-----------
glib: Add version modulation, merging tbd

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

Modified: csw/mgar/pkg/glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib/trunk/Makefile	2010-03-15 09:48:36 UTC (rev 9184)
+++ csw/mgar/pkg/glib/trunk/Makefile	2010-03-15 13:48:52 UTC (rev 9185)
@@ -1,30 +1,32 @@
 GARNAME = glib
-# Most applications bind to libglib-1.2.so.0, so stick to 1.2.x for the moment
-GARVERSION = 1.2.10
-#GARVERSION = 1.3.15
+GARVERSION = 1.3.15
 CATEGORIES = lib
 
-DESCRIPTION = The GLib library of C routines
+EXTRA_MODULATORS = GARVERSION
+MODULATIONS_GARVERSION = 1.2.10 1.3.15
+
+DESCRIPTION = Utility library commonly associated with GNOME programs
 define BLURB
   GLib is a library containing many useful C routines for things such as trees,
   hashes, and lists.
 endef
 
-SPKG_DESC_CSWglib2 = Utility library commonly associated with GNOME programs
+GNOME_SUBV_FUNC = $(shell echo $1 | awk -F. '{print $$1"."$$2}')
+MASTER_SITES = $(sort $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GNOME_ROOT)/$(GNOME_PROJ)/$(call GNOME_SUBV_FUNC,$(VERSION))/))
+SOURCEFILES  = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)-$(VERSION).tar.gz)
+DISTFILES  = $(SOURCEFILES)
+NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES))
 
-RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv
+DEP_PKGS = CSWggettextrt CSWiconv
 
-MASTER_SITES = $(GNOME_MIRROR)
-
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-
 # glib 1.x doesn't seem to be 64 bit clean
 #BUILD64 = 1
 #NOISAEXEC = 1
 
 # Only needed for 1.3.x
-#EXTRA_BUILD_EXPORTS = SGML_CATALOG_FILES
-#SGML_CATALOG_FILES = $(sysconfdir)/sgml/catalog
+SGML_CATALOG_FILES = $(sysconfdir)/sgml/catalog
+EXTRA_BUILD_EXPORT-1.3.15 = SGML_CATALOG_FILES
+EXTRA_BUILD_EXPORTS = $(EXTRA_BUILD_EXPORT-$(GARVERSION))
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv

Modified: csw/mgar/pkg/glib/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib/trunk/checksums	2010-03-15 09:48:36 UTC (rev 9184)
+++ csw/mgar/pkg/glib/trunk/checksums	2010-03-15 13:48:52 UTC (rev 9185)
@@ -1 +1,2 @@
-6fe30dad87c77b91b632def29dd69ef9  download/glib-1.2.10.tar.gz
+6fe30dad87c77b91b632def29dd69ef9  glib-1.2.10.tar.gz
+cf44901e30edebe13b32da1bee852193  glib-1.3.15.tar.gz


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