Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory vz-cvs-3.sog:/tmp/cvs-serv18311
Modified Files:
tcltk-x86_64.info tcltk-x86_64.patch
Log Message:
don't propagate build-dir paths into installed config scripts
Index: tcltk-x86_64.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk-x86_64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tcltk-x86_64.patch 17 Jul 2011 18:09:23 -0000 1.3
+++ tcltk-x86_64.patch 25 Jul 2011 23:00:13 -0000 1.4
@@ -61,6 +61,47 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
+diff -Nurd -x'*~' tcltk-8.5.10.orig/tcl8.5.10/unix/tclConfig.sh.in
tcltk-8.5.10/tcl8.5.10/unix/tclConfig.sh.in
+--- tcltk-8.5.10.orig/tcl8.5.10/unix/tclConfig.sh.in 2011-06-23
09:18:36.000000000 -0400
++++ tcltk-8.5.10/tcl8.5.10/unix/tclConfig.sh.in 2011-07-25
17:53:10.000000000 -0400
+@@ -100,7 +100,7 @@
+
+ # String to pass to linker to pick up the Tcl library from its
+ # build directory.
+-TCL_BUILD_LIB_SPEC='@TCL_BUILD_LIB_SPEC@'
++TCL_BUILD_LIB_SPEC='@TCL_BUILD_LIB_SPEC@' # FINK REMOVE THIS
+
+ # String to pass to linker to pick up the Tcl library from its
+ # installed directory.
+@@ -135,7 +135,8 @@
+ # different place than the directory containing the source files, this
+ # points to the location of the sources, not the location where Tcl was
+ # compiled.
+-TCL_SRC_DIR='@TCL_SRC_DIR@'
++TCL_SRC_DIR='/dev/null'
++TCL_SRC_DIR='@TCL_SRC_DIR@' # FINK REMOVE THIS
+
+ # List of standard directories in which to look for packages during
+ # "package require" commands. Contains the "prefix" directory plus also
+@@ -153,14 +154,16 @@
+
+ # String to pass to linker to pick up the Tcl stub library from its
+ # build directory.
+-TCL_BUILD_STUB_LIB_SPEC='@TCL_BUILD_STUB_LIB_SPEC@'
++TCL_BUILD_STUB_LIB_SPEC='@TCL_STUB_LIB_SPEC@'
++TCL_BUILD_STUB_LIB_SPEC='@TCL_BUILD_STUB_LIB_SPEC@' # FINK REMOVE THIS
+
+ # String to pass to linker to pick up the Tcl stub library from its
+ # installed directory.
+ TCL_STUB_LIB_SPEC='@TCL_STUB_LIB_SPEC@'
+
+ # Path to the Tcl stub library in the build directory.
+-TCL_BUILD_STUB_LIB_PATH='@TCL_BUILD_STUB_LIB_PATH@'
++TCL_BUILD_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
++TCL_BUILD_STUB_LIB_PATH='@TCL_BUILD_STUB_LIB_PATH@' # FINK REMOVE THIS
+
+ # Path to the Tcl stub library in the install directory.
+ TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
diff -Nurd -x'*~' tcltk-8.5.10.orig/tk8.5.10/unix/configure
tcltk-8.5.10/tk8.5.10/unix/configure
--- tcltk-8.5.10.orig/tk8.5.10/unix/configure 2011-06-23 14:37:39.000000000
-0400
+++ tcltk-8.5.10/tk8.5.10/unix/configure 2011-07-17 13:06:59.000000000
-0400
@@ -106,3 +147,45 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
+diff -Nurd -x'*~' tcltk-8.5.10.orig/tk8.5.10/unix/tkConfig.sh.in
tcltk-8.5.10/tk8.5.10/unix/tkConfig.sh.in
+--- tcltk-8.5.10.orig/tk8.5.10/unix/tkConfig.sh.in 2011-06-23
14:37:39.000000000 -0400
++++ tcltk-8.5.10/tk8.5.10/unix/tkConfig.sh.in 2011-07-25 17:55:01.000000000
-0400
+@@ -53,7 +53,8 @@
+
+ # String to pass to linker to pick up the Tk library from its
+ # build directory.
+-TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@'
++TK_BUILD_LIB_SPEC='@TK_LIB_SPEC@'
++TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@' # FINK REMOVE THIS
+
+ # String to pass to linker to pick up the Tk library from its
+ # installed directory.
+@@ -69,7 +70,8 @@
+ # different place than the directory containing the source files, this
+ # points to the location of the sources, not the location where Tk was
+ # compiled.
+-TK_SRC_DIR='@TK_SRC_DIR@'
++TK_SRC_DIR='/dev/null'
++TK_SRC_DIR='@TK_SRC_DIR@' # FINK REMOVE THIS
+
+ # Needed if you want to make a 'fat' shared library library
+ # containing tk objects or link a different wish.
+@@ -84,14 +86,16 @@
+
+ # String to pass to linker to pick up the Tk stub library from its
+ # build directory.
+-TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@'
++TK_BUILD_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@'
++TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@' # FINK REMOVE THIS
+
+ # String to pass to linker to pick up the Tk stub library from its
+ # installed directory.
+ TK_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@'
+
+ # Path to the Tk stub library in the build directory.
+-TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@'
++TK_BUILD_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
++TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@' # FINK REMOVE THIS
+
+ # Path to the Tk stub library in the install directory.
+ TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
Index: tcltk-x86_64.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk-x86_64.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tcltk-x86_64.info 17 Jul 2011 18:09:23 -0000 1.7
+++ tcltk-x86_64.info 25 Jul 2011 23:00:13 -0000 1.8
@@ -1,6 +1,6 @@
Package: tcltk
Version: 8.5.10
-Revision: 1
+Revision: 2
Architecture: x86_64
BuildDepends: <<
fink (>= 0.24.12-1),
@@ -24,7 +24,7 @@
Source2: mirror:sourceforge:tcl/tk%v-src.tar.gz
Source2-MD5: adfdaca46cc95fec8557df8ecdb0715c
PatchFile: %n-x86_64.patch
-PatchFile-MD5: fab99d5c11da2160e4be9f5bec0398e5
+PatchFile-MD5: c6df25f812e021756f9dd5786f35dbf8
NoSourceDirectory: true
SetCPPFLAGS: -MD
ConfigureParams: --enable-shared --disable-corefoundation --exec-prefix=%p
--mandir=%p/share/man --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib tcl_cv_type_64bit="long long"
@@ -63,6 +63,8 @@
ln -s libtcl8.5.dylib %i/lib/libtcl.dylib
ln -s libtclstub8.5.a %i/lib/libtclstub.a
/usr/bin/ranlib %i/lib/libtkstub8.5.a
+
+ perl -ni -e 'print unless /# FINK REMOVE THIS/' %i/lib/tclConfig.sh
%i/lib/tkConfig.sh
<<
SplitOff: <<
Package: %N-shlibs
------------------------------------------------------------------------------
Storage Efficiency Calculator
This modeling tool is based on patent-pending intellectual property that
has been used successfully in hundreds of IBM storage optimization engage-
ments, worldwide. Store less, Store more with what you own, Move data to
the right place. Try It Now! http://www.accelacomm.com/jaw/sfnl/114/51427378/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
