[pkgsrc/trunk]: pkgsrc/x11/lablgtk Darwin i386 uses stubs as well or else we ...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f2c18c105a0
branches:  trunk
changeset: 552120:8f2c18c105a0
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sun Dec 28 13:10:29 2008 +0000

description:
Darwin i386 uses stubs as well or else we get PLIST errors on install
gtkspell is not required so split it out as an option but keep it enabled by
 default so there's no change in the package.  Without gtkspell it removes
 a whole slew of dependencies which makes this package a fair bit lighter.
Make a small change to a CONFLICTS statement to keep pkglint happy.

diffstat:

 x11/lablgtk/Makefile       |  12 ++++++------
 x11/lablgtk/PLIST          |  10 +---------
 x11/lablgtk/PLIST.gtkspell |   9 +++++++++
 x11/lablgtk/options.mk     |  14 +++++++++++---
 4 files changed, 27 insertions(+), 18 deletions(-)

diffs (119 lines):

diff -r 4fed8f3fef4a -r 8f2c18c105a0 x11/lablgtk/Makefile
--- a/x11/lablgtk/Makefile      Sun Dec 28 12:57:17 2008 +0000
+++ b/x11/lablgtk/Makefile      Sun Dec 28 13:10:29 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/07/14 12:56:18 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2008/12/28 13:10:29 adrianp Exp $
 #
 
 DISTNAME=      lablgtk-2.10.1
@@ -19,21 +19,21 @@
 
 BUILDLINK_DEPMETHOD.ocaml=     full
 
-CONFLICTS=     lablgtk2-2.*
+CONFLICTS=     lablgtk2-2.*{,nb*}
 
 .include "../../mk/bsd.prefs.mk"
 
 # Stub libraries for functions missing from base system.
 PLIST_VARS+=   stubs
-.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \
-    ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \
-    ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS"
+
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" || \
+    ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
+    ${OPSYS} == "SunOS"
 PLIST.stubs=   yes
 .endif
 
 .include "options.mk"
 
 .include "../../lang/ocaml/buildlink3.mk"
-.include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4fed8f3fef4a -r 8f2c18c105a0 x11/lablgtk/PLIST
--- a/x11/lablgtk/PLIST Sun Dec 28 12:57:17 2008 +0000
+++ b/x11/lablgtk/PLIST Sun Dec 28 13:10:29 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/12/28 13:10:29 adrianp Exp $
 bin/gdk-pixbuf-mlsource
 bin/lablgtk2
 lib/ocaml/lablgtk2/gAction.cmi
@@ -195,9 +195,6 @@
 lib/ocaml/lablgtk2/gtkSignal.ml
 lib/ocaml/lablgtk2/gtkSignal.mli
 lib/ocaml/lablgtk2/gtkSourceView_types.mli
-lib/ocaml/lablgtk2/gtkSpell.cmi
-lib/ocaml/lablgtk2/gtkSpell.cmx
-lib/ocaml/lablgtk2/gtkSpell.ml
 lib/ocaml/lablgtk2/gtkSpell.mli
 lib/ocaml/lablgtk2/gtkStock.cmi
 lib/ocaml/lablgtk2/gtkStock.cmx
@@ -223,12 +220,8 @@
 lib/ocaml/lablgtk2/lablgtk.a
 lib/ocaml/lablgtk2/lablgtk.cma
 lib/ocaml/lablgtk2/lablgtk.cmxa
-lib/ocaml/lablgtk2/lablgtkspell.a
-lib/ocaml/lablgtk2/lablgtkspell.cma
-lib/ocaml/lablgtk2/lablgtkspell.cmxa
 lib/ocaml/lablgtk2/lablgtktop
 lib/ocaml/lablgtk2/liblablgtk2.a
-lib/ocaml/lablgtk2/liblablgtkspell.a
 lib/ocaml/lablgtk2/ml_domain.h
 lib/ocaml/lablgtk2/ml_gdk.h
 lib/ocaml/lablgtk2/ml_gdkpixbuf.h
@@ -255,7 +248,6 @@
 lib/ocaml/lablgtk2/wrappers.h
 lib/ocaml/lablgtk2/xml_lexer.mli
 ${PLIST.stubs}lib/ocaml/stublibs/dlllablgtk2.so
-${PLIST.stubs}lib/ocaml/stublibs/dlllablgtkspell.so
 @comment in ocaml: lib/ocaml/stublibs
 @dirrm lib/ocaml/lablgtk2
 @comment in ocaml: lib/ocaml
diff -r 4fed8f3fef4a -r 8f2c18c105a0 x11/lablgtk/PLIST.gtkspell
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/lablgtk/PLIST.gtkspell        Sun Dec 28 13:10:29 2008 +0000
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST.gtkspell,v 1.1 2008/12/28 13:10:29 adrianp Exp $
+lib/ocaml/lablgtk2/gtkSpell.cmi
+lib/ocaml/lablgtk2/gtkSpell.cmx
+lib/ocaml/lablgtk2/gtkSpell.ml
+lib/ocaml/lablgtk2/lablgtkspell.a
+lib/ocaml/lablgtk2/lablgtkspell.cma
+lib/ocaml/lablgtk2/lablgtkspell.cmxa
+lib/ocaml/lablgtk2/liblablgtkspell.a
+${PLIST.stubs}lib/ocaml/stublibs/dlllablgtkspell.so
diff -r 4fed8f3fef4a -r 8f2c18c105a0 x11/lablgtk/options.mk
--- a/x11/lablgtk/options.mk    Sun Dec 28 12:57:17 2008 +0000
+++ b/x11/lablgtk/options.mk    Sun Dec 28 13:10:29 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2007/10/27 13:29:38 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2008/12/28 13:10:29 adrianp Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lablgtk
-PKG_SUPPORTED_OPTIONS= glade gnomecanvas gtksourceview svg
-PKG_SUGGESTED_OPTIONS= gnomecanvas svg
+PKG_SUPPORTED_OPTIONS= glade gnomecanvas gtksourceview svg gtkspell
+PKG_SUGGESTED_OPTIONS= gnomecanvas svg gtkspell
 
 .include "../../mk/bsd.options.mk"
 
@@ -14,6 +14,14 @@
 CONFIGURE_ARGS+=       --without-glade
 .endif
 
+.if !empty(PKG_OPTIONS:Mgtkspell)
+.include "../../textproc/gtkspell/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-gtkspell
+PLIST_SRC+=            PLIST.gtkspell
+.else
+CONFIGURE_ARGS+=       --without-gtkspell
+.endif
+
 .if !empty(PKG_OPTIONS:Mgnomecanvas)
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"