Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 May 2021 12:00:15 GMT
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 643e95373d09 - main - graphics/goocanvas2: the port had been improved (+)
Message-ID:  <202105211200.14LC0FHs077016@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=643e95373d09c143cc4d82aa8fcdd1fc283c9706

commit 643e95373d09c143cc4d82aa8fcdd1fc283c9706
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-05-21 11:58:52 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
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 <bsd.port.options.mk>
-
-.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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105211200.14LC0FHs077016>