From owner-dev-commits-ports-all@freebsd.org Fri May 21 11:36:06 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 798566579C2; Fri, 21 May 2021 11:36:06 +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 4Fml122FFkz4tNL; Fri, 21 May 2021 11:36:06 +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 340C710B94; Fri, 21 May 2021 11:36:06 +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 14LBa6ui044748; Fri, 21 May 2021 11:36:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14LBa6RL044747; Fri, 21 May 2021 11:36:06 GMT (envelope-from git) Date: Fri, 21 May 2021 11:36:06 GMT Message-Id: <202105211136.14LBa6RL044747@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: 93715fdbe16f - main - graphics/goocanvas: 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: 93715fdbe16f18738c781d0ed73ce96a09fae239 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 11:36:06 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=93715fdbe16f18738c781d0ed73ce96a09fae239 commit 93715fdbe16f18738c781d0ed73ce96a09fae239 Author: Alexey Dokuchaev AuthorDate: 2021-05-21 11:30:42 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-05-21 11:33:54 +0000 graphics/goocanvas: the port had been improved (+) - Define LICENSE (LGPL20) - Do not manually set CPPFLAGS and LDFLAGS, USES+=localbase does the job nicely and is only needed in the NLS case anyways - Convert to option helpers and INSTALL_TARGET=install-strip - Fix documentation path (/usr/local/share/doc/goocanvas/goocanvas -> /usr/local/share/doc/goocanvas) --- graphics/goocanvas/Makefile | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile index 5e57bc7066fa..6d1a87fa89ef 100644 --- a/graphics/goocanvas/Makefile +++ b/graphics/goocanvas/Makefile @@ -1,5 +1,4 @@ # Created by: Michael Johnson -# $MCom: ports/trunk/graphics/goocanvas/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= goocanvas PORTVERSION= 1.0.0 @@ -10,6 +9,8 @@ MASTER_SITES= GNOME MAINTAINER= kwm@FreeBSD.org COMMENT= Canvas widget for GTK+ +LICENSE= LGPL20 + PORTSCOUT= ignore:1 LIB_DEPENDS= libfreetype.so:print/freetype2 \ @@ -19,35 +20,24 @@ USES= gnome libtool pathfix pkgconfig tar:bzip2 USE_GNOME= cairo gdkpixbuf2 gtk20 GNU_CONFIGURE= yes USE_LDCONFIG= yes - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip LIBS= -lm PORTDOCS= * 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 localbase post-patch: - @${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|' \ + @${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR:H}|' \ ${WRKSRC}/configure -.if ! ${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-off: @${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.in -.endif -.if ! ${PORT_OPTIONS:MNLS} - @${REINPLACE_CMD} -e '/^SUBDIRS/s|po||g' ${WRKSRC}/Makefile.in -.endif -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgoocanvas.so.* +post-patch-NLS-off: + @${REINPLACE_CMD} -e '/^SUBDIRS/s|po||g' ${WRKSRC}/Makefile.in .include