[csw-devel] SF.net SVN: gar:[9147] csw/mgar/pkg/tcl/trunk

[dmichelsen at users.sourceforge.net]

Revision: 9147
          http://gar.svn.sourceforge.net/gar/?rev=9147&view=rev
Author:   dmichelsen
Date:     2010-03-13 20:43:19 +0000 (Sat, 13 Mar 2010)

Log Message:
-----------
tcl: Add version modulation for 8.4

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

Modified: csw/mgar/pkg/tcl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl/trunk/Makefile	2010-03-13 20:42:45 UTC (rev 9146)
+++ csw/mgar/pkg/tcl/trunk/Makefile	2010-03-13 20:43:19 UTC (rev 9147)
@@ -1,38 +1,44 @@
 GARNAME = tcl
-GARVERSION = 8.5.7
+GARVERSION = 8.5.8
 CATEGORIES = lang
 
+EXTRA_MODULATORS = GARVERSION
+MODULATIONS_GARVERSION = 8.4.19 8.5.8
+# The legacy library was not available in 64 bit, so don't bother compiling it
+SKIP_MODULATIONS = isa-sparcv9-garversion-8.4.19 isa-amd64-garversion-8.4.19
+
 DESCRIPTION = Tcl programming language
 define BLURB
 endef
 
 SF_PROJ = tcl
 MASTER_SITES = $(SF_MIRRORS)
+SOURCEFILES  = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)$(VERSION)-src.tar.gz)
+DISTFILES  = $(SOURCEFILES)
+NOEXTRACT = $(filter-out $(GARNAME)$(GARVERSION)-src.tar.gz,$(SOURCEFILES))
 
-DISTNAME = $(GARNAME)$(GARVERSION)
-DISTFILES  = $(DISTNAME)-src.tar.gz
-
 # Fix for finding libsunmath on i386 and amd64
-PATCHFILES += configure.patch
-PATCHFILES += tcl.m4.patch
+PATCHFILES-8.5.8  = configure.patch
+PATCHFILES-8.5.8 += tcl.m4.patch
 
-RUNTIME_DEP_PKGS_CSWtcl += CSWsunmath
+PATCHFILES = $(PATCHFILES-$(GARVERSION))
+ALLFILES_PATCHFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(PATCHFILES-$(VERSION)))
 
-PATCHDIR = $(WORKDIR)/$(DISTNAME)
-
-SPKG_SOURCEURL = http://www.tcl.tk/
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*)-src.tar.gz
 
-BUILD64 = 1
-NOISAEXEC = 1
+VENDOR_URL = http://www.tcl.tk/
+LICENSE = license.terms
 
+DISTNAME = $(GARNAME)$(GARVERSION)
+PATCHDIR = $(WORKDIR)/$(DISTNAME)
 WORKSRC = $(WORKDIR)/$(DISTNAME)/unix
 
-LICENSE = license.terms
+BUILD64-8.5.8 = 1
+BUILD64 = $(BUILD64-$(GARVERSION))
+NOISAEXEC = 1
 
 INCLUDE_FLAGS =
 
@@ -41,12 +47,23 @@
 # tk need the static tclstub library for some reason
 EXTRA_MERGE_INCLUDE_FILES  = $(libdir)/libtclstub.*\.a
 
+MERGE_SCRIPTS_isa-default-garversion-8.4.19 = copy-lib-only
+
+MERGE_SCRIPTS_isa-default-garversion-8.5.8 = copy-all
+MERGE_SCRIPTS_isa-extra-garversion-8.5.8 = copy-relocated-only
+MERGE_DIRS_isa-extra-garversion-8.5.8 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+
 include gar/category.mk
 
-CFLAGS := $(filter-out -I%,$(CFLAGS))
+# CFLAGS := $(filter-out -I%,$(CFLAGS))
 DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
 
 pre-configure-modulated:
 	@echo " ==> Regenerating build tools..."
 	@(cd $(WORKSRC) ; cp -p ../license.terms .; autoconf)
 	@$(MAKECOOKIE)
+
+merge-copy-lib-only:
+	ginstall -d $(PKGROOT)$(libdir)
+	ginstall $(INSTALLISADIR)$(libdir)/*.so $(PKGROOT)$(libdir)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/tcl/trunk/checksums
===================================================================
--- csw/mgar/pkg/tcl/trunk/checksums	2010-03-13 20:42:45 UTC (rev 9146)
+++ csw/mgar/pkg/tcl/trunk/checksums	2010-03-13 20:43:19 UTC (rev 9147)
@@ -1,3 +1,4 @@
 dc8664f3dc92693aaaad68785e4426ae  configure.patch
 cc9b1bd7ddf8e27e97ef464806885349  tcl.m4.patch
-f70ad8f78b5e4a9f792fe101f22b125f  tcl8.5.7-src.tar.gz
+ade2c033a7b545ee108f3fdfeb629fcf  tcl8.4.19-src.tar.gz
+7f123e53b3daaaba2478d3af5a0752e3  tcl8.5.8-src.tar.gz


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