diff options
author | adrianp <adrianp> | 2008-12-28 13:10:29 +0000 |
---|---|---|
committer | adrianp <adrianp> | 2008-12-28 13:10:29 +0000 |
commit | d356df04858c3517e9a8535bd46260b27f4b5e94 (patch) | |
tree | c8f22cd1cefdf24784f79882022fc8834a107e98 /x11 | |
parent | 6d49f7848f65b2f038befd9894b169085fe1a4cc (diff) | |
download | pkgsrc-d356df04858c3517e9a8535bd46260b27f4b5e94.tar.gz |
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 (limited to 'x11')
-rw-r--r-- | x11/lablgtk/Makefile | 12 | ||||
-rw-r--r-- | x11/lablgtk/PLIST | 10 | ||||
-rw-r--r-- | x11/lablgtk/PLIST.gtkspell | 9 | ||||
-rw-r--r-- | x11/lablgtk/options.mk | 14 |
4 files changed, 27 insertions, 18 deletions
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index d7fb324375d..9a1a0829f95 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -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 @@ BUILD_TARGET= world 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 --git a/x11/lablgtk/PLIST b/x11/lablgtk/PLIST index a287adb0a17..f05146f4c96 100644 --- a/x11/lablgtk/PLIST +++ b/x11/lablgtk/PLIST @@ -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.cmx 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/gtk_tags.h 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/win32.h 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 --git a/x11/lablgtk/PLIST.gtkspell b/x11/lablgtk/PLIST.gtkspell new file mode 100644 index 00000000000..2bdb9c358c6 --- /dev/null +++ b/x11/lablgtk/PLIST.gtkspell @@ -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 --git a/x11/lablgtk/options.mk b/x11/lablgtk/options.mk index 700f1801590..9a9213b7b87 100644 --- a/x11/lablgtk/options.mk +++ b/x11/lablgtk/options.mk @@ -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 @@ PLIST_SRC+= PLIST.glade 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" |