cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop the gtk2 FLAVOR.

Browse Source
This commit is contained in:
ajacoutot 2011-09-12 08:13:31 +00:00
parent 356a559311
commit 9e4daae7fc
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.465 2011/09/12 07:48:38 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.466 2011/09/12 08:13:31 ajacoutot Exp $
# $FreeBSD: Makefile,v 1.178 1997/11/24 05:32:52 fenner Exp $
SUBDIR =
@ -189,7 +189,7 @@
SUBDIR += piewm
SUBDIR += pinot
SUBDIR += podbrowser
SUBDIR += polkit-gnome,gtk2
SUBDIR += polkit-gnome
SUBDIR += polkit-qt4
SUBDIR += pwm
SUBDIR += py-Xlib

24
x11/polkit-gnome/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2011/08/17 16:59:47 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.12 2011/09/12 08:13:31 ajacoutot Exp $
COMMENT= PolicyKit integration for GNOME/GTK+2
DISTNAME= polkit-gnome-0.102
REVISION= 0
CATEGORIES= x11 sysutils
@ -25,7 +26,7 @@ WANTLIB += Xrandr Xrender atk-1.0 c cairo expat fontconfig freetype
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png polkit-agent-1 polkit-gobject-1 pthread
WANTLIB += pthread-stubs xcb xcb-render xcb-shm z
WANTLIB += pthread-stubs xcb xcb-render xcb-shm z cairo-gobject gdk-3 gtk-3
MASTER_SITES= http://hal.freedesktop.org/releases/
@ -34,7 +35,8 @@ MODULES= devel/gettext \
BUILD_DEPENDS= devel/gobject-introspection
LIB_DEPENDS= sysutils/polkit>=0.102
LIB_DEPENDS= sysutils/polkit>=0.102 \
x11/gtk+3
# XXX: the libtool wrapper script is passed as argument to g-ir-scanner,
# instead of the actual library
@ -48,20 +50,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--localstatedir=/var \
--enable-introspection \
--disable-gtk-doc
FLAVORS= gtk2
FLAVOR?=
.if ${FLAVOR:L:Mgtk2}
CONFIGURE_ARGS+=--with-gtk=2.0
LIB_DEPENDS+= x11/gtk+2
WANTLIB += gdk-x11-2.0 gtk-x11-2.0
.else
CONFIGURE_ARGS+=--with-gtk=3.0
LIB_DEPENDS+= x11/gtk+3
WANTLIB += cairo-gobject gdk-3 gtk-3
.endif
--disable-gtk-doc \
--with-gtk=3.0
# revert the following commit:
# ----------------------------------------------------------------------

3
x11/polkit-gnome/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2011/08/17 16:59:47 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.7 2011/09/12 08:13:31 ajacoutot Exp $
@pkgpath x11/polkit-gnome,gtk2
%%SHARED%%
include/polkit-gtk-1/
include/polkit-gtk-1/polkitgtk/