Index: head/textproc/antiword/Makefile
===================================================================
--- head/textproc/antiword/Makefile	(revision 438146)
+++ head/textproc/antiword/Makefile	(revision 438147)
@@ -1,49 +1,46 @@
 # Created by: Yen-Ming Lee <leeym@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	antiword
 PORTVERSION=	0.37
 PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.winfield.demon.nl/linux/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application for displaying Microsoft(R) Word documents
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/Docs/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n022003l.afm:print/gsfonts
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n022003l.afm:print/gsfonts
 
 USES=		cpe gmake shebangfix perl5
 CPE_VENDOR=	antiword_project
 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 \
+PORTDOCS=	ChangeLog Emacs Exmh FAQ History Mozilla Mutt Netscape \
 		QandA ReadMe antiword.1 antiword.man antiword.php testdoc.doc
 
-OPTIONS_DEFINE=	DEBUG
+OPTIONS_DEFINE=	DOCS DEBUG
 
-.include <bsd.port.options.mk>
+DEBUG_CFLAGS=		-DDEBUG
+DEBUG_CFLAGS_OFF=	-DNDEBUG
 
-.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|OPT)/d; s,/usr/share,${PREFIX}/share,g; s|/usr/local/bin|${PREFIX}/bin|g' ${WRKSRC}/Makefile.Linux
 	@${REINPLACE_CMD} -E 's,/usr/share,${PREFIX}/share,g' ${WRKSRC}/antiword.h
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/Docs/antiword.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+post-install-DOCS-on:
 	@${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	(revision 438146)
+++ head/textproc/antiword/files/patch-wordole.c	(revision 438147)
@@ -1,14 +1,14 @@
---- wordole.c
+--- wordole.c.orig	2005-08-26 19:49:57 UTC
 +++ 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) {