Changes 20060413:

* FF failed to output lookups in the right order for the GSUB table.
* FF would crash when attempting to generate a font which had no familyname
* FF could be built agains ft2.2 only if the debugger were being built.
  Make it work always.
* Patch by Mike Frysinger from gentoo. Use the HOME environment variable in
  preference to /etc/passwd.
* Write sfddiff as a fontforge script and put it back into the install process.
* Add code to font compare so it can do the old sfddiff --merge option.
* Someone wanted acorn2sfd! Make it compile again.
* Make configure look for libgif

9 files changed, 75 insertions, 121 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 0c233ca8300..fc5e5d3b231 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2006/04/13 18:23:32 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/14 08:45:06 adam Exp $
 
 DISTNAME=	fontforge_full-${VERSION}
 PKGNAME=	fontforge-${VERSION}
-PKGREVISION=	2
 CATEGORIES=	fonts editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fontforge/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,10 +10,10 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://fontforge.sourceforge.net/
 COMMENT=	Postscript font editor
 
-VERSION=	20060209
+VERSION=	20060413
 
-USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-freetype-src
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index 3a7cc4fb57f..38fb0fe6c25 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/05 07:03:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/04/14 08:45:06 adam Exp $
 bin/fontforge
+bin/sfddiff
 lib/libgdraw.la
 lib/libgunicode.la
 lib/pkgconfig/fontforge.pc
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 63a8de8a312..2f0af8e1ebb 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.20 2006/04/05 07:03:25 adam Exp $
+$NetBSD: distinfo,v 1.21 2006/04/14 08:45:06 adam Exp $
 
-SHA1 (fontforge_full-20060209.tar.bz2) = 263a7d30a089aae230130b7581529121b9d15b5e
-RMD160 (fontforge_full-20060209.tar.bz2) = 95e3f6200b135fd44676db1ab00d067ea708ed2a
-Size (fontforge_full-20060209.tar.bz2) = 3259680 bytes
+SHA1 (fontforge_full-20060413.tar.bz2) = b99341f2f1f02dbfd9182bd38afb805125e36ea2
+RMD160 (fontforge_full-20060413.tar.bz2) = f9d098e9135f0074beac2ea919177f1dbb985d0e
+Size (fontforge_full-20060413.tar.bz2) = 3226436 bytes
 SHA1 (patch-aa) = 7f7a11310fc5050b58e901e08c182dc5025874c6
-SHA1 (patch-ab) = c6ac28364922c736ea89fcc83a0600bb4a1570bb
+SHA1 (patch-ab) = f1ea8f8a63810a225bf39d4577321411bbb9077c
 SHA1 (patch-ac) = 7fe3d9174e407e04966081155965ff994a0fd69b
 SHA1 (patch-ad) = 6a76e7e5e4882eb5af6f31ff3dbc6e7c17b69784
-SHA1 (patch-ae) = bb14ecc96253f117191649f2d1a2c12d7fd351a3
-SHA1 (patch-af) = 3f19724b600eeb22cb132ded36098e47d19c4ea2
-SHA1 (patch-ag) = 50868ed681b58a0ea54ae7e0475dfeed0378d6a2
-SHA1 (patch-ah) = 4af516d22d0f13a7985a7803d348e8fe915c14bd
+SHA1 (patch-ae) = 5e10c47b52b7e9aaeb3dcc36337775cd66d4934b
+SHA1 (patch-af) = b417bde49041767f5959519d738096b1f5976b07
+SHA1 (patch-ag) = 7a54cd574ff723037e10161526547dae9daf3573
+SHA1 (patch-ah) = 328b157281c7face7692e97fa4782b104b4b474f
+SHA1 (patch-ai) = 52cb64eb2e504cf6b9e2eb9d8dce4194aeb651fe
diff --git a/fonts/fontforge/patches/patch-ab b/fonts/fontforge/patches/patch-ab
index 9cc35272f22..4176b5c93c8 100644
--- a/fonts/fontforge/patches/patch-ab
+++ b/fonts/fontforge/patches/patch-ab
@@ -1,36 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2006/03/07 23:09:28 minskim Exp $
+$NetBSD: patch-ab,v 1.7 2006/04/14 08:45:06 adam Exp $
 
-PR bin/32650
-
---- po/ja.po.orig	2006-01-30 05:57:06.000000000 +0000
+--- po/ja.po.orig	2006-04-09 18:27:13.000000000 +0200
 +++ po/ja.po
-@@ -3092,13 +3092,13 @@ msgstr "TFMとENCを出力"
- msgid "Output OFM & CFG"
- msgstr "OFMとCFGを出力"
- 
--msgid "The AFM file contains metrics information that many word-processors will read when using a PostScript\xa9 font."
-+msgid "The AFM file contains metrics information that many word-processors will read when using a PostScript® font."
- msgstr "AFMファイルには, 多くのワープロがPostScriptフォント\n使用時に読み込むメトリック情報が含まれています."
- 
--msgid "The PFM file contains information Windows needs to install a PostScript\xa9 font."
-+msgid "The PFM file contains information Windows needs to install a PostScript® font."
- msgstr "PFMファイルには, PostScriptフォントをインストール\nするときにWindowsが必要とする情報が含まれています."
- 
--msgid "The tfm and enc files contain information TeX needs to install a PostScript\xa9 font."
-+msgid "The tfm and enc files contain information TeX needs to install a PostScript® font."
- msgstr "TFM,ENCの両ファイルには, PostScriptフォントをインストール\nするときにTeXが必要とする情報が含まれています."
- 
- msgid ""
-@@ -3300,7 +3300,7 @@ msgid ""
- "on the entire font."
- msgstr "このフォントには少なくとも1つ非整数の座標が含まれています.\nこれは仕様上全く問題ありませんが,普通ではありませんし\n生成されるフォントのサイズを増加させます.\nフォント全体に対して エレメント(l)→整数値に変換(d) を\n適用することを試してみてはどうでしょうか."
- 
--msgid "PostScript\xa9"
-+msgid "PostScript®"
- msgstr "PostScript"
- 
- msgid "TrueType"
-@@ -4500,7 +4500,7 @@ msgstr "ブリス表意記号"
+@@ -5110,7 +5110,7 @@ msgstr "ブリス表意記号"
  msgid "Bopomofo"
  msgstr "注音字母"
  
@@ -39,66 +11,30 @@ PR bin/32650
  msgstr "ブラーフミー文字"
  
  msgid "Braille"
-@@ -4608,7 +4608,7 @@ msgstr "マヤ神聖文字"
+@@ -5251,7 +5251,7 @@ msgstr "マヤ神聖文字"
  msgid "Meroitic"
  msgstr "メロエ文字"
  
--msgid "Malay\xc4\x81lam"
-+msgid "Malayālam"
+-msgid "Script|Malay\xc4\x81lam"
++msgid "Script|Malayālam"
  msgstr "マラヤーラム文字"
  
- msgid "Myanmar"
-@@ -7485,7 +7485,7 @@ msgid ""
- "commands. PostScript shouldn't care though."
- msgstr "同じパス上の2つの隣り合う点が2,3ユニットより\n近くにある場合,FontForgeの一部のコマンドで問題が生ずる\nおそれがあります.\nただし, PostScriptインタプリタには影響ありません."
- 
--msgid "_X near\xc2\xb9"
-+msgid "_X near¹"
- msgstr "近接する_X"
- 
- msgid ""
-@@ -7493,7 +7493,7 @@ msgid ""
- "glyphs start at the same location."
- msgstr "いくつかのグリフの中に, 同じ位置から始まる垂直ステムがあるかどうかをチェックします."
- 
--msgid "_Y near\xe2\x91\xaf"
-+msgid "_Y near¹"
- msgstr "近接する_Y"
- 
- msgid ""
-@@ -7501,7 +7501,7 @@ msgid ""
- "glyphs start at the same location."
- msgstr "いくつかのグリフの中に, 同じ位置から始まる水平ステムがあるかどうかをチェックします."
- 
--msgid "Y near\xe2\x91\xaf _standard heights"
-+msgid "Y near¹ _standard heights"
- msgstr "標準の高さの近くのY座標(_S)"
- 
- msgid ""
-@@ -7552,7 +7552,7 @@ msgid ""
- "hint exists without any points that lie on it."
- msgstr "Ghostviewは (おそらくその他のインタプリタも)\n点が1個も上に載っていないヒントが存在すると\n問題を生じます."
- 
--msgid "_Points near\xe2\xa1\x9f hint edges"
-+msgid "_Points near¹ hint edges"
- msgstr "ヒント端に近い点(_P)"
- 
- msgid ""
-@@ -7562,7 +7562,7 @@ msgid ""
- "has the wrong width."
- msgstr "点があるヒントから僅かに離れている場合, その多くは\n1本のステムが複数の部分からなり, 一部が間違った幅を持っているのが\n原因です."
- 
--msgid "Hint _Width.Near\xe2\x91\xaf"
-+msgid "Hint _Width.Near¹"
- msgstr "ヒント幅のぶれ量(_W)"
- 
- msgid "Allows you to check that stems have consistant widths.."
-@@ -7694,7 +7694,7 @@ msgid ""
- "point to make a significant difference in the shape of the curve."
- msgstr "制御点は,主たる点との距離が近すぎて曲線の形を変える\n役に立たない場合,無意味なものとされます"
- 
--msgid "\xe2\x91\xaf \"Near\" means within"
-+msgid "¹ \"Near\" means within"
- msgstr " \"近く\"と判断される距離(_N)"
- 
- msgid "Near"
+ msgid "Script|Mongolian"
+@@ -13568,7 +13568,7 @@ msgstr ""
+ msgid "Namelist contains non-ASCII names"
+ msgstr "名前リストに非ASCIIの名前が含まれています"
+ 
+-msgid""
++msgid ""
+ "Glyph names should be limited to characters in the ASCII character set,\n"
+ "but there are names in this namelist which use characters outside\n"
+ "that range."
+@@ -13577,7 +13577,7 @@ msgstr ""
+ "この名前リストにはその範囲に含まれない文字を使用している\n"
+ "名前があります."
+ 
+-msgid""
++msgid ""
+ "Glyph names should be limited to characters in the ASCII character set, "
+ "but there are names in this namelist which use characters outside that range."
+ msgstr ""
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index 0f96b65d955..3c9067c1546 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,16 +1,16 @@
-$NetBSD: patch-ae,v 1.1 2006/04/05 07:03:25 adam Exp $
+$NetBSD: patch-ae,v 1.2 2006/04/14 08:45:06 adam Exp $
 
---- fontforge/fontinfo.c.orig	2006-04-04 11:33:59.000000000 +0200
+--- fontforge/fontinfo.c.orig	2006-04-06 16:02:54.000000000 +0200
 +++ fontforge/fontinfo.c
-@@ -5151,6 +5151,7 @@ static int GFI_OK(GGadget *g, GEvent *e)
+@@ -5182,6 +5182,7 @@ static int GFI_OK(GGadget *g, GEvent *e)
  #endif
  	char os2_vendor[4];
  	NameList *nl;
 +	int ans;
+ 	extern int allow_utf8_glyphnames;
  
  	if ( d->tn_smallactive!=-1 )
- 	    TN_FinishSmallEdit(d);
-@@ -5324,7 +5325,7 @@ return( true );
+@@ -5369,7 +5370,7 @@ return(true);
  	    buts[2] = GTK_STOCK_CANCEL;
  #endif
  	    buts[3] = NULL;
diff --git a/fonts/fontforge/patches/patch-af b/fonts/fontforge/patches/patch-af
index e068c1a1bf0..9d50ec320ce 100644
--- a/fonts/fontforge/patches/patch-af
+++ b/fonts/fontforge/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2006/04/05 07:03:25 adam Exp $
+$NetBSD: patch-af,v 1.2 2006/04/14 08:45:06 adam Exp $
 
---- fontforge/openfontdlg.c.orig	2006-02-06 03:45:51.000000000 +0100
+--- fontforge/openfontdlg.c.orig	2006-03-26 19:26:51.000000000 +0200
 +++ fontforge/openfontdlg.c
-@@ -134,8 +134,11 @@ return( true );
+@@ -140,8 +140,11 @@ return( true );
  }
  
  static int e_h(GWindow gw, GEvent *event) {
@@ -15,7 +15,7 @@ $NetBSD: patch-af,v 1.1 2006/04/05 07:03:25 adam Exp $
  	d->done = true;
      } else if ( event->type == et_map ) {
  	/* Above palettes */
-@@ -144,16 +147,15 @@ static int e_h(GWindow gw, GEvent *event
+@@ -150,16 +153,15 @@ static int e_h(GWindow gw, GEvent *event
  return( false );
      } else if ( event->type == et_mousemove ||
  	    (event->type==et_mousedown && event->u.mouse.button==3 )) {
diff --git a/fonts/fontforge/patches/patch-ag b/fonts/fontforge/patches/patch-ag
index 888f0a5605e..c1b9d8f6814 100644
--- a/fonts/fontforge/patches/patch-ag
+++ b/fonts/fontforge/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2006/04/05 07:03:25 adam Exp $
+$NetBSD: patch-ag,v 1.2 2006/04/14 08:45:06 adam Exp $
 
---- fontforge/parsettf.c.orig	2006-04-04 11:38:32.000000000 +0200
+--- fontforge/parsettf.c.orig	2006-03-30 07:53:44.000000000 +0200
 +++ fontforge/parsettf.c
-@@ -4254,7 +4254,7 @@ return;
+@@ -4253,7 +4253,7 @@ return;
  
  static int readttf(FILE *ttf, struct ttfinfo *info, char *filename) {
      char *oldloc;
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.1 2006/04/05 07:03:25 adam Exp $
  
  #if !defined(FONTFORGE_CONFIG_NO_WINDOWING_UI)
      gwwv_progress_change_stages(3);
-@@ -4283,12 +4283,12 @@ return( 0 );
+@@ -4282,12 +4282,12 @@ return( 0 );
  	buts[3] = NULL;
  #if defined(FONTFORGE_CONFIG_GDRAW)
  	buts[2] = _("_Cancel");
diff --git a/fonts/fontforge/patches/patch-ah b/fonts/fontforge/patches/patch-ah
index 46d960c85c9..8e6331e92b5 100644
--- a/fonts/fontforge/patches/patch-ah
+++ b/fonts/fontforge/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.1 2006/04/05 07:03:25 adam Exp $
+$NetBSD: patch-ah,v 1.2 2006/04/14 08:45:06 adam Exp $
 
---- fontforge/savefontdlg.c.orig	2006-04-04 11:44:50.000000000 +0200
+--- fontforge/savefontdlg.c.orig	2006-04-13 19:56:36.000000000 +0200
 +++ fontforge/savefontdlg.c
-@@ -2143,6 +2143,12 @@ static void DoSave(struct gfc_data *d,un
+@@ -2218,6 +2218,13 @@ static void DoSave(struct gfc_data *d,un
      struct sflist *sfs=NULL, *cur, *last=NULL;
-     static int psscalewarned=0, ttfscalewarned=0;
+     static int psscalewarned=0, ttfscalewarned=0, psfnlenwarned=0;
      int flags;
 +    struct sflist *sfl;
 +    char **former;
@@ -12,10 +12,11 @@ $NetBSD: patch-ah,v 1.1 2006/04/05 07:03:25 adam Exp $
 +    GTextInfo *ti = GGadgetGetListItemSelected(d->rename);
 +    char *nlname = u2utf8_copy(ti->text);
 +    extern NameList *force_names_when_saving;
++    int notdef_pos = SFFindNotdef(d->sf,-1);
  #if defined(FONTFORGE_CONFIG_GDRAW)
      char *buts[3];
      buts[0] = _("_Yes");
-@@ -2151,12 +2157,6 @@ static void DoSave(struct gfc_data *d,un
+@@ -2226,13 +2233,6 @@ static void DoSave(struct gfc_data *d,un
  #elif defined(FONTFORGE_CONFIG_GTK)
      static char *buts[] = { GTK_STOCK_YES, GTK_STOCK_NO, NULL };
  #endif
@@ -25,6 +26,7 @@ $NetBSD: patch-ah,v 1.1 2006/04/05 07:03:25 adam Exp $
 -    GTextInfo *ti = GGadgetGetListItemSelected(d->rename);
 -    char *nlname = u2utf8_copy(ti->text);
 -    extern NameList *force_names_when_saving;
+-    int notdef_pos = SFFindNotdef(d->sf,-1);
  
      rename_to = NameListByName(nlname);
      free(nlname);
diff --git a/fonts/fontforge/patches/patch-ai b/fonts/fontforge/patches/patch-ai
new file mode 100644
index 00000000000..d457a667b30
--- /dev/null
+++ b/fonts/fontforge/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2006/04/14 08:45:06 adam Exp $
+
+--- po/fr.po.orig	2006-04-14 09:57:24.000000000 +0200
++++ po/fr.po
+@@ -4664,8 +4664,8 @@ msgid "List of class numbers"
+ msgstr "Liste des numéros de classes"
+ 
+ #: contextchain.c:2733
+-msgid "Classes"
+-msgstr "Classes"
++#msgid "Classes"
++#msgstr "Classes"
+ 
+ #: cvdebug.c:733 cvdebug.c:735
+ msgid "No Watch Points"