From owner-svn-ports-head@freebsd.org Fri Aug 25 17:21:15 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 313AFDDD2DD; Fri, 25 Aug 2017 17:21:15 +0000 (UTC) (envelope-from danfe@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 mx1.freebsd.org (Postfix) with ESMTPS id 0764668381; Fri, 25 Aug 2017 17:21:14 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7PHLE55082044; Fri, 25 Aug 2017 17:21:14 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7PHLDOD082041; Fri, 25 Aug 2017 17:21:13 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201708251721.v7PHLDOD082041@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 25 Aug 2017 17:21:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448722 - head/x11/keybinder X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/x11/keybinder X-SVN-Commit-Revision: 448722 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 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: Fri, 25 Aug 2017 17:21:15 -0000 Author: danfe Date: Fri Aug 25 17:21:13 2017 New Revision: 448722 URL: https://svnweb.freebsd.org/changeset/ports/448722 Log: - Make build dependency on `textproc/gtk-doc' 1) optional, and 2) actually useful (for developers). Previously, API documentation was never built, disabled via CONFIGURE_ARGS; these docs are of no use to general public and might be interesting only to application developers working with the library, so do not install them by default (just as before) - While here, deobfuscate one installation command that was obfuscated in r406897 (careless commit of Kato's patch) and make the port description more accurate and readable Modified: head/x11/keybinder/Makefile head/x11/keybinder/pkg-descr head/x11/keybinder/pkg-plist Modified: head/x11/keybinder/Makefile ============================================================================== --- head/x11/keybinder/Makefile Fri Aug 25 17:18:20 2017 (r448721) +++ head/x11/keybinder/Makefile Fri Aug 25 17:21:13 2017 (r448722) @@ -11,8 +11,6 @@ COMMENT= Library for registering keyboard shortcuts LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= gtkdocize:textproc/gtk-doc - USE_GITHUB= yes GH_ACCOUNT= engla @@ -20,24 +18,32 @@ USES= autoreconf gmake libtool pathfix pkgconfig USE_GNOME= gtk20 introspection:build USE_XORG= x11 xext xrender GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-gtk-doc INSTALL_TARGET= install-strip USE_LDCONFIG= yes -OPTIONS_DEFINE= EXAMPLES LUA PYTHON +OPTIONS_DEFINE= EXAMPLES GTKDOC LUA PYTHON OPTIONS_DEFAULT= PYTHON -OPTIONS_SUB= yes +OPTIONS_SUB= yes +GTKDOC_DESC= Build API documentation (requires textproc/gtk-doc) +GTKDOC_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc +GTKDOC_CONFIGURE_ON= --enable-gtk-doc + # Override LUA description LUA_DESC= Lua bindings LUA_USES= lua:51 LUA_CONFIGURE_ON= --with-lua-includes=${LUA_INCDIR} LUA_CONFIGURE_OFF= --disable-lua + PYTHON_USES= python:2 PYTHON_USE= gnome=pygtk2 PYTHON_CONFIGURE_OFF= --disable-python -pre-configure: +post-patch-GTKDOC-off: + @${REINPLACE_CMD} -E '/GTK_DOC_CHECK|docs/d' ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e '/^SUBDIRS/s, docs,,' ${WRKSRC}/Makefile.am + +pre-configure-GTKDOC-on: @(cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/gtkdocize) post-build-EXAMPLES-on: @@ -46,7 +52,6 @@ post-build-EXAMPLES-on: post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples && ${INSTALL_DATA} * \ - ${STAGEDIR}${EXAMPLESDIR}) + ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/x11/keybinder/pkg-descr ============================================================================== --- head/x11/keybinder/pkg-descr Fri Aug 25 17:18:20 2017 (r448721) +++ head/x11/keybinder/pkg-descr Fri Aug 25 17:21:13 2017 (r448722) @@ -4,8 +4,8 @@ Keybinder works with GTK-based applications using the The port provides the following: - A C library, libkeybinder - - Lua bindings, lua-keybinder + - Lua bindings, lua-keybinder (off by default) - Python bindings, python-keybinder - - An examples directory with programs in C, Lua, Python, and Vala + - Example programs in C, Lua, Python, and Vala WWW: https://github.com/engla/keybinder Modified: head/x11/keybinder/pkg-plist ============================================================================== --- head/x11/keybinder/pkg-plist Fri Aug 25 17:18:20 2017 (r448721) +++ head/x11/keybinder/pkg-plist Fri Aug 25 17:21:13 2017 (r448722) @@ -19,3 +19,19 @@ libdata/pkgconfig/keybinder.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vexample.vala share/gir-1.0/Keybinder-0.0.gir +%%GTKDOC%%share/gtk-doc/html/keybinder/annotation-glossary.html +%%GTKDOC%%share/gtk-doc/html/keybinder/api-index-full.html +%%GTKDOC%%share/gtk-doc/html/keybinder/ch01.html +%%GTKDOC%%share/gtk-doc/html/keybinder/deprecated-api-index.html +%%GTKDOC%%share/gtk-doc/html/keybinder/home.png +%%GTKDOC%%share/gtk-doc/html/keybinder/index.html +%%GTKDOC%%share/gtk-doc/html/keybinder/keybinder-keybinder.html +%%GTKDOC%%share/gtk-doc/html/keybinder/keybinder.devhelp2 +%%GTKDOC%%share/gtk-doc/html/keybinder/left-insensitive.png +%%GTKDOC%%share/gtk-doc/html/keybinder/left.png +%%GTKDOC%%share/gtk-doc/html/keybinder/object-tree.html +%%GTKDOC%%share/gtk-doc/html/keybinder/right-insensitive.png +%%GTKDOC%%share/gtk-doc/html/keybinder/right.png +%%GTKDOC%%share/gtk-doc/html/keybinder/style.css +%%GTKDOC%%share/gtk-doc/html/keybinder/up-insensitive.png +%%GTKDOC%%share/gtk-doc/html/keybinder/up.png