diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/tcl-tclX/Makefile | 16 | ||||
| -rw-r--r-- | lang/tcl-tclX/distinfo | 6 | ||||
| -rw-r--r-- | lang/tcl-tclX/patches/patch-aa | 7 | ||||
| -rw-r--r-- | lang/tcl-tclX/patches/patch-ac | 19 |
4 files changed, 35 insertions, 13 deletions
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile index 3fc48dddece..a1bbdfac78d 100644 --- a/lang/tcl-tclX/Makefile +++ b/lang/tcl-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:35 agc Exp $ +# $NetBSD: Makefile,v 1.5 2001/04/26 07:17:40 skrll Exp $ # DISTNAME= tclX8.2.0 @@ -25,7 +25,16 @@ MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ WRKSRC= ${WRKDIR}/tclX8.2.0/unix post-extract: - ${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n + @${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n + @if [ ! -e ${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ + cd ../../lang/tcl && ${MAKE} extract; \ + fi + +post-patch: + @${MV} ${WRKSRC}/configure ${WRKSRC}/configure.tmp + @${SED} -e 's:@PKGSRC_TCL_SRC_DIR@:${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2:g' \ + ${WRKSRC}/configure.tmp > ${WRKSRC}/configure + @${CHMOD} a+x ${WRKSRC}/configure post-build: cd ${WRKSRC}/../tcl/unix && ${MAKE_ENV} ${MAKE} buildhelp @@ -39,6 +48,9 @@ post-install: # we don't want to modify the man page, as it is also used by ../tk-tclX, # so... +pre-clean: + @cd ../../lang/tcl && ${MAKE} clean + test: @(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} test) diff --git a/lang/tcl-tclX/distinfo b/lang/tcl-tclX/distinfo index 1efbe7e4d85..2b4378c2fd3 100644 --- a/lang/tcl-tclX/distinfo +++ b/lang/tcl-tclX/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 15:01:00 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/04/26 07:17:41 skrll Exp $ SHA1 (tclX8.2.0.tar.gz) = 51295ad001d9d057e4ec2f13016f6aa4111fdd28 Size (tclX8.2.0.tar.gz) = 721198 bytes -SHA1 (patch-aa) = e12481d4b9318d9e57be0d16b8083247a22122e8 +SHA1 (patch-aa) = 47eb7e69e714a8bccf862c5115f6694c3b213881 SHA1 (patch-ab) = cfda1a17f27f4b12d31a069032a98739bd31a244 -SHA1 (patch-ac) = 1a7eee5daadc3447f772230422282d12149fbdf7 +SHA1 (patch-ac) = e31cbafcf1d65e634653ed881b675868c827eeb6 SHA1 (patch-ad) = 252a21da464267d7c7d45e168a89b29a40273359 SHA1 (patch-ae) = a43144f37706245779362026073e09d8505a3d3f SHA1 (patch-af) = aae38769aa1dce905088264613198251bd2290a7 diff --git a/lang/tcl-tclX/patches/patch-aa b/lang/tcl-tclX/patches/patch-aa index e81559b4033..71a05bc56e5 100644 --- a/lang/tcl-tclX/patches/patch-aa +++ b/lang/tcl-tclX/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/09/06 16:40:03 jwise Exp $ ---- Common.mk.in.orig Sun Feb 6 19:54:02 2000 -+++ Common.mk.in Tue Sep 5 16:28:43 2000 +$NetBSD: patch-aa,v 1.2 2001/04/26 07:17:41 skrll Exp $ + +--- Common.mk.in.orig Mon Feb 7 00:54:02 2000 ++++ Common.mk.in @@ -36,7 +36,8 @@ #------------------------------------------------------------------------------ # Programs and options used by build diff --git a/lang/tcl-tclX/patches/patch-ac b/lang/tcl-tclX/patches/patch-ac index da971337b27..e4c4cad4822 100644 --- a/lang/tcl-tclX/patches/patch-ac +++ b/lang/tcl-tclX/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/09/06 16:40:05 jwise Exp $ ---- configure.orig Sun Feb 6 19:54:02 2000 -+++ configure Tue Sep 5 14:14:35 2000 -@@ -1984,7 +1984,7 @@ +$NetBSD: patch-ac,v 1.2 2001/04/26 07:17:41 skrll Exp $ + +--- configure.orig Mon Feb 7 00:54:02 2000 ++++ configure +@@ -784,6 +784,7 @@ + echo "$ac_t""file not found" 1>&6 + fi + ++TCL_SRC_DIR=@PKGSRC_TCL_SRC_DIR@ + # + # The eval is required to do the TCL_DBGX substitution in the + # TCL_LIB_FILE variable +@@ -1984,7 +1985,7 @@ DL_LIBS="" LDFLAGS="" LD_SEARCH_FLAGS="" @@ -10,7 +19,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/09/06 16:40:05 jwise Exp $ else echo "$ac_t""no" 1>&6 -@@ -2509,11 +2509,7 @@ +@@ -2509,11 +2510,7 @@ # # Determine suffix to use for the object files for the shared library. # |