diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile
index e6e462e8a66b..6ebf84c26d1a 100644
--- a/x11/lablgtk2/Makefile
+++ b/x11/lablgtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/06/15 21:39:54 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/07/18 13:10:44 jmmv Exp $
 #
 
 DISTNAME=	lablgtk-2.6.0
@@ -21,6 +21,17 @@ BUILDLINK_DEPMETHOD.ocaml=	full
 # previous name of this package; does not conflict with lablgtk-1.*
 CONFLICTS=	lablgtk-2.*
 
+.include "../../mk/bsd.prefs.mk"
+
+# Stub libraries for functions missing from base system.
+.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \
+    ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \
+    ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS"
+PLIST_SUBST+=	HAVE_STUBS=""
+.else
+PLIST_SUBST+=	HAVE_STUBS="@comment "
+.endif
+
 .include "options.mk"
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/x11/lablgtk2/PLIST b/x11/lablgtk2/PLIST
index ff21b7836d22..939874045af7 100644
--- a/x11/lablgtk2/PLIST
+++ b/x11/lablgtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/06/09 13:17:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/07/18 13:10:44 jmmv Exp $
 bin/gdk-pixbuf-mlsource
 bin/lablgtk2
 lib/ocaml/lablgtk2/gAction.cmi
@@ -243,8 +243,8 @@ lib/ocaml/lablgtk2/varcc
 lib/ocaml/lablgtk2/win32.h
 lib/ocaml/lablgtk2/wrappers.h
 lib/ocaml/lablgtk2/xml_lexer.mli
-lib/ocaml/stublibs/dlllablgtk2.so
-lib/ocaml/stublibs/dlllablgtkspell.so
+${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtk2.so
+${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtkspell.so
 @unexec ${RMDIR} %D/lib/ocaml/stublibs 2>/dev/null || ${TRUE}
 @dirrm lib/ocaml/lablgtk2
 @unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}
diff --git a/x11/lablgtk2/PLIST.glade b/x11/lablgtk2/PLIST.glade
index ea82a252a7ea..45da64d64917 100644
--- a/x11/lablgtk2/PLIST.glade
+++ b/x11/lablgtk2/PLIST.glade
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.glade,v 1.1 2007/06/09 13:17:18 wiz Exp $
+@comment $NetBSD: PLIST.glade,v 1.2 2007/07/18 13:10:44 jmmv Exp $
 bin/lablgladecc2
 lib/ocaml/lablgtk2/glade.cmi
 lib/ocaml/lablgtk2/glade.cmx
@@ -7,4 +7,4 @@ lib/ocaml/lablgtk2/lablglade.a
 lib/ocaml/lablgtk2/lablglade.cma
 lib/ocaml/lablgtk2/lablglade.cmxa
 lib/ocaml/lablgtk2/liblablglade2.a
-lib/ocaml/stublibs/dlllablglade2.so
+${HAVE_STUBS}lib/ocaml/stublibs/dlllablglade2.so
diff --git a/x11/lablgtk2/PLIST.gnome b/x11/lablgtk2/PLIST.gnome
index 99c77c4674ed..1ad11d491254 100644
--- a/x11/lablgtk2/PLIST.gnome
+++ b/x11/lablgtk2/PLIST.gnome
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gnome,v 1.1 2007/06/09 13:17:18 wiz Exp $
+@comment $NetBSD: PLIST.gnome,v 1.2 2007/07/18 13:10:44 jmmv Exp $
 lib/ocaml/lablgtk2/gnoDruid.cmi
 lib/ocaml/lablgtk2/gnoDruid.cmx
 lib/ocaml/lablgtk2/gnoDruid.ml
@@ -10,4 +10,4 @@ lib/ocaml/lablgtk2/lablgnomeui.a
 lib/ocaml/lablgtk2/lablgnomeui.cma
 lib/ocaml/lablgtk2/lablgnomeui.cmxa
 lib/ocaml/lablgtk2/liblablgnomeui.a
-lib/ocaml/stublibs/dlllablgnomeui.so
+${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomeui.so
diff --git a/x11/lablgtk2/PLIST.gnomecanvas b/x11/lablgtk2/PLIST.gnomecanvas
index 26b186ef3566..7ed0ebf13e65 100644
--- a/x11/lablgtk2/PLIST.gnomecanvas
+++ b/x11/lablgtk2/PLIST.gnomecanvas
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gnomecanvas,v 1.1 2007/06/09 13:17:18 wiz Exp $
+@comment $NetBSD: PLIST.gnomecanvas,v 1.2 2007/07/18 13:10:44 jmmv Exp $
 lib/ocaml/lablgtk2/gnoCanvas.cmi
 lib/ocaml/lablgtk2/gnoCanvas.cmx
 lib/ocaml/lablgtk2/gnoCanvas.ml
@@ -17,5 +17,5 @@ lib/ocaml/lablgtk2/panel.cmi
 lib/ocaml/lablgtk2/panel.cmx
 lib/ocaml/lablgtk2/panel.ml
 lib/ocaml/lablgtk2/panel_tags.h
-lib/ocaml/stublibs/dlllablgnomecanvas.so
-lib/ocaml/stublibs/dlllablpanel.so
+${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomecanvas.so
+${HAVE_STUBS}lib/ocaml/stublibs/dlllablpanel.so
diff --git a/x11/lablgtk2/PLIST.svg b/x11/lablgtk2/PLIST.svg
index 325b27157ce6..1a8d84d58f20 100644
--- a/x11/lablgtk2/PLIST.svg
+++ b/x11/lablgtk2/PLIST.svg
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.svg,v 1.1 2007/06/09 13:17:18 wiz Exp $
+@comment $NetBSD: PLIST.svg,v 1.2 2007/07/18 13:10:45 jmmv Exp $
 lib/ocaml/lablgtk2/gnoDruid.cmi
 lib/ocaml/lablgtk2/gnoDruid.cmx
 lib/ocaml/lablgtk2/gnoDruid.ml
@@ -17,5 +17,5 @@ lib/ocaml/lablgtk2/liblablrsvg.a
 lib/ocaml/lablgtk2/rsvg.cmi
 lib/ocaml/lablgtk2/rsvg.cmx
 lib/ocaml/lablgtk2/rsvg.ml
-lib/ocaml/stublibs/dlllablgnomeui.so
-lib/ocaml/stublibs/dlllablrsvg.so
+${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomeui.so
+${HAVE_STUBS}lib/ocaml/stublibs/dlllablrsvg.so