From owner-svn-ports-all@freebsd.org Sun Oct 6 23:44:28 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 65933137CEA; Sun, 6 Oct 2019 23:44:28 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46mgF8223gz40tw; Sun, 6 Oct 2019 23:44:28 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 28C345FEC; Sun, 6 Oct 2019 23:44:28 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x96NiSXU039194; Sun, 6 Oct 2019 23:44:28 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x96NiR8C039192; Sun, 6 Oct 2019 23:44:27 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201910062344.x96NiR8C039192@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sun, 6 Oct 2019 23:44:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513920 - head/sysutils/garcon X-SVN-Group: ports-head X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: head/sysutils/garcon X-SVN-Commit-Revision: 513920 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2019 23:44:28 -0000 Author: woodsb02 Date: Sun Oct 6 23:44:27 2019 New Revision: 513920 URL: https://svnweb.freebsd.org/changeset/ports/513920 Log: sysutils/garcon: Make GTK2 optional (on by default) Approved by: madpilot (xfce maintainer) Differential Revision: https://reviews.freebsd.org/D21873 Modified: head/sysutils/garcon/Makefile head/sysutils/garcon/pkg-plist Modified: head/sysutils/garcon/Makefile ============================================================================== --- head/sysutils/garcon/Makefile Sun Oct 6 23:22:37 2019 (r513919) +++ head/sysutils/garcon/Makefile Sun Oct 6 23:44:27 2019 (r513920) @@ -3,7 +3,7 @@ PORTNAME= garcon PORTVERSION= 0.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 @@ -20,17 +20,20 @@ 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 Modified: head/sysutils/garcon/pkg-plist ============================================================================== --- head/sysutils/garcon/pkg-plist Sun Oct 6 23:22:37 2019 (r513919) +++ head/sysutils/garcon/pkg-plist Sun Oct 6 23:44:27 2019 (r513920) @@ -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