Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory vz-cvs-3.sog:/tmp/cvs-serv8032
Modified Files:
tcltk-x86_64.info tcltk-x86_64.patch tcltk.info tcltk.patch
Log Message:
install internal headers
Index: tcltk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- tcltk.info 27 Jul 2011 12:39:30 -0000 1.18
+++ tcltk.info 27 Jul 2011 15:06:50 -0000 1.19
@@ -1,8 +1,9 @@
Package: tcltk
+Epoch: 1
Version: 8.4.19
-Revision: 4
+Revision: 5
BuildDepends: x11-dev, fink (>= 0.24.12-1)
-Depends: %N-shlibs (= %v-%r)
+Depends: %N-shlibs (= %e:%v-%r)
Source: mirror:sourceforge:tcl/tcl%v-src.tar.gz
Source-MD5: ade2c033a7b545ee108f3fdfeb629fcf
SourceDirectory: tcl%v
@@ -10,7 +11,7 @@
Source2-MD5: 9b998d0456d1b956eb9da610837a9c47
NoSourceDirectory: true
PatchFile: %n.patch
-PatchFile-MD5: 43ecc0c42184d1b732b2b21ff8439364
+PatchFile-MD5: ef1fff3077a578894b0c176aedb4f2e8
ConfigureParams: --enable-shared --disable-corefoundation --exec-prefix=%p
--mandir=%p/share/man --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib
CompileScript: <<
#!/bin/sh -ev
@@ -49,7 +50,21 @@
ln -s libtclstub${MAJORVER}.a %i/lib/libtclstub.a
/usr/bin/ranlib %i/lib/libtkstub${MAJORVER}.a
- perl -ni -e 'print unless /# FINK REMOVE THIS/' %i/lib/tclConfig.sh
%i/lib/tkConfig.sh
+ for pkg in tcl tk; do
+ mkdir -p
%i/include/tcltk-private/${pkg}${MAJORVER}/{generic,unix}
+ cp ${pkg}%v/generic/*.h
%i/include/tcltk-private/${pkg}${MAJORVER}/generic
+ cp ${pkg}%v/unix/*.h
%i/include/tcltk-private/${pkg}${MAJORVER}/unix
+
+ pushd %i/include
+ for hdr in *.h ; do
+ if [ -f
tcltk-private/${pkg}${MAJORVER}/generic/${hdr} ]; then
+ ln -sf ../../${hdr}
tcltk-private/${pkg}${MAJORVER}/generic
+ fi
+ done
+ popd
+
+ perl -pi -e "s,%b/${pkg}%v/unix,%p/lib,;
s,%b,%p/include/tcltk-private," %i/lib/${pkg}Config.sh
+ done
<<
SplitOff: <<
Package: %N-shlibs
@@ -72,7 +87,7 @@
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
- Depends: %N (= %v-%r), %N-shlibs (= %v-%r)
+ Depends: %N (= %e:%v-%r), %N-shlibs (= %e:%v-%r)
Replaces: %N (<= 8.4.13-2)
Files: <<
lib/tclConfig.sh
@@ -91,6 +106,10 @@
tk%v/README:README.tk
tk%v/ChangeLog:ChangeLog.tk
<<
+ DescUsage: <<
+Packages that want to use the supplied internal-interface headers
+should BuildDepends on %n of at least epoch 1 or higher.
+ <<
<<
DocFiles: <<
@@ -130,6 +149,10 @@
access. We cannot allow that (no guarantee that they exist, or
where they exist, or that they are the correct arch or build-
options, etc), so adjust to point to the installed locations.
+
+ Building extensions sometimes needs access to internal
+ headers, so install them in a private location. Point
+ *Config.sh vars accordingly. Thanks fedora!
<<
DescDetail: <<
Tcl provides a portable scripting environment for Unix, Windows,
Index: tcltk-x86_64.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk-x86_64.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tcltk-x86_64.info 27 Jul 2011 12:39:30 -0000 1.10
+++ tcltk-x86_64.info 27 Jul 2011 15:06:50 -0000 1.11
@@ -1,6 +1,7 @@
Package: tcltk
+Epoch: 1
Version: 8.5.10
-Revision: 2
+Revision: 3
Architecture: x86_64
BuildDepends: <<
fink (>= 0.24.12-1),
@@ -12,7 +13,7 @@
xft2-dev (>= 2.1.14-1)
<<
Depends: <<
- %N-shlibs (= %v-%r),
+ %N-shlibs (= %e:%v-%r),
fontconfig2-shlibs (>= 2.8.0-4),
freetype219-shlibs (>= 2.3.12-1),
x11-shlibs,
@@ -24,7 +25,7 @@
Source2: mirror:sourceforge:tcl/tk%v-src.tar.gz
Source2-MD5: adfdaca46cc95fec8557df8ecdb0715c
PatchFile: %n-x86_64.patch
-PatchFile-MD5: c6df25f812e021756f9dd5786f35dbf8
+PatchFile-MD5: fab99d5c11da2160e4be9f5bec0398e5
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"
@@ -67,7 +68,21 @@
ln -s libtclstub${MAJORVER}.a %i/lib/libtclstub.a
/usr/bin/ranlib %i/lib/libtkstub${MAJORVER}.a
- perl -ni -e 'print unless /# FINK REMOVE THIS/' %i/lib/tclConfig.sh
%i/lib/tkConfig.sh
+ for pkg in tcl tk; do
+ mkdir -p
%i/include/tcltk-private/${pkg}${MAJORVER}/{generic,unix}
+ cp ${pkg}%v/generic/*.h
%i/include/tcltk-private/${pkg}${MAJORVER}/generic
+ cp ${pkg}%v/unix/*.h
%i/include/tcltk-private/${pkg}${MAJORVER}/unix
+
+ pushd %i/include
+ for hdr in *.h ; do
+ if [ -f
tcltk-private/${pkg}${MAJORVER}/generic/${hdr} ]; then
+ ln -sf ../../${hdr}
tcltk-private/${pkg}${MAJORVER}/generic
+ fi
+ done
+ popd
+
+ perl -pi -e "s,%b/${pkg}%v/unix,%p/lib,;
s,%b,%p/include/tcltk-private," %i/lib/${pkg}Config.sh
+ done
<<
SplitOff: <<
Package: %N-shlibs
@@ -94,7 +109,7 @@
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
- Depends: %N (= %v-%r), %N-shlibs (= %v-%r)
+ Depends: %N (= %e:%v-%r), %N-shlibs (= %e:%v-%r)
Files: <<
lib/tclConfig.sh
lib/tkConfig.sh
@@ -112,6 +127,10 @@
tk%v/README:README.tk
tk%v/ChangeLog:ChangeLog.tk
<<
+ DescUsage: <<
+Packages that want to use the supplied internal-interface headers
+should BuildDepends on %n of at least epoch 1 or higher.
+ <<
<<
DocFiles: <<
@@ -155,6 +174,10 @@
access. We cannot allow that (no guarantee that they exist, or
where they exist, or that they are the correct arch or build-
options, etc), so adjust to point to the installed locations.
+
+ Building extensions sometimes needs access to internal
+ headers, so install them in a private location. Point
+ *Config.sh vars accordingly. Thanks fedora!
<<
DescDetail: <<
Tcl provides a portable scripting environment for Unix, Windows,
Index: tcltk.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tcltk.patch 25 Jul 2011 21:49:53 -0000 1.6
+++ tcltk.patch 27 Jul 2011 15:06:50 -0000 1.7
@@ -28,47 +28,6 @@
tcl_config_files="${tcl_config_files} Makefile dltest/Makefile tclConfig.sh"
-diff -Nurd -x'*~' tcltk-8.4.19.orig/tcl8.4.19/unix/tclConfig.sh.in
tcltk-8.4.19/tcl8.4.19/unix/tclConfig.sh.in
---- tcltk-8.4.19.orig/tcl8.4.19/unix/tclConfig.sh.in 2008-04-17
16:29:49.000000000 -0400
-+++ tcltk-8.4.19/tcl8.4.19/unix/tclConfig.sh.in 2011-07-25
17:39:24.000000000 -0400
-@@ -111,7 +111,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.
-@@ -146,7 +146,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
-@@ -164,14 +165,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.4.19.orig/tk8.4.19/unix/configure
tcltk-8.4.19/tk8.4.19/unix/configure
--- tcltk-8.4.19.orig/tk8.4.19/unix/configure 2008-04-17 11:14:08.000000000
-0400
+++ tcltk-8.4.19/tk8.4.19/unix/configure 2008-07-28 18:15:21.000000000
-0400
@@ -127,45 +86,3 @@
/*
-diff -Nurd -x'*~' tcltk-8.4.19.orig/tk8.4.19/unix/tkConfig.sh.in
tcltk-8.4.19/tk8.4.19/unix/tkConfig.sh.in
---- tcltk-8.4.19.orig/tk8.4.19/unix/tkConfig.sh.in 2008-04-17
11:14:08.000000000 -0400
-+++ tcltk-8.4.19/tk8.4.19/unix/tkConfig.sh.in 2011-07-25 17:38:09.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.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk-x86_64.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tcltk-x86_64.patch 25 Jul 2011 23:00:13 -0000 1.4
+++ tcltk-x86_64.patch 27 Jul 2011 15:06:50 -0000 1.5
@@ -61,47 +61,6 @@
: ${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
@@ -147,45 +106,3 @@
: ${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@'
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
