- ttf2pk, ttf2pfm: install forgoten font maps

- install ttf2bdf
- install ttfbanner
- include a patch in previous chinese/CJK for ttf2pk (patch-big5eten)
  which add support for big5 eten extension maps
- it should use gmake
- bump PORTREVISION

PR:		ports/84346
Submitted by:	maintainer

6 files changed, 80 insertions, 7 deletions

diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile
index f1158b26ff0c..50320260e01e 100644
--- a/print/freetype-tools/Makefile
+++ b/print/freetype-tools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freetype-tools
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
@@ -28,22 +29,32 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--disable-nls --enable-static --enable-shared
 USE_REINPLACE=	yes
 
-MAN1=		ttf2tfm.1 ttf2pk.1
+TEXMFMAIN=	${PREFIX}/share/texmf
+
+MAN1=		ttf2bdf.1 ttf2tfm.1 ttf2pk.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
 		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|LIBTOOL =.*|LIBTOOL = ${LIBTOOL}|'
+	@${FIND} ${WRKSRC} -name '*.orig' | ${XARGS} ${RM}
 
 post-build:
-	cd ${WRKSRC}/contrib/ttf2bdf && ./configure --prefix=${PREFIX} && ${GMAKE}
-	cd ${WRKSRC}/contrib/ttf2pfb && ./configure --prefix=${PREFIX} && ${GMAKE}
-	cd ${WRKSRC}/contrib/ttf2pk && ./configure --prefix=${PREFIX} --with-kpathsea-dir=${LOCALBASE} && ${GMAKE}
+	@cd ${WRKSRC}/contrib/ttf2bdf && ./configure --prefix=${PREFIX} && ${GMAKE}
+	@cd ${WRKSRC}/contrib/ttf2pfb && ./configure --prefix=${PREFIX} && ${GMAKE}
+	@cd ${WRKSRC}/contrib/ttf2pk && ./configure --prefix=${PREFIX} --with-kpathsea-dir=${LOCALBASE} && ${GMAKE}
+	@cd ${WRKSRC}/contrib/ttfbanner && ./configure --prefix=${PREFIX} && ${GMAKE}
 
 do-install:
-	cd ${WRKSRC}/contrib/ttf2pk && ${GMAKE} install
-	cd ${WRKSRC}/contrib/ttf2pfb && ${GMAKE} install
-	cd ${WRKSRC}/contrib/ttf2pk && ${GMAKE} install
+	@cd ${WRKSRC}/contrib/ttf2bdf && ${GMAKE} install
+	@cd ${WRKSRC}/contrib/ttf2pfb && ${GMAKE} install
+	@cd ${WRKSRC}/contrib/ttf2pk && ${GMAKE} install
+	@cd ${WRKSRC}/contrib/ttfbanner && ${GMAKE} install
+	@${MKDIR} ${TEXMFMAIN}/ttf2pk
+	@for f in ${WRKSRC}/contrib/ttf2pk/data/*; do \
+	  ${INSTALL_DATA} $$f ${TEXMFMAIN}/ttf2pk; \
+	done
+	@${LN} -fs ${TEXMFMAIN}/ttf2pk ${TEXMFMAIN}/ttf2tfm
 
 .include <bsd.port.mk>
diff --git a/print/freetype-tools/files/patch-big5eten b/print/freetype-tools/files/patch-big5eten
new file mode 100644
index 000000000000..11ca0e542369
--- /dev/null
+++ b/print/freetype-tools/files/patch-big5eten
@@ -0,0 +1,21 @@
+--- contrib/ttf2pk/data/UBig5.sfd.orig   Thu Dec 10 22:40:10 1998
++++ contrib/ttf2pk/data/UBig5.sfd        Fri Jan 21 23:38:41 2000
+@@ -1746,12 +1746,12 @@
+    0x6207 0x6B1E 0x7227 0x864C 0x8EA8 0x9482 0x9480 0x9481 \
+    0x9A69 0x9A68 0x9B2E 0x9E19 0x7229 0x864B 0x8B9F 0x9483 \
+    0x9C79 0x9EB7 0x7675 0x9A6B 0x9C7A 0x9E1D 0x7069 0x706A \
+-   0x9EA4 0x9F7E 0x9F49 0x9F98 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
++   0x9EA4 0x9F7E 0x9F49 0x9F98 0x7881 0x92B9 0x88CF 0x58BB \
++   0x6052 0x7CA7 0x5AFA 0x2554 0x2566 0x2557 0x2560 0x256C \
++   0x2563 0x255A 0x2569 0x255D 0x2552 0x2564 0x2555 0x255E \
++   0x256A 0x2561 0x2558 0x2567 0x255B 0x2553 0x2565 0x2556 \
++   0x255F 0x256B 0x2562 0x2559 0x2568 0x255C 0x2551 0x2550 \
++   0x256D 0x256E 0x2570 0x256F 0x25A0 0xFFFE 0xFFFE 0xFFFE \
+    0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+    0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+    0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
diff --git a/print/freetype-tools/files/patch-libtool b/print/freetype-tools/files/patch-libtool
index 2277236839b2..554caa4670ab 100644
--- a/print/freetype-tools/files/patch-libtool
+++ b/print/freetype-tools/files/patch-libtool
@@ -26,3 +26,15 @@
                                       $(LIBDIR)/libttf.la $(LDFLAGS)
  
  install: $(PROGRAMS)
+
+--- contrib/ttfbanner/Makefile.in.orig	Sat Jul 30 14:09:54 2005
++++ contrib/ttfbanner/Makefile.in	Sat Jul 30 14:10:03 2005
+@@ -35,7 +35,7 @@
+ default all: ttfbanner
+ 
+ ttfbanner: ttfbanner.o $(LIBDIR)/libttf.la
+-	$(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) -o $@ $< \
++	$(LIBTOOL) --tag=CXX --mode=link $(CC) $(FT_CFLAGS) -o $@ $< \
+ 			       $(LIBDIR)/libttf.la $(LDFLAGS)
+ 
+ clean:
diff --git a/print/freetype-tools/files/patch-malloc b/print/freetype-tools/files/patch-malloc
new file mode 100644
index 000000000000..8a04a033b8fa
--- /dev/null
+++ b/print/freetype-tools/files/patch-malloc
@@ -0,0 +1,10 @@
+--- contrib/ttfbanner/ttfbanner.c.orig	Sat Jul 30 14:07:56 2005
++++ contrib/ttfbanner/ttfbanner.c	Sat Jul 30 14:08:02 2005
+@@ -4,7 +4,6 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include "freetype.h"
+ #include "ttfbanner.h"
diff --git a/print/freetype-tools/pkg-descr b/print/freetype-tools/pkg-descr
index 9f9e32fc8c79..538d9a8f8fa2 100644
--- a/print/freetype-tools/pkg-descr
+++ b/print/freetype-tools/pkg-descr
@@ -5,5 +5,6 @@ ttf2pk:  A simple conversion tool to bring TrueType quality to the
          TeX world.
 ttf2bdf: Produce bitmapped fonts from TrueType files for your X11
          applications.
+ttfbanner: make posters using a TrueType font
 
 WWW: http://freetype.sourceforge.net/freetype1/projects.html
diff --git a/print/freetype-tools/pkg-plist b/print/freetype-tools/pkg-plist
index 2fe9ac020818..a9a1d82ed84b 100644
--- a/print/freetype-tools/pkg-plist
+++ b/print/freetype-tools/pkg-plist
@@ -1,5 +1,23 @@
 bin/getafm
 bin/t1asm
+bin/ttf2bdf
 bin/ttf2pfb
 bin/ttf2pk
 bin/ttf2tfm
+bin/ttfbanner
+share/texmf/ttf2pk/Big5.sfd
+share/texmf/ttf2pk/ET5.enc
+share/texmf/ttf2pk/EUC.sfd
+share/texmf/ttf2pk/SJIS.sfd
+share/texmf/ttf2pk/T1-WGL4.enc
+share/texmf/ttf2pk/UBg5plus.sfd
+share/texmf/ttf2pk/UBig5.sfd
+share/texmf/ttf2pk/UGB.sfd
+share/texmf/ttf2pk/UGBK.sfd
+share/texmf/ttf2pk/UJIS.sfd
+share/texmf/ttf2pk/UKS.sfd
+share/texmf/ttf2pk/Unicode.sfd
+share/texmf/ttf2pk/VPS.rpl
+share/texmf/ttf2pk/ttfonts.map
+share/texmf/ttf2tfm
+@dirrm share/texmf/ttf2pk