Changes 20060703:

* Bug fixes and improvements

8 files changed, 8 insertions, 153 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 79537261e9f..78ea561d191 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/04/17 13:46:24 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2006/07/10 20:52:44 adam Exp $
 
 DISTNAME=	fontforge_full-${VERSION}
 PKGNAME=	fontforge-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	fonts editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fontforge/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +10,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://fontforge.sourceforge.net/
 COMMENT=	Postscript font editor
 
-VERSION=	20060413
+VERSION=	20060703
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index 04995651900..3f985a06c07 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/04/17 07:07:19 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/07/10 20:52:44 adam Exp $
 bin/fontforge
 bin/sfddiff
 lib/libgdraw.la
@@ -11,3 +11,4 @@ share/locale/fr/LC_MESSAGES/FontForge.mo
 share/locale/it/LC_MESSAGES/FontForge.mo
 share/locale/ja/LC_MESSAGES/FontForge.mo
 share/locale/ru/LC_MESSAGES/FontForge.mo
+share/locale/vi/LC_MESSAGES/FontForge.mo
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 27e5fc28ffa..deab0946a65 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.24 2006/05/20 23:34:39 jlam Exp $
+$NetBSD: distinfo,v 1.25 2006/07/10 20:52:44 adam Exp $
 
-SHA1 (fontforge_full-20060413.tar.bz2) = b99341f2f1f02dbfd9182bd38afb805125e36ea2
-RMD160 (fontforge_full-20060413.tar.bz2) = f9d098e9135f0074beac2ea919177f1dbb985d0e
-Size (fontforge_full-20060413.tar.bz2) = 3226436 bytes
+SHA1 (fontforge_full-20060703.tar.bz2) = f67d862707be29fa13172033deeb4f13d1bf4687
+RMD160 (fontforge_full-20060703.tar.bz2) = 04c61000f143a82efca67312e0bd1b6bcc6c2a37
+Size (fontforge_full-20060703.tar.bz2) = 3360930 bytes
 SHA1 (patch-aa) = 7f7a11310fc5050b58e901e08c182dc5025874c6
 SHA1 (patch-ab) = f6ca0968357b7e06af837e8c439151754269defb
 SHA1 (patch-ac) = 7fe3d9174e407e04966081155965ff994a0fd69b
 SHA1 (patch-ad) = 6a76e7e5e4882eb5af6f31ff3dbc6e7c17b69784
-SHA1 (patch-ae) = 5e10c47b52b7e9aaeb3dcc36337775cd66d4934b
-SHA1 (patch-af) = b417bde49041767f5959519d738096b1f5976b07
-SHA1 (patch-ag) = 7a54cd574ff723037e10161526547dae9daf3573
-SHA1 (patch-ah) = 328b157281c7face7692e97fa4782b104b4b474f
-SHA1 (patch-ai) = 95f44952e26529c6078bd85555ecbbdbf96dd271
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
deleted file mode 100644
index 3c9067c1546..00000000000
--- a/fonts/fontforge/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2006/04/14 08:45:06 adam Exp $
-
---- fontforge/fontinfo.c.orig	2006-04-06 16:02:54.000000000 +0200
-+++ fontforge/fontinfo.c
-@@ -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 )
-@@ -5369,7 +5370,7 @@ return(true);
- 	    buts[2] = GTK_STOCK_CANCEL;
- #endif
- 	    buts[3] = NULL;
--	    int ans = gwwv_ask(_("Change UniqueID?"),(const char **) buts,0,2,_("You have changed this font's name without changing the UniqueID (or XUID).\nThis is probably not a good idea, would you like me to\ngenerate a random new value?"));
-+	    ans = gwwv_ask(_("Change UniqueID?"),(const char **) buts,0,2,_("You have changed this font's name without changing the UniqueID (or XUID).\nThis is probably not a good idea, would you like me to\ngenerate a random new value?"));
- 	    if ( ans==2 ) {
- 		GDrawSetCursor(gw,ct_pointer);
- return(true);
diff --git a/fonts/fontforge/patches/patch-af b/fonts/fontforge/patches/patch-af
deleted file mode 100644
index 9d50ec320ce..00000000000
--- a/fonts/fontforge/patches/patch-af
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/04/14 08:45:06 adam Exp $
-
---- fontforge/openfontdlg.c.orig	2006-03-26 19:26:51.000000000 +0200
-+++ fontforge/openfontdlg.c
-@@ -140,8 +140,11 @@ return( true );
- }
- 
- static int e_h(GWindow gw, GEvent *event) {
-+    GRect r, size;
-+    struct gfc_data *d;
-+
-     if ( event->type==et_close ) {
--	struct gfc_data *d = GDrawGetUserData(gw);
-+	d = GDrawGetUserData(gw);
- 	d->done = true;
-     } else if ( event->type == et_map ) {
- 	/* Above palettes */
-@@ -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 )) {
--	struct gfc_data *d = GDrawGetUserData(gw);
-+	d = GDrawGetUserData(gw);
- 	if ( !WithinList(d,event) )
- 	    GFileChooserPopupCheck(d->gfc,event);
-     } else if (( event->type==et_mouseup || event->type==et_mousedown ) &&
- 	    (event->u.mouse.button==4 || event->u.mouse.button==5) ) {
--	struct gfc_data *d = GDrawGetUserData(gw);
-+	d = GDrawGetUserData(gw);
- return( GGadgetDispatchEvent((GGadget *) (d->gfc),event));
-     } else if ( event->type == et_resize ) {
--	GRect r, size;;
--	struct gfc_data *d = GDrawGetUserData(gw);
-+	d = GDrawGetUserData(gw);
- 	GDrawGetSize(gw,&size);
- 	GGadgetGetSize(d->gfc,&r);
- 	GGadgetResize(d->gfc,size.width-2*r.x,r.height);
diff --git a/fonts/fontforge/patches/patch-ag b/fonts/fontforge/patches/patch-ag
deleted file mode 100644
index c1b9d8f6814..00000000000
--- a/fonts/fontforge/patches/patch-ag
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2006/04/14 08:45:06 adam Exp $
-
---- fontforge/parsettf.c.orig	2006-03-30 07:53:44.000000000 +0200
-+++ fontforge/parsettf.c
-@@ -4253,7 +4253,7 @@ return;
- 
- static int readttf(FILE *ttf, struct ttfinfo *info, char *filename) {
-     char *oldloc;
--    int i;
-+    int i, choice;
- 
- #if !defined(FONTFORGE_CONFIG_NO_WINDOWING_UI)
-     gwwv_progress_change_stages(3);
-@@ -4282,12 +4282,12 @@ return( 0 );
- 	buts[3] = NULL;
- #if defined(FONTFORGE_CONFIG_GDRAW)
- 	buts[2] = _("_Cancel");
--	int choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
-+	choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
- #elif defined(FONTFORGE_CONFIG_GTK)
- 	buts[2] = GTK_STOCK_CANCEL;
--	int choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
-+	choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
- #else
--	int choice = 0;
-+	choice = 0;
- #endif
- 	if ( choice==2 ) {
- 	    setlocale(LC_NUMERIC,oldloc);
diff --git a/fonts/fontforge/patches/patch-ah b/fonts/fontforge/patches/patch-ah
deleted file mode 100644
index 8e6331e92b5..00000000000
--- a/fonts/fontforge/patches/patch-ah
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2006/04/14 08:45:06 adam Exp $
-
---- fontforge/savefontdlg.c.orig	2006-04-13 19:56:36.000000000 +0200
-+++ fontforge/savefontdlg.c
-@@ -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, psfnlenwarned=0;
-     int flags;
-+    struct sflist *sfl;
-+    char **former;
-+    NameList *rename_to;
-+    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");
-@@ -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
--    struct sflist *sfl;
--    char **former;
--    NameList *rename_to;
--    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
deleted file mode 100644
index 4cf32116e6f..00000000000
--- a/fonts/fontforge/patches/patch-ai
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2006/04/19 19:43:18 rillig Exp $
-
-gcc 2.95 does not like declarations intermixed with code.
-
---- fontforge/charinfo.c.orig	2006-03-24 22:54:58.000000000 +0100
-+++ fontforge/charinfo.c	2006-04-19 21:41:30.000000000 +0200
-@@ -4288,13 +4288,13 @@ return( true );
- 
- static int CI_NameCheck(const unichar_t *name) {
-     int bad, questionable;
-+    extern int allow_utf8_glyphnames;
- #if defined(FONTFORGE_CONFIG_GDRAW)
-     char *buts[3];
-     buts[0] = _("_Yes"); buts[1]=_("_No"); buts[2] = NULL;
- #elif defined(FONTFORGE_CONFIG_GTK)
-     static char *buts[] = { GTK_STOCK_YES, GTK_STOCK_CANCEL, NULL };
- #endif
--    extern int allow_utf8_glyphnames;
- 
-     if ( uc_strcmp(name,".notdef")==0 )		/* This name is a special case and doesn't follow conventions */
- return( true );