ports/103529: www/seamonkey: enable SVG and Pango font rendering support.

[Thierry Thomas]

>Number:         103529
>Category:       ports
>Synopsis:       www/seamonkey: enable SVG and Pango font rendering support.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 23 20:40:22 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 6.1-STABLE FreeBSD 6.1-STABLE #0: Sat Sep 9 19:06:00 CEST 2006 thierry at graf.pompo.net:/usr/obj/usr/src/sys/GRAF060511 i386


	
>Description:
	- svg-renderer is set to cairo, but it is ignored because SVG
	  is not enabled;

	- s/post-patch/pre-configure/ to not squeeze configure;

	- fix an error in configure by adding -- to expr;

	- merge Pango font support from PR ports/102866.

>How-To-Repeat:
	Check a page including SVG content
	(e.g. <http://www.mapviewsvg.com/examples/schlatterbach/index.html>).

>Fix:
	Please apply the following patch:

--- seamonkey.diff begins here ---
diff -urN www/seamonkey.orig/Makefile www/seamonkey/Makefile
--- www/seamonkey.orig/Makefile	Fri Sep 15 18:09:48 2006
+++ www/seamonkey/Makefile	Sat Sep 23 16:04:28 2006
@@ -7,7 +7,8 @@
 #
 
 PORTNAME=	seamonkey
-DISTVERSION=	1.0.5
+PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
@@ -30,9 +31,11 @@
 
 MOZ_EXTENSIONS=	default
 MOZ_OPTIONS+=	--enable-application=suite	\
+		--enable-svg			\
 		--enable-svg-renderer=cairo	\
 		--enable-system-cairo		\
-		--enable-canvas
+		--enable-canvas			\
+		--enable-pango
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=suite
 
 NOT_FOR_ARCHS=	ia64
@@ -95,7 +98,7 @@
 MOZ_OPTIONS+=	--disable-composer
 .endif
 
-post-patch:
+pre-configure:
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
 		${WRKSRC}/modules/libpref/src/init/all.js
 	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
diff -urN www/seamonkey.orig/files/patch-configure www/seamonkey/files/patch-configure
--- www/seamonkey.orig/files/patch-configure	Fri Dec 23 01:04:18 2005
+++ www/seamonkey/files/patch-configure	Sat Sep 23 22:11:19 2006
@@ -1,15 +1,15 @@
---- configure.orig	Tue Oct  4 02:01:48 2005
-+++ configure	Thu Dec 22 17:54:43 2005
-@@ -10016,7 +10016,7 @@
+--- configure.orig	Thu Aug 31 17:37:23 2006
++++ configure	Sat Sep 23 22:10:51 2006
+@@ -10115,7 +10115,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 10022 "configure"
+ #line 10121 "configure"
  #include "confdefs.h"
-@@ -10047,7 +10047,7 @@
+@@ -10146,7 +10146,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -18,16 +18,16 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10057,7 +10057,7 @@
+@@ -10156,7 +10156,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 10063 "configure"
+ #line 10162 "configure"
  #include "confdefs.h"
-@@ -10088,7 +10088,7 @@
+@@ -10187,7 +10187,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -36,7 +36,7 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -12518,7 +12518,7 @@
+@@ -12618,7 +12618,7 @@
    MOZ_SUITE=1
    MOZ_PROFILESHARING=
    MOZ_APP_VERSION=$SEAMONKEY_VERSION
@@ -45,3 +45,21 @@
    cat >> confdefs.h <<\EOF
  #define MOZ_SUITE 1
  EOF
+@@ -13248,7 +13248,7 @@
+ echo "configure:13249: checking MOZ_PANGO_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+-            MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`"
++            MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.6.0 pangoft2 >= 1.6.0\"`"
+             echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
+         else
+             MOZ_PANGO_CFLAGS=""
+@@ -19208,7 +19208,7 @@
+ LIBS_PATH=
+ for lib_arg in $NSPR_LIBS $TK_LIBS; do
+   case $lib_arg in
+-    -L* ) LIBS_PATH="${LIBS_PATH:+$LIBS_PATH:}"`expr $lib_arg : "-L\(.*\)"` ;;
++    -L* ) LIBS_PATH="${LIBS_PATH:+$LIBS_PATH:}"`expr -- $lib_arg : "-L\(.*\)"` ;;
+       * ) ;;
+   esac
+ done
diff -urN www/seamonkey.orig/files/patch-gfx_src_gtk_Makefile.in www/seamonkey/files/patch-gfx_src_gtk_Makefile.in
--- www/seamonkey.orig/files/patch-gfx_src_gtk_Makefile.in	Thu Jan  1 01:00:00 1970
+++ www/seamonkey/files/patch-gfx_src_gtk_Makefile.in	Thu Sep 21 23:28:10 2006
@@ -0,0 +1,11 @@
+--- ./gfx/src/gtk/Makefile.in.orig	Tue Apr 26 06:46:13 2005
++++ ./gfx/src/gtk/Makefile.in	Mon Sep  4 19:15:34 2006
+@@ -201,7 +201,7 @@
+ 		$(NULL)
+ endif
+ 
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS)
+ CXXFLAGS	+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
+ CFLAGS		+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
+ 
--- seamonkey.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: