summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam>2000-12-11 16:40:42 +0000
committerjlam <jlam>2000-12-11 16:40:42 +0000
commit5b55155411d58bfc9192ec9ebdbda8d89d459883 (patch)
treef5d9b4bfe1b5b3c3b2f6845de8e0915a05e8e0e1 /x11
parent92ab044a302d63ada1435ab0830f30c5b2ba2ac7 (diff)
downloadpkgsrc-5b55155411d58bfc9192ec9ebdbda8d89d459883.tar.gz
Honor CFLAGS passed in from environment during build.
Diffstat (limited to 'x11')
-rw-r--r--x11/tk/files/patch-sum4
-rw-r--r--x11/tk/patches/patch-aa16
2 files changed, 15 insertions, 5 deletions
diff --git a/x11/tk/files/patch-sum b/x11/tk/files/patch-sum
index 595b2d6eed8..0da7011c800 100644
--- a/x11/tk/files/patch-sum
+++ b/x11/tk/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/09/01 16:22:00 jwise Exp $
+$NetBSD: patch-sum,v 1.5 2000/12/11 16:40:42 jlam Exp $
-MD5 (patch-aa) = 690f5a3a425aac23641fed8932249f76
+MD5 (patch-aa) = da1dd0584fac838fcef56f2cc85db2fe
MD5 (patch-ab) = f84101d9150c16b95154485e6335372f
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index 5df58195a48..8bac842bde7 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2000/09/01 16:22:00 jwise Exp $
---- Makefile.in.orig Mon Aug 28 23:29:09 2000
-+++ Makefile.in Mon Aug 28 23:34:09 2000
+$NetBSD: patch-aa,v 1.3 2000/12/11 16:40:43 jlam Exp $
+
+--- Makefile.in.orig Tue Aug 8 15:19:31 2000
++++ Makefile.in
@@ -76,7 +76,7 @@
# The directory containing the Tcl sources and headers appropriate
# for this version of Tk ("srcdir" will be replaced or has already
@@ -10,6 +11,15 @@ $NetBSD: patch-aa,v 1.2 2000/09/01 16:22:00 jwise Exp $
# The directory containing the Tcl library archive file appropriate
# for this version of Tk:
+@@ -100,7 +100,7 @@
+ #CFLAGS = $(CFLAGS_DEBUG)
+ #CFLAGS = $(CFLAGS_OPTIMIZE)
+ #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+-CFLAGS = @CFLAGS@
++CFLAGS += @CFLAGS@
+
+ # A "-I" switch that can be used when compiling to make all of the
+ # X11 include files accessible (the configure script will try to
@@ -154,8 +154,8 @@
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.