Index: head/textproc/antiword/Makefile
===================================================================
--- head/textproc/antiword/Makefile	(revision 374538)
+++ head/textproc/antiword/Makefile	(revision 374539)
@@ -1,39 +1,47 @@
 # Created by: Yen-Ming Lee <leeym@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	antiword
 PORTVERSION=	0.37
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.winfield.demon.nl/linux/
 
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Application for displaying Microsoft(R) Word documents
 
+OPTIONS_DEFINE=	DEBUG
+
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n022003l.afm:${PORTSDIR}/print/gsfonts
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n022003l.afm:${PORTSDIR}/print/gsfonts
 
 USES=		gmake shebangfix perl5
 USE_PERL5=	build
 SHEBANG_FILES=	kantiword Unix-only/fontinfo.pl
 MAKE_JOBS_UNSAFE=yes
 INSTALL_TARGET=	global_install
 
 PORTDOCS=	COPYING ChangeLog Emacs Exmh FAQ History Mozilla Mutt Netscape \
 		QandA ReadMe antiword.1 antiword.man antiword.php testdoc.doc
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDEBUG}
+CFLAGS+=	-DDEBUG
+.else
 CFLAGS+=	-DNDEBUG
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -E 's,/usr/share,${LOCALBASE}/share,g; s,fonts2,fonts,' ${WRKSRC}/Unix-only/fontinfo.pl
-	@${REINPLACE_CMD} -E 's|LD|CC|g; /^(CC|CFLAGS)/d; s,/usr/share,${PREFIX}/share,g; s|/usr/local/bin|${PREFIX}/bin|g' ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -E 's|LD|CC|g; /^(CC|CFLAGS|OPT)/d; s,/usr/share,${PREFIX}/share,g; s|/usr/local/bin|${PREFIX}/bin|g' ${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -E 's,/usr/share,${PREFIX}/share,g' ${WRKSRC}/antiword.h
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/Docs/antiword.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/Docs && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/textproc/antiword/files/patch-wordole.c
===================================================================
--- head/textproc/antiword/files/patch-wordole.c	(nonexistent)
+++ head/textproc/antiword/files/patch-wordole.c	(revision 374539)
@@ -0,0 +1,14 @@
+--- wordole.c
++++ wordole.c
+@@ -259,6 +259,11 @@ bGetPPS(FILE *pFile,
+ 		}
+ 		tNameSize = (size_t)usGetWord(0x40, aucBytes);
+ 		tNameSize = (tNameSize + 1) / 2;
++		if (tNameSize >= sizeof(atPPSlist[0].szName)) {
++			werr(0, "PPS %d appears to be invalid.", iIndex);
++			atPPSlist = xfree(atPPSlist);
++			return FALSE;
++		}
+ 		vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize);
+ 		atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes);
+ 		if (atPPSlist[iIndex].ucType == 5) {

Property changes on: head/textproc/antiword/files/patch-wordole.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/textproc/antiword/pkg-plist
===================================================================
--- head/textproc/antiword/pkg-plist	(revision 374538)
+++ head/textproc/antiword/pkg-plist	(revision 374539)
@@ -1,34 +1,35 @@
 bin/antiword
 bin/kantiword
 man/man1/antiword.1.gz
 %%DATADIR%%/8859-1.txt
 %%DATADIR%%/8859-10.txt
 %%DATADIR%%/8859-11.txt
 %%DATADIR%%/8859-13.txt
 %%DATADIR%%/8859-14.txt
 %%DATADIR%%/8859-15.txt
 %%DATADIR%%/8859-16.txt
 %%DATADIR%%/8859-2.txt
 %%DATADIR%%/8859-3.txt
 %%DATADIR%%/8859-4.txt
 %%DATADIR%%/8859-5.txt
 %%DATADIR%%/8859-6.txt
 %%DATADIR%%/8859-7.txt
 %%DATADIR%%/8859-8.txt
 %%DATADIR%%/8859-9.txt
 %%DATADIR%%/MacCyrillic.txt
 %%DATADIR%%/MacRoman.txt
 %%DATADIR%%/UTF-8.txt
 %%DATADIR%%/cp1250.txt
 %%DATADIR%%/cp1251.txt
 %%DATADIR%%/cp1252.txt
 %%DATADIR%%/cp437.txt
 %%DATADIR%%/cp850.txt
 %%DATADIR%%/cp852.txt
 %%DATADIR%%/cp862.txt
 %%DATADIR%%/cp864.txt
 %%DATADIR%%/cp866.txt
 %%DATADIR%%/fontnames
 %%DATADIR%%/koi8-r.txt
 %%DATADIR%%/koi8-u.txt
 %%DATADIR%%/roman.txt
+@dirrmtry %%DATADIR%%