From owner-dev-commits-ports-all@freebsd.org Fri May 21 12:00:16 2021 Return-Path: Delivered-To: dev-commits-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 0B80C630592; Fri, 21 May 2021 12:00:16 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FmlXv5Hydz3MKd; Fri, 21 May 2021 12:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 961D310F0F; Fri, 21 May 2021 12:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14LC0Fn2077022; Fri, 21 May 2021 12:00:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14LC0FHs077016; Fri, 21 May 2021 12:00:15 GMT (envelope-from git) Date: Fri, 21 May 2021 12:00:15 GMT Message-Id: <202105211200.14LC0FHs077016@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 643e95373d09 - main - graphics/goocanvas2: the port had been improved (+) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 643e95373d09c143cc4d82aa8fcdd1fc283c9706 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 May 2021 12:00:16 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=643e95373d09c143cc4d82aa8fcdd1fc283c9706 commit 643e95373d09c143cc4d82aa8fcdd1fc283c9706 Author: Alexey Dokuchaev AuthorDate: 2021-05-21 11:58:52 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-05-21 11:59:40 +0000 graphics/goocanvas2: the port had been improved (+) - Drop needless `localbase' from USES list - Install documentation in standard place - Convert to option helpers while I'm here --- graphics/goocanvas2/Makefile | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/graphics/goocanvas2/Makefile b/graphics/goocanvas2/Makefile index c1469b553b6a..d88f3d99b9ec 100644 --- a/graphics/goocanvas2/Makefile +++ b/graphics/goocanvas2/Makefile @@ -12,7 +12,7 @@ COMMENT= Canvas widget for GTK+ 3 LICENSE= LGPL20 -USES= gmake gnome libtool localbase pathfix pkgconfig python:build tar:xz +USES= gmake gnome libtool pathfix pkgconfig python:build tar:xz USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build USE_LDCONFIG= yes @@ -20,26 +20,22 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-python=no INSTALL_TARGET= install-strip +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= * -DOCSDIR= ${PREFIX}/share/gtk-doc/html/goocanvas2 OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext post-patch: -.if ! ${PORT_OPTIONS:MDOCS} + @${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR:H}|' \ + ${WRKSRC}/configure + +post-patch-DOCS-off: @${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.in -.endif -.if ! ${PORT_OPTIONS:MNLS} + +post-patch-NLS-off: @${REINPLACE_CMD} -e '/^SUBDIRS/s|po||g' ${WRKSRC}/Makefile.in -.endif .include