Update to 4.7, patch 1:

- Completely revamped the PSF font import/export system to make it actually useable. - Changed to use FreeType 2. - Miscellaneous fixes.
2004-04-05 21:41:46 +00:00 · 2004-04-05 21:41:46 +00:00 · 7837a7d329
commit 7837a7d329
parent 696ae0bbe8
6 changed files with 100 additions and 38 deletions
--- a/x11/xmbdfed/Makefile
+++ b/x11/xmbdfed/Makefile
@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.14 2003/10/08 17:13:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.15 2004/04/05 21:41:46 naddy Exp $

 COMMENT=	"Motif tool for editing X11 bitmap fonts"

-VERSION=	4.5
+VERSION=	4.7
 DISTNAME=	xmbdfed-${VERSION}
 PKGNAME=	${DISTNAME}.1
 CATEGORIES=	x11
+HOMEPAGE=	http://crl.nmsu.edu/~mleisher/xmbdfed.html

 # BSD/Public Domain
 PERMIT_PACKAGE_CDROM=	Yes
@ -13,23 +14,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=	http://crl.nmsu.edu/~mleisher/ \
-		ftp://crl.nmsu.edu/CLR/multiling/General/
+MASTER_SITES=	http://crl.nmsu.edu/~mleisher/
+EXTRACT_SUFX=	.tar.bz2
 PATCHFILES=	xmbdfed-${VERSION}-patch1

-LIB_DEPENDS=	ttf.1.3::print/freetype
-
 USE_X11=	Yes
 USE_MOTIF=	any

-MAKE_FLAGS=	CC='${CC}' CFLAGS='${CFLAGS}' STATIC='' \
-		FTYPE_LIBS='-L${LOCALBASE}/lib -lttf' \
-		FTYPE_DEFS='-DHAVE_FREETYPE' \
-		FTYPE_INCS='-I${LOCALBASE}/include/freetype1/freetype' \
-		HBFDEFS='-Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/bin/gunzip -c\""' \
-		INCS='-I${X11BASE}/include -I${LOCALBASE}/include $$(FTYPE_INCS)' \
-		LIBS='-L${X11BASE}/lib -L${LOCALBASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext $$(FTYPE_LIBS)'
-
 NO_REGRESS=	Yes

 do-install:
--- a/x11/xmbdfed/distinfo
+++ b/x11/xmbdfed/distinfo
@ -1,6 +1,6 @@
-MD5 (xmbdfed-4.5-patch1) = 46a319341604ebd83e54ba9330b06ed6
-MD5 (xmbdfed-4.5.tar.gz) = 8420d39931a0674784f3fd0c0f1f9d6a
-RMD160 (xmbdfed-4.5-patch1) = 02f13a6116a4972fba99d90762636faf0e6a65ea
-RMD160 (xmbdfed-4.5.tar.gz) = a6c1d9202e6d978dbc0aaa1fb6389a3d14b16c26
-SHA1 (xmbdfed-4.5-patch1) = 2b2da028973f14868b0f9387db8fa3c117662be4
-SHA1 (xmbdfed-4.5.tar.gz) = 325f2f3a8ae68b3f5d22ff9bdd115d30cdd743db
+MD5 (xmbdfed-4.7-patch1) = f18ea8561330db825bd7edcb61b0758a
+MD5 (xmbdfed-4.7.tar.bz2) = 27872bb7473e5d64d9a24281ae6ad3d9
+RMD160 (xmbdfed-4.7-patch1) = 69880ceb0c055e569e9fae55740ac48bd472e4f6
+RMD160 (xmbdfed-4.7.tar.bz2) = 3df40c8061f2b84e01fdadd55904091c47d558e1
+SHA1 (xmbdfed-4.7-patch1) = 76e27d1fde66bd4bffdfc201be2476f3c2881cf4
+SHA1 (xmbdfed-4.7.tar.bz2) = d47e8b43d5326b0e09ac9e2808ce2f9510127e46
--- a/x11/xmbdfed/patches/patch-Makefile
+++ b/x11/xmbdfed/patches/patch-Makefile
@ -0,0 +1,76 @@
+$OpenBSD: patch-Makefile,v 1.1 2004/04/05 21:41:46 naddy Exp $
+--- Makefile.orig	2004-02-17 16:24:06.000000000 +0100
+++ Makefile	2004-03-18 18:37:07.000000000 +0100
+@@ -22,8 +22,8 @@
+ #
+ # $Id: patch-Makefile,v 1.1 2004/04/05 21:41:46 naddy Exp $
+ #
+-CC = gcc
+-CFLAGS = -g -Wall
+#CC = gcc
+#CFLAGS = -g -Wall
+ 
+ OTHER = README CHANGES COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \
+         xmbdfedrc xmbdfed.man
+@@ -46,17 +46,17 @@ OBJS = FGrid.o GEdit.o GEditTB.o GTest.o
+ # Uncomment these if you have the FreeType library and want to use it to
+ # import OpenType fonts.
+ #
+-#FTYPE_INCS = -I/usr/local/include
+-#FTYPE_LIBS = -L/usr/local/lib -lfreetype
+-#FTYPE_DEFS = -DHAVE_FREETYPE
+FTYPE_INCS = -I${X11BASE}/include/freetype2
+FTYPE_LIBS = -L${X11BASE}/lib -lfreetype
+FTYPE_DEFS = -DHAVE_FREETYPE
+ 
+ #
+ # Uncomment these if you have the hbf.h and hbf.c files in the current
+ # directory and the patch has been applied.
+ #
+-#HBF_HDRS = hbf.h
+-#HBF_OBJS = hbf.o
+-#HBF_DEFS = -DHAVE_HBF
+HBF_HDRS = hbf.h
+HBF_OBJS = hbf.o
+HBF_DEFS = -DHAVE_HBF
+ 
+ #
+ # Specify the various defines needed for HBF fonts.  If you do not have GNU
+@@ -64,7 +64,7 @@ OBJS = FGrid.o GEdit.o GEditTB.o GTest.o
+ # files with a ".gz" extension.  If you don't care about HBF fonts, just
+ # comment this line out.
+ #
+-HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/local/bin/gunzip -c\""
+HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/bin/gunzip -c\""
+ 
+ #
+ # Set the defines used for all files except the HBF support.
+@@ -82,9 +82,9 @@ DEFS = -DHAVE_XLIB $(FTYPE_DEFS) $(HBF_D
+ #
+ # Uncomment these for Solaris.
+ #
+-INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
+-LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
+-       -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
+#INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
+#LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
+#       -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
+ 
+ #
+ # Uncomment these for Linux.
+@@ -129,10 +129,14 @@ LIBS = -R/usr/openwin/lib -R/usr/dt/lib 
+ #LIBS = -L/usr/Motif-1.2/lib32 -lXm \
+ #       -L/usr/lib/X11 -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
+ 
+INCS= -I${X11BASE}/include -I${LOCALBASE}/include ${FTYPE_INCS}
+LIBS= -L${X11BASE}/lib -L${LOCALBASE}/lib \
+      ${MOTIFLIB} -lXp -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE ${FTYPE_LIBS}
+
+ all: xmbdfed
+ 
+ xmbdfed: $(OBJS)
+-	$(PURIFY) $(CC) $(STATIC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS)
+	$(PURIFY) $(CC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS)
+ 
+ hbf.o: hbf.c
+ 	$(CC) $(CFLAGS) $(DEFS) $(HBFDEFS) $(INCS) -c $< -o $@
--- a/x11/xmbdfed/patches/patch-bdf_h
+++ b/x11/xmbdfed/patches/patch-bdf_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-bdf_h,v 1.1 2002/07/26 19:31:36 naddy Exp $
--- bdf.h.orig	Wed Sep 19 23:00:42 2001
-+++ bdf.h	Fri Jul 26 21:24:20 2002
-@@ -41,7 +41,7 @@
- 
- #ifdef HAVE_FREETYPE
- #include <freetype.h>
-#include <extend/ftxsbit.h>
-+#include <ftxsbit.h>
- #endif /* HAVE_FREETYPE */
- 
- #ifdef __cplusplus
--- a/x11/xmbdfed/patches/patch-xmbdfed_c
+++ b/x11/xmbdfed/patches/patch-xmbdfed_c
@ -1,12 +1,12 @@
-$OpenBSD: patch-xmbdfed_c,v 1.1 2002/07/26 19:31:36 naddy Exp $
--- xmbdfed.c.orig	Wed Sep 19 23:00:44 2001
-+++ xmbdfed.c	Fri Jul 26 21:24:20 2002
-@@ -101,7 +101,7 @@ static Boolean exiting = False;
+$OpenBSD: patch-xmbdfed_c,v 1.2 2004/04/05 21:41:46 naddy Exp $
+--- xmbdfed.c.orig	2004-03-18 14:16:50.000000000 +0100
+++ xmbdfed.c	2004-03-18 14:17:35.000000000 +0100
+@@ -103,7 +103,7 @@ static Boolean exiting = False;
 #define HGINFO "\"%s\" %04lX (%02X,%02X)\nascent %d descent %d right %d left %d"
 
 static String fallback_resources[] = {
-    "*fontList: -adobe-new century schoolbook-medium-r-normal--14-100-100-100-p-82-iso8859-1",
-+/*    "*fontList: -adobe-new century schoolbook-medium-r-normal--14-100-100-100-p-82-iso8859-1", */
+-    "*fontList: -adobe-new century schoolbook-medium-r-normal--14-140-75-75-p-82-iso8859-1",
+/*    "*fontList: -adobe-new century schoolbook-medium-r-normal--14-140-75-75-p-82-iso8859-1", */
     (String) NULL,
 };
 
--- a/x11/xmbdfed/pkg/DESCR
+++ b/x11/xmbdfed/pkg/DESCR
@ -5,6 +5,7 @@ XmBDFEditor is a Motif-based BDF font editor with the following features:
  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.
@ -14,7 +15,13 @@ XmBDFEditor is a Motif-based BDF font editor with the following features:
  o  Supports unencoded glyphs (ENCODING of -1).
  o  Display of glyph encodings in octal, decimal, or hex.
  o  Builtin on-line help.
+  o  Imports PK/GF fonts.
  o  Imports HBF (Han Bitmap Font) fonts.
  o  Imports Linux console fonts (PSF, CP, and FNT).
  o  Imports Sun console fonts (vfont format).
  o  Imports fonts from the X server.
+  o  Imports Windows FON/FNT fonts.
+  o  Imports TrueType fonts and collections.
+  o  Exports PSF fonts.
+  o  Exports HEX fonts.
+  o  Edits two and four bits per pixel gray scale fonts.