6 files changed, 44 insertions, 7 deletions

diff --git a/print/typetools/Makefile b/print/typetools/Makefile
index acee6d888c88..9bb122aa936a 100644
--- a/print/typetools/Makefile
+++ b/print/typetools/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	typetools
-PORTVERSION=	2.98
+PORTVERSION=	2.99
 CATEGORIES=	print
 MASTER_SITES=	http://www.lcdf.org/type/
 DISTNAME=	lcdf-${PORTNAME}-${PORTVERSION}
@@ -17,10 +17,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_kpathsea_kpathsea_h=yes
 CONFIGURE_ARGS=	--with-kpathsea=${LOCALBASE}
 
-MAN1=		cfftot1.1 mmafm.1 mmpfb.1 otfinfo.1 otftotfm.1 t1dotlessj.1 \
-		t1lint.1 t1rawafm.1 t1reencode.1 t1testpage.1 ttftotype42.1
-
 DATADIR=	${PREFIX}/share/lcdf-${PORTNAME}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/print/typetools/distinfo b/print/typetools/distinfo
index 58fe93d2d430..837023ef7ab8 100644
--- a/print/typetools/distinfo
+++ b/print/typetools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lcdf-typetools-2.98.tar.gz) = 26b9be336b3d575555436d139e5a9c40fea58f5b9468516f974ca7bd1eeae17f
-SIZE (lcdf-typetools-2.98.tar.gz) = 621485
+SHA256 (lcdf-typetools-2.99.tar.gz) = cbb0ed8c42d078fb216b8f4b8ca7a29e0ad3c1969f580a6f2558c829a472adff
+SIZE (lcdf-typetools-2.99.tar.gz) = 627203
diff --git a/print/typetools/files/patch-libefont__cff.cc b/print/typetools/files/patch-libefont__cff.cc
new file mode 100644
index 000000000000..f227f9ae1c3a
--- /dev/null
+++ b/print/typetools/files/patch-libefont__cff.cc
@@ -0,0 +1,10 @@
+--- ./libefont/cff.cc.orig	2013-08-13 20:22:52.000000000 +0000
++++ ./libefont/cff.cc	2014-01-03 11:41:17.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <ctype.h>
+ #include <efont/t1unparser.hh>
+ 
++#undef static_assert
+ #ifndef static_assert
+ #define static_assert(c) switch (c) case 0: case (c):
+ #endif
diff --git a/print/typetools/files/patch-libefont__otf.cc b/print/typetools/files/patch-libefont__otf.cc
new file mode 100644
index 000000000000..5f879e6c829f
--- /dev/null
+++ b/print/typetools/files/patch-libefont__otf.cc
@@ -0,0 +1,10 @@
+--- ./libefont/otf.cc.orig	2013-08-13 20:23:45.000000000 +0000
++++ ./libefont/otf.cc	2014-01-03 11:41:56.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <efont/otfdata.hh>	// for ntohl()
+ #include <efont/otfname.hh>
+ 
++#undef static_assert
+ #ifndef static_assert
+ #define static_assert(c) switch (c) case 0: case (c):
+ #endif
diff --git a/print/typetools/files/patch-libefont__t1interp.cc b/print/typetools/files/patch-libefont__t1interp.cc
new file mode 100644
index 000000000000..4ef8455654c6
--- /dev/null
+++ b/print/typetools/files/patch-libefont__t1interp.cc
@@ -0,0 +1,10 @@
+--- ./libefont/t1interp.cc.orig	2013-08-13 20:18:57.000000000 +0000
++++ ./libefont/t1interp.cc	2014-01-03 11:42:48.000000000 +0000
+@@ -30,6 +30,7 @@
+ #define CHECK_PATH_START()	do { _state = S_PATH; } while (0)
+ #define CHECK_PATH_END()	do { if (_state == S_PATH) { act_closepath(cmd); } _state = S_IPATH; } while (0)
+ 
++#undef static_assert
+ #ifndef static_assert
+ # define static_assert(c)	switch (c) case 0: case (c):
+ #endif
diff --git a/print/typetools/pkg-plist b/print/typetools/pkg-plist
index 14c7de08dfaf..5b5c003f395e 100644
--- a/print/typetools/pkg-plist
+++ b/print/typetools/pkg-plist
@@ -9,6 +9,17 @@ bin/t1rawafm
 bin/t1reencode
 bin/t1testpage
 bin/ttftotype42
+man/man1/cfftot1.1.gz
+man/man1/mmafm.1.gz
+man/man1/mmpfb.1.gz
+man/man1/otfinfo.1.gz
+man/man1/otftotfm.1.gz
+man/man1/t1dotlessj.1.gz
+man/man1/t1lint.1.gz
+man/man1/t1rawafm.1.gz
+man/man1/t1reencode.1.gz
+man/man1/t1testpage.1.gz
+man/man1/ttftotype42.1.gz
 %%DATADIR%%/7t.enc
 %%DATADIR%%/glyphlist.txt
 %%DATADIR%%/texglyphlist.txt