summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmmv <jmmv>2004-12-24 18:33:09 +0000
committerjmmv <jmmv>2004-12-24 18:33:09 +0000
commitd155cc58a02faa2f76668db3aaa88f5a9997e71d (patch)
tree2417ca1266c6df2a37f57ff749710d56588129c5
parentea2804ce0ca52b346ade6c73066a900f6c20418b (diff)
downloadpkgsrc-d155cc58a02faa2f76668db3aaa88f5a9997e71d.tar.gz
Make sure the rpaths reach the compiler; otherwise, lablgtk can't find the
X11 libraries. I suspect this was not noticed before because the whole ocaml was linked against these libraries, so they were pulled in at runtime anyway.
-rw-r--r--x11/lablgtk/Makefile3
-rw-r--r--x11/lablgtk/distinfo3
-rw-r--r--x11/lablgtk/patches/patch-ab13
3 files changed, 17 insertions, 2 deletions
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index ecc68a8dfea..3c7745f83a7 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/12/24 17:21:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/24 18:33:09 jmmv Exp $
DISTNAME= lablgtk-1.2.6
PKGREVISION= 3
@@ -11,6 +11,7 @@ COMMENT= GTK+ bindings for ocaml
USE_BUILDLINK3= YES
USE_GNU_TOOLS+= make
+USE_X11= YES
BUILDLINK_DEPMETHOD.ocaml= full
diff --git a/x11/lablgtk/distinfo b/x11/lablgtk/distinfo
index 8de088637a1..237aa751c7b 100644
--- a/x11/lablgtk/distinfo
+++ b/x11/lablgtk/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/03/04 16:13:35 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/12/24 18:33:09 jmmv Exp $
SHA1 (lablgtk-1.2.6.tar.gz) = a70bffb0756fcbf464f0cb5e9eb87a8f9580f43f
Size (lablgtk-1.2.6.tar.gz) = 480949 bytes
SHA1 (patch-aa) = 0fcec0178fdb2bbfbe7b69f892823da820b2833f
+SHA1 (patch-ab) = ed99be6695e6ac0f122c52d8a52df99a11ea7b6f
diff --git a/x11/lablgtk/patches/patch-ab b/x11/lablgtk/patches/patch-ab
new file mode 100644
index 00000000000..838f3c2a349
--- /dev/null
+++ b/x11/lablgtk/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/12/24 18:33:09 jmmv Exp $
+
+--- Makefile.orig 2003-05-23 10:36:29.000000000 +0200
++++ Makefile
+@@ -46,7 +46,7 @@ GTKCFLAGS = `$(GTK_CONFIG) --cflags`
+ endif
+ endif
+
+-GTKLIBS = `$(GTK_CONFIG) --libs`
++GTKLIBS = `$(GTK_CONFIG) --libs | sed -e 's| | -ccopt |g;s|^|-ccopt |'`
+ GLLIBS = -lGLU -lGL
+
+ all: config.make