From 7d190ef0746a09c6cc5bbbf05926b3f68e73ed05 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Fri, 21 Apr 2006 11:52:19 +0000
Subject: Correctly link against non-native X11. Fix another case of -ldl.

---
 games/scid/Makefile         |  5 ++++-
 games/scid/distinfo         |  4 ++--
 games/scid/patches/patch-aa | 18 ++++++++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'games/scid')

diff --git a/games/scid/Makefile b/games/scid/Makefile
index 162e513e45c..2a99346e1ad 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/21 11:52:19 joerg Exp $
 #
 
 DISTNAME=		scid-3.6.1
@@ -25,8 +25,11 @@ SUBST_SED.paths=	-e 's,@TCLPREFIX@,${BUILDLINK_PREFIX.tcl},g'	\
 			-e 's,@TKPREFIX@,${BUILDLINK_PREFIX.tk},g'	\
 			-e 's,@LIBDL@,${BUILDLINK_LDADD.dl},g'
 
+MAKE_ENV+=		X_LDFLAGS=${X11_LDFLAGS:Q}
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/scid/distinfo b/games/scid/distinfo
index 38c148e51c3..8cb4a8c33bd 100644
--- a/games/scid/distinfo
+++ b/games/scid/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 23:12:02 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/04/21 11:52:19 joerg Exp $
 
 SHA1 (scid-3.6.1.tar.gz) = a002a42afd46cc59a3c512473891a227d29ecc34
 RMD160 (scid-3.6.1.tar.gz) = ebc660d56fe5e29429586e76904d9238185a1c0c
 Size (scid-3.6.1.tar.gz) = 2272946 bytes
-SHA1 (patch-aa) = 5ca2e398007210da5fe1a41a0a7a28fd6dcf54fe
+SHA1 (patch-aa) = 88359fa77d0e9559420a8eada3a5a9fc56a85b28
diff --git a/games/scid/patches/patch-aa b/games/scid/patches/patch-aa
index 67c62998b9e..a86d54ad0a3 100644
--- a/games/scid/patches/patch-aa
+++ b/games/scid/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/02/20 16:18:41 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2006/04/21 11:52:19 joerg Exp $
 
---- configure.orig	2004-03-02 13:09:53.000000000 -0600
+--- configure.orig	2004-03-02 19:09:53.000000000 +0000
 +++ configure
 @@ -26,6 +26,9 @@ tclsh=tclsh;
  ##  done; \
@@ -12,6 +12,20 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/02/20 16:18:41 minskim Exp $
  # Now execute this script using the best tclsh version found:
  # The backslash at the end of this line is needed: \
  exec $tclsh "$0" ${1+"$@"}
+@@ -61,10 +64,10 @@ set var(TCL_VERSION) $tcl_version
+ set var(WARNINGS) -Wall
+ set var(ZLIB) -lz
+ 
+-set defaultVar(TCL_INCLUDE) {-I/usr/include}
+-set defaultVar(TCL_LIBRARY) {-L/usr/lib -ltcl$(TCL_VERSION) -ldl}
++set defaultVar(TCL_INCLUDE) {-I@TCLPREFIX@/include}
++set defaultVar(TCL_LIBRARY) {-L@TCLPREFIX@/lib -Wl,-R@TCLPREFIX@/lib -ltcl$(TCL_VERSION) @LIBDL@}
+ set defaultVar(TK_LIBRARY) \
+-    {$(TCL_LIBRARY) -ltk$(TCL_VERSION) -L/usr/X11R6/lib -lX11}
++    {-L@TKPREFIX@/lib -Wl,-R@TKPREFIX@/lib $(TCL_LIBRARY) -ltk$(TCL_VERSION) $(X_LDFLAGS) -lX11}
+ 
+ 
+ # findDir:
 @@ -105,14 +108,8 @@ proc findTclTkPaths {} {
  
      # headerPath: List of possible locations for tcl.h and tk.h
-- 
cgit v1.2.3