Import gbdfed-1.4 + distribution patch.

gbdfed is a GTK-based BDF font editor with the following features:

  o  Multiple fonts can be loaded from the command line.
  o  Multiple fonts can be open at the same time.
  o  Cutting and pasting glyphs between fonts.
  o  Multiple glyph bitmap editors can be open at the same time.
  o  Cutting and pasting between glyph bitmap editors.
  o  Export of XBM files from glyph bitmap editors.
  o  Automatic correction of certain metrics when a font is loaded.
  o  Generation of XLFD font names for fonts without XLFD names.
  o  Update an XLFD font name from the font properties and vice-versa.
  o  Font property & comment editor.
  o  Supports unencoded glyphs (ENCODING of -1).
  o  Display of glyph encodings in octal, decimal, or hex.
  o  Builtin on-line help.

gbdfed imports and/or exports the following formats:

  o PK/GF, HBF (Han Bitmap Font)
  o PSF, CP, FNT (linux) and vfont (Sun) console fonts
  o X server built-in fonts
  o Windows FON/FNT
  o OpenType/TrueType fonts and collections
  o PSF/HEX fonts

5 files changed, 108 insertions, 0 deletions

diff --git a/fonts/gbdfed/DESCR b/fonts/gbdfed/DESCR
new file mode 100644
index 00000000000..858d469e7f5
--- /dev/null
+++ b/fonts/gbdfed/DESCR
@@ -0,0 +1,24 @@
+gbdfed is a GTK-based BDF font editor with the following features:
+
+  o  Multiple fonts can be loaded from the command line.
+  o  Multiple fonts can be open at the same time.
+  o  Cutting and pasting glyphs between fonts.
+  o  Multiple glyph bitmap editors can be open at the same time.
+  o  Cutting and pasting between glyph bitmap editors.
+  o  Export of XBM files from glyph bitmap editors.
+  o  Automatic correction of certain metrics when a font is loaded.
+  o  Generation of XLFD font names for fonts without XLFD names.
+  o  Update an XLFD font name from the font properties and vice-versa.
+  o  Font property & comment editor.
+  o  Supports unencoded glyphs (ENCODING of -1).
+  o  Display of glyph encodings in octal, decimal, or hex.
+  o  Builtin on-line help.
+
+gbdfed imports and/or exports the following formats:
+
+  o PK/GF, HBF (Han Bitmap Font)
+  o PSF, CP, FNT (linux) and vfont (Sun) console fonts
+  o X server built-in fonts
+  o Windows FON/FNT
+  o OpenType/TrueType fonts and collections
+  o PSF/HEX fonts
diff --git a/fonts/gbdfed/Makefile b/fonts/gbdfed/Makefile
new file mode 100644
index 00000000000..3f89e53c591
--- /dev/null
+++ b/fonts/gbdfed/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/08/09 19:52:02 bjs Exp $
+#
+
+DISTNAME=	gbdfed-1.4
+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
+HOMEPAGE=	http://www.math.nmsu.edu/~mleisher/Software/gbdfed/
+COMMENT=	GTK-based BDF font editor
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config
+USE_LIBTOOL=	yes
+
+AUTO_MKDIRS=	yes
+BINDIR=		${PREFIX}/bin
+MAN1DIR=	${PREFIX}/${PKGMANDIR}/man1
+
+do-install:
+	cd ${WRKSRC:Q} && \
+		${LIBTOOL} --mode=install ${INSTALL_PROGRAM} gbdfed \
+			${DESTDIR:Q}${BINDIR:Q} && \
+		${INSTALL_MAN} gbdfed.man ${DESTDIR:Q}${MAN1DIR:Q}/gbdfed.1
+
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/gbdfed/PLIST b/fonts/gbdfed/PLIST
new file mode 100644
index 00000000000..094d20e548a
--- /dev/null
+++ b/fonts/gbdfed/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/08/09 19:52:02 bjs Exp $
+bin/gbdfed
+man/man1/gbdfed.1
diff --git a/fonts/gbdfed/distinfo b/fonts/gbdfed/distinfo
new file mode 100644
index 00000000000..9db362bbb34
--- /dev/null
+++ b/fonts/gbdfed/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2008/08/09 19:52:02 bjs 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 (patch-aa) = 2247ae325bd54647c7a06a096488eb75e68315a7
diff --git a/fonts/gbdfed/patches/patch-aa b/fonts/gbdfed/patches/patch-aa
new file mode 100644
index 00000000000..22c3a55a7b8
--- /dev/null
+++ b/fonts/gbdfed/patches/patch-aa
@@ -0,0 +1,35 @@
+$NetBSD: patch-aa,v 1.1.1.1 2008/08/09 19:52:02 bjs Exp $
+
+--- Makefile.in.orig	2008-05-21 17:41:46.000000000 -0400
++++ Makefile.in
+@@ -27,9 +27,9 @@ MKINSTALLDIRS = ./mkinstalldirs
+ CC = @CC@
+ CFLAGS = @XX_CFLAGS@ @CFLAGS@
+ 
+-DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \
+-	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+-	-DGTK_DISABLE_DEPRECATED
++DEFINES = @DEFINES@ #-DG_DISABLE_DEPRECATED \
++	#-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
++	#-DGTK_DISABLE_DEPRECATED
+ 
+ SRCS = bdf.c \
+        bdfcons.c \
+@@ -97,7 +97,7 @@ mandir = @mandir@
+ all: gbdfed
+ 
+ gbdfed: $(OBJS)
+-	$(CC) $(STATIC) $(LDFLAGS) -o gbdfed $(OBJS) $(LIBS)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o gbdfed $(OBJS:.o=.lo) $(LIBS)
+ 
+ clean:
+ 	$(RM) -f *.o *BAK *CKP *~ core
+@@ -109,7 +109,7 @@ distclean: clean
+ 	$(RM) -rf gbdfed config.* Makefile autom4te.cache
+ 
+ .c.o:
+-	$(CC) $(DEFINES) $(CFLAGS) $(INCS) -c $< -o $@
++	$(LIBTOOL) --mode=compile $(CC) $(DEFINES) $(CFLAGS) $(INCS) -c $< -o $(@:.o=.lo)
+ 
+ install: gbdfed
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1