From owner-svn-ports-head@FreeBSD.ORG Wed May 22 11:32:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E3189D71; Wed, 22 May 2013 11:32:23 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D4E4582; Wed, 22 May 2013 11:32:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4MBWNIe064738; Wed, 22 May 2013 11:32:23 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4MBWNMI064734; Wed, 22 May 2013 11:32:23 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201305221132.r4MBWNMI064734@svn.freebsd.org> From: Koop Mast Date: Wed, 22 May 2013 11:32:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318761 - in head: devel/glib20-reference x11-toolkits/gtk20-reference x11-toolkits/gtk30-reference X-SVN-Group: ports-head 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.14 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: Wed, 22 May 2013 11:32:24 -0000 Author: kwm Date: Wed May 22 11:32:22 2013 New Revision: 318761 URL: http://svnweb.freebsd.org/changeset/ports/318761 Log: Make PORTDOCS in the -reference framework overwriteable. So some of the -reference ports that install multiple docs or "books" can make sure they get installed correctly. This impacts the -reference ports of glib20, gtk20 and gtk30. The problem was that for example in glib20 the reference was installed in share/doc/glib/{glib,gio,gobject} however devhelp only look in share/doc/${book} for the *.devhelp2 file. PR: ports/173577 Submitted by: Victor Balada Diaz Modified: head/devel/glib20-reference/Makefile (contents, props changed) head/devel/glib20-reference/bsd.gnome-reference.mk (contents, props changed) head/x11-toolkits/gtk20-reference/Makefile (contents, props changed) head/x11-toolkits/gtk30-reference/Makefile (contents, props changed) Modified: head/devel/glib20-reference/Makefile ============================================================================== --- head/devel/glib20-reference/Makefile Wed May 22 09:48:12 2013 (r318760) +++ head/devel/glib20-reference/Makefile Wed May 22 11:32:22 2013 (r318761) @@ -9,6 +9,12 @@ PORTREVISION= 1 BOOKS= glib gobject gio +# custom DOCSDIR. This is because we want the references to be installed +# in share/doc/${book} and not share/doc/glib/${book} +DOCSDIR= ${PREFIX}/share/doc + +PORTDOCS= glib/* gobject/* gio/* + glib_MAN= glib-gettextize.1 gobject_MAN= glib-genmarshal.1 glib-mkenums.1 gobject-query.1 Modified: head/devel/glib20-reference/bsd.gnome-reference.mk ============================================================================== --- head/devel/glib20-reference/bsd.gnome-reference.mk Wed May 22 09:48:12 2013 (r318760) +++ head/devel/glib20-reference/bsd.gnome-reference.mk Wed May 22 11:32:22 2013 (r318761) @@ -35,7 +35,7 @@ DISTINFO_FILE= ${PARENTDIR}/distinfo REFERENCE_SRC?= ${WRKSRC}/docs/reference BOOKS?= . -PORTDOCS= * +PORTDOCS?= * .if !target(do-build) do-build: Modified: head/x11-toolkits/gtk20-reference/Makefile ============================================================================== --- head/x11-toolkits/gtk20-reference/Makefile Wed May 22 09:48:12 2013 (r318760) +++ head/x11-toolkits/gtk20-reference/Makefile Wed May 22 11:32:22 2013 (r318761) @@ -1,12 +1,13 @@ -# New ports collection makefile for: gtk20-reference -# Date created: 09 May 2006 -# Whom: Jean-Yves Lefort -# +# Created by: Jean-Yves Lefort # $FreeBSD$ -# -PORTREVISION= 2 +PORTREVISION= 0 + +# custom DOCSDIR. This is because we want the references to be installed +# in share/doc/${book} and not share/doc/gtk/${book} +DOCSDIR= ${PREFIX}/share/doc BOOKS= gdk gtk +PORTDOCS= gdk/* gtk/* .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk" Modified: head/x11-toolkits/gtk30-reference/Makefile ============================================================================== --- head/x11-toolkits/gtk30-reference/Makefile Wed May 22 09:48:12 2013 (r318760) +++ head/x11-toolkits/gtk30-reference/Makefile Wed May 22 11:32:22 2013 (r318761) @@ -1,12 +1,14 @@ -# New ports collection makefile for: gtk20-reference -# Date created: 09 May 2006 -# Whom: Jean-Yves Lefort -# +# Created by: Jean-Yves Lefort # $FreeBSD$ -# -PORTREVISION= 0 +PORTREVISION= 1 + +# custom DOCSDIR. This is because we want the references to be installed +# in share/doc/${book} and not share/doc/gtk/${book} +DOCSDIR= ${PREFIX}/share/doc BOOKS= gdk gtk +PORTDOCS= gdk/* gtk/* + .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"