Update to 2.8.0, and finally enable optional support for the Mozilla

plug-in.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2767 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 159 insertions, 35 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 898342b91..7d20d665d 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	librsvg2
-PORTVERSION=	2.7.2
+PORTVERSION=	2.8.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.7
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
 DISTNAME=	librsvg-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -26,9 +26,9 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehack gnomeprefix lthack libartlgpl2 libgsf gnomevfs2
+USE_GNOME=	gnomehack gnomeprefix libartlgpl2 libgsf gnomevfs2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-svgz \
@@ -44,8 +44,59 @@ PLIST_SUB=	GTK_VERSION=${GTK_VERSION}
 
 MAN1=		rsvg.1
 
+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.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index aaacd1c53..5d72e12e6 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/librsvg-2.7.2.tar.bz2) = c9377b685ca6e9a8892301a86724e4a7
-SIZE (gnome2/librsvg-2.7.2.tar.bz2) = 362870
+MD5 (gnome2/librsvg-2.8.0.tar.bz2) = 95d277280babc5c39e42521fb478ba0d
+SIZE (gnome2/librsvg-2.8.0.tar.bz2) = 352538
diff --git a/graphics/librsvg2/files/extra-patch-Makefile.in b/graphics/librsvg2/files/extra-patch-Makefile.in
new file mode 100644
index 000000000..27c8fcd29
--- /dev/null
+++ b/graphics/librsvg2/files/extra-patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Fri Sep  3 00:54:51 2004
++++ Makefile.in	Fri Sep  3 00:55:00 2004
+@@ -307,7 +307,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data
++SUBDIRS = . gtk-engine gdk-pixbuf-loader doc data
+ @HAVE_GTK_FALSE@target_rsvg_view = 
+ @HAVE_GTK_TRUE@target_rsvg_view = rsvg-view
+ man_MANS = rsvg.1
diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
new file mode 100644
index 000000000..1f570b247
--- /dev/null
+++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
@@ -0,0 +1,27 @@
+--- moz-plugin/Makefile.in.orig	Fri Sep  3 01:07:24 2004
++++ moz-plugin/Makefile.in	Fri Sep  3 01:08:00 2004
+@@ -282,15 +282,15 @@
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
+-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
+-	  else :; fi; \
+-	done
++#	@$(NORMAL_INSTALL)
++#	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
++#	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
++#	  if test -f $$p; then \
++#	    f="`echo $$p | sed -e 's|^.*/||'`"; \
++#	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
++#	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
++#	  else :; fi; \
++#	done
+ 
+ uninstall-pluginLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c b/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c
new file mode 100644
index 000000000..f75959a2a
--- /dev/null
+++ b/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c
@@ -0,0 +1,15 @@
+--- moz-plugin/moz-plugin.c.orig	Fri Sep  3 00:48:45 2004
++++ moz-plugin/moz-plugin.c	Fri Sep  3 00:49:35 2004
+@@ -26,9 +26,12 @@
+ #include <config.h>
+ 
+ #include <stdio.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ #include <unistd.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Intrinsic.h>
diff --git a/graphics/librsvg2/files/patch-rsvg-filter.c b/graphics/librsvg2/files/patch-rsvg-filter.c
deleted file mode 100644
index 4c762be8b..000000000
--- a/graphics/librsvg2/files/patch-rsvg-filter.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- rsvg-filter.c.orig	Wed Jun  9 01:24:25 2004
-+++ rsvg-filter.c	Wed Jun  9 01:24:32 2004
-@@ -484,9 +484,9 @@
- rsvg_filter_store_output(GString * name, RsvgFilterPrimitiveOutput result,
- 						  RsvgFilterContext * ctx)
- {
-+	RsvgFilterPrimitiveOutput * store;
- 	g_object_unref (G_OBJECT (ctx->lastresult.result));
- 	
--	RsvgFilterPrimitiveOutput * store;
- 
- 	store = g_new(RsvgFilterPrimitiveOutput, 1);
- 	*store = result;
diff --git a/graphics/librsvg2/files/patch-rsvg-paint-server.c b/graphics/librsvg2/files/patch-rsvg-paint-server.c
new file mode 100644
index 000000000..60b599b8d
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-paint-server.c
@@ -0,0 +1,18 @@
+--- rsvg-paint-server.c.orig	Fri Sep  3 00:46:30 2004
++++ rsvg-paint-server.c	Fri Sep  3 00:46:44 2004
+@@ -488,13 +488,13 @@
+ 	double affine[6];
+ 	double caffine[6];
+ 	int i, j;
++	gdouble minx, miny, maxx, maxy, xcoord, ycoord, xoffset, yoffset;
++	GdkPixbuf *save, *render;
+ 
+ 	if (ctx->ctx == NULL)
+ 		return;
+ 
+-	gdouble minx, miny, maxx, maxy, xcoord, ycoord, xoffset, yoffset;
+ 	
+-	GdkPixbuf *save, *render;
+ 
+ 	if (pattern->obj_bbox) {
+ 		affine[0] = ctx->x1 - ctx->x0;
diff --git a/graphics/librsvg2/files/patch-rsvg-shapes.c b/graphics/librsvg2/files/patch-rsvg-shapes.c
new file mode 100644
index 000000000..093359421
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-shapes.c
@@ -0,0 +1,27 @@
+--- rsvg-shapes.c.orig	Fri Sep  3 00:47:10 2004
++++ rsvg-shapes.c	Fri Sep  3 00:47:51 2004
+@@ -646,9 +646,10 @@
+ static void 
+ rsvg_defs_drawable_group_pack (RsvgDefsDrawableGroup *self, RsvgDefsDrawable *child)
+ {
++    	RsvgDefsDrawableGroup *z;
+ 	if (self == NULL)
+ 		return;
+-	RsvgDefsDrawableGroup *z = (RsvgDefsDrawableGroup *)self;
++	z = (RsvgDefsDrawableGroup *)self;
+ 	g_ptr_array_add(z->children, child);
+ }
+ 
+@@ -704,11 +705,11 @@
+ void
+ rsvg_handle_path (RsvgHandle *ctx, const char * d, const char * id)
+ {
++	RsvgDefsDrawablePath *path;
+ 	if (!ctx->in_defs)
+ 		rsvg_render_path (ctx, d);
+ 
+ 	   
+-	RsvgDefsDrawablePath *path;
+ 	
+ 	path = g_new (RsvgDefsDrawablePath, 1);
+ 	path->d = g_strdup(d);
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index dd250f612..070543b22 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -3,26 +3,13 @@ bin/rsvg-view
 include/librsvg-2/librsvg/librsvg-features.h
 include/librsvg-2/librsvg/rsvg-gz.h
 include/librsvg-2/librsvg/rsvg.h
+%%PLUGIN%%lib/browser_plugins/libmozsvgdec.so
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so
 lib/librsvg-2.a
 lib/librsvg-2.so
-lib/librsvg-2.so.9
+lib/librsvg-2.so.10
 libdata/pkgconfig/librsvg-2.0.pc
-share/doc/librsvg/html/home.png
-share/doc/librsvg/html/i1073.html
-share/doc/librsvg/html/index.html
-share/doc/librsvg/html/index.sgml
-share/doc/librsvg/html/left.png
-share/doc/librsvg/html/r22.html
-share/doc/librsvg/html/r436.html
-share/doc/librsvg/html/r473.html
-share/doc/librsvg/html/right.png
-share/doc/librsvg/html/rsvg-convenience-functions.html
-share/doc/librsvg/html/rsvg-core-api.html
-share/doc/librsvg/html/rsvg-creating-a-svgz-reader.html
-share/doc/librsvg/html/rsvg.html
-share/doc/librsvg/html/up.png
 share/gnome/pixmaps/svg-viewer.svg
 @dirrm share/doc/librsvg/html
 @dirrm share/doc/librsvg
@@ -30,3 +17,4 @@ share/gnome/pixmaps/svg-viewer.svg
 @dirrm include/librsvg-2
 @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
 @unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
+%%PLUGIN%%@unexec rmdir %D/lib/browser_plugins 2>/dev/null || /usr/bin/true