From owner-svn-ports-head@freebsd.org Mon Mar 11 12:17:48 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34EA815409B9; Mon, 11 Mar 2019 12:17:48 +0000 (UTC) (envelope-from adridg@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 C413293C2B; Mon, 11 Mar 2019 12:17:47 +0000 (UTC) (envelope-from adridg@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 93578A9A2; Mon, 11 Mar 2019 12:17:47 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2BCHlT0036136; Mon, 11 Mar 2019 12:17:47 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2BCHlI2036134; Mon, 11 Mar 2019 12:17:47 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201903111217.x2BCHlI2036134@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Mon, 11 Mar 2019 12:17:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495352 - head/net-im/libaccounts-glib X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/net-im/libaccounts-glib X-SVN-Commit-Revision: 495352 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C413293C2B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.995,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Mon, 11 Mar 2019 12:17:48 -0000 Author: adridg Date: Mon Mar 11 12:17:46 2019 New Revision: 495352 URL: https://svnweb.freebsd.org/changeset/ports/495352 Log: Introduce DOCS option to net-im/libaccounts-glib. This allows the documentation -- HTML produced through gtkdoc -- to be removed from the package. It also tightens up the build requirements a little bit. Committed with some changes from the submitted patch. PR: 236257 Submitted by: rozhuk.im@gmail.com Modified: head/net-im/libaccounts-glib/Makefile head/net-im/libaccounts-glib/pkg-plist Modified: head/net-im/libaccounts-glib/Makefile ============================================================================== --- head/net-im/libaccounts-glib/Makefile Mon Mar 11 12:11:41 2019 (r495351) +++ head/net-im/libaccounts-glib/Makefile Mon Mar 11 12:17:46 2019 (r495352) @@ -3,7 +3,7 @@ PORTNAME= libaccounts-glib PORTVERSION= 1.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im DIST_SUBDIR= KDE/${GL_ACCOUNT} @@ -13,11 +13,10 @@ COMMENT= Accounts and SSO framework for Linux and POSI LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= gtkdocize:textproc/gtk-doc LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib GNU_CONFIGURE= YES -CONFIGURE_ARGS= --disable-tests --enable-gtk-doc +CONFIGURE_ARGS= --disable-tests INSTALL_TARGET= install-strip USES= autoreconf gmake gnome libtool pathfix pkgconfig python sqlite:3 @@ -30,7 +29,22 @@ USE_GITLAB= yes GL_ACCOUNT= accounts-sso GL_COMMIT= 00254a604a7c7bd38c41794a80ad8930e90f21aa -pre-configure: - cd ${WRKSRC} && gtkdocize --copy --flavour no-tmpl +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. +# Also drop the docs/ files from AC_CONFIG_FILES. +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/docs//g' ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -e 's/^GTK_DOC_CHECK/# GTK_DOC_CHECK/' \ + -e '/^.docs\//d' ${WRKSRC}/configure.ac .include Modified: head/net-im/libaccounts-glib/pkg-plist ============================================================================== --- head/net-im/libaccounts-glib/pkg-plist Mon Mar 11 12:11:41 2019 (r495351) +++ head/net-im/libaccounts-glib/pkg-plist Mon Mar 11 12:17:46 2019 (r495352) @@ -22,50 +22,50 @@ libdata/pkgconfig/libaccounts-glib.pc share/backup-framework/applications/accounts.conf share/dbus-1/interfaces/com.google.code.AccountsSSO.Accounts.Manager.xml share/gir-1.0/Accounts-1.0.gir -share/gtk-doc/html/libaccounts-glib/AgAccount.html -share/gtk-doc/html/libaccounts-glib/AgAccountService.html -share/gtk-doc/html/libaccounts-glib/AgApplication.html -share/gtk-doc/html/libaccounts-glib/AgAuthData.html -share/gtk-doc/html/libaccounts-glib/AgManager.html -share/gtk-doc/html/libaccounts-glib/AgProvider.html -share/gtk-doc/html/libaccounts-glib/AgService.html -share/gtk-doc/html/libaccounts-glib/AgServiceType.html -share/gtk-doc/html/libaccounts-glib/account-management.html -share/gtk-doc/html/libaccounts-glib/ag-backup.html -share/gtk-doc/html/libaccounts-glib/ag-tool.html -share/gtk-doc/html/libaccounts-glib/annotation-glossary.html -share/gtk-doc/html/libaccounts-glib/api-index-1-1.html -share/gtk-doc/html/libaccounts-glib/api-index-1-2.html -share/gtk-doc/html/libaccounts-glib/api-index-1-4.html -share/gtk-doc/html/libaccounts-glib/api-index-1-5.html -share/gtk-doc/html/libaccounts-glib/api-index-deprecated.html -share/gtk-doc/html/libaccounts-glib/api-index-full.html -share/gtk-doc/html/libaccounts-glib/appendices.html -share/gtk-doc/html/libaccounts-glib/gettext-xml-files.html -share/gtk-doc/html/libaccounts-glib/glossary.html -share/gtk-doc/html/libaccounts-glib/home.png -share/gtk-doc/html/libaccounts-glib/index.html -share/gtk-doc/html/libaccounts-glib/left-insensitive.png -share/gtk-doc/html/libaccounts-glib/left.png -share/gtk-doc/html/libaccounts-glib/libaccounts-compiling.html -share/gtk-doc/html/libaccounts-glib/libaccounts-glib-objects.html -share/gtk-doc/html/libaccounts-glib/libaccounts-glib-overview.html -share/gtk-doc/html/libaccounts-glib/libaccounts-glib-tools.html -share/gtk-doc/html/libaccounts-glib/libaccounts-glib.devhelp2 -share/gtk-doc/html/libaccounts-glib/libaccounts-overview.html -share/gtk-doc/html/libaccounts-glib/libaccounts-running.html -share/gtk-doc/html/libaccounts-glib/object-tree.html -share/gtk-doc/html/libaccounts-glib/provider-file-format.html -share/gtk-doc/html/libaccounts-glib/right-insensitive.png -share/gtk-doc/html/libaccounts-glib/right.png -share/gtk-doc/html/libaccounts-glib/service-file-format.html -share/gtk-doc/html/libaccounts-glib/service-type-file-format.html -share/gtk-doc/html/libaccounts-glib/style.css -share/gtk-doc/html/libaccounts-glib/up-insensitive.png -share/gtk-doc/html/libaccounts-glib/up.png -share/gtk-doc/html/libaccounts-glib/validating-xml-files.html -share/gtk-doc/html/libaccounts-glib/xml-file-formats.html -share/gtk-doc/html/libaccounts-glib/xml-files.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgAccount.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgAccountService.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgApplication.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgAuthData.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgManager.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgProvider.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgService.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgServiceType.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/account-management.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/ag-backup.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/ag-tool.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/annotation-glossary.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-1-1.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-1-2.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-1-4.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-1-5.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-deprecated.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-full.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/appendices.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/gettext-xml-files.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/glossary.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/home.png +%%DOCS%%share/gtk-doc/html/libaccounts-glib/index.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/left-insensitive.png +%%DOCS%%share/gtk-doc/html/libaccounts-glib/left.png +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-compiling.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib-objects.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib-overview.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib-tools.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib.devhelp2 +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-overview.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-running.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/object-tree.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/provider-file-format.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/right-insensitive.png +%%DOCS%%share/gtk-doc/html/libaccounts-glib/right.png +%%DOCS%%share/gtk-doc/html/libaccounts-glib/service-file-format.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/service-type-file-format.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/style.css +%%DOCS%%share/gtk-doc/html/libaccounts-glib/up-insensitive.png +%%DOCS%%share/gtk-doc/html/libaccounts-glib/up.png +%%DOCS%%share/gtk-doc/html/libaccounts-glib/validating-xml-files.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/xml-file-formats.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/xml-files.html share/vala/vapi/libaccounts-glib.deps share/vala/vapi/libaccounts-glib.vapi share/xml/accounts/schema/dtd/accounts-application.dtd