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

[hson at users.sourceforge.net]

Revision: 9413
          http://gar.svn.sourceforge.net/gar/?rev=9413&view=rev
Author:   hson
Date:     2010-03-28 16:16:49 +0000 (Sun, 28 Mar 2010)

Log Message:
-----------
Removed the modulation for 8.4 since tk 8.4 cant be rebuilt and packaged with
8.5. Instead package legacy lib files.

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

Added Paths:
-----------
    csw/mgar/pkg/tcl/trunk/files/8.4.i386.tar.xz
    csw/mgar/pkg/tcl/trunk/files/8.4.sparc.tar.xz

Modified: csw/mgar/pkg/tcl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl/trunk/Makefile	2010-03-28 16:12:55 UTC (rev 9412)
+++ csw/mgar/pkg/tcl/trunk/Makefile	2010-03-28 16:16:49 UTC (rev 9413)
@@ -2,29 +2,25 @@
 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-8.5.8  = configure.patch
-PATCHFILES-8.5.8 += tcl.m4.patch
-PATCHFILES-8.5.8 += tclInt.h.patch
+WORKSRC = $(WORKDIR)/$(DISTNAME)/unix
 
-PATCHFILES = $(PATCHFILES-$(GARVERSION))
-ALLFILES_PATCHFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(PATCHFILES-$(VERSION)))
+RUNTIME_DEP_PKGS_CSWtcl += CSWsunmath
 
+# Fix for finding libsunmath on i386 and amd64
+PATCHFILES  = configure.patch
+PATCHFILES += tcl.m4.patch
+PATCHFILES += tclInt.h.patch
+
+PATCHDIR = $(WORKDIR)/$(DISTNAME)
 # 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
@@ -33,31 +29,18 @@
 VENDOR_URL = http://www.tcl.tk/
 LICENSE = license.terms
 
-DISTNAME = $(GARNAME)$(GARVERSION)
-PATCHDIR = $(WORKDIR)/$(DISTNAME)
-WORKSRC = $(WORKDIR)/$(DISTNAME)/unix
-
-BUILD64-8.5.8 = 1
-BUILD64 = $(BUILD64-$(GARVERSION))
+BUILD64 = 1
 NOISAEXEC = 1
 
 INCLUDE_FLAGS =
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-INSTALL_ARGS-8.4.19 = install
-INSTALL_ARGS-8.5.8 = install install-private-headers install-tzdata install-msgs
-INSTALL_ARGS = $(INSTALL_ARGS-$(GARVERSION))
+INSTALL_ARGS = install install-private-headers install-tzdata install-msgs
 
 # tk need the static tclstub library for some reason
 MERGE_EXCLUDE_STATICLIBS =
 
-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))
@@ -68,7 +51,10 @@
 	@(cd $(WORKSRC) ; cp -p ../license.terms .; autoconf)
 	@$(MAKECOOKIE)
 
-merge-copy-lib-only:
-	ginstall -d $(PKGROOT)$(libdir)
-	ginstall $(INSTALLISADIR)$(libdir)/*.so $(PKGROOT)$(libdir)
+post-install-isa-sparcv8:
+	@( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -)
 	@$(MAKECOOKIE)
+
+post-install-isa-i386:
+	@( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/tcl/trunk/checksums
===================================================================
--- csw/mgar/pkg/tcl/trunk/checksums	2010-03-28 16:12:55 UTC (rev 9412)
+++ csw/mgar/pkg/tcl/trunk/checksums	2010-03-28 16:16:49 UTC (rev 9413)
@@ -1,5 +1,4 @@
 dc8664f3dc92693aaaad68785e4426ae  configure.patch
 cc9b1bd7ddf8e27e97ef464806885349  tcl.m4.patch
-ade2c033a7b545ee108f3fdfeb629fcf  tcl8.4.19-src.tar.gz
 7f123e53b3daaaba2478d3af5a0752e3  tcl8.5.8-src.tar.gz
 3c9c100904b6ba774a679ad7f2b4a036  tclInt.h.patch

Added: csw/mgar/pkg/tcl/trunk/files/8.4.i386.tar.xz
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/tcl/trunk/files/8.4.i386.tar.xz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/tcl/trunk/files/8.4.sparc.tar.xz
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/tcl/trunk/files/8.4.sparc.tar.xz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


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