summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorghen <ghen>2007-09-21 22:07:54 +0000
committerghen <ghen>2007-09-21 22:07:54 +0000
commiteeb303a8b5d8c092b5d1ffa801c76b21cd292f71 (patch)
treeb485f4d8d271150c49d633ed4c6ccbbc8c616dcb /www
parent39226b1259bef101c03e09c505703cd5e6bee4c1 (diff)
downloadpkgsrc-eeb303a8b5d8c092b5d1ffa801c76b21cd292f71.tar.gz
Add --enable-system-cairo to CONFIGURE_ARGS to fix build problem with recent
cairo versions that conflict with Mozilla's included version. Reported via PR#37006 and fixed with input from Vincent on tech-pkg@netbsd.org. Bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r--www/seamonkey/Makefile3
-rw-r--r--www/seamonkey/Makefile.common5
-rw-r--r--www/seamonkey/PLIST11
3 files changed, 7 insertions, 12 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 2eb71c2961c..38d29641200 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2007/05/31 12:29:38 ghen Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 22:07:54 ghen Exp $
MOZILLA= seamonkey
+PKGREVISION= 1
COMMENT= Full featured gecko-based browser
diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common
index cf356761fe5..18c91565dd5 100644
--- a/www/seamonkey/Makefile.common
+++ b/www/seamonkey/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2007/06/18 21:33:33 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.28 2007/09/21 22:07:54 ghen Exp $
MOZ_DIST_VER?= ${MOZ_VER}
DISTNAME?= seamonkey-${MOZ_DIST_VER}.source
@@ -85,6 +85,9 @@ MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1
CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1
CONFIGURE_ARGS+= --enable-svg
CONFIGURE_ARGS+= --enable-svg-renderer-libart
+CONFIGURE_ARGS+= --enable-svg-renderer=cairo
+.include "../../graphics/cairo/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-system-cairo
.endif
.if defined(BUILD_CALENDAR)
diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST
index d2ad901b055..99526963d91 100644
--- a/www/seamonkey/PLIST
+++ b/www/seamonkey/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/07/26 08:50:17 ghen Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/09/21 22:07:54 ghen Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
@@ -700,12 +700,6 @@ include/${MOZILLA}/autoconfig/nsIReadConfig.h
include/${MOZILLA}/bayesflt/nsBayesianFilter.h
include/${MOZILLA}/bayesflt/nsBayesianFilterCID.h
include/${MOZILLA}/browser/nsIBrowserInstance.h
-include/${MOZILLA}/cairo/cairo-features.h
-include/${MOZILLA}/cairo/cairo-ft.h
-include/${MOZILLA}/cairo/cairo-rename.h
-include/${MOZILLA}/cairo/cairo-xlib-xrender.h
-include/${MOZILLA}/cairo/cairo-xlib.h
-include/${MOZILLA}/cairo/cairo.h
include/${MOZILLA}/caps/nsICryptoHash.h
include/${MOZILLA}/caps/nsIPrincipal.h
include/${MOZILLA}/caps/nsIScriptSecurityManager.h
@@ -1614,7 +1608,6 @@ include/${MOZILLA}/layout/nsStyleUtil.h
include/${MOZILLA}/layout/nsTextTransformer.h
include/${MOZILLA}/layout/nsTreeColFrame.h
include/${MOZILLA}/layout/nsTreeUtils.h
-include/${MOZILLA}/libpixman/pixman.h
include/${MOZILLA}/libreg/NSReg.h
include/${MOZILLA}/libreg/VerReg.h
include/${MOZILLA}/liveconnect/jsjava.h
@@ -3172,7 +3165,6 @@ include/${MOZILLA}/nss/watcomfx.h
@dirrm include/${MOZILLA}/locale
@dirrm include/${MOZILLA}/liveconnect
@dirrm include/${MOZILLA}/libreg
-@dirrm include/${MOZILLA}/libpixman
@dirrm include/${MOZILLA}/ldap-private
@dirrm include/${MOZILLA}/ldap
@dirrm include/${MOZILLA}/layout
@@ -3211,7 +3203,6 @@ include/${MOZILLA}/nss/watcomfx.h
@dirrm include/${MOZILLA}/chrome
@dirrm include/${MOZILLA}/chardet
@dirrm include/${MOZILLA}/caps
-@dirrm include/${MOZILLA}/cairo
@dirrm include/${MOZILLA}/browser
@dirrm include/${MOZILLA}/bayesflt
@dirrm include/${MOZILLA}/autoconfig