gconf2 module goes wantlib

This commit is contained in:
espie 2010-11-06 20:48:11 +00:00
parent 1d8cec31c3
commit e99803c88e
4 changed files with 44 additions and 33 deletions

View File

@ -1,25 +1,28 @@
# $OpenBSD: gconf2.port.mk,v 1.4 2009/06/11 18:25:54 ajacoutot Exp $
# $OpenBSD: gconf2.port.mk,v 1.5 2010/11/06 20:48:11 espie Exp $
MODGCONF2_LIB_DEPENDS= gconf-2::devel/gconf2
MODGCONF2_BUILD_DEPENDS=:gconf2-*:devel/gconf2
MODGCONF2_RUN_DEPENDS= :gconf2-*:devel/gconf2
MODGCONF2_LIBDEP?= Yes
MODGCONF2_WANTLIB = gconf-2
MODGCONF2_LIB_DEPENDS = ::devel/gconf2
MODGCONF2_BUILD_DEPENDS =:gconf2-*:devel/gconf2
MODGCONF2_RUN_DEPENDS = :gconf2-*:devel/gconf2
MODGCONF2_LIBDEP ?= Yes
.if ${MODGCONF2_LIBDEP:L} == "yes"
LIB_DEPENDS+= ${MODGCONF2_LIB_DEPENDS}
LIB_DEPENDS += ${MODGCONF2_LIB_DEPENDS}
WANTLIB += ${MODGCONF2_WANTLIB}
.endif
# The RUN_DEPENDS entry is to ensure gconf2 is installed. This is
# necessary so that we have gconftool-2 installed on static archs.
RUN_DEPENDS+= ${MODGCONF2_RUN_DEPENDS}
RUN_DEPENDS += ${MODGCONF2_RUN_DEPENDS}
BUILD_DEPENDS+= ${MODGCONF2_BUILD_DEPENDS}
BUILD_DEPENDS += ${MODGCONF2_BUILD_DEPENDS}
.if defined(MODGCONF2_SCHEMAS_DIR)
SCHEMAS_INSTDIR=share/schemas/${MODGCONF2_SCHEMAS_DIR:L}
SUBST_VARS+= SCHEMAS_INSTDIR
CONFIGURE_ARGS+=--with-gconf-schema-file-dir=${LOCALBASE}/${SCHEMAS_INSTDIR}
SCHEMAS_INSTDIR = share/schemas/${MODGCONF2_SCHEMAS_DIR:L}
SUBST_VARS += SCHEMAS_INSTDIR
CONFIGURE_ARGS += --with-gconf-schema-file-dir=${LOCALBASE}/${SCHEMAS_INSTDIR}
.endif
MODGCONF2_post-patch+= ln -s /usr/bin/true ${WRKDIR}/bin/gconftool-2
MODGCONF2_post-patch += ln -s /usr/bin/true ${WRKDIR}/bin/gconftool-2

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.54 2010/11/05 10:06:44 espie Exp $
# $OpenBSD: Makefile,v 1.55 2010/11/06 20:48:11 espie Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -94,24 +94,29 @@ BUILD_DEPENDS+= :zip-*:archivers/zip \
MODULES+= lang/python \
devel/gconf2
MODGCONF2_LIBDEP=No
LIB_DEPENDS-main=gdk-x11-2.0.>=400.14,gtk-x11-2.0.>=400.14::x11/gtk+2 \
LIB_DEPENDS-main=::x11/gtk+2 \
${MODPY_LIB_DEPENDS} \
db.>=4:db->=4,<5:databases/db/v4 \
xslt.>=3::textproc/libxslt \
curl.>=7::net/curl \
neon.>=24::net/neon \
wpd.>=8::textproc/libwpd \
icuuc.>=0,icudata.>=0,icui18n,icule::textproc/icu4c \
:db->=4,<5:databases/db/v4 \
::textproc/libxslt \
::net/curl \
::net/neon \
::textproc/libwpd \
::textproc/icu4c \
::devel/gperf \
raptor.>=2::textproc/raptor \
rasqal,rdf.>=0::textproc/redland \
::textproc/raptor \
::textproc/redland \
${MODGCONF2_LIB_DEPENDS}
WANTLIB-main= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
WANTLIB-main = gdk-x11-2.0.>=400.14 gtk-x11-2.0.>=400.14 \
db.>=4 xslt.>=3 curl.>=7 neon.>=24 wpd.>=8 \
icuuc.>=0 icudata.>=0 icui18n icule \
raptor.>=2 rasqal rdf.>=0
WANTLIB-main += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
crypto dbus-1 expat fontconfig freetype gio-2.0 glib-2.0 \
gmodule-2.0 gobject-2.0 gthread-2.0 iconv intl \
jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
png pthread pthread-stubs ssl util xcb xml2 z gdk_pixbuf-2.0
png pthread pthread-stubs ssl util xcb xml2 z gdk_pixbuf-2.0 \
${MODGCONF2_WANTLIB}
WANTLIB-main += ${MODPY_WANTLIB}
RUN_DEPENDS-main= :desktop-file-utils-*:devel/desktop-file-utils
@ -120,16 +125,17 @@ RUN_DEPENDS-main= :desktop-file-utils-*:devel/desktop-file-utils
STDLIB= stdc++
.else
STDLIB= estdc++
LIB_DEPENDS-main+= estdc++.>=11:libstdc++->=4.2,<4.3|libstdc++->=4.2v0,<4.3v0:lang/gcc/4.2,-estdc
LIB_DEPENDS-main += :libstdc++->=4.2,<4.3|libstdc++->=4.2v0,<4.3v0:lang/gcc/4.2,-estdc
WANTLIB-main += estdc++.>=11
.endif
MODULES+= x11/qt3
RUN_DEPENDS-kde= ::editors/openoffice3
LIB_DEPENDS-kde= ${MODQT_LIB_DEPENDS} \
kabc,kdecore,kdeui,kio::x11/kde/libs3
::x11/kde/libs3
WANTLIB-kde= ${MODQT_WANTLIB} \
X11 Xau Xdmcp Xext Xrandr Xrender ${STDLIB} m \
pthread-stubs xcb
pthread-stubs xcb kabc kdecore kdeui kio
.if !${FLAVOR:L:Mno_java}
MODULES+= java

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2010/10/24 21:19:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2010/11/06 20:48:11 espie Exp $
MULTI_PACKAGES= -main -themes
@ -39,15 +39,17 @@ MODULES= textproc/intltool \
devel/gconf2
LIB_DEPENDS-main= ${MODGCONF2_LIB_DEPENDS} \
gnome-2::x11/gnome/libgnome \
gnomeui-2::x11/gnome/libgnomeui \
esd:esound->=0.2.38:audio/esound
::x11/gnome/libgnome \
::x11/gnome/libgnomeui \
:esound->=0.2.38:audio/esound
LIB_DEPENDS-themes=
WANTLIB-themes=
RUN_DEPENDS-main= ${RUN_DEPENDS} \
:desktop-file-utils-*:devel/desktop-file-utils
RUN_DEPENDS-themes= ::games/gtetrinet
PKG_ARCH-themes= *
WANTLIB-main += gnome-2 gnomeui-2 esd ${MODGCONF2_WANTLIB}
WANTLIB-main += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB-main += Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0
WANTLIB-main += audiofile bonobo-2 bonobo-activation bonoboui-2 c cairo

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2010/10/28 11:39:53 steven Exp $
# $OpenBSD: Makefile,v 1.68 2010/11/06 20:48:11 espie Exp $
COMMENT-main = good elements for GStreamer
COMMENT-aalib = aalib element for GStreamer (plugins-good)
@ -41,7 +41,7 @@ WANTLIB = glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
pcre xml2 m z gstreamer-0.10 gstbase-0.10
LIB_DEPENDS = :gstreamer->=0.10.30:$P/core
WANTLIB-main = ${WANTLIB} gdk_pixbuf-2.0 \
WANTLIB-main = ${WANTLIB} ${MODGCONF2_WANTLIB} gdk_pixbuf-2.0 \
ICE SM X11 Xdamage Xext Xfixes sndio ossaudio \
gstcontroller-0.10 Xau Xdmcp xcb-render xcb-render-util \
pthread-stubs xcb Xrender cairo expat orc-0.4 \