Presenting GNOME 2.8 for FreeBSD (2.8.1 to be exact).

This release notes detailing all of the new goodies in GNOME 2.8 can
be found at http://www.gnome.org/start/2.8/notes/, and the list of what
was fixed in GNOME 2.8.1 can be found at
http://lists.gnome.org/archives/gnome-announce-list/2004-October/msg00056.html.

This release, as well as all of our others, would not have been possible
without the great efforts of our FreeBSD GNOME Team.  The list of
current members can be found at http://www.freebsd.org/gnome/contact.html
(including our newest member, Michael Johnson <ahze@FreeBSD.org>).

Special thanks also goes out to all of the loyal FreeBSD GNOME users that
put up with crashes and hangs to test and debug GNOME on FreeBSD.  We would
especially like to thank those users that provided patches for GNOME 2.7 and
2.8:

Franz Klammer <klammer@webonaut.com>
Piotr Smyrak <piotr.smyrak@heron.pl>
Radek Kozlowski <radek@raadradd.com>
Khairil Yusof <kaeru@pd.jaring.my>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Vladimir Grebenschikov <vova@fbsd.ru>

GNOME 2.8 also features a new, FreeBSD-specific splashscreen that
was designed by jimmac for GNOME 2.8, then daemonized by
Franz Klammer <klammer@webonaut.com> and Radek Kozlowski
<radek@raadradd.com>.

As with GNOME 2.6, you cannot just "portupgrade" to GNOME 2.8.  There is
a script provided at http://www.marcuscom.com/downloads/gnome_upgrade28.sh
that will aid in the upgrade process.  Full documentation on the GNOME 2.8
upgrade is coming following this commit.

From all of us at FreeBSD GNOME, ENJOY!

1 files changed, 69 insertions, 9 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 78d92c7..1d534fa 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	librsvg2
-PORTVERSION=	2.6.5
-PORTREVISION=	1
+PORTVERSION=	2.8.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
 DISTNAME=	librsvg-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,23 +19,84 @@ COMMENT=	Library for parsing and rendering SVG vector-graphic files
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		popt.0:${PORTSDIR}/devel/popt \
-		croco.3:${PORTSDIR}/textproc/libcroco
-RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.4.0/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2
+		croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco
+RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/${GTK_VERSION}/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
-USE_GNOME=	gnomehack lthack gtk20 libartlgpl2 libxml2 libgsf
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
+USE_GNOME=	gnomehack gnomeprefix libartlgpl2 libgsf gnomevfs2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-svgz \
 		--disable-gtk-doc \
 		--without-gimp \
+		--enable-gnome-vfs \
 		--with-croco
-PLIST_SUB=	GTK_VERSION="2.4.0"
+
+CROCO_VERSION=	0.6
+GTK_VERSION=	2.4.0
+
+PLIST_SUB=	GTK_VERSION=${GTK_VERSION}
 
 MAN1=		rsvg.1
 
-.include <bsd.port.mk>
+OPTIONS=	MOZILLA_PLUGIN "Enable the RSVG browser plug-in" no
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_MOZILLA_PLUGIN)
+.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
+BUILD_DEPENDS+=	${X11BASE}/lib/firefox/lib/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
+RUN_DEPENDS+=	${X11BASE}/lib/firefox/lib/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
+.else
+BUILD_DEPENDS+=	${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
+RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
+.endif
+
+HEADERS_SUFX=
+
+.if !defined(WITH_MOZILLA)
+HEADERS_SUFX=
+.else
+.if ${WITH_MOZILLA}=="mozilla"
+HEADERS_SUFX=
+.else
+.if ${WITH_MOZILLA}=="mozilla-devel"
+HEADERS_SUFX=	-devel
+.else
+.if ${WITH_MOZILLA}=="firefox"
+CONFIGURE_ENV+=	PKG_CONFIG_PATH=${X11BASE}/lib/firefox/lib/pkgconfig
+.endif
+.endif
+.endif
+.endif
+PLIST_SUB+=	PLUGIN=""
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile.in
+PLIST_SUB+=	PLUGIN="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+		${WRKSRC}/librsvg-2.0.pc.in
+.if defined(WITH_MOZILLA_PLUGIN)
+.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
+	@${REINPLACE_CMD} -e 's|mozilla-|firefox-|g' ${WRKSRC}/configure
+.else
+	@${REINPLACE_CMD} -e 's|mozilla-plugin|mozilla-plugin${HEADERS_SUFX}|g' \
+		${WRKSRC}/configure
+.endif
+.endif
+
+.if defined(WITH_MOZILLA_PLUGIN)
+post-install:
+	${MKDIR} ${PREFIX}/lib/browser_plugins
+	${INSTALL_PROGRAM} ${WRKSRC}/moz-plugin/.libs/libmozsvgdec.so \
+		${PREFIX}/lib/browser_plugins
+.endif
+
+.include <bsd.port.post.mk>