Remove ORBit support and use GDBus for IPC.

lots of WANTLIB fallout (fix coming right up)

bulk testing by jasper@, thanks
some sqlports clue from espie@
This commit is contained in:
ajacoutot 2011-10-29 08:10:12 +00:00
parent 0a9d40c452
commit 1262b4af43

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.69 2011/10/26 17:12:52 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.70 2011/10/29 08:10:12 ajacoutot Exp $
COMMENT-main= configuration database system for GNOME
COMMENT-polkit= PolicyKit integration for GConf2
@ -10,6 +10,9 @@ PKGNAME= gconf2-${GNOME_VERSION}
PKGNAME-main= gconf2-${GNOME_VERSION}
PKGNAME-polkit= gconf2-polkit-${GNOME_VERSION}
REVISION-main= 0
REVISION-polkit=0
SHARED_LIBS += gconf-2 6.2 # 5.5
CATEGORIES= devel
@ -29,10 +32,10 @@ PERMIT_DISTFILES_CDROM= Yes
WANTLIB += c gio-2.0 glib-2.0 gmodule-2.0 ffi
WANTLIB += gobject-2.0 gthread-2.0 pcre pthread z
WANTLIB-main += ${WANTLIB} ORBit-2 m xml2 dbus-1 dbus-glib-1
WANTLIB-main += ${WANTLIB} m xml2 dbus-1 dbus-glib-1
WANTLIB-polkit += ${WANTLIB} gconf-2 polkit-gobject-1
WANTLIB-polkit += ORBit-2 c dbus-1 dbus-glib-1 gio-2.0 glib-2.0
WANTLIB-polkit += c dbus-1 dbus-glib-1 gio-2.0 glib-2.0
WANTLIB-polkit += gmodule-2.0 gobject-2.0 gthread-2.0 pcre pthread z
WANTLIB-polkit += dbus-1 dbus-glib-1
@ -50,7 +53,6 @@ MULTI_PACKAGES= -main -polkit
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} \
${MODPY_RUN_DEPENDS}
LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/ORBit2 \
textproc/libxml \
x11/dbus-glib
@ -64,7 +66,8 @@ MODGNOME_TOOLS= goi
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --without-openldap \
--enable-defaults-service \
--disable-gtk
--disable-gtk \
--disable-orbit
FAKE_FLAGS= sysgconfdir=${PREFIX}/share/examples/gconf2 \
sysconfdir=${PREFIX}/share/examples/gconf2