Date: Sun, 10 Mar 2019 14:16:13 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495294 - head/net-im/libsignon-glib Message-ID: <201903101416.x2AEGDrD039382@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Sun Mar 10 14:16:13 2019 New Revision: 495294 URL: https://svnweb.freebsd.org/changeset/ports/495294 Log: Add DOCS option to net-im/libsignon-glib. This makes the documentation optional (but defaults to on). Without the documentation, no gtkdoc needs to be built, and no Doxygen gets dragged in. The ports framework for --enable-<foo> doesn't help here, because that option is created by the gtkdoc autoconf macros, which we don't want to have involved. Use sed to comment out the offending bits. Patch considerably changed from the PR. PORTREVISION bumped because there's now options where there were none before, but the default package doesn't change at all. PR: 236259 Reported by: rozhuk.im@gmail.com Modified: head/net-im/libsignon-glib/Makefile head/net-im/libsignon-glib/pkg-plist Modified: head/net-im/libsignon-glib/Makefile ============================================================================== --- head/net-im/libsignon-glib/Makefile Sun Mar 10 13:10:45 2019 (r495293) +++ head/net-im/libsignon-glib/Makefile Sun Mar 10 14:16:13 2019 (r495294) @@ -2,7 +2,7 @@ PORTNAME= libsignon-glib PORTVERSION= 1.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im DIST_SUBDIR= KDE/${GL_ACCOUNT} @@ -12,12 +12,11 @@ COMMENT= GLib-based client library for applications ha LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= gtkdocize:textproc/gtk-doc \ - signond:sysutils/signon-qt5 +BUILD_DEPENDS= signond:sysutils/signon-qt5 RUN_DEPENDS= signond:sysutils/signon-qt5 GNU_CONFIGURE= YES -CONFIGURE_ARGS= --disable-tests --enable-gtk-doc +CONFIGURE_ARGS= --disable-tests USES= autoreconf gmake gnome libtool pathfix pkgconfig python tar:bz2 USE_GNOME= introspection pygobject3 @@ -31,8 +30,19 @@ GL_ACCOUNT= accounts-sso GL_COMMIT= 4e85baaf483268d04bbf835bebeac4ae30c7c327 CFLAGS+= -Wno-error -# Run gtdocize as done in autogen.sh -pre-configure: +OPTIONS_DEFINE= DOCS +OPTIONS_SUB= yes + +DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc +DOCS_CONFIGURE_ENABLE= gtk-doc + +# Run gtdocize as done in autogen.sh. When DOCS is off, the +# unexpanded GTK_DOC_CHECK macro remains, so comment it out instead. +pre-configure-DOCS-on: cd ${CONFIGURE_WRKSRC} && gtkdocize --copy --flavour no-tmpl + +pre-configure-DOCS-off: + @${TOUCH} ${WRKSRC}/gtk-doc.make + @${REINPLACE_CMD} -e 's/^GTK_DOC_CHECK/# GTK_DOC_CHECK/' ${WRKSRC}/configure.ac .include <bsd.port.mk> Modified: head/net-im/libsignon-glib/pkg-plist ============================================================================== --- head/net-im/libsignon-glib/pkg-plist Sun Mar 10 13:10:45 2019 (r495293) +++ head/net-im/libsignon-glib/pkg-plist Sun Mar 10 14:16:13 2019 (r495294) @@ -15,33 +15,33 @@ lib/libsignon-glib.so.1.0.0 %%PYTHON_SITELIBDIR%%/gi/overrides/Signon.pyo libdata/pkgconfig/libsignon-glib.pc share/gir-1.0/Signon-1.0.gir -share/gtk-doc/html/libsignon-glib/SignonAuthService.html -share/gtk-doc/html/libsignon-glib/SignonAuthSession.html -share/gtk-doc/html/libsignon-glib/SignonIdentity.html -share/gtk-doc/html/libsignon-glib/SignonIdentityInfo.html -share/gtk-doc/html/libsignon-glib/annotation-glossary.html -share/gtk-doc/html/libsignon-glib/api-index-1-8.html -share/gtk-doc/html/libsignon-glib/api-index-deprecated.html -share/gtk-doc/html/libsignon-glib/api-index-full.html -share/gtk-doc/html/libsignon-glib/appendices.html -share/gtk-doc/html/libsignon-glib/credential-management.html -share/gtk-doc/html/libsignon-glib/gdbus-com.google.code.AccountsSSO.SingleSignOn.AuthService.html -share/gtk-doc/html/libsignon-glib/gdbus-com.google.code.AccountsSSO.SingleSignOn.AuthSession.html -share/gtk-doc/html/libsignon-glib/gdbus-com.google.code.AccountsSSO.SingleSignOn.Identity.html -share/gtk-doc/html/libsignon-glib/home.png -share/gtk-doc/html/libsignon-glib/index.html -share/gtk-doc/html/libsignon-glib/left-insensitive.png -share/gtk-doc/html/libsignon-glib/left.png -share/gtk-doc/html/libsignon-glib/libsignon-glib-SignonError.html -share/gtk-doc/html/libsignon-glib/libsignon-glib-objects.html -share/gtk-doc/html/libsignon-glib/libsignon-glib-overview.html -share/gtk-doc/html/libsignon-glib/libsignon-glib.devhelp2 -share/gtk-doc/html/libsignon-glib/object-tree.html -share/gtk-doc/html/libsignon-glib/right-insensitive.png -share/gtk-doc/html/libsignon-glib/right.png -share/gtk-doc/html/libsignon-glib/signond-dbus-api.html -share/gtk-doc/html/libsignon-glib/style.css -share/gtk-doc/html/libsignon-glib/up-insensitive.png -share/gtk-doc/html/libsignon-glib/up.png +%%DOCS%%share/gtk-doc/html/libsignon-glib/SignonAuthService.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/SignonAuthSession.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/SignonIdentity.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/SignonIdentityInfo.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/annotation-glossary.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/api-index-1-8.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/api-index-deprecated.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/api-index-full.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/appendices.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/credential-management.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/gdbus-com.google.code.AccountsSSO.SingleSignOn.AuthService.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/gdbus-com.google.code.AccountsSSO.SingleSignOn.AuthSession.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/gdbus-com.google.code.AccountsSSO.SingleSignOn.Identity.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/home.png +%%DOCS%%share/gtk-doc/html/libsignon-glib/index.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/left-insensitive.png +%%DOCS%%share/gtk-doc/html/libsignon-glib/left.png +%%DOCS%%share/gtk-doc/html/libsignon-glib/libsignon-glib-SignonError.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/libsignon-glib-objects.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/libsignon-glib-overview.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/libsignon-glib.devhelp2 +%%DOCS%%share/gtk-doc/html/libsignon-glib/object-tree.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/right-insensitive.png +%%DOCS%%share/gtk-doc/html/libsignon-glib/right.png +%%DOCS%%share/gtk-doc/html/libsignon-glib/signond-dbus-api.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/style.css +%%DOCS%%share/gtk-doc/html/libsignon-glib/up-insensitive.png +%%DOCS%%share/gtk-doc/html/libsignon-glib/up.png share/vala/vapi/signon.vapi @comment share/gtk-doc/html/libsignon-glib/index.sgml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903101416.x2AEGDrD039382>