diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-21 18:55:02 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-21 18:55:02 +0000 |
| commit | 5371ddc664e60b6e58b76e5618f33da6d8d38040 (patch) | |
| tree | 46e4bf173875e633303cf7ce2aa41188ba1e1924 /x11/tk | |
| parent | 9a286d8d0af00cf9906cac4406dbf750d806a7f4 (diff) | |
| download | pkgsrc-5371ddc664e60b6e58b76e5618f33da6d8d38040.tar.gz | |
Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.
Diffstat (limited to 'x11/tk')
| -rw-r--r-- | x11/tk/Makefile | 16 | ||||
| -rw-r--r-- | x11/tk/distinfo | 4 | ||||
| -rw-r--r-- | x11/tk/patches/patch-aa | 11 |
3 files changed, 13 insertions, 18 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 93785f98248..e2209477cff 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/05/24 02:58:29 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/21 18:55:02 jlam Exp $ DISTNAME= tk8.3.2 PKGNAME= tk-8.3.2nb1 @@ -10,15 +10,15 @@ MAINTAINER= jwise@netbsd.org HOMEPAGE= http://www.tcltk.com/ COMMENT= Graphical toolkit for TCL -DEPENDS+= tcl>=8.3.2:../../lang/tcl +.include "../../lang/tcl/buildlink.mk" -WRKSRC= ${WRKDIR}/${DISTNAME}/unix -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib +WRKSRC= ${WRKDIR}/${DISTNAME}/unix +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_DIR}/lib -USE_X11= yes - -USE_LIBTOOL= yes +USE_X11= yes +USE_BUILDLINK_ONLY= yes +USE_LIBTOOL= yes post-install: ${RM} -f ${PREFIX}/bin/wish diff --git a/x11/tk/distinfo b/x11/tk/distinfo index cf72e67e89f..d6fb4427d92 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/05/24 02:58:29 jlam Exp $ +$NetBSD: distinfo,v 1.4 2001/06/21 18:55:02 jlam Exp $ SHA1 (tk8.3.2.tar.gz) = a573d33fa76ca64a7148d3cc6b7b18906c311dab Size (tk8.3.2.tar.gz) = 2529172 bytes -SHA1 (patch-aa) = 0867d35fdc70dff1585552f07202d9da244f24db +SHA1 (patch-aa) = 24bff2ffec6ec9f528395db57387f1729d1ef2eb SHA1 (patch-ab) = 57af1fc87d4d5a901ae2bd0fd57c8ce0c751989a SHA1 (patch-ac) = 222832f6f71f9914f01f51a21b1366ca08aae96a SHA1 (patch-ad) = ec0c859b9561e94c9cbf7d9b78920fe2f0004329 diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa index e95456a2bca..e2dde770ad9 100644 --- a/x11/tk/patches/patch-aa +++ b/x11/tk/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2001/05/24 02:58:29 jlam Exp $ +$NetBSD: patch-aa,v 1.5 2001/06/21 18:55:02 jlam Exp $ --- Makefile.in.orig Tue Aug 8 15:19:31 2000 +++ Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.4 2001/05/24 02:58:29 jlam Exp $ # for this version of Tk ("srcdir" will be replaced or has already # been replaced by the configure script): -TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic -+TCL_GENERIC_DIR = ${PREFIX}/include/tcl/generic ++TCL_GENERIC_DIR = ${BUILDLINK_DIR}/include/tcl/generic # The directory containing the Tcl library archive file appropriate # for this version of Tk: @@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.4 2001/05/24 02:58:29 jlam Exp $ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ # Additional search flags needed to find the various shared libraries -@@ -233,11 +233,12 @@ +@@ -233,7 +233,8 @@ # either. #---------------------------------------------------------------- @@ -50,11 +50,6 @@ $NetBSD: patch-aa,v 1.4 2001/05/24 02:58:29 jlam Exp $ CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -I${UNIX_DIR} -I${GENERIC_DIR} \ ---I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \ -+-I${BMAP_DIR} -I${TCL_GENERIC_DIR} -I${PREFIX}/include ${X11_INCLUDES} \ - ${AC_FLAGS} ${PROTO_FLAGS} \ - ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS} - @@ -389,7 +390,7 @@ |