pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/tcl83 PKG_DESTDIR_SUPPORT
details: https://anonhg.NetBSD.org/pkgsrc/rev/995287ae3d27
branches: trunk
changeset: 568742:995287ae3d27
user: abs <abs%pkgsrc.org@localhost>
date: Thu Dec 17 18:35:26 2009 +0000
description:
PKG_DESTDIR_SUPPORT
diffstat:
lang/tcl83/Makefile | 40 +++++++++++++++---------------
lang/tcl83/distinfo | 14 +++++-----
lang/tcl83/patches/patch-aa | 13 ++++++++-
lang/tcl83/patches/patch-ab | 57 ++++++++++++++++++--------------------------
lang/tcl83/patches/patch-ac | 4 +-
lang/tcl83/patches/patch-ae | 16 ++++++------
lang/tcl83/patches/patch-af | 30 +++++++++++-----------
lang/tcl83/patches/patch-ag | 4 +-
8 files changed, 89 insertions(+), 89 deletions(-)
diffs (truncated from 513 to 300 lines):
diff -r eb1f5ca9336c -r 995287ae3d27 lang/tcl83/Makefile
--- a/lang/tcl83/Makefile Thu Dec 17 18:23:14 2009 +0000
+++ b/lang/tcl83/Makefile Thu Dec 17 18:35:26 2009 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2009/08/20 15:24:59 jwise Exp $
+# $NetBSD: Makefile,v 1.19 2009/12/17 18:35:26 abs Exp $
#
DISTNAME= tcl8.3.4
PKGNAME= tcl-8.3.4
PKGREVISION= 2
CATEGORIES= lang
-MASTER_SITES= ftp://ftp.funet.fi/pub/languages/tcl/tcl/tcl8_3/
+MASTER_SITES= ftp://ftp.funet.fi/pub/languages/tcl/tcl/tcl8_3/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.tcltk.com/
@@ -28,6 +28,9 @@
# Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages.
CONFIGURE_ENV+= TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+= include/tcl/unix include/tcl/generic
+
.include "../../mk/bsd.prefs.mk"
# NetBSD-1.5.x-m68k platforms apparently have a compiler optimization bug
@@ -45,7 +48,7 @@
# linked to a longer filename.
#
post-patch:
- @cd ${WRKSRC}/unix; \
+ cd ${WRKSRC}/unix; \
${MV} -f mkLinks mkLinks.tmp; \
${GREP} -v "^exit 0" mkLinks.tmp > mkLinks; \
${CAT} mkLinks.tmp \
@@ -70,22 +73,19 @@
${MV} ${WRKSRC}/tclConfig.sh.tmp ${WRKSRC}/unix/tclConfig.sh
post-install:
- cd ${PREFIX}/bin && ${LN} -s tclsh8.3 tclsh
- ${INSTALL_DATA_DIR} ${PREFIX}/include/tcl
- ${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/unix
- ${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/unix/tclUnixPort.h ${PREFIX}/include/tcl/unix
- ${INSTALL_DATA} ${WRKSRC}/generic/tcl.h ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tclCompile.h ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tclDecls.h ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tclIO.h ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tclInitScript.h ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tclInt.h ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tclIntDecls.h ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tclIntPlatDecls.h ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tclMath.h ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tclPlatDecls.h ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tclPort.h ${PREFIX}/include/tcl/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tclRegexp.h ${PREFIX}/include/tcl/generic
+ cd ${DESTDIR}${PREFIX}/bin && ${LN} -s tclsh8.3 tclsh
+ ${INSTALL_DATA} ${WRKSRC}/unix/tclUnixPort.h ${DESTDIR}${PREFIX}/include/tcl/unix
+ ${INSTALL_DATA} ${WRKSRC}/generic/tcl.h ${DESTDIR}${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tclCompile.h ${DESTDIR}${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tclDecls.h ${DESTDIR}${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tclIO.h ${DESTDIR}${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tclInitScript.h ${DESTDIR}${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tclInt.h ${DESTDIR}${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tclIntDecls.h ${DESTDIR}${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tclIntPlatDecls.h ${DESTDIR}${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tclMath.h ${DESTDIR}${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tclPlatDecls.h ${DESTDIR}${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tclPort.h ${DESTDIR}${PREFIX}/include/tcl/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tclRegexp.h ${DESTDIR}${PREFIX}/include/tcl/generic
.include "../../mk/bsd.pkg.mk"
diff -r eb1f5ca9336c -r 995287ae3d27 lang/tcl83/distinfo
--- a/lang/tcl83/distinfo Thu Dec 17 18:23:14 2009 +0000
+++ b/lang/tcl83/distinfo Thu Dec 17 18:35:26 2009 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2007/10/27 15:16:52 hubertf Exp $
+$NetBSD: distinfo,v 1.7 2009/12/17 18:35:26 abs Exp $
SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec
RMD160 (tcl8.3.4.tar.gz) = 1840927939f9bbc4c48a53f256212f26c164e517
Size (tcl8.3.4.tar.gz) = 2654756 bytes
-SHA1 (patch-aa) = 36e3e635b5f70b658c7151254cf02529611a3120
-SHA1 (patch-ab) = 1f717fcab6ddce1023ad889fabc049b4a950912e
-SHA1 (patch-ac) = b01dc7dbe9b9bd92de4792b74a25b01e33ad4bb9
-SHA1 (patch-ae) = a2d8477c6b2f80700876128e14e39afdb4e5504b
-SHA1 (patch-af) = 96f10a1cf1340362ede4eee6327fe44f6b9f9bb3
-SHA1 (patch-ag) = a4bc4fe104890a874463df5b2795499f871dd1ba
+SHA1 (patch-aa) = 7d6a122753bb277dfb9614ea57436c317cd3d412
+SHA1 (patch-ab) = b98391bfc0642eb2562383482d028826824444c6
+SHA1 (patch-ac) = 35ec24f9cc18bdea9c596bb58bccaddd807d47c2
+SHA1 (patch-ae) = b1f2fea3397c8377290a1e74de5b86ca5ce526b0
+SHA1 (patch-af) = 8e701b8f30974037d1147cd25fd6478d35f9d78b
+SHA1 (patch-ag) = ecab865e47fd46a778b37346d009a01bdcc54dc5
diff -r eb1f5ca9336c -r 995287ae3d27 lang/tcl83/patches/patch-aa
--- a/lang/tcl83/patches/patch-aa Thu Dec 17 18:23:14 2009 +0000
+++ b/lang/tcl83/patches/patch-aa Thu Dec 17 18:35:26 2009 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2005/11/04 09:56:09 rillig Exp $
+$NetBSD: patch-aa,v 1.4 2009/12/17 18:35:26 abs Exp $
---- unix/Makefile.in.orig 2001-10-20 10:24:15.000000000 +1000
+--- unix/Makefile.in.orig 2001-10-20 00:24:15.000000000 +0000
+++ unix/Makefile.in
+@@ -35,7 +35,7 @@ mandir = @mandir@
+ # to be different than those used for actually reference files at
+ # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
+ # when installing files.
+-INSTALL_ROOT =
++INSTALL_ROOT = $(DESTDIR)
+
+ # Path for the platform independent Tcl scripting libraries:
+ TCL_LIBRARY = $(prefix)/lib/tcl$(VERSION)
@@ -87,7 +87,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
diff -r eb1f5ca9336c -r 995287ae3d27 lang/tcl83/patches/patch-ab
--- a/lang/tcl83/patches/patch-ab Thu Dec 17 18:23:14 2009 +0000
+++ b/lang/tcl83/patches/patch-ab Thu Dec 17 18:35:26 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
+$NetBSD: patch-ab,v 1.6 2009/12/17 18:35:27 abs Exp $
---- unix/configure.orig 2001-10-20 02:24:15.000000000 +0200
-+++ unix/configure 2007-10-27 16:52:15.000000000 +0200
-@@ -4719,7 +4719,7 @@
+--- unix/configure.orig 2001-10-20 00:24:15.000000000 +0000
++++ unix/configure
+@@ -4719,7 +4719,7 @@ echo "configure:4710: checking system ve
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
@@ -11,7 +11,7 @@
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
-@@ -4776,6 +4776,7 @@
+@@ -4776,6 +4776,7 @@ fi
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
@@ -19,7 +19,7 @@
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -5114,6 +5115,9 @@
+@@ -5114,6 +5115,9 @@ fi
LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
EXTRA_CFLAGS=""
LDFLAGS=""
@@ -29,7 +29,7 @@
;;
IRIX-6.*|IRIX64-6.5*)
SHLIB_CFLAGS=""
-@@ -5138,6 +5142,9 @@
+@@ -5138,6 +5142,9 @@ fi
esac
LDFLAGS="-n32"
fi
@@ -39,7 +39,7 @@
;;
IRIX64-6.*)
SHLIB_CFLAGS=""
-@@ -5148,6 +5155,9 @@
+@@ -5148,6 +5155,9 @@ fi
DL_LIBS=""
LDFLAGS=""
LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -49,7 +49,7 @@
;;
Linux*)
SHLIB_CFLAGS="-fPIC"
-@@ -5221,6 +5231,9 @@
+@@ -5221,6 +5231,9 @@ fi
EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
fi
@@ -59,7 +59,7 @@
;;
GNU*)
SHLIB_CFLAGS="-fPIC"
-@@ -5298,6 +5311,9 @@
+@@ -5298,6 +5311,9 @@ fi
LD_SEARCH_FLAGS=""
;;
NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
@@ -69,7 +69,7 @@
# Not available on all versions: check for include file.
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -5330,17 +5346,15 @@
+@@ -5330,17 +5346,15 @@ if eval "test \"`echo '$ac_cv_header_'$a
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
@@ -89,7 +89,7 @@
#include "confdefs.h"
#ifdef __ELF__
-@@ -5351,11 +5365,20 @@
+@@ -5351,11 +5365,20 @@ EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
@@ -112,7 +112,7 @@
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
fi
-@@ -5383,7 +5406,7 @@
+@@ -5383,7 +5406,7 @@ fi
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
@@ -121,7 +121,7 @@
# FreeBSD 3.* and greater have ELF.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="ld -Bshareable -x"
-@@ -5401,7 +5424,7 @@
+@@ -5401,7 +5424,7 @@ fi
Rhapsody-*|Darwin-*)
SHLIB_CFLAGS="-fno-common"
SHLIB_LD="cc -dynamiclib \${LDFLAGS}"
@@ -130,7 +130,7 @@
SHLIB_LD_LIBS="${LIBS}"
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"
-@@ -5410,6 +5433,9 @@
+@@ -5410,6 +5433,9 @@ fi
LD_SEARCH_FLAGS=""
CFLAGS_OPTIMIZE="-O3"
EXTRA_CFLAGS="-arch ppc -pipe"
@@ -140,7 +140,7 @@
;;
NEXTSTEP-*)
SHLIB_CFLAGS=""
-@@ -5569,6 +5595,9 @@
+@@ -5569,6 +5595,9 @@ EOF
DL_LIBS="-ldl"
LDFLAGS=""
LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -150,7 +150,7 @@
;;
SunOS-5*)
-@@ -5616,6 +5645,9 @@
+@@ -5616,6 +5645,9 @@ EOF
else
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -160,7 +160,7 @@
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -5858,7 +5890,7 @@
+@@ -5858,7 +5890,7 @@ fi
;;
IRIX*)
;;
@@ -169,7 +169,7 @@
;;
Rhapsody-*|Darwin-*)
;;
-@@ -6016,7 +6048,7 @@
+@@ -6016,7 +6048,7 @@ echo "configure:6008: checking FIONBIO v
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
@@ -178,7 +178,7 @@
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
-@@ -6103,7 +6135,7 @@
+@@ -6103,7 +6135,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
else
@@ -187,7 +187,7 @@
fi
else
case $system in
-@@ -6141,7 +6173,7 @@
+@@ -6141,7 +6173,7 @@ if test "$SHARED_BUILD" = "0" -o $TCL_NE
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
fi
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -196,7 +196,7 @@
else
TCL_BUILD_EXP_FILE="lib.exp"
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -6171,10 +6203,17 @@
+@@ -6171,10 +6203,17 @@ VERSION=${TCL_VERSION}
#--------------------------------------------------------------------
if test "$prefix" != "$exec_prefix"; then
@@ -216,7 +216,7 @@
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
-@@ -6262,6 +6301,8 @@
Home |
Main Index |
Thread Index |
Old Index