[csw-devel] SF.net SVN: gar:[15594] csw/mgar/pkg

[igalic at users.sourceforge.net]

Revision: 15594
          http://gar.svn.sourceforge.net/gar/?rev=15594&view=rev
Author:   igalic
Date:     2011-09-09 16:05:36 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
tcl84, tcl85: talked to dam, *do* introduce SONAME in 8.4
Fix deps. Introduce alternatives in 8.5 and rename everything to 8-5

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

Modified: csw/mgar/pkg/tcl84/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl84/trunk/Makefile	2011-09-09 15:30:26 UTC (rev 15593)
+++ csw/mgar/pkg/tcl84/trunk/Makefile	2011-09-09 16:05:36 UTC (rev 15594)
@@ -2,7 +2,7 @@
 VERSION = 8.4.19
 CATEGORIES = lang
 
-DESCRIPTION = Tcl programming language, version 8.4
+DESCRIPTION = Tcl programming language v8.4
 define BLURB
 endef
 
@@ -29,7 +29,9 @@
 PATCHFILES += tcl-dtrace.patch
 
 PACKAGES  = CSWtcl
-PACKAGES += CSWtcl8.4
+PACKAGES += CSWtcl8-4
+PACKAGES += CSWlibtcl8-4-0
+PACKAGES += CSWtcl8-4-dev
 
 ALTERNATIVES_PRIO = 840
 
@@ -38,17 +40,33 @@
 #              # 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           = CSWtcl8.4
-RUNTIME_DEP_PKGS_CSWtcl8.4-i386   = CSWsunmath
-RUNTIME_DEP_PKGS_CSWtcl8.4-i386  += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH))
+RUNTIME_DEP_PKGS_CSWtcl               = CSWtcl8-4
+RUNTIME_DEP_PKGS_CSWtcl8-4-i386       = CSWsunmath
+RUNTIME_DEP_PKGS_CSWtcl8-4           += CSWlibtcl8-4-0
+RUNTIME_DEP_PKGS_CSWtcl8-4           += $(RUNTIME_DEP_PKGS_CSWtcl8-4-$(GARCH))
+RUNTIME_DEP_PKGS_CSWlibtcl8-4-0-i386 += CSWsunmath
+RUNTIME_DEP_PKGS_CSWlibtcl8-4-0      += $(RUNTIME_DEP_PKGS_CSWlibtcl8-4-0-$(GARCH))
+RUNTIME_DEP_PKGS_CSWtcl8-4-dev       += CSWlibtcl8-4-0
 
 SPKG_DESC_CSWtcl          = $(DESCRIPTION), backwards compatibility package
-SPKG_DESC_CSWtcl8.4       = $(DESCRIPTION)
+SPKG_DESC_CSWtcl8-4       = $(DESCRIPTION)
+SPKG_DESC_CSWlibtcl8-4-0  = $(DESCRIPTION), libraries
+SPKG_DESC_CSWtcl8-4-dev   = $(DESCRIPTION), development files
 
-ALTERNATIVES_CSWtcl8.4 += tcl8.4
-ALTERNATIVES_tc8.4 += $(bindir)/tclsh
-ALTERNATIVES_tc8.4 += $(libdir)/tclConfig.sh
+SPKG_DESC_CSWtcl          = $(DESCRIPTION)
+SPKG_DESC_CSWlibtcl8-4-0  = $(DESCRIPTION), libraries
+SPKG_DESC_CSWtcl-dev      = $(DESCRIPTION), development files
 
+PKGFILES_CSWlibtcl8-4-0   = $(call pkgfiles_lib,libtcl8.4.so.0)
+PKGFILES_CSWtcl8-4-dev    = $(PKGFILES_DEVEL)
+# Make sure CSWtcl remains empty, it's just for backwards compatibility:
+PKGFILES_CSWtcl8-4        = .*
+
+
+ALTERNATIVES_CSWtcl8-4 += tcl8_4
+ALTERNATIVES_tc8_4     += $(bindir)/tclsh $(ALTERNATIVES_PRIO)
+ALTERNATIVES_tc8_4     += $(libdir)/tclConfig.sh
+
 BUILD64 = 1
 
 INCLUDE_FLAGS =
@@ -77,8 +95,16 @@
 	@(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) ; \
+		mv $(REN_LIBTCL) $(REN_LIBTCL).0 ; \
+		ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) )
+	@$(MAKECOOKIE)
+
 post-install-modulated:
-	@# Need to manually create symlink to latest version
+	@# 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

Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile	2011-09-09 15:30:26 UTC (rev 15593)
+++ csw/mgar/pkg/tcl85/trunk/Makefile	2011-09-09 16:05:36 UTC (rev 15594)
@@ -2,7 +2,7 @@
 VERSION = 8.5.10
 CATEGORIES = lang
 
-DESCRIPTION = Tcl programming language
+DESCRIPTION = Tcl programming language v8.5
 define BLURB
 endef
 
@@ -33,6 +33,8 @@
 PACKAGES += CSWlibtcl8-5-0
 PACKAGES += CSWtcl-dev
 
+ALTERNATIVES_PRIO = 845
+
 # 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
@@ -45,20 +47,22 @@
 RUNTIME_DEP_PKGS_CSWlibtcl8-5-0      += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-$(GARCH))
 RUNTIME_DEP_PKGS_CSWtcl-dev          += CSWlibtcl8-5-0
 
-SPKG_DESC_CSWtcl          = $(DESCRIPTION)
+SPKG_DESC_CSWtcl8-5       = $(DESCRIPTION)
 SPKG_DESC_CSWlibtcl8-5-0  = $(DESCRIPTION), libraries
 SPKG_DESC_CSWtcl-dev      = $(DESCRIPTION), development files
 
 PKGFILES_CSWlibtcl8-5-0   = $(call pkgfiles_lib,libtcl8.5.so.0)
-PKGFILES_CSWtcl-dev       = $(PKGFILES_DEVEL)
+PKGFILES_CSWtcl8-5-dev    = $(PKGFILES_DEVEL)
 
+ALTERNATIVES_CSWtcl8_5 += tcl8_5
+ALTERNATIVES_tc8_5     += $(bindir)/tclsh $(ALTERNATIVES_PRIO)
+ALTERNATIVES_tc8_5     += $(libdir)/tclConfig.sh
 
 CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n
 CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n
 CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/lib/tcl8.5/clock.tcl
 CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/lib/tcl8.5/clock.tcl
 
-
 BUILD64 = 1
 
 INCLUDE_FLAGS =
@@ -96,7 +100,7 @@
 	@$(MAKECOOKIE)
 
 post-install-modulated:
-	@# Need to manually create symlink to latest version
+	@# 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

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