Index: head/sysutils/garcon/Makefile =================================================================== --- head/sysutils/garcon/Makefile (revision 513919) +++ head/sysutils/garcon/Makefile (revision 513920) @@ -1,38 +1,41 @@ # Created by: Oliver Lehmann # $FreeBSD$ PORTNAME= garcon PORTVERSION= 0.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Freedesktop compliant menu library # garcon's source code is licensed under GPLv2, while its # documentation is under GFDL 1.1. LICENSE= GPLv2 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 USES= compiler:c11 gettext-tools gmake gnome libtool pathfix \ pkgconfig tar:bzip2 xfce -USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 gtk30 intltool +USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool USE_XFCE= libmenu USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -CONFIGURE_ARGS= --without-html-dir \ - --enable-gtk2 +CONFIGURE_ARGS= --without-html-dir -OPTIONS_DEFINE= NLS +OPTIONS_DEFINE= GTK2 NLS +OPTIONS_DEFAULT= GTK2 OPTIONS_SUB= yes + +GTK2_USE= gnome=gtk20 +GTK2_CONFIGURE_ENABLE= gtk2 NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime .include Index: head/sysutils/garcon/pkg-plist =================================================================== --- head/sysutils/garcon/pkg-plist (revision 513919) +++ head/sysutils/garcon/pkg-plist (revision 513920) @@ -1,109 +1,109 @@ etc/xdg/menus/xfce-applications.menu include/garcon-1/garcon/garcon-config.h include/garcon-1/garcon/garcon-environment.h include/garcon-1/garcon/garcon-marshal.h include/garcon-1/garcon/garcon-menu-directory.h include/garcon-1/garcon/garcon-menu-element.h include/garcon-1/garcon/garcon-menu-item-action.h include/garcon-1/garcon/garcon-menu-item-cache.h include/garcon-1/garcon/garcon-menu-item-pool.h include/garcon-1/garcon/garcon-menu-item.h include/garcon-1/garcon/garcon-menu-merger.h include/garcon-1/garcon/garcon-menu-node.h include/garcon-1/garcon/garcon-menu-parser.h include/garcon-1/garcon/garcon-menu-separator.h include/garcon-1/garcon/garcon-menu-tree-provider.h include/garcon-1/garcon/garcon-menu.h include/garcon-1/garcon/garcon.h -include/garcon-gtk2-1/garcon-gtk/garcon-gtk-menu.h -include/garcon-gtk2-1/garcon-gtk/garcon-gtk.h +%%GTK2%%include/garcon-gtk2-1/garcon-gtk/garcon-gtk-menu.h +%%GTK2%%include/garcon-gtk2-1/garcon-gtk/garcon-gtk.h include/garcon-gtk3-1/garcon-gtk/garcon-gtk-menu.h include/garcon-gtk3-1/garcon-gtk/garcon-gtk.h lib/libgarcon-1.so lib/libgarcon-1.so.0 lib/libgarcon-1.so.0.0.0 -lib/libgarcon-gtk2-1.so -lib/libgarcon-gtk2-1.so.0 -lib/libgarcon-gtk2-1.so.0.0.0 +%%GTK2%%lib/libgarcon-gtk2-1.so +%%GTK2%%lib/libgarcon-gtk2-1.so.0 +%%GTK2%%lib/libgarcon-gtk2-1.so.0.0.0 lib/libgarcon-gtk3-1.so lib/libgarcon-gtk3-1.so.0 lib/libgarcon-gtk3-1.so.0.0.0 libdata/pkgconfig/garcon-1.pc -libdata/pkgconfig/garcon-gtk2-1.pc +%%GTK2%%libdata/pkgconfig/garcon-gtk2-1.pc libdata/pkgconfig/garcon-gtk3-1.pc share/desktop-directories/xfce-accessories.directory share/desktop-directories/xfce-development.directory share/desktop-directories/xfce-education.directory share/desktop-directories/xfce-games.directory share/desktop-directories/xfce-graphics.directory share/desktop-directories/xfce-hardware.directory share/desktop-directories/xfce-multimedia.directory share/desktop-directories/xfce-network.directory share/desktop-directories/xfce-office.directory share/desktop-directories/xfce-other.directory share/desktop-directories/xfce-personal.directory share/desktop-directories/xfce-screensavers.directory share/desktop-directories/xfce-settings.directory share/desktop-directories/xfce-system.directory %%NLS%%share/locale/am/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ar/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ast/LC_MESSAGES/garcon.mo %%NLS%%share/locale/be/LC_MESSAGES/garcon.mo %%NLS%%share/locale/bg/LC_MESSAGES/garcon.mo %%NLS%%share/locale/bn/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ca/LC_MESSAGES/garcon.mo %%NLS%%share/locale/cs/LC_MESSAGES/garcon.mo %%NLS%%share/locale/cy/LC_MESSAGES/garcon.mo %%NLS%%share/locale/da/LC_MESSAGES/garcon.mo %%NLS%%share/locale/de/LC_MESSAGES/garcon.mo %%NLS%%share/locale/el/LC_MESSAGES/garcon.mo %%NLS%%share/locale/en_AU/LC_MESSAGES/garcon.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/garcon.mo %%NLS%%share/locale/eo/LC_MESSAGES/garcon.mo %%NLS%%share/locale/es/LC_MESSAGES/garcon.mo %%NLS%%share/locale/et/LC_MESSAGES/garcon.mo %%NLS%%share/locale/eu/LC_MESSAGES/garcon.mo %%NLS%%share/locale/fi/LC_MESSAGES/garcon.mo %%NLS%%share/locale/fr/LC_MESSAGES/garcon.mo %%NLS%%share/locale/gl/LC_MESSAGES/garcon.mo %%NLS%%share/locale/he/LC_MESSAGES/garcon.mo %%NLS%%share/locale/hi/LC_MESSAGES/garcon.mo %%NLS%%share/locale/hr/LC_MESSAGES/garcon.mo %%NLS%%share/locale/hu/LC_MESSAGES/garcon.mo %%NLS%%share/locale/hy/LC_MESSAGES/garcon.mo %%NLS%%share/locale/hy_AM/LC_MESSAGES/garcon.mo %%NLS%%share/locale/id/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ie/LC_MESSAGES/garcon.mo %%NLS%%share/locale/is/LC_MESSAGES/garcon.mo %%NLS%%share/locale/it/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ja/LC_MESSAGES/garcon.mo %%NLS%%share/locale/kk/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ko/LC_MESSAGES/garcon.mo %%NLS%%share/locale/lt/LC_MESSAGES/garcon.mo %%NLS%%share/locale/lv/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ms/LC_MESSAGES/garcon.mo %%NLS%%share/locale/nb/LC_MESSAGES/garcon.mo %%NLS%%share/locale/nl/LC_MESSAGES/garcon.mo %%NLS%%share/locale/nn/LC_MESSAGES/garcon.mo %%NLS%%share/locale/oc/LC_MESSAGES/garcon.mo %%NLS%%share/locale/pa/LC_MESSAGES/garcon.mo %%NLS%%share/locale/pl/LC_MESSAGES/garcon.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/garcon.mo %%NLS%%share/locale/pt/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ro/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ru/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sk/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sl/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sq/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sr/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sv/LC_MESSAGES/garcon.mo %%NLS%%share/locale/te/LC_MESSAGES/garcon.mo %%NLS%%share/locale/th/LC_MESSAGES/garcon.mo %%NLS%%share/locale/tr/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ug/LC_MESSAGES/garcon.mo %%NLS%%share/locale/uk/LC_MESSAGES/garcon.mo %%NLS%%share/locale/uz@Latn/LC_MESSAGES/garcon.mo %%NLS%%share/locale/uz/LC_MESSAGES/garcon.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/garcon.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/garcon.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/garcon.mo