From 587856e7598a2ce882d9f1e1d26082c5da8ba05b Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Tue, 8 Jun 2004 17:52:22 +0000
Subject: Fix build.  The main binary was not beeing built properly because of
 missing library dependencies (caused by the tcl/tk update to 8.4).  Use
 tclConfig.sh to determine which libraries are really needed.  Noted in last
 kristerw@'s bulk build.

---
 cad/tkgate/Makefile         |  5 ++++-
 cad/tkgate/distinfo         |  4 ++--
 cad/tkgate/patches/patch-ab | 22 +++++++++++++++++-----
 3 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'cad/tkgate')

diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 17d7cfc0488..990cbd1f5fd 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/27 21:30:06 snj Exp $
+# $NetBSD: Makefile,v 1.12 2004/06/08 17:52:22 jmmv Exp $
 #
 
 DISTNAME=	tkgate-1.6i
@@ -20,6 +20,9 @@ USE_GNU_TOOLS+=		m4
 
 TKGATE_SITENAME=	Earth
 
+CONFIGURE_ENV+=		BUILDLINK_LDFLAGS="${BUILDLINK_LDFLAGS}"
+CONFIGURE_ENV+=		PREFIX="${PREFIX}"
+
 CONFIG_SUBST=		PREFIX="${PREFIX}"
 CONFIG_SUBST+=		LOCALBASE="${LOCALBASE}"
 CONFIG_SUBST+=		X11BASE="${X11BASE}"
diff --git a/cad/tkgate/distinfo b/cad/tkgate/distinfo
index 8e6afb25fde..3b2409f21ba 100644
--- a/cad/tkgate/distinfo
+++ b/cad/tkgate/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/10/29 00:33:46 dmcmahill Exp $
+$NetBSD: distinfo,v 1.2 2004/06/08 17:52:22 jmmv Exp $
 
 SHA1 (tkgate-1.6i.tgz) = 6eece2eb4aaa2f45c2b1c68b9c5b79a76b3bb084
 Size (tkgate-1.6i.tgz) = 1459011 bytes
 SHA1 (patch-aa) = 210f7ceceb5be91db6316fbd5b108d7dac6263d2
-SHA1 (patch-ab) = 7e568bf4699f60f0e6973e480aa513138977f4e4
+SHA1 (patch-ab) = fc014dff8095b9b62f68075572ca2dd3ba74f120
diff --git a/cad/tkgate/patches/patch-ab b/cad/tkgate/patches/patch-ab
index 86a79b5ee2a..bca284369bb 100644
--- a/cad/tkgate/patches/patch-ab
+++ b/cad/tkgate/patches/patch-ab
@@ -1,13 +1,25 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/10/29 00:33:46 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.2 2004/06/08 17:52:22 jmmv Exp $
 
---- configure.orig	Mon Oct 28 23:11:21 2002
-+++ configure	Mon Oct 28 23:11:43 2002
-@@ -70,7 +70,7 @@
+--- configure.orig	2001-06-11 22:44:36.000000000 +0200
++++ configure
+@@ -70,7 +70,7 @@ done
  #
  LPATH=""
  IPATH=""
 -LIBS=""
-+LIBS="-lm ${BUILDLINK_LDFLAGS}"
++LIBS="${BUILDLINK_LDFLAGS}"
  TCLTKOK=1
  
  ##################################################################
+@@ -453,6 +453,11 @@ find_tcltk_version()
+       union LIBS -l$tcl_lib
+       union LPATH -L$TCLLIB
+ 
++      . ${PREFIX}/lib/tclConfig.sh
++      for l in ${TCL_LIBS}; do
++          union LIBS ${l}
++      done
++
+       echo "Tcl/Tk Version: $tcltk_ver"
+   else
+       echo "Tcl/Tk Version: not found"
-- 
cgit v1.2.3