5 files changed, 15 insertions, 54 deletions

diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index 8ecf9846ba60..2be6f6be24e2 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	antiword
-PORTVERSION=	0.32
+PORTVERSION=	0.33
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.winfield.demon.nl/linux/
 
 MAINTAINER=	leeym@leeym.com
 
-WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
+USE_REINPLACE=	yes
+INSTALL_TARGET=	global_install
 
 MAN1=		antiword.1
 
 post-patch:
-	@${PERL5} -pi -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/antiword.h
+	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' \
+		-e 's,/usr/share,${PREFIX}/share,g' \
+		${WRKSRC}/Makefile.* ${WRKSRC}/*.[ch]
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/antiword ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/kantiword ${PREFIX}/bin
+post-install:
 	@${INSTALL_MAN} ${WRKSRC}/Docs/antiword.1 ${MANPREFIX}/man/man1
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/Resources/* ${DATADIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/Docs/* ${DOCSDIR}
diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo
index a36c1cb01fd5..1b60953ea6ed 100644
--- a/textproc/antiword/distinfo
+++ b/textproc/antiword/distinfo
@@ -1 +1 @@
-MD5 (antiword-0.32.tar.gz) = bbbef871b7e7bea4df2102c8f634f81e
+MD5 (antiword-0.33.tar.gz) = e2178402066bbb1f5b3a49d47316a1fc
diff --git a/textproc/antiword/files/patch-Makefile.Linux b/textproc/antiword/files/patch-Makefile.Linux
deleted file mode 100644
index 4153a5ba4e6a..000000000000
--- a/textproc/antiword/files/patch-Makefile.Linux
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.Linux.orig	Sat Jul 21 15:58:03 2001
-+++ Makefile.Linux	Sat Nov  3 15:30:36 2001
-@@ -2,7 +2,7 @@
- # Makefile for antiword (Linux version)
- #
- 
--CC	= gcc
-+CC	?= gcc
- LD	= gcc
- 
- # must be equal to DEBUG or NDEBUG
-@@ -12,7 +12,7 @@
- 
- LDLIBS	=
- 
--CFLAGS	= -Wall -pedantic $(OPT) -D$(DB)
-+CFLAGS	+= -Wall -pedantic -D$(DB)
- LDFLAGS	=
- 
- OBJS	=\
-@@ -27,7 +27,7 @@
- 	antiword\
- 	kantiword
- 
--INSTALL_DIR = $(HOME)/bin
-+INSTALL_DIR = $(PREFIX)/bin
- 
- all:		$(PROGS)
- 
diff --git a/textproc/antiword/files/patch-antiword.h b/textproc/antiword/files/patch-antiword.h
deleted file mode 100644
index 6efb054bd72f..000000000000
--- a/textproc/antiword/files/patch-antiword.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- antiword.h.orig	Sat Oct 27 08:35:52 2001
-+++ antiword.h	Sat Oct 27 08:36:13 2001
-@@ -143,7 +143,7 @@
- #define ANTIWORD_DIR		"antiword"
- #define FONTNAMES_FILE		"fontname.txt"
- #else
--#define GLOBAL_ANTIWORD_DIR	"/opt/antiword/share"
-+#define GLOBAL_ANTIWORD_DIR	"%%PREFIX%%/share/antiword"
- #define ANTIWORD_DIR		".antiword"
- #define FONTNAMES_FILE		"fontnames"
- #endif /* __dos */
diff --git a/textproc/antiword/pkg-plist b/textproc/antiword/pkg-plist
index 9de253704084..2527861952c3 100644
--- a/textproc/antiword/pkg-plist
+++ b/textproc/antiword/pkg-plist
@@ -5,6 +5,7 @@ share/antiword/8859-10.txt
 share/antiword/8859-13.txt
 share/antiword/8859-14.txt
 share/antiword/8859-15.txt
+share/antiword/8859-16.txt
 share/antiword/8859-2.txt
 share/antiword/8859-3.txt
 share/antiword/8859-4.txt
@@ -13,28 +14,29 @@ share/antiword/8859-6.txt
 share/antiword/8859-7.txt
 share/antiword/8859-8.txt
 share/antiword/8859-9.txt
-share/antiword/Default
-share/antiword/Example
 share/antiword/MacRoman.txt
 share/antiword/UTF-8.txt
-share/antiword/Unicode
 share/antiword/cp1250.txt
 share/antiword/cp1251.txt
 share/antiword/cp1252.txt
+share/antiword/cp437.txt
+share/antiword/cp850.txt
+share/antiword/cp852.txt
 share/antiword/fontnames
-share/antiword/fontnames.russian
 share/antiword/koi8-r.txt
+share/antiword/koi8-u.txt
 share/antiword/roman.txt
 %%PORTDOCS%%share/doc/antiword/COPYING
 %%PORTDOCS%%share/doc/antiword/ChangeLog
 %%PORTDOCS%%share/doc/antiword/Exmh
 %%PORTDOCS%%share/doc/antiword/FAQ
 %%PORTDOCS%%share/doc/antiword/History
-%%PORTDOCS%%share/doc/antiword/Netscape
 %%PORTDOCS%%share/doc/antiword/Mutt
+%%PORTDOCS%%share/doc/antiword/Netscape
 %%PORTDOCS%%share/doc/antiword/QandA
 %%PORTDOCS%%share/doc/antiword/ReadMe
 %%PORTDOCS%%share/doc/antiword/antiword.1
 %%PORTDOCS%%share/doc/antiword/antiword.man
+%%PORTDOCS%%share/doc/antiword/testdoc.doc
 %%PORTDOCS%%@dirrm share/doc/antiword
 @dirrm share/antiword