From f3aa0b64ca82b68530c28d9d9e41d400fa11b2f4 Mon Sep 17 00:00:00 2001 From: Ben Woods Date: Sun, 6 Oct 2019 23:44:27 +0000 Subject: [PATCH] sysutils/garcon: Make GTK2 optional (on by default) Approved by: madpilot (xfce maintainer) Differential Revision: https://reviews.freebsd.org/D21873 --- sysutils/garcon/Makefile | 13 ++++++++----- sysutils/garcon/pkg-plist | 12 ++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile index 3088d1992cca..0b0e334fb476 100644 --- a/sysutils/garcon/Makefile +++ b/sysutils/garcon/Makefile @@ -3,7 +3,7 @@ PORTNAME= garcon PORTVERSION= 0.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 @@ -20,18 +20,21 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ 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 diff --git a/sysutils/garcon/pkg-plist b/sysutils/garcon/pkg-plist index 873d608df2c8..4fba1087e319 100644 --- a/sysutils/garcon/pkg-plist +++ b/sysutils/garcon/pkg-plist @@ -15,21 +15,21 @@ 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