summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-01-05 11:17:10 +0000
committerjlam <jlam@pkgsrc.org>2004-01-05 11:17:10 +0000
commit2c03f435c837dcfa10f204128f2c33465a17cefb (patch)
tree0376c3e6dc6e2c84e788f7b7470da2a462f95a78 /x11
parent88bdf50ea4d5a9d2cfa2a160bbcd011e9becd5e2 (diff)
downloadpkgsrc-2c03f435c837dcfa10f204128f2c33465a17cefb.tar.gz
bl3ify
Diffstat (limited to 'x11')
-rw-r--r--x11/tk/Makefile8
-rw-r--r--x11/tk/distinfo4
-rw-r--r--x11/tk/patches/patch-aa4
3 files changed, 9 insertions, 7 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 6a32ae72c42..65521e60939 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/07/17 22:56:46 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/05 11:24:18 jlam Exp $
DISTNAME= tk8.3.4
PKGNAME= tk-8.3.4
@@ -11,13 +11,15 @@ MAINTAINER= jwise@NetBSD.org
HOMEPAGE= http://www.tcltk.com/
COMMENT= Graphical toolkit for TCL
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
MAKE_ENV+= TOUCH="${TOUCH}"
USE_X11= yes
USE_LIBTOOL= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
TEST_TARGET= test
# Initially install the man pages into ${WRKDIR}/man, as we need a staged
@@ -84,5 +86,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixInt.h ${PREFIX}/include/tk/unix
${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixPort.h ${PREFIX}/include/tk/unix
-.include "../../lang/tcl/buildlink2.mk"
+.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 5c2643216ee..a4666c37057 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2003/03/16 18:37:43 jschauma Exp $
+$NetBSD: distinfo,v 1.11 2004/01/05 11:24:18 jlam Exp $
SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2
Size (tk8.3.4.tar.gz) = 2589635 bytes
-SHA1 (patch-aa) = 49fe346ebad9b4ded0f0c64727cea3cf22655678
+SHA1 (patch-aa) = 213c82956f692cc493215e222c08da76cf18841e
SHA1 (patch-ab) = b99c7a48dc525a45305ad6265735de56df4b5d9c
SHA1 (patch-ac) = 172762efa65eb05345d70cf38893bc96b56a2481
SHA1 (patch-ad) = 1815fc19986674cb2ea03a8d60cd1514ff47fba9
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index 7f0704cebd2..0884684df04 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2001/12/23 17:11:30 bjoern Exp $
+$NetBSD: patch-aa,v 1.8 2004/01/05 11:24:18 jlam Exp $
--- Makefile.in.orig Sat Oct 20 02:24:40 2001
+++ Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.7 2001/12/23 17:11:30 bjoern 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 = ${BUILDLINK_DIR}/include/tcl/generic
++TCL_GENERIC_DIR = $(TCL_BIN_DIR)/../include/tcl/generic
# The directory containing the Tcl library archive file appropriate
# for this version of Tk: