-libxml2 in bl3'd, so it should be used -- help "configure" finding it.

-While the program is prepared to work w/o libxml2 (with some loss of
 functionality), there is a little glitch -- see PR pkg/38446 by
 Keith Waclena. The fix shouldn't be needed for pkgsrc anymore because
 libxml2 should be found now, but add it anyway.
bump PKGREVISION

4 files changed, 56 insertions, 4 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 21d9cc1f77d..6fa6012f5af 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2008/06/22 18:30:54 adam Exp $
+# $NetBSD: Makefile,v 1.49 2008/06/23 11:38:50 drochner Exp $
 
 DISTNAME=	fontforge_full-${VERSION}
 PKGNAME=	fontforge-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	fonts editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fontforge/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,6 +24,7 @@ USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-freetype-src
 CONFIGURE_ARGS+=	--without-python
+CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 # checks for X11/Intrinsic.h
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index fd7b04d496c..268c461692c 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.40 2008/06/22 18:30:54 adam Exp $
+$NetBSD: distinfo,v 1.41 2008/06/23 11:38:50 drochner Exp $
 
 SHA1 (fontforge_full-20080607.tar.bz2) = 5c72921bb43556ec0b6c174f07f9406065363feb
 RMD160 (fontforge_full-20080607.tar.bz2) = 0f9f1653d69acd3a24409df169ef2bf70f515816
 Size (fontforge_full-20080607.tar.bz2) = 4844736 bytes
 SHA1 (patch-aa) = 269a8aaf439539fceb3eb31b771af631988b5070
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = 2e562e815ba0d8f844dc004f076273ef823c38b6
+SHA1 (patch-ae) = de1948996c64aeb77e9cde3062c1679ae60ca512
+SHA1 (patch-af) = ddf487cf9a2252a67f7afbcaa62fdbdf7b68c8ae
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index e789357cce6..5800c229cb9 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,7 +1,36 @@
-$NetBSD: patch-ae,v 1.13 2008/06/22 18:30:54 adam Exp $
+$NetBSD: patch-ae,v 1.14 2008/06/23 11:38:51 drochner Exp $
 
 --- configure.orig	2008-05-05 17:07:18.000000000 +0200
 +++ configure
+@@ -19201,8 +19201,8 @@ if test $ac_cv_file__usr_include_libxml2
+   CFLAGS="$CFLAGS -I/usr/include/libxml2/"
+ else
+ 
+- echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
+-echo $ECHO_N "checking for /usr/local/include/libxml2/libxml... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for ${LOCALBASE}/include/libxml2/libxml" >&5
++echo $ECHO_N "checking for ${LOCALBASE}/include/libxml2/libxml... $ECHO_C" >&6
+ if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -19210,7 +19210,7 @@ else
+   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+ echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+-if test -r "/usr/local/include/libxml2/libxml"; then
++if test -r "${LOCALBASE}/include/libxml2/libxml"; then
+   ac_cv_file__usr_local_include_libxml2_libxml=yes
+ else
+   ac_cv_file__usr_local_include_libxml2_libxml=no
+@@ -19219,7 +19219,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5
+ echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6
+ if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then
+-  CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"
++  CFLAGS="$CFLAGS -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2/"
+ else
+   cat >>confdefs.h <<\_ACEOF
+ #define _NO_LIBXML 1
 @@ -22082,7 +22082,7 @@ fi
  
  # Standard set of common directories for X headers.
diff --git a/fonts/fontforge/patches/patch-af b/fonts/fontforge/patches/patch-af
new file mode 100644
index 00000000000..450be2be303
--- /dev/null
+++ b/fonts/fontforge/patches/patch-af
@@ -0,0 +1,20 @@
+$NetBSD: patch-af,v 1.4 2008/06/23 11:38:51 drochner Exp $
+
+--- fontforge/cvimportdlg.c.orig	2008-04-17 14:36:53.000000000 +0200
++++ fontforge/cvimportdlg.c
+@@ -51,6 +51,7 @@ return;
+     fclose(plate);
+ }
+ 
++#ifndef _NO_LIBXML
+ static void ImportSVG(CharView *cv,char *path) {
+     SCImportSVG(cv->b.sc,CVLayer((CharViewBase *) cv),path,NULL,0,false);
+ }
+@@ -58,6 +59,7 @@ static void ImportSVG(CharView *cv,char 
+ static void ImportGlif(CharView *cv,char *path) {
+     SCImportGlif(cv->b.sc,CVLayer((CharViewBase *) cv),path,NULL,0,false);
+ }
++#endif
+ 
+ static void ImportFig(CharView *cv,char *path) {
+     SCImportFig(cv->b.sc,CVLayer((CharViewBase *) cv),path,false);