[pkgsrc/trunk]: pkgsrc/fonts/gbdfed Update to 1.5, fix getline problem.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/27cd99f35660
branches:  trunk
changeset: 562934:27cd99f35660
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Aug 08 16:28:36 2009 +0000

description:
Update to 1.5, fix getline problem.

This version fixes several minor bugs, removes the last of the
deprecated GTK+ code, and improves the user interface of the
GlyphEditor.

diffstat:

 fonts/gbdfed/Makefile         |   8 ++------
 fonts/gbdfed/distinfo         |   9 +++++----
 fonts/gbdfed/patches/patch-ab |  41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 10 deletions(-)

diffs (84 lines):

diff -r ab91fa5d3ff0 -r 27cd99f35660 fonts/gbdfed/Makefile
--- a/fonts/gbdfed/Makefile     Sat Aug 08 16:24:19 2009 +0000
+++ b/fonts/gbdfed/Makefile     Sat Aug 08 16:28:36 2009 +0000
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/08/09 19:52:02 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2009/08/08 16:28:36 wiz Exp $
 #
 
-DISTNAME=      gbdfed-1.4
+DISTNAME=      gbdfed-1.5
 CATEGORIES=    fonts
 MASTER_SITES=  http://www.math.nmsu.edu/~mleisher/Software/gbdfed/
 EXTRACT_SUFX=  .tbz2
 
-PATCH_SITES=   ${MASTER_SITES}
-PATCHFILES=    gbdfed-1.4-patch1
-PATCH_DIST_STRIP=      -p1
-
 MAINTAINER=    bjs%NetBSD.org@localhost
 HOMEPAGE=      http://www.math.nmsu.edu/~mleisher/Software/gbdfed/
 COMMENT=       GTK-based BDF font editor
diff -r ab91fa5d3ff0 -r 27cd99f35660 fonts/gbdfed/distinfo
--- a/fonts/gbdfed/distinfo     Sat Aug 08 16:24:19 2009 +0000
+++ b/fonts/gbdfed/distinfo     Sat Aug 08 16:28:36 2009 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/08/09 19:52:02 bjs Exp $
+$NetBSD: distinfo,v 1.2 2009/08/08 16:28:36 wiz Exp $
 
 SHA1 (gbdfed-1.4-patch1) = b8c5c0b7219a085e3d947dc39da39ae4270102ec
 RMD160 (gbdfed-1.4-patch1) = 476e9d2aaa0716cf9d052688e542ebec998b6263
 Size (gbdfed-1.4-patch1) = 6035 bytes
-SHA1 (gbdfed-1.4.tbz2) = 0e6fadefbb470e89d7045f6d640606100c96e5c2
-RMD160 (gbdfed-1.4.tbz2) = 9faa2ee2fbf34c6eaea1662231266233052bff56
-Size (gbdfed-1.4.tbz2) = 228556 bytes
+SHA1 (gbdfed-1.5.tbz2) = b3a937beedf222e10bf6f379240d43687a9c75ac
+RMD160 (gbdfed-1.5.tbz2) = d3754e4b0a2005ac347010a21296e45e1b1d3ef6
+Size (gbdfed-1.5.tbz2) = 229315 bytes
 SHA1 (patch-aa) = 2247ae325bd54647c7a06a096488eb75e68315a7
+SHA1 (patch-ab) = 38deb59e7a8a8479a2cf52c00f4404242e410d18
diff -r ab91fa5d3ff0 -r 27cd99f35660 fonts/gbdfed/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/gbdfed/patches/patch-ab     Sat Aug 08 16:28:36 2009 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-ab,v 1.1 2009/08/08 16:28:36 wiz Exp $
+
+--- bdfgname.c.orig    2009-03-06 18:12:28.000000000 +0000
++++ bdfgname.c
+@@ -39,7 +39,7 @@ static unsigned int adobe_names_used;
+ #define MAX_GLYPH_NAME_LEN 127
+ 
+ static int
+-getline(FILE *in, char *buf, int limit)
++get_line(FILE *in, char *buf, int limit)
+ {
+     int c, i;
+ 
+@@ -78,11 +78,11 @@ _bdf_find_name(int code, char *name, FIL
+ 
+     while (!feof(in)) {
+         pos = ftell(in);
+-        (void) getline(in, buf, 256);
++        (void) get_line(in, buf, 256);
+         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
+             buf[0] = 0;
+             pos = ftell(in);
+-            (void) getline(in, buf, 256);
++            (void) get_line(in, buf, 256);
+         }
+ 
+         if (buf[0] == 0)
+@@ -139,11 +139,11 @@ _bdf_load_adobe_names(FILE *in)
+ 
+     while (!feof(in)) {
+         pos = ftell(in);
+-        (void) getline(in, buf, 256);
++        (void) get_line(in, buf, 256);
+         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
+             buf[0] = 0;
+             pos = ftell(in);
+-            (void) getline(in, buf, 256);
++            (void) get_line(in, buf, 256);
+         }
+ 
+         if (adobe_names_used == adobe_names_size) {