[pkgsrc/trunk]: pkgsrc/lang Make tcl-tclX and tk-tclX use Tcl/Tk 8.4. Bump P...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang Make tcl-tclX and tk-tclX use Tcl/Tk 8.4. Bump P...
From: minskim <minskim%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:45:20 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/98100ee556ab
branches:  trunk
changeset: 471173:98100ee556ab
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Mar 20 19:28:52 2004 +0000

description:
Make tcl-tclX and tk-tclX use Tcl/Tk 8.4.  Bump PKGREVISION.
While here, update HOMEPAGE.

diffstat:

 lang/tcl-tclX/Makefile         |  28 +++++++++++++++++++---------
 lang/tcl-tclX/buildlink2.mk    |  21 +++++++++++++++++++++
 lang/tcl-tclX/distinfo         |   5 +++--
 lang/tcl-tclX/patches/patch-ab |   4 ++--
 lang/tcl-tclX/patches/patch-ah |  15 +++++++++++++++
 lang/tk-tclX/Makefile          |  40 +++++++++++++++++++++++++---------------
 lang/tk-tclX/distinfo          |   5 +++--
 7 files changed, 88 insertions(+), 30 deletions(-)

diffs (242 lines):

diff -r f9138f50b998 -r 98100ee556ab lang/tcl-tclX/Makefile
--- a/lang/tcl-tclX/Makefile    Sat Mar 20 19:28:46 2004 +0000
+++ b/lang/tcl-tclX/Makefile    Sat Mar 20 19:28:52 2004 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.16 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/20 19:28:52 minskim Exp $
 #
 
 DISTNAME=      tclX8.2.0
 PKGNAME=       tcl-tclX-8.2.0
+PKGREVISION=   1
 CATEGORIES=    lang tcl
 MASTER_SITES=  ftp://ftp.neosoft.com/pub/tcl/TclX/
 
 MAINTAINER=    jwise%NetBSD.org@localhost
-HOMEPAGE=      http://www.neosoft.com/TclX/
+HOMEPAGE=      http://tclx.sourceforge.net/
 COMMENT=       Extended Tcl (TclX), a set of Tcl extensions for system programming
 
 CONFLICTS+=    tclX-[0-9]*
@@ -16,20 +17,30 @@
 USE_BUILDLINK2=                yes
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-shared --with-tcl=${PREFIX}/lib --enable-tk=NO
+CONFIGURE_ARGS+=       --enable-shared \
+                       --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
+                       --enable-tk=NO
 TEST_TARGET=           test
 
-CONFIGURE_ENV+=                \
-       PKGSRC_TCL_SRC_DIR="${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4"
+PKGSRC_TCL_SRC_DIR=    ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.4.6
+CONFIGURE_ENV+=                PKGSRC_TCL_SRC_DIR="${PKGSRC_TCL_SRC_DIR}"
 
 MAKE_ENV+=             GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \
                        SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \
                        SHAREGRP=${SHAREGRP}
 
+SUBST_CLASSES+=                paths
+SUBST_MESSAGE.paths=   "Fixing Tcl library names."
+SUBST_STAGE.paths=     post-patch
+SUBST_FILES.paths=     ${WRKSRC}/../tcl/unix/Makefile.in
+SUBST_SED.paths=       -e 's,ltcl83,ltcl,g'
+
+.include "../../lang/tcl/buildlink2.mk"
+
 post-extract:
        @${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n
-       @if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4 ]; then  \
-               cd ../../lang/tcl83 && ${MAKE} extract;                 \
+       @if [ ! -e ${PKGSRC_TCL_SRC_DIR} ]; then        \
+               cd ../../lang/tcl && ${MAKE} extract;                   \
        fi
 
 post-build:
@@ -45,7 +56,6 @@
 # so...
 
 pre-clean:
-       @cd ../../lang/tcl83 && ${MAKE} clean
+       @cd ../../lang/tcl && ${MAKE} clean
 
-.include "../../lang/tcl83/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f9138f50b998 -r 98100ee556ab lang/tcl-tclX/buildlink2.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/tcl-tclX/buildlink2.mk       Sat Mar 20 19:28:52 2004 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.1 2004/03/20 19:28:52 minskim Exp $
+
+.if !defined(TCL_TCLX_BUILDLINK2_MK)
+TCL_TCLX_BUILDLINK2_MK=        # defined
+
+BUILDLINK_PACKAGES+=           tcl-tclX
+BUILDLINK_DEPENDS.tcl-tclX?=   tcl-tclX>=8.2.0nb1
+BUILDLINK_PKGSRCDIR.tcl-tclX?= ../../lang/tcl-tclX
+
+EVAL_PREFIX+=  BUILDLINK_PREFIX.tcl-tclX=tcl-tclX
+BUILDLINK_PREFIX.tcl-tclX_DEFAULT=     ${LOCALBASE}
+BUILDLINK_FILES.tcl-tclX+=     include/*.h
+BUILDLINK_FILES.tcl-tclX+=     lib/libtclx82.*
+
+.include "../../lang/tcl/buildlink2.mk"
+
+BUILDLINK_TARGETS+=    tcl-tclX-buildlink
+
+tcl-tclX-buildlink: _BUILDLINK_USE
+
+.endif # TCL_TCLX_BUILDLINK2_MK
diff -r f9138f50b998 -r 98100ee556ab lang/tcl-tclX/distinfo
--- a/lang/tcl-tclX/distinfo    Sat Mar 20 19:28:46 2004 +0000
+++ b/lang/tcl-tclX/distinfo    Sat Mar 20 19:28:52 2004 +0000
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.4 2001/04/27 09:16:18 skrll Exp $
+$NetBSD: distinfo,v 1.5 2004/03/20 19:28:52 minskim Exp $
 
 SHA1 (tclX8.2.0.tar.gz) = 51295ad001d9d057e4ec2f13016f6aa4111fdd28
 Size (tclX8.2.0.tar.gz) = 721198 bytes
 SHA1 (patch-aa) = 47eb7e69e714a8bccf862c5115f6694c3b213881
-SHA1 (patch-ab) = cfda1a17f27f4b12d31a069032a98739bd31a244
+SHA1 (patch-ab) = da32caa8d65643f2159496ef016ce68b3f304e9e
 SHA1 (patch-ac) = 10f778e6a8336ff41164e2f089ac8ad7c8d5ccdb
 SHA1 (patch-ad) = 252a21da464267d7c7d45e168a89b29a40273359
 SHA1 (patch-ae) = a43144f37706245779362026073e09d8505a3d3f
 SHA1 (patch-af) = 5b68c6ea909437c66dad60bf7b330805d854baca
 SHA1 (patch-ag) = 6c8876699bfe325b3370bb554d4727e05fc64b8b
+SHA1 (patch-ah) = 8283f991ccc4f1cf35e9e100596bfbdf54157ad2
diff -r f9138f50b998 -r 98100ee556ab lang/tcl-tclX/patches/patch-ab
--- a/lang/tcl-tclX/patches/patch-ab    Sat Mar 20 19:28:46 2004 +0000
+++ b/lang/tcl-tclX/patches/patch-ab    Sat Mar 20 19:28:52 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/09/06 16:40:05 jwise Exp $
+$NetBSD: patch-ab,v 1.2 2004/03/20 19:28:52 minskim Exp $
 --- ../tcl/unix/Makefile.in.orig       Sun Feb  6 19:53:59 2000
 +++ ../tcl/unix/Makefile.in    Tue Sep  5 19:23:03 2000
 @@ -142,30 +142,23 @@
@@ -73,7 +73,7 @@
 +      -${BSD_INSTALL_DATA_DIR}  ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
 +      ${BSD_INSTALL_DATA} ${TCLX_GENERIC_DIR}/tclExtend.h ${INSTALL_ROOT}${TCLX_INST_INCL}
 +      ${BSD_INSTALL_DATA} ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
-+      ${BSD_INSTALL_DATA_DIR} ${HELP_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
++      ${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
 +      cd ${HELP_DIR} && ${GTAR} cf - . | (cd ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help && ${GTAR} xf -)
 +      ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
  
diff -r f9138f50b998 -r 98100ee556ab lang/tcl-tclX/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/tcl-tclX/patches/patch-ah    Sat Mar 20 19:28:52 2004 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2004/03/20 19:28:52 minskim Exp $
+
+--- ../tk/generic/tkXshell.c.orig      2000-02-06 18:54:00.000000000 -0600
++++ ../tk/generic/tkXshell.c
+@@ -84,8 +84,8 @@ Tcl_ThreadDataKey dataKey;
+ extern int            isatty _ANSI_ARGS_((int fd));
+ extern char *         strrchr _ANSI_ARGS_((CONST char *string, int c));
+ #endif
+-extern void           TkpDisplayWarning _ANSI_ARGS_((char *msg,
+-                          char *title));
++extern void           TkpDisplayWarning _ANSI_ARGS_((CONST char *msg,
++                          CONST char *title));
+ 
+ #ifndef TKX_SHELL
+ /*
diff -r f9138f50b998 -r 98100ee556ab lang/tk-tclX/Makefile
--- a/lang/tk-tclX/Makefile     Sat Mar 20 19:28:46 2004 +0000
+++ b/lang/tk-tclX/Makefile     Sat Mar 20 19:28:52 2004 +0000
@@ -1,31 +1,31 @@
-# $NetBSD: Makefile,v 1.15 2004/03/08 20:27:14 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/20 19:28:52 minskim Exp $
 #
 
 DISTNAME=      tclX8.2.0
 PKGNAME=       tk-tclX-8.2.0
+PKGREVISION=   1
 CATEGORIES=    lang tcl tk
 MASTER_SITES=  ftp://ftp.neosoft.com/pub/tcl/TclX/
 
 MAINTAINER=    jwise%NetBSD.org@localhost
-HOMEPAGE=      http://www.neosoft.com/TclX/
+HOMEPAGE=      http://tclx.sourceforge.net/
 COMMENT=       Extended Tcl (TclX), a set of Tcl extensions for system programming
 
-DEPENDS+=      tk>=8.3.4:../../x11/tk83
-DEPENDS+=      tcl-tclX-8.2.0:../../lang/tcl-tclX
-
 CONFLICTS+=    tclX-[0-9]*
 
 WRKSRC=                ${WRKDIR}/tclX8.2.0/unix
+USE_BUILDLINK2=                yes
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-shared --with-tcl=${PREFIX}/lib \
-                       --with-tk=${PREFIX}/lib
+CONFIGURE_ARGS+=       --enable-shared \
+                       --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
+                       --with-tk=${BUILDLINK_PREFIX.tk}/lib
 TEST_DIRS=             ${WRKSRC}/../tk/unix
 TEST_TARGET=           test
 
 CONFIGURE_ENV+=                \
-       PKGSRC_TCL_SRC_DIR="${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4" \
-       PKGSRC_TK_SRC_DIR="${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.4"
+       PKGSRC_TCL_SRC_DIR="${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.4.6" \
+       PKGSRC_TK_SRC_DIR="${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.4.6"
 
 MAKE_ENV+=             GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \
                        SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \
@@ -34,18 +34,28 @@
 FILESDIR=      ${.CURDIR}/../../lang/tcl-tclX/files
 PATCHDIR=      ${.CURDIR}/../../lang/tcl-tclX/patches
 
+SUBST_CLASSES+=                paths
+SUBST_MESSAGE.paths=   "Fixing Tcl/Tk library names."
+SUBST_STAGE.paths=     post-patch
+SUBST_FILES.paths=     ${WRKSRC}/../tk/unix/Makefile.in
+SUBST_SED.paths=       -e 's,ltcl83,ltcl,g' -e 's,ltk83,ltk,g'
+
+.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl-tclX/buildlink2.mk"
+.include "../../x11/tk/buildlink2.mk"
+
 post-extract:
        ${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n
-       @if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4 ]; then  \
-               cd ../../lang/tcl83 && ${MAKE} extract;                 \
+       @if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.4.6 ]; then  \
+               cd ../../lang/tcl && ${MAKE} extract;                   \
        fi
-       @if [ ! -e ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.4 ]; then     \
-               cd ../../x11/tk83 && ${MAKE} extract;                   \
+       @if [ ! -e ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.4.6 ]; then     \
+               cd ../../x11/tk && ${MAKE} extract;                     \
        fi
 
 pre-clean:
-       @cd ../../lang/tcl83 && ${MAKE} clean
-       @cd ../../x11/tk83 && ${MAKE} clean
+       @cd ../../lang/tcl && ${MAKE} clean
+       @cd ../../x11/tk && ${MAKE} clean
 
 do-build:
        @cd ${WRKSRC}/../tk/unix && ${MAKE_ENV} ${MAKE}
diff -r f9138f50b998 -r 98100ee556ab lang/tk-tclX/distinfo
--- a/lang/tk-tclX/distinfo     Sat Mar 20 19:28:46 2004 +0000
+++ b/lang/tk-tclX/distinfo     Sat Mar 20 19:28:52 2004 +0000
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.3 2001/04/27 09:16:19 skrll Exp $
+$NetBSD: distinfo,v 1.4 2004/03/20 19:28:52 minskim Exp $
 
 SHA1 (tclX8.2.0.tar.gz) = 51295ad001d9d057e4ec2f13016f6aa4111fdd28
 Size (tclX8.2.0.tar.gz) = 721198 bytes
 SHA1 (patch-aa) = 47eb7e69e714a8bccf862c5115f6694c3b213881
-SHA1 (patch-ab) = cfda1a17f27f4b12d31a069032a98739bd31a244
+SHA1 (patch-ab) = da32caa8d65643f2159496ef016ce68b3f304e9e
 SHA1 (patch-ac) = 10f778e6a8336ff41164e2f089ac8ad7c8d5ccdb
 SHA1 (patch-ad) = 252a21da464267d7c7d45e168a89b29a40273359
 SHA1 (patch-ae) = a43144f37706245779362026073e09d8505a3d3f
 SHA1 (patch-af) = 5b68c6ea909437c66dad60bf7b330805d854baca
 SHA1 (patch-ag) = 6c8876699bfe325b3370bb554d4727e05fc64b8b
+SHA1 (patch-ah) = 8283f991ccc4f1cf35e9e100596bfbdf54157ad2
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note updates of tcl-tclX and tk-tclX to 8.2.0nb1.
Next by Date: [pkgsrc/trunk]: pkgsrc/net/iftop Convert to bl3 now that ncurses/builtin.mk h...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note updates of tcl-tclX and tk-tclX to 8.2.0nb1.
Next by Thread: [pkgsrc/trunk]: pkgsrc/net/iftop Convert to bl3 now that ncurses/builtin.mk h...
Indexes:
Home | Main Index | Thread Index | Old Index