From 31708e89f40978adca13dd09560e69b91d306580 Mon Sep 17 00:00:00 2001
From: shattered <shattered@pkgsrc.org>
Date: Sat, 8 Dec 2012 19:51:51 +0000
Subject: Update to 1.6.  Changes:

1. Fixed a problem with implicit dynamic links which are becoming a no-no.
2. Fixed a name collision with glib 2.10.
3. Updated to work with GTK+ 2.20.
---
 fonts/gbdfed/Makefile         |  5 ++---
 fonts/gbdfed/distinfo         | 12 ++++--------
 fonts/gbdfed/patches/patch-ab | 41 -----------------------------------------
 3 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 fonts/gbdfed/patches/patch-ab

(limited to 'fonts/gbdfed')

diff --git a/fonts/gbdfed/Makefile b/fonts/gbdfed/Makefile
index 38b9109be6d..894534094d2 100644
--- a/fonts/gbdfed/Makefile
+++ b/fonts/gbdfed/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2012/10/08 23:01:33 adam Exp $
+# $NetBSD: Makefile,v 1.18 2012/12/08 19:51:51 shattered Exp $
 #
 
-DISTNAME=	gbdfed-1.5
-PKGREVISION=	13
+DISTNAME=	gbdfed-1.6
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.math.nmsu.edu/~mleisher/Software/gbdfed/
 EXTRACT_SUFX=	.tbz2
diff --git a/fonts/gbdfed/distinfo b/fonts/gbdfed/distinfo
index 9bcd7349533..bf44b33594e 100644
--- a/fonts/gbdfed/distinfo
+++ b/fonts/gbdfed/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.2 2009/08/08 16:28:36 wiz Exp $
+$NetBSD: distinfo,v 1.3 2012/12/08 19:51:51 shattered Exp $
 
-SHA1 (gbdfed-1.4-patch1) = b8c5c0b7219a085e3d947dc39da39ae4270102ec
-RMD160 (gbdfed-1.4-patch1) = 476e9d2aaa0716cf9d052688e542ebec998b6263
-Size (gbdfed-1.4-patch1) = 6035 bytes
-SHA1 (gbdfed-1.5.tbz2) = b3a937beedf222e10bf6f379240d43687a9c75ac
-RMD160 (gbdfed-1.5.tbz2) = d3754e4b0a2005ac347010a21296e45e1b1d3ef6
-Size (gbdfed-1.5.tbz2) = 229315 bytes
+SHA1 (gbdfed-1.6.tbz2) = 4985f100e56a5b097f169f63be3ef7b054d929c9
+RMD160 (gbdfed-1.6.tbz2) = 205de4c1e3e2e0e3e3c037d2b1f3090ff15723f0
+Size (gbdfed-1.6.tbz2) = 236166 bytes
 SHA1 (patch-aa) = 2247ae325bd54647c7a06a096488eb75e68315a7
-SHA1 (patch-ab) = 38deb59e7a8a8479a2cf52c00f4404242e410d18
diff --git a/fonts/gbdfed/patches/patch-ab b/fonts/gbdfed/patches/patch-ab
deleted file mode 100644
index da2cf19cda8..00000000000
--- a/fonts/gbdfed/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$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) {
-- 
cgit v1.2.3