summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2011-12-24 04:23:21 +0000
committerdholland <dholland@pkgsrc.org>2011-12-24 04:23:21 +0000
commitc0926217ad89cc83df17d2b8c30739bd9f6ddc39 (patch)
tree9642084e034f5ce4988da8ab5190cb4553ea256f /x11
parentfa5716799b2dcd98a12812ae87a115fcf7acde04 (diff)
downloadpkgsrc-c0926217ad89cc83df17d2b8c30739bd9f6ddc39.tar.gz
This needs to expose gnome-panel via bl3 if it's built with the
"gnomecanvas" option. Otherwise some packages fail to link because they can't find -lnspr4. PKGREVISION -> 10. Because the packages affected by this don't build without it, I don't think they need to be revbumped.
Diffstat (limited to 'x11')
-rw-r--r--x11/lablgtk/Makefile4
-rw-r--r--x11/lablgtk/buildlink3.mk11
2 files changed, 12 insertions, 3 deletions
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 170b03f218f..724d2bc09bd 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2011/12/06 00:19:25 sbd Exp $
+# $NetBSD: Makefile,v 1.52 2011/12/24 04:23:21 dholland Exp $
#
DISTNAME= lablgtk-2.14.2
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= x11
MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
diff --git a/x11/lablgtk/buildlink3.mk b/x11/lablgtk/buildlink3.mk
index c857cbc746a..3d60aaaf43d 100644
--- a/x11/lablgtk/buildlink3.mk
+++ b/x11/lablgtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2011/12/24 04:23:21 dholland Exp $
BUILDLINK_TREE+= lablgtk
@@ -8,6 +8,15 @@ LABLGTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.lablgtk+= lablgtk>=2.6.0nb3
BUILDLINK_ABI_DEPENDS.lablgtk?= lablgtk>=2.6.0nb5
BUILDLINK_PKGSRCDIR.lablgtk?= ../../x11/lablgtk
+
+# gnome-panel must be exposed if and only if we built with it
+pkgbase := lablgtk
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.lablgtk:Mgnomecanvas)
+. include "../../x11/gnome-panel/buildlink3.mk"
+.endif
+
.endif # LABLGTK_BUILDLINK3_MK
BUILDLINK_TREE+= -lablgtk