- drop gtk2 flavor

This commit is contained in:
jasper 2011-09-12 08:35:20 +00:00
parent fdb84675ac
commit 2bad784361
5 changed files with 33 additions and 85 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.155 2011/09/12 08:24:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.156 2011/09/12 08:35:20 jasper Exp $
SUBDIR =
SUBDIR += alacarte
@ -35,7 +35,6 @@
SUBDIR += gjs
SUBDIR += gnote
SUBDIR += gucharmap
SUBDIR += gucharmap,gtk2
SUBDIR += gvfs
SUBDIR += icon-theme
SUBDIR += icon-theme-extras

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.46 2011/06/21 10:26:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.47 2011/09/12 08:35:20 jasper Exp $
SHARED_ONLY= Yes
@ -6,7 +6,9 @@ COMMENT= Unicode character map for the GNOME project
GNOME_PROJECT= gucharmap
GNOME_VERSION= 3.0.1
REVISION= 3
SHARED_LIBS += gucharmap_2_90 0.0 # 7.0
REVISION= 4
HOMEPAGE= http://live.gnome.org/Gucharmap
@ -22,7 +24,7 @@ WANTLIB += c cairo drm 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 pthread pthread-stubs xcb xcb-render
WANTLIB += xcb-shm z
WANTLIB += xcb-shm z cairo-gobject gdk-3 gtk-3
MODULES= devel/gettext \
x11/gnome \
@ -38,23 +40,12 @@ MODGNOME_HELP_FILES= Yes
DESKTOP_FILES= Yes
MODGCONF2_SCHEMAS_DIR= gucharmap
FLAVORS= gtk2
FLAVOR?=
.if ${FLAVOR:L:Mgtk2}
SHARED_LIBS += gucharmap 2.0 # .7.0
CONFIGURE_ARGS+= --with-gtk=2.0
LIB_DEPENDS+= x11/gtk+2,-main
WANTLIB+= gdk-x11-2.0 gtk-x11-2.0
.else
SHARED_LIBS += gucharmap_2_90 0.0 # 7.0
CONFIGURE_ARGS+= --with-gtk=3.0
LIB_DEPENDS+= x11/gtk+3,-main
WANTLIB+= cairo-gobject gdk-3 gtk-3
.endif
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-introspection
--enable-introspection \
--with-gtk=3.0
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,43 +0,0 @@
@comment $OpenBSD: PFRAG.gtk2,v 1.2 2011/06/21 10:26:18 ajacoutot Exp $
include/gucharmap-2.0/
include/gucharmap-2.0/gucharmap/
include/gucharmap-2.0/gucharmap/gucharmap-block-chapters-model.h
include/gucharmap-2.0/gucharmap/gucharmap-block-codepoint-list.h
include/gucharmap-2.0/gucharmap/gucharmap-chapters-model.h
include/gucharmap-2.0/gucharmap/gucharmap-chapters-view.h
include/gucharmap-2.0/gucharmap/gucharmap-charmap.h
include/gucharmap-2.0/gucharmap/gucharmap-chartable.h
include/gucharmap-2.0/gucharmap/gucharmap-codepoint-list.h
include/gucharmap-2.0/gucharmap/gucharmap-script-chapters-model.h
include/gucharmap-2.0/gucharmap/gucharmap-script-codepoint-list.h
include/gucharmap-2.0/gucharmap/gucharmap-type-builtins.h
include/gucharmap-2.0/gucharmap/gucharmap-unicode-info.h
include/gucharmap-2.0/gucharmap/gucharmap.h
lib/girepository-1.0/Gucharmap-2.0.typelib
@lib lib/libgucharmap.so.${LIBgucharmap_VERSION}
lib/pkgconfig/gucharmap-2.pc
share/gir-1.0/Gucharmap-2.0.gir
share/gnome/help/gucharmap/it/
share/gnome/help/gucharmap/it/figures/
share/gnome/help/gucharmap/it/figures/gucharmap_window.png
share/gnome/help/gucharmap/it/gucharmap.xml
share/gnome/help/gucharmap/it/legal.xml
share/gnome/help/gucharmap/ja/
share/gnome/help/gucharmap/ja/figures/
share/gnome/help/gucharmap/ja/figures/gucharmap_window.png
share/gnome/help/gucharmap/ja/gucharmap.xml
share/gnome/help/gucharmap/ja/legal.xml
share/gnome/help/gucharmap/zh_HK/
share/gnome/help/gucharmap/zh_HK/figures/
share/gnome/help/gucharmap/zh_HK/figures/gucharmap_window.png
share/gnome/help/gucharmap/zh_HK/gucharmap.xml
share/gnome/help/gucharmap/zh_HK/legal.xml
share/gnome/help/gucharmap/zh_TW/
share/gnome/help/gucharmap/zh_TW/figures/
share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png
share/gnome/help/gucharmap/zh_TW/gucharmap.xml
share/gnome/help/gucharmap/zh_TW/legal.xml
share/omf/gucharmap/gucharmap-it.omf
share/omf/gucharmap/gucharmap-ja.omf
share/omf/gucharmap/gucharmap-zh_HK.omf
share/omf/gucharmap/gucharmap-zh_TW.omf

View File

@ -1,21 +0,0 @@
@comment $OpenBSD: PFRAG.no-gtk2,v 1.1 2011/06/08 07:33:03 ajacoutot Exp $
include/gucharmap-2.90/
include/gucharmap-2.90/gucharmap/
include/gucharmap-2.90/gucharmap/gucharmap-block-chapters-model.h
include/gucharmap-2.90/gucharmap/gucharmap-block-codepoint-list.h
include/gucharmap-2.90/gucharmap/gucharmap-chapters-model.h
include/gucharmap-2.90/gucharmap/gucharmap-chapters-view.h
include/gucharmap-2.90/gucharmap/gucharmap-charmap.h
include/gucharmap-2.90/gucharmap/gucharmap-chartable.h
include/gucharmap-2.90/gucharmap/gucharmap-codepoint-list.h
include/gucharmap-2.90/gucharmap/gucharmap-script-chapters-model.h
include/gucharmap-2.90/gucharmap/gucharmap-script-codepoint-list.h
include/gucharmap-2.90/gucharmap/gucharmap-type-builtins.h
include/gucharmap-2.90/gucharmap/gucharmap-unicode-info.h
include/gucharmap-2.90/gucharmap/gucharmap.h
lib/girepository-1.0/Gucharmap-2.90.typelib
lib/libgucharmap_2_90.a
lib/libgucharmap_2_90.la
@lib lib/libgucharmap_2_90.so.${LIBgucharmap_2_90_VERSION}
lib/pkgconfig/gucharmap-2.90.pc
share/gir-1.0/Gucharmap-2.90.gir

View File

@ -1,10 +1,31 @@
@comment $OpenBSD: PLIST,v 1.19 2011/05/15 09:22:36 jasper Exp $
@comment $OpenBSD: PLIST,v 1.20 2011/09/12 08:35:20 jasper Exp $
@pkgpath x11/gnome/gucharmap,gtk2
bin/charmap
bin/gnome-character-map
@bin bin/gucharmap
!%%gtk2%%
%%gtk2%%
include/gucharmap-2.90/
include/gucharmap-2.90/gucharmap/
include/gucharmap-2.90/gucharmap/gucharmap-block-chapters-model.h
include/gucharmap-2.90/gucharmap/gucharmap-block-codepoint-list.h
include/gucharmap-2.90/gucharmap/gucharmap-chapters-model.h
include/gucharmap-2.90/gucharmap/gucharmap-chapters-view.h
include/gucharmap-2.90/gucharmap/gucharmap-charmap.h
include/gucharmap-2.90/gucharmap/gucharmap-chartable.h
include/gucharmap-2.90/gucharmap/gucharmap-codepoint-list.h
include/gucharmap-2.90/gucharmap/gucharmap-script-chapters-model.h
include/gucharmap-2.90/gucharmap/gucharmap-script-codepoint-list.h
include/gucharmap-2.90/gucharmap/gucharmap-type-builtins.h
include/gucharmap-2.90/gucharmap/gucharmap-unicode-info.h
include/gucharmap-2.90/gucharmap/gucharmap.h
lib/girepository-1.0/Gucharmap-2.90.typelib
lib/libgucharmap_2_90.a
lib/libgucharmap_2_90.la
@lib lib/libgucharmap_2_90.so.${LIBgucharmap_2_90_VERSION}
lib/pkgconfig/gucharmap-2.90.pc
share/applications/gucharmap.desktop
share/gir-1.0/Gucharmap-2.90.gir
share/gnome/
share/gnome/help/
share/gnome/help/gucharmap/
share/gnome/help/gucharmap/C/
share/gnome/help/gucharmap/C/figures/
@ -183,6 +204,7 @@ share/locale/xh/LC_MESSAGES/gucharmap.mo
share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
share/locale/zh_HK/LC_MESSAGES/gucharmap.mo
share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
share/omf/
share/omf/gucharmap/
share/omf/gucharmap/gucharmap-C.omf
share/omf/gucharmap/gucharmap-bg.omf