From owner-svn-ports-head@freebsd.org Tue Nov 12 13:43:12 2019 Return-Path: Delivered-To: svn-ports-head@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 3D5311AE439; Tue, 12 Nov 2019 13:43:12 +0000 (UTC) (envelope-from amdmi3@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 47C88J0tJnz4ZCt; Tue, 12 Nov 2019 13:43:12 +0000 (UTC) (envelope-from amdmi3@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 024AD8CD; Tue, 12 Nov 2019 13:43:12 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xACDhBkH032011; Tue, 12 Nov 2019 13:43:11 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xACDhBKo032010; Tue, 12 Nov 2019 13:43:11 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201911121343.xACDhBKo032010@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 12 Nov 2019 13:43:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517333 - head/devel/cutter X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/devel/cutter X-SVN-Commit-Revision: 517333 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2019 13:43:12 -0000 Author: amdmi3 Date: Tue Nov 12 13:43:11 2019 New Revision: 517333 URL: https://svnweb.freebsd.org/changeset/ports/517333 Log: - Switch to USES=localbase - Switch to options helpers and OPTIONS_SUB, simplifying the port PR: 241896 Submitted by: amdmi3 Approved by: romain (maintainer) Modified: head/devel/cutter/Makefile Modified: head/devel/cutter/Makefile ============================================================================== --- head/devel/cutter/Makefile Tue Nov 12 13:29:17 2019 (r517332) +++ head/devel/cutter/Makefile Tue Nov 12 13:43:11 2019 (r517333) @@ -18,52 +18,31 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -CPPFLAGS+= "-I${LOCALBASE}/include" CONFIGURE_ARGS= --disable-gtk-doc-html --with-html-dir=${PREFIX}/share/doc \ --disable-gstreamer GNU_CONFIGURE= yes -USES= gettext gnome gmake libtool pathfix pkgconfig +USES= gettext gnome gmake libtool localbase pathfix pkgconfig USE_GNOME= intlhack gdkpixbuf2 glib20 gtk20 USE_LDCONFIG= yes INSTALL_TARGET= install-strip TEST_TARGET= check OPTIONS_DEFINE= GOFFICE SOUP LCOV NLS +OPTIONS_SUB= yes GOFFICE_DESC= GOffice support SOUP_DESC= libsoup support LCOV_DESC= Force dependency on lcov -.include - -.if ${PORT_OPTIONS:MGOFFICE} -CONFIGURE_ARGS+=--enable-goffice +GOFFICE_CONFIGURE_ENABLE=goffice # the 0.8 is part of the library name don't remove it. -LIB_DEPENDS+= libgoffice-0.8.so:devel/goffice -PLIST_SUB+= GOFFICE="" -.else -CONFIGURE_ARGS+=--disable-goffice -PLIST_SUB+= GOFFICE="@comment " -.endif +GOFFICE_LIB_DEPENDS= libgoffice-0.8.so:devel/goffice -.if ${PORT_OPTIONS:MLCOV} -RUN_DEPENDS+= lcov:devel/lcov -.endif +LCOV_RUN_DEPENDS= lcov:devel/lcov -.if ${PORT_OPTIONS:MSOUP} -CONFIGURE_ARGS+=--enable-libsoup -LIB_DEPENDS+= libsoup-2.4.so:devel/libsoup -PLIST_SUB+= SOUP="" -.else -CONFIGURE_ARGS+=--disable-libsoup -PLIST_SUB+= SOUP="@comment " -.endif +SOUP_CONFIGURE_ENABLE= libsoup +SOUP_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls .include