summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam>2001-06-21 20:16:26 +0000
committerjlam <jlam>2001-06-21 20:16:26 +0000
commit21b5aa699071f5d0db1f248b690858245aec4db9 (patch)
treeb84b1c80c3504129cb537ee6dc11195af91521b0 /x11
parentb75dd675494caa39c763e655ab181932a49b0847 (diff)
downloadpkgsrc-21b5aa699071f5d0db1f248b690858245aec4db9.tar.gz
Touch ${TK_LIB_FILE} during build so that it doesn't have to be re-linked
during installation.
Diffstat (limited to 'x11')
-rw-r--r--x11/tk/Makefile3
-rw-r--r--x11/tk/distinfo4
-rw-r--r--x11/tk/patches/patch-aa16
3 files changed, 16 insertions, 7 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index d470986c896..3c42947b830 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/21 19:40:47 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/21 20:16:26 jlam Exp $
DISTNAME= tk8.3.2
PKGNAME= tk-8.3.2nb1
@@ -13,6 +13,7 @@ COMMENT= Graphical toolkit for TCL
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_DIR}/lib
+MAKE_ENV+= TOUCH="${TOUCH}"
USE_X11= yes
USE_BUILDLINK_ONLY= yes
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index d6fb4427d92..f61a5dcba63 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/06/21 18:55:02 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/06/21 20:16:26 jlam Exp $
SHA1 (tk8.3.2.tar.gz) = a573d33fa76ca64a7148d3cc6b7b18906c311dab
Size (tk8.3.2.tar.gz) = 2529172 bytes
-SHA1 (patch-aa) = 24bff2ffec6ec9f528395db57387f1729d1ef2eb
+SHA1 (patch-aa) = 5f87e399acde1b912f0db1abda475fd1564eba06
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 e2dde770ad9..89f54ac80dd 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2001/06/21 18:55:02 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/06/21 20:16:27 jlam Exp $
--- Makefile.in.orig Tue Aug 8 15:19:31 2000
+++ Makefile.in
@@ -50,7 +50,15 @@ $NetBSD: patch-aa,v 1.5 2001/06/21 18:55:02 jlam Exp $
CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} \
-@@ -389,7 +390,7 @@
+@@ -371,6 +372,7 @@
+ rm -f ${TK_LIB_FILE}
+ @MAKE_LIB@
+ $(RANLIB) ${TK_LIB_FILE}
++ ${TOUCH} ${TK_LIB_FILE}
+
+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ rm -f ${STUB_LIB_FILE}
+@@ -389,7 +391,7 @@
wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
@@ -59,7 +67,7 @@ $NetBSD: patch-aa,v 1.5 2001/06/21 18:55:02 jlam Exp $
@TK_BUILD_LIB_SPEC@ \
$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish
-@@ -400,12 +401,12 @@
+@@ -400,12 +402,12 @@
make tcltest
tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE)
@@ -74,7 +82,7 @@ $NetBSD: patch-aa,v 1.5 2001/06/21 18:55:02 jlam Exp $
@TK_BUILD_LIB_SPEC@ \
$(WISH_LIBS) $(TK_LD_SEARCH_FLAGS) -lXt -o xttest
-@@ -456,7 +457,7 @@
+@@ -456,7 +458,7 @@
chmod +x $(UNIX_DIR)/mkLinks; \
fi
@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"