- Install isp directory to fix Movemail support [1]

- Add WITH_CAIRO_RENDER knob that uses cairo for SVG rendering that
   replaces SVG rendering from libart.

Pointed out by:	marcus [1]
Approved by:	marcus (co mentor)

7 files changed, 89 insertions, 37 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 7ebf45c5194e..eef3406e3baf 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -7,15 +7,17 @@
 
 PORTNAME?=	mozilla
 PORTVERSION=	1.8.a4
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.a4/a4/}/src \
 			adamw/:local
-DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.a4/a4/}${EXTRACT_SUFX} \
-		libart_lgpl${EXTRACT_SUFX}:local
+DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.a4/a4/}${EXTRACT_SUFX}
+.if !defined(WITH_CAIRO_RENDER)
+DISTFILES+=	libart_lgpl${EXTRACT_SUFX}:local
+.endif
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
@@ -67,7 +69,6 @@ CONFIGURE_ARGS=					\
 		--disable-bidi			\
 		--disable-plaintext-editor-only	\
 		--enable-svg			\
-		--enable-svg-renderer-libart	\
 		--disable-tests			\
 		--disable-xterm-updates		\
 		--enable-xinerama		\
@@ -81,8 +82,7 @@ CONFIGURE_ARGS=					\
 
 PLIST=		${WRKDIR}/pkg-plist
 MOZ_EXTENSIONS=	default
-CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1 \
-		LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
@@ -119,6 +119,18 @@ OPTIONS=XFT "Enable Xft font anti-aliasing" on \
 BROKEN=		"Does not compile on ia64 or alpha"
 .endif
 
+.if defined(WITH_CAIRO_RENDER)
+LIB_DEPENDS+=		svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
+
+CONFIGURE_ARGS+=	--enable-svg-renderer-cairo \
+			--disable-svg-renderer-libart
+CONFIGURE_ENV+=		MOZ_SVG_RENDERER_CAIRO=1
+.else
+CONFIGURE_ARGS+=	--enable-svg-renderer-libart \
+			--disable-svg-renderer-cairo
+CONFIGURE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1
+.endif
+
 .if !defined(WITHOUT_XFT)
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=--enable-xft --disable-freetype2
@@ -187,7 +199,7 @@ FAKEDIR=	${WRKDIR}/fake
 CONFIGURE_ARGS+=	--enable-reorder
 .endif
 
-.if ${OSVERSION} < 500035
+.if ${OSVERSION} < 500035 && !defined(WITH_CAIRO_RENDER)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
 .endif
 
@@ -289,6 +301,7 @@ pre-install:
 	fi
 	${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST}
 	${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST}
+	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults
 	cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \
 			&& ${FIND} -d * -type d | \
diff --git a/www/mozilla-devel/pkg-descr b/www/mozilla-devel/pkg-descr
index 10b9ea56ea93..04ecd23f9b66 100644
--- a/www/mozilla-devel/pkg-descr
+++ b/www/mozilla-devel/pkg-descr
@@ -1,10 +1,10 @@
 This is the current release of the Mozilla open source web browser. It should 
 be fully compliant with all W3C standards, including HTML, CSS, XML, XSL, 
-JavaScript, MathML, SVG and RDF.  This version also supports SSL encryption, 
-and Java with the use of the FreeBSD native Java plug-in.
+JavaScript, MathML, SSL encryption, SVG and RDF.  Also supports Java with
+the use of the FreeBSD native Java plug-in.
 
 This is the latest bleeding edge release.  Beware that you'll probably find
-bugs here, so if you value stability, try www/mozilla or www/mozilla-vendor.
+bugs here, so if you value stability, try www/mozilla.
 
 This version has been built with GTK+-2 bindings for use with applications
 such as Galeon 2.
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 1e9585a83744..3cc685b4fd2b 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -7,15 +7,17 @@
 
 PORTNAME?=	mozilla
 PORTVERSION=	1.7.3
-PORTREVISION?=	2
+PORTREVISION?=	3
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION}/src \
 			adamw/:local
-DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
-		libart_lgpl${EXTRACT_SUFX}:local
+DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX}
+.if !defined(WITH_CAIRO_RENDER)
+DISTFILES+=	libart_lgpl${EXTRACT_SUFX}:local
+.endif
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
@@ -72,7 +74,6 @@ CONFIGURE_ARGS=					\
 		--disable-bidi			\
 		--disable-plaintext-editor-only	\
 		--enable-svg			\
-		--enable-svg-renderer-libart	\
 		--disable-tests			\
 		--disable-xterm-updates		\
 		--enable-xinerama		\
@@ -86,8 +87,7 @@ CONFIGURE_ARGS=					\
 
 PLIST=		${WRKDIR}/pkg-plist
 MOZ_EXTENSIONS=	default
-CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1 \
-		LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
@@ -123,6 +123,18 @@ OPTIONS=XFT "Enable Xft font anti-aliasing" on \
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_CAIRO_RENDER)
+LIB_DEPENDS+=		svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
+
+CONFIGURE_ARGS+=	--enable-svg-renderer-cairo \
+			--disable-svg-renderer-libart
+CONFIGURE_ENV+=		MOZ_SVG_RENDERER_CAIRO=1
+.else
+CONFIGURE_ARGS+=	--enable-svg-renderer-libart \
+			--disable-svg-renderer-cairo
+CONFIGURE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1
+.endif
+
 .if !defined(WITHOUT_XFT)
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=--enable-xft
@@ -191,7 +203,7 @@ FAKEDIR=	${WRKDIR}/fake
 #CONFIGURE_ARGS+=	--enable-reorder
 #.endif
 
-.if ${OSVERSION} < 500035
+.if ${OSVERSION} < 500035 && !defined(WITH_CAIRO_RENDER)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
 .endif
 
@@ -295,6 +307,7 @@ pre-install:
 	fi
 	${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST}
 	${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST}
+	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults
 	cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \
 			&& ${FIND} -d * -type d | \
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 7ebf45c5194e..eef3406e3baf 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -7,15 +7,17 @@
 
 PORTNAME?=	mozilla
 PORTVERSION=	1.8.a4
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.a4/a4/}/src \
 			adamw/:local
-DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.a4/a4/}${EXTRACT_SUFX} \
-		libart_lgpl${EXTRACT_SUFX}:local
+DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.a4/a4/}${EXTRACT_SUFX}
+.if !defined(WITH_CAIRO_RENDER)
+DISTFILES+=	libart_lgpl${EXTRACT_SUFX}:local
+.endif
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
@@ -67,7 +69,6 @@ CONFIGURE_ARGS=					\
 		--disable-bidi			\
 		--disable-plaintext-editor-only	\
 		--enable-svg			\
-		--enable-svg-renderer-libart	\
 		--disable-tests			\
 		--disable-xterm-updates		\
 		--enable-xinerama		\
@@ -81,8 +82,7 @@ CONFIGURE_ARGS=					\
 
 PLIST=		${WRKDIR}/pkg-plist
 MOZ_EXTENSIONS=	default
-CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1 \
-		LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
@@ -119,6 +119,18 @@ OPTIONS=XFT "Enable Xft font anti-aliasing" on \
 BROKEN=		"Does not compile on ia64 or alpha"
 .endif
 
+.if defined(WITH_CAIRO_RENDER)
+LIB_DEPENDS+=		svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
+
+CONFIGURE_ARGS+=	--enable-svg-renderer-cairo \
+			--disable-svg-renderer-libart
+CONFIGURE_ENV+=		MOZ_SVG_RENDERER_CAIRO=1
+.else
+CONFIGURE_ARGS+=	--enable-svg-renderer-libart \
+			--disable-svg-renderer-cairo
+CONFIGURE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1
+.endif
+
 .if !defined(WITHOUT_XFT)
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=--enable-xft --disable-freetype2
@@ -187,7 +199,7 @@ FAKEDIR=	${WRKDIR}/fake
 CONFIGURE_ARGS+=	--enable-reorder
 .endif
 
-.if ${OSVERSION} < 500035
+.if ${OSVERSION} < 500035 && !defined(WITH_CAIRO_RENDER)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
 .endif
 
@@ -289,6 +301,7 @@ pre-install:
 	fi
 	${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST}
 	${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST}
+	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults
 	cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \
 			&& ${FIND} -d * -type d | \
diff --git a/www/seamonkey/pkg-descr b/www/seamonkey/pkg-descr
index 10b9ea56ea93..04ecd23f9b66 100644
--- a/www/seamonkey/pkg-descr
+++ b/www/seamonkey/pkg-descr
@@ -1,10 +1,10 @@
 This is the current release of the Mozilla open source web browser. It should 
 be fully compliant with all W3C standards, including HTML, CSS, XML, XSL, 
-JavaScript, MathML, SVG and RDF.  This version also supports SSL encryption, 
-and Java with the use of the FreeBSD native Java plug-in.
+JavaScript, MathML, SSL encryption, SVG and RDF.  Also supports Java with
+the use of the FreeBSD native Java plug-in.
 
 This is the latest bleeding edge release.  Beware that you'll probably find
-bugs here, so if you value stability, try www/mozilla or www/mozilla-vendor.
+bugs here, so if you value stability, try www/mozilla.
 
 This version has been built with GTK+-2 bindings for use with applications
 such as Galeon 2.
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 7ebf45c5194e..eef3406e3baf 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -7,15 +7,17 @@
 
 PORTNAME?=	mozilla
 PORTVERSION=	1.8.a4
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.a4/a4/}/src \
 			adamw/:local
-DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.a4/a4/}${EXTRACT_SUFX} \
-		libart_lgpl${EXTRACT_SUFX}:local
+DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.a4/a4/}${EXTRACT_SUFX}
+.if !defined(WITH_CAIRO_RENDER)
+DISTFILES+=	libart_lgpl${EXTRACT_SUFX}:local
+.endif
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
@@ -67,7 +69,6 @@ CONFIGURE_ARGS=					\
 		--disable-bidi			\
 		--disable-plaintext-editor-only	\
 		--enable-svg			\
-		--enable-svg-renderer-libart	\
 		--disable-tests			\
 		--disable-xterm-updates		\
 		--enable-xinerama		\
@@ -81,8 +82,7 @@ CONFIGURE_ARGS=					\
 
 PLIST=		${WRKDIR}/pkg-plist
 MOZ_EXTENSIONS=	default
-CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1 \
-		LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
@@ -119,6 +119,18 @@ OPTIONS=XFT "Enable Xft font anti-aliasing" on \
 BROKEN=		"Does not compile on ia64 or alpha"
 .endif
 
+.if defined(WITH_CAIRO_RENDER)
+LIB_DEPENDS+=		svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
+
+CONFIGURE_ARGS+=	--enable-svg-renderer-cairo \
+			--disable-svg-renderer-libart
+CONFIGURE_ENV+=		MOZ_SVG_RENDERER_CAIRO=1
+.else
+CONFIGURE_ARGS+=	--enable-svg-renderer-libart \
+			--disable-svg-renderer-cairo
+CONFIGURE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1
+.endif
+
 .if !defined(WITHOUT_XFT)
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=--enable-xft --disable-freetype2
@@ -187,7 +199,7 @@ FAKEDIR=	${WRKDIR}/fake
 CONFIGURE_ARGS+=	--enable-reorder
 .endif
 
-.if ${OSVERSION} < 500035
+.if ${OSVERSION} < 500035 && !defined(WITH_CAIRO_RENDER)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
 .endif
 
@@ -289,6 +301,7 @@ pre-install:
 	fi
 	${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST}
 	${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST}
+	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults
 	cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \
 			&& ${FIND} -d * -type d | \
diff --git a/www/seamonkey2/pkg-descr b/www/seamonkey2/pkg-descr
index 10b9ea56ea93..04ecd23f9b66 100644
--- a/www/seamonkey2/pkg-descr
+++ b/www/seamonkey2/pkg-descr
@@ -1,10 +1,10 @@
 This is the current release of the Mozilla open source web browser. It should 
 be fully compliant with all W3C standards, including HTML, CSS, XML, XSL, 
-JavaScript, MathML, SVG and RDF.  This version also supports SSL encryption, 
-and Java with the use of the FreeBSD native Java plug-in.
+JavaScript, MathML, SSL encryption, SVG and RDF.  Also supports Java with
+the use of the FreeBSD native Java plug-in.
 
 This is the latest bleeding edge release.  Beware that you'll probably find
-bugs here, so if you value stability, try www/mozilla or www/mozilla-vendor.
+bugs here, so if you value stability, try www/mozilla.
 
 This version has been built with GTK+-2 bindings for use with applications
 such as Galeon 2.