aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2013-05-22 19:32:22 +0800
committerkwm <kwm@FreeBSD.org>2013-05-22 19:32:22 +0800
commit3637d905285d43885c21c95ec2163eca5c4308a5 (patch)
tree5e4f43bdd1cfb444cadce7701f0beab24075cdbe
parent86ccdcbc29888e59a57aeb89d9b549b4cc364064 (diff)
downloadfreebsd-ports-gnome-3637d905285d43885c21c95ec2163eca5c4308a5.tar.gz
freebsd-ports-gnome-3637d905285d43885c21c95ec2163eca5c4308a5.tar.zst
freebsd-ports-gnome-3637d905285d43885c21c95ec2163eca5c4308a5.zip
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 <victor@bsdes.net>
-rw-r--r--devel/glib20-reference/Makefile6
-rw-r--r--devel/glib20-reference/bsd.gnome-reference.mk2
-rw-r--r--x11-toolkits/gtk20-reference/Makefile13
-rw-r--r--x11-toolkits/gtk30-reference/Makefile14
4 files changed, 22 insertions, 13 deletions
diff --git a/devel/glib20-reference/Makefile b/devel/glib20-reference/Makefile
index 0f38c793a7d4..557b8d346d1f 100644
--- a/devel/glib20-reference/Makefile
+++ b/devel/glib20-reference/Makefile
@@ -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
diff --git a/devel/glib20-reference/bsd.gnome-reference.mk b/devel/glib20-reference/bsd.gnome-reference.mk
index 107d19c26c12..9335fc3b6e4b 100644
--- a/devel/glib20-reference/bsd.gnome-reference.mk
+++ b/devel/glib20-reference/bsd.gnome-reference.mk
@@ -35,7 +35,7 @@ DISTINFO_FILE= ${PARENTDIR}/distinfo
REFERENCE_SRC?= ${WRKSRC}/docs/reference
BOOKS?= .
-PORTDOCS= *
+PORTDOCS?= *
.if !target(do-build)
do-build:
diff --git a/x11-toolkits/gtk20-reference/Makefile b/x11-toolkits/gtk20-reference/Makefile
index b7beec30130d..00b7e3e4582c 100644
--- a/x11-toolkits/gtk20-reference/Makefile
+++ b/x11-toolkits/gtk20-reference/Makefile
@@ -1,12 +1,13 @@
-# New ports collection makefile for: gtk20-reference
-# Date created: 09 May 2006
-# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org>
-#
+# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
# $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"
diff --git a/x11-toolkits/gtk30-reference/Makefile b/x11-toolkits/gtk30-reference/Makefile
index 092169fe3fa5..488701c1f304 100644
--- a/x11-toolkits/gtk30-reference/Makefile
+++ b/x11-toolkits/gtk30-reference/Makefile
@@ -1,12 +1,14 @@
-# New ports collection makefile for: gtk20-reference
-# Date created: 09 May 2006
-# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org>
-#
+# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
# $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"