[csw-devel] SF.net SVN: gar:[17472] csw/mgar/pkg/tcl85/trunk

[dmichelsen at users.sourceforge.net]

Revision: 17472
          http://gar.svn.sourceforge.net/gar/?rev=17472&view=rev
Author:   dmichelsen
Date:     2012-03-20 08:08:37 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
tcl85/trunk: Update to 8.5.11 and rework packages

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

Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile	2012-03-20 02:07:48 UTC (rev 17471)
+++ csw/mgar/pkg/tcl85/trunk/Makefile	2012-03-20 08:08:37 UTC (rev 17472)
@@ -1,5 +1,5 @@
 NAME = tcl8.5
-VERSION = 8.5.10
+VERSION = 8.5.11
 CATEGORIES = lang
 GARTYPE = v2
 
@@ -28,32 +28,33 @@
 PATCHDIR = $(WORKDIR)/$(DISTNAME)
 PATCHFILES  = soname.diff
 PATCHFILES += tcl.m4.patch
-PATCHFILES += tcl-dtrace.patch
+# PATCHFILES += tcl-dtrace.patch
 
-PACKAGES  = CSWtcl
-PACKAGES += CSWlibtcl8-5-0
-PACKAGES += CSWtcl-dev
-
-ALTERNATIVES_PRIO = 850
-
 # The dependencies on the ISAs differ, here's from tcl-x.y.z/unix/tcl.m4: 
 #
 #              # On Solaris 5.x i386 with the sunpro compiler we need to link
 #              # with sunmath to get floating point rounding control
-#
-RUNTIME_DEP_PKGS_CSWtcl-i386          = CSWsunmath
-RUNTIME_DEP_PKGS_CSWtcl              += CSWlibtcl8-5-0
-RUNTIME_DEP_PKGS_CSWtcl              += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH))
+
+PACKAGES  = CSWtcl
+SPKG_DESC_CSWtcl = Tcl meta package
+RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-5-0
+RUNTIME_DEP_PKGS_CSWtcl-i386 = CSWsunmath
+RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH))
+
+SPKG_DESC_CSWtcl8-5       = Tcl programming language v8.5
+
+PACKAGES += CSWlibtcl8-5-0
+SPKG_DESC_CSWlibtcl8-5-0 = $(DESCRIPTION), libraries
+PKGFILES_CSWlibtcl8-5-0 += $(call pkgfiles_lib,libtcl8.5.so.0)
 RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-i386 += CSWsunmath
-RUNTIME_DEP_PKGS_CSWlibtcl8-5-0      += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-$(GARCH))
-RUNTIME_DEP_PKGS_CSWtcl-dev          += CSWlibtcl8-5-0
+RUNTIME_DEP_PKGS_CSWlibtcl8-5-0 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-$(GARCH))
 
-SPKG_DESC_CSWtcl8-5       = $(DESCRIPTION)
-SPKG_DESC_CSWlibtcl8-5-0  = $(DESCRIPTION), libraries
-SPKG_DESC_CSWtcl-dev      = $(DESCRIPTION), development files
+PACKAGES += CSWtcl-dev
+SPKG_DESC_CSWtcl-dev = $(DESCRIPTION), development files
+PKGFILES_CSWtcl-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5-0
 
-PKGFILES_CSWlibtcl8-5-0   = $(call pkgfiles_lib,libtcl8.5.so.0)
-PKGFILES_CSWtcl8-5-dev    = $(PKGFILES_DEVEL)
+ALTERNATIVES_PRIO = 850
 
 ALTERNATIVES_CSWtcl8_5 += tcl8_5
 ALTERNATIVE_tcl8_5     += $(bindir)/tclsh $(ALTERNATIVES_PRIO)
@@ -89,13 +90,13 @@
 
 pre-configure-modulated:
 	@echo " ==> Regenerating build tools..."
-	@(cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if )
+	(cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if )
 	@$(MAKECOOKIE)
 
 pre-test-modulated:
 	@# Need to manually create symlink to latest version
 	@echo Creating symlinks for libtcl8.5.so
-	@(cd $(WORKSRC) ; \
+	(cd $(WORKSRC) ; \
 		mv $(REN_LIBTCL) $(REN_LIBTCL).0 ; \
 		ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) )
 	@$(MAKECOOKIE)
@@ -103,8 +104,8 @@
 post-install-modulated:
 	@# Need to manually create symlink to latest version - it will be handled by alternatives
 	@echo Creating tclsh link
-	@ln -s $(REN_TCLSH) $(INSTALLISADIR)/$(bindir)/tclsh
-	@perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(libdir)/tclConfig.sh
-	@perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(prefix)/share/man/man1/tclsh.1
+	ln -s $(REN_TCLSH) $(INSTALLISADIR)/$(bindir)/tclsh
+	perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(libdir)/tclConfig.sh
+	perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(prefix)/share/man/man1/tclsh.1
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/tcl85/trunk/checksums
===================================================================
--- csw/mgar/pkg/tcl85/trunk/checksums	2012-03-20 02:07:48 UTC (rev 17471)
+++ csw/mgar/pkg/tcl85/trunk/checksums	2012-03-20 08:08:37 UTC (rev 17472)
@@ -1,6 +1 @@
-dc8664f3dc92693aaaad68785e4426ae  configure.patch
-cc9b1bd7ddf8e27e97ef464806885349  tcl.m4.patch
-a08eaf8467c0631937067c1948dd326b  tcl8.5.10-src.tar.gz
-3c9c100904b6ba774a679ad7f2b4a036  tclInt.h.patch
-1dea9df5cd9579dce4746cf5d428aa1a  tcl-dtrace.patch
-1d6c493907986871a90c7c9612520ffd  soname.diff
+b01a9691c83990b3db0ce62d1012ca67  tcl8.5.11-src.tar.gz

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