Presenting GNOME 2.10 for FreeBSD!

The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall.  However, a lot of
FreeBSD specific additions and fixes have been made.  For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support.  See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.

GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work.  We would also like to thank our adventurous users that chose to
ride the walrus.  We'd especially like to thank the following users that
provided patches for GNOME 2.10:

ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk

And anyone else I may have accidentally omitted.

As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer.  However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession.  You can
use the deskutils/splashsetter port to choose the one you like best.

As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10.  Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.

Enjoy!

6 files changed, 135 insertions, 58 deletions

diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 06d274d2aac8..880ac2eed127 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,23 +6,95 @@
 #
 
 PORTNAME=	yelp
-PORTVERSION=	2.6.5
+PORTVERSION=	2.9.3
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.9
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A help browser for the GNOME 2 desktop
 
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \
+		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \
+		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+
+MOZILLA=	mozilla
+HEADERS_SUFX=
+
+.if !defined(WITH_MOZILLA)
+MOZILLA=	mozilla
+HEADERS_SUFX=
+.else
+.if ${WITH_MOZILLA}=="firefox"
+MOZILLA=	firefox
+.else
+.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
+MOZILLA=	mozilla-devel
+HEADERS_SUFX=	-devel
+.else
+MOZILLA=	mozilla
+HEADERS_SUFX=
+.endif
+.endif
+.endif
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libgtkhtml
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--enable-man \
+		--enable-info \
+		--with-mozilla=${MOZILLA}
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
-.include <bsd.port.mk>
+GCONF_SCHEMAS=	yelp.schemas
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+.if ${MOZILLA}=="mozilla-devel"
+USE_GCC=	3.4
+.endif
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " By default yelp uses www/mozilla for html rendering, but you can"
+	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "  mozilla-devel "
+	@${ECHO_MSG} "  firefox "
+	@${ECHO_MSG} ""
+
+post-patch:
+.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="mozilla-devel"
+	@${REINPLACE_CMD} -e 's|xmozilla|xmozilla-devel|g; \
+		s|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \
+		s|$$MOZILLA-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' \
+		${WRKSRC}/configure
+.endif
+
+post-configure:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g ; \
+		s|%%MOZILLA%%|${MOZILLA}|g' <${FILESDIR}/yelp.sh \
+		> ${WRKDIR}/yelp.sh
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g ; \
+		s|%%MOZILLA%%|${MOZILLA}|g' <${FILESDIR}/gnome-help.sh \
+		> ${WRKDIR}/gnome-help.sh
+
+post-install:
+	${MV} -f ${PREFIX}/bin/yelp ${PREFIX}/bin/yelp-bin
+	${MV} -f ${PREFIX}/bin/gnome-help ${PREFIX}/bin/gnome-help-bin
+	${INSTALL_SCRIPT} ${WRKDIR}/yelp.sh ${PREFIX}/bin/yelp
+	${INSTALL_SCRIPT} ${WRKDIR}/gnome-help.sh ${PREFIX}/bin/gnome-help
+
+.include <bsd.port.post.mk>
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 84e9d90bbd8e..626d42489854 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/yelp-2.6.5.tar.bz2) = 9bd94af344ee6a0bf69aa6f9cbd6b7e9
-SIZE (gnome2/yelp-2.6.5.tar.bz2) = 654264
+MD5 (gnome2/yelp-2.9.3.tar.bz2) = a6ed659313698900a7170426881b874b
+SIZE (gnome2/yelp-2.9.3.tar.bz2) = 637236
diff --git a/x11/yelp/files/gnome-help.sh b/x11/yelp/files/gnome-help.sh
new file mode 100644
index 000000000000..0951d0096233
--- /dev/null
+++ b/x11/yelp/files/gnome-help.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+dist_bin=`dirname $0`
+
+MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
+
+if [ -n "$LD_LIBRARY_PATH" ]; then
+  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+else
+  LD_LIBRARY_PATH=$MOZILLA_HOME
+fi
+export LD_LIBRARY_PATH
+
+MOZILLA_FIVE_HOME=$MOZILLA_HOME
+export MOZILLA_FIVE_HOME
+
+exec "%%PREFIX%%/bin/gnome-help-bin" "$@"
diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure
deleted file mode 100644
index 7e0c0705f738..000000000000
--- a/x11/yelp/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Mar 22 19:14:23 2004
-+++ configure	Mon Mar 22 19:14:23 2004
-@@ -9879,7 +9879,7 @@
- 
- YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
- 
--idl_dirs="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`"
-+idl_dirs="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`"
- for ac_prog in gsed sed
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/x11/yelp/files/yelp.sh b/x11/yelp/files/yelp.sh
new file mode 100644
index 000000000000..52a6643b7544
--- /dev/null
+++ b/x11/yelp/files/yelp.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+dist_bin=`dirname $0`
+
+MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
+
+if [ -n "$LD_LIBRARY_PATH" ]; then
+  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+else
+  LD_LIBRARY_PATH=$MOZILLA_HOME
+fi
+export LD_LIBRARY_PATH
+
+MOZILLA_FIVE_HOME=$MOZILLA_HOME
+export MOZILLA_FIVE_HOME
+
+exec "%%PREFIX%%/bin/yelp-bin" "$@"
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index d12169a1d3d8..e6dea27dee6a 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -1,47 +1,29 @@
 bin/gnome-help
+bin/gnome-help-bin
 bin/yelp
+bin/yelp-bin
 libdata/bonobo/servers/GNOME_Yelp.server
 share/gnome/applications/yelp.desktop
-share/gnome/sgml/docbook/yelp/db2html-admon.xsl
-share/gnome/sgml/docbook/yelp/db2html-biblio.xsl
-share/gnome/sgml/docbook/yelp/db2html-block.xsl
-share/gnome/sgml/docbook/yelp/db2html-callout.xsl
-share/gnome/sgml/docbook/yelp/db2html-chunk.xsl
-share/gnome/sgml/docbook/yelp/db2html-common.xsl
-share/gnome/sgml/docbook/yelp/db2html-division.xsl
-share/gnome/sgml/docbook/yelp/db2html-ebnf.xsl
-share/gnome/sgml/docbook/yelp/db2html-footnote.xsl
-share/gnome/sgml/docbook/yelp/db2html-glossary.xsl
-share/gnome/sgml/docbook/yelp/db2html-header.xsl
-share/gnome/sgml/docbook/yelp/db2html-html.xsl
-share/gnome/sgml/docbook/yelp/db2html-index.xsl
-share/gnome/sgml/docbook/yelp/db2html-inline.xsl
-share/gnome/sgml/docbook/yelp/db2html-list.xsl
-share/gnome/sgml/docbook/yelp/db2html-math.xsl
-share/gnome/sgml/docbook/yelp/db2html-media.xsl
-share/gnome/sgml/docbook/yelp/db2html-navbar.xsl
-share/gnome/sgml/docbook/yelp/db2html-param.xsl
-share/gnome/sgml/docbook/yelp/db2html-qanda.xsl
-share/gnome/sgml/docbook/yelp/db2html-refentry.xsl
-share/gnome/sgml/docbook/yelp/db2html-suppressed.xsl
-share/gnome/sgml/docbook/yelp/db2html-synopsis.xsl
-share/gnome/sgml/docbook/yelp/db2html-table.xsl
-share/gnome/sgml/docbook/yelp/db2html-title.xsl
-share/gnome/sgml/docbook/yelp/db2html-titlepage.xsl
-share/gnome/sgml/docbook/yelp/db2html-toc.xsl
-share/gnome/sgml/docbook/yelp/db2html-xref.xsl
 share/gnome/sgml/docbook/yelp/db2html.xsl
-share/gnome/sgml/docbook/yelp/gettext.xsl
-share/gnome/sgml/docbook/yelp/l10n.xml
+share/gnome/sgml/docbook/yelp/info2html.xsl
 share/gnome/sgml/docbook/yelp/man2html.xsl
+share/gnome/sgml/docbook/yelp/toc2html.xsl
 share/gnome/yelp/default.css
-share/gnome/yelp/icons/caution.png
-share/gnome/yelp/icons/important.png
-share/gnome/yelp/icons/note.png
-share/gnome/yelp/icons/tip.png
-share/gnome/yelp/icons/warning.png
+share/gnome/yelp/icons/yelp-icon-caution.png
+share/gnome/yelp/icons/yelp-icon-important.png
+share/gnome/yelp/icons/yelp-icon-note.png
+share/gnome/yelp/icons/yelp-icon-tip.png
+share/gnome/yelp/icons/yelp-icon-warning.png
+share/gnome/yelp/icons/yelp-watermark-blockquote-00AB.png
+share/gnome/yelp/icons/yelp-watermark-blockquote-00BB.png
+share/gnome/yelp/icons/yelp-watermark-blockquote-201C.png
+share/gnome/yelp/icons/yelp-watermark-blockquote-201D.png
+share/gnome/yelp/icons/yelp-watermark-blockquote-201E.png
 share/gnome/yelp/important_docs.xml
+share/gnome/yelp/man.xml
+share/gnome/yelp/scrollkeeper.xml
 share/gnome/yelp/toc.xml
+share/gnome/yelp/ui/yelp-ui.xml
 share/gnome/yelp/ui/yelp.glade
 share/locale/af/LC_MESSAGES/yelp.mo
 share/locale/am/LC_MESSAGES/yelp.mo
@@ -83,7 +65,6 @@ share/locale/ko/LC_MESSAGES/yelp.mo
 share/locale/li/LC_MESSAGES/yelp.mo
 share/locale/lt/LC_MESSAGES/yelp.mo
 share/locale/lv/LC_MESSAGES/yelp.mo
-share/locale/mi/LC_MESSAGES/yelp.mo
 share/locale/mk/LC_MESSAGES/yelp.mo
 share/locale/ml/LC_MESSAGES/yelp.mo
 share/locale/mn/LC_MESSAGES/yelp.mo
@@ -110,7 +91,6 @@ share/locale/sv/LC_MESSAGES/yelp.mo
 share/locale/ta/LC_MESSAGES/yelp.mo
 share/locale/tg/LC_MESSAGES/yelp.mo
 share/locale/th/LC_MESSAGES/yelp.mo
-share/locale/tk/LC_MESSAGES/yelp.mo
 share/locale/tr/LC_MESSAGES/yelp.mo
 share/locale/uk/LC_MESSAGES/yelp.mo
 share/locale/vi/LC_MESSAGES/yelp.mo
@@ -118,11 +98,13 @@ share/locale/wa/LC_MESSAGES/yelp.mo
 share/locale/zh_CN/LC_MESSAGES/yelp.mo
 share/locale/zh_TW/LC_MESSAGES/yelp.mo
 share/locale/zu/LC_MESSAGES/yelp.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@dirrm share/locale/zu/LC_MESSAGES
+@dirrm share/locale/zu
+@dirrm share/locale/nso/LC_MESSAGES
+@dirrm share/locale/nso
+@dirrm share/locale/mr/LC_MESSAGES
+@dirrm share/locale/mr
 @dirrm share/gnome/yelp/ui
 @dirrm share/gnome/yelp/icons
 @dirrm share/gnome/yelp
 @dirrm share/gnome/sgml/docbook/yelp
-@dirrm share/gnome/sgml/docbook
-@dirrm share/gnome/sgml