From 2405c4a1f418941b9ff91c83a0f39eabf36ce5bb Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Thu, 15 Feb 2007 21:19:00 +0000
Subject: Add modular Xorg support. This should get some more attention by the
 maintainer as it obviously doesn't honour CFLAGS et al.

---
 lang/STk/Makefile         | 10 ++++++++--
 lang/STk/distinfo         |  3 ++-
 lang/STk/patches/patch-ao | 13 +++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 lang/STk/patches/patch-ao

(limited to 'lang')

diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index 26adb662519..0f948bc8f76 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:09:43 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/15 21:19:00 joerg Exp $
 
 DISTNAME=       	STk-4.0.1
 PKGREVISION=		1
@@ -12,5 +12,11 @@ COMMENT=		Scheme interpreter with full access to the Tk graphical package
 OSVERSION_SPECIFIC=	yes
 GNU_CONFIGURE=		yes
 
-.include "../../mk/x11.buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+MAKE_ENV+=		X11_LDFLAGS=${X11_LDFLAGS:Q}
+
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/STk/distinfo b/lang/STk/distinfo
index 69b87456ad5..184ef8d6479 100644
--- a/lang/STk/distinfo
+++ b/lang/STk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/01/12 15:04:18 joerg Exp $
+$NetBSD: distinfo,v 1.8 2007/02/15 21:19:00 joerg Exp $
 
 SHA1 (STk-4.0.1.tar.gz) = 50dc98c2b64db1c9cca54411cb406feb4cb57600
 RMD160 (STk-4.0.1.tar.gz) = 58ad3c66f77a6ab33db5d4ca9f2510d50b6b6f0d
@@ -17,3 +17,4 @@ SHA1 (patch-ak) = 7548a9912788c1a951ef9d14f0b21bebf0899b66
 SHA1 (patch-al) = c5a8f2f3d2a70ef5c4ca23c1574b5b25f2c0dacb
 SHA1 (patch-am) = cb59da47c5e7fd1f07c456fa1a1258217c798ed5
 SHA1 (patch-an) = 0ee1b8edf2fe7a8910c42d46375ba0ad90bf1bd6
+SHA1 (patch-ao) = 5c210dc3b21240393dea35407c209ee4b44709f7
diff --git a/lang/STk/patches/patch-ao b/lang/STk/patches/patch-ao
new file mode 100644
index 00000000000..68b6169ef47
--- /dev/null
+++ b/lang/STk/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2007/02/15 21:19:00 joerg Exp $
+
+--- Src/Makefile.in.orig	2007-02-15 20:52:32.000000000 +0000
++++ Src/Makefile.in
+@@ -47,7 +47,7 @@ TCLLIB		= ../Tcl/libtcl.a
+ EVTCLLIB	= ../Tcl/libevtcl.a
+ MPLIB		= ../Mp/$(MP).a
+ STACKLIB	= ../Stack/libstack.a
+-LIBS    	= @LIBS@ $(LIB_DLD) $(LIB_MALLOC)
++LIBS    	= ${X11_LDFLAGS} @LIBS@ $(LIB_DLD) $(LIB_MALLOC)
+ 
+ ALLIBS	 = $(MPLIB) $(STACKLIB) $(TKLIB) $(TCLLIB) $(EVTCLLIB)
+ SALLLIBS = $(MPLIB) $(STACKLIB) $(TCLLIB) 
-- 
cgit v1.2.3