[csw-devel] SF.net SVN: gar:[15601] csw/mgar/pkg/tcl84/trunk

[igalic at users.sourceforge.net]

Revision: 15601
          http://gar.svn.sourceforge.net/gar/?rev=15601&view=rev
Author:   igalic
Date:     2011-09-10 02:07:30 +0000 (Sat, 10 Sep 2011)
Log Message:
-----------
tcl84: Add all deps to CSWtcl. Fix soname patch

Modified Paths:
--------------
    csw/mgar/pkg/tcl84/trunk/Makefile
    csw/mgar/pkg/tcl84/trunk/checksums
    csw/mgar/pkg/tcl84/trunk/files/soname.diff

Modified: csw/mgar/pkg/tcl84/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl84/trunk/Makefile	2011-09-10 00:19:59 UTC (rev 15600)
+++ csw/mgar/pkg/tcl84/trunk/Makefile	2011-09-10 02:07:30 UTC (rev 15601)
@@ -32,6 +32,8 @@
 ALTERNATIVES_PRIO = 840
 
 RUNTIME_DEP_PKGS_CSWtcl         = CSWtcl8-4
+RUNTIME_DEP_PKGS_CSWtcl        += CSWlibtcl8-4-0
+RUNTIME_DEP_PKGS_CSWtcl        += CSWtcl8-4-dev
 RUNTIME_DEP_PKGS_CSWtcl8-4      = CSWlibtcl8-4-0
 RUNTIME_DEP_PKGS_CSWtcl8-4-dev  = CSWlibtcl8-4-0
 
@@ -53,7 +55,7 @@
 ALTERNATIVE_tcl8_4     += $(bindir)/tclsh $(ALTERNATIVES_PRIO)
 ALTERNATIVE_tcl8_4     += $(libdir)/tclConfig.sh $(ALTERNATIVES_PRIO)
 
-CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWtcl8-4k
+CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWtcl8-4
 
 BUILD64 = 1
 

Modified: csw/mgar/pkg/tcl84/trunk/checksums
===================================================================
--- csw/mgar/pkg/tcl84/trunk/checksums	2011-09-10 00:19:59 UTC (rev 15600)
+++ csw/mgar/pkg/tcl84/trunk/checksums	2011-09-10 02:07:30 UTC (rev 15601)
@@ -2,4 +2,4 @@
 3c9c100904b6ba774a679ad7f2b4a036  tclInt.h.patch
 1dea9df5cd9579dce4746cf5d428aa1a  tcl-dtrace.patch
 ade2c033a7b545ee108f3fdfeb629fcf  tcl8.4.19-src.tar.gz
-10ae65cdcd10dc7a4ba7d84f5d7c2338  soname.diff
+501d29403a68188481938d0b546f40ba  soname.diff

Modified: csw/mgar/pkg/tcl84/trunk/files/soname.diff
===================================================================
--- csw/mgar/pkg/tcl84/trunk/files/soname.diff	2011-09-10 00:19:59 UTC (rev 15600)
+++ csw/mgar/pkg/tcl84/trunk/files/soname.diff	2011-09-10 02:07:30 UTC (rev 15601)
@@ -1,15 +1,6 @@
 diff -ur tcl8.4.19/unix/Makefile.in tcl8.4.19-solfix/unix/Makefile.in
 --- tcl8.4.19/unix/Makefile.in	2008-04-17 22:29:49.000000000 +0200
-+++ tcl8.4.19-solfix/unix/Makefile.in	2011-09-09 20:20:12.621101557 +0200
-@@ -207,7 +207,7 @@
- SHLIB_LD		= @SHLIB_LD@
- SHLIB_CFLAGS		= @SHLIB_CFLAGS@
- SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
--TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
-+TCL_SHLIB_LD_EXTRAS     = @TCL_SHLIB_LD_EXTRAS@
- 
- SHLIB_SUFFIX		= @SHLIB_SUFFIX@
- #SHLIB_SUFFIX		=
++++ tcl8.4.19-solfix/unix/Makefile.in	2011-09-10 04:00:22.590399176 +0200
 @@ -634,7 +634,9 @@
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@ -21,14 +12,28 @@
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
+Only in tcl8.4.19-solfix/unix: autom4te.cache
+diff -ur tcl8.4.19/unix/configure.in tcl8.4.19-solfix/unix/configure.in
+--- tcl8.4.19/unix/configure.in	2008-04-17 22:29:49.000000000 +0200
++++ tcl8.4.19-solfix/unix/configure.in	2011-09-10 03:48:07.771286323 +0200
+@@ -568,7 +568,7 @@
+ 
+ # Trick to replace DBGX with TCL_DBGX
+ DBGX='${TCL_DBGX}'
+-eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
++eval "TCL_LIB_FILE=${TCL_LIB_FILE}".0
+ 
+ TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+Only in tcl8.4.19-solfix/unix: license.terms
 diff -ur tcl8.4.19/unix/tcl.m4 tcl8.4.19-solfix/unix/tcl.m4
 --- tcl8.4.19/unix/tcl.m4	2008-04-17 22:29:49.000000000 +0200
-+++ tcl8.4.19-solfix/unix/tcl.m4	2011-09-09 20:21:56.672149153 +0200
-@@ -1843,6 +1843,7 @@
++++ tcl8.4.19-solfix/unix/tcl.m4	2011-09-10 03:52:19.203297058 +0200
+@@ -1907,6 +1907,7 @@
  	    # symbols when dynamically loaded into tclsh.
  
  	    SHLIB_LD_LIBS='${LIBS}'
-+	    TCL_SHLIB_LD_EXTRAS="-h \${TCL_LIB_FILE}.0"
++	    TCL_SHLIB_LD_EXTRAS="-h \${TCL_LIB_FILE}"
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"

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