diff options
Diffstat (limited to 'lang/tk-tclX')
-rw-r--r-- | lang/tk-tclX/Makefile | 40 | ||||
-rw-r--r-- | lang/tk-tclX/distinfo | 5 |
2 files changed, 28 insertions, 17 deletions
diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile index 5433d0c8285..443f3fa9b4e 100644 --- a/lang/tk-tclX/Makefile +++ b/lang/tk-tclX/Makefile @@ -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 -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 @@ MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ 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 --git a/lang/tk-tclX/distinfo b/lang/tk-tclX/distinfo index bbb1b28c503..a81922be82c 100644 --- a/lang/tk-tclX/distinfo +++ b/lang/tk-tclX/distinfo @@ -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 |