6 files changed, 88 insertions, 39 deletions

diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index f180535f6c26..8ecf9846ba60 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -6,25 +6,28 @@
 #
 
 PORTNAME=	antiword
-PORTVERSION=	0.31
+PORTVERSION=	0.32
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.winfield.demon.nl/linux/
 
-MAINTAINER=	leeym@cae.ce.ntu.edu.tw
+MAINTAINER=	leeym@leeym.com
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
 MAN1=		antiword.1
 
+post-patch:
+	@${PERL5} -pi -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/antiword.h
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/antiword ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/kantiword ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/Docs/antiword.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/Resources/* ${DATADIR}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/antiword
-.for file in COPYING ChangeLog FAQ History Netscape QandA ReadMe
-	@${INSTALL_DATA} ${WRKSRC}/Docs/${file} ${PREFIX}/share/doc/antiword
-.endfor
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/Docs/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo
index eb399dd1657e..a36c1cb01fd5 100644
--- a/textproc/antiword/distinfo
+++ b/textproc/antiword/distinfo
@@ -1 +1 @@
-MD5 (antiword-0.31.tar.gz) = bacc1727e44453f8ae38f2cdb7b7c54d
+MD5 (antiword-0.32.tar.gz) = bbbef871b7e7bea4df2102c8f634f81e
diff --git a/textproc/antiword/files/patch-Makefile.Linux b/textproc/antiword/files/patch-Makefile.Linux
new file mode 100644
index 000000000000..4153a5ba4e6a
--- /dev/null
+++ b/textproc/antiword/files/patch-Makefile.Linux
@@ -0,0 +1,29 @@
+--- 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-aa b/textproc/antiword/files/patch-aa
deleted file mode 100644
index e84319895d69..000000000000
--- a/textproc/antiword/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- antiword.h.orig	Thu Nov 30 03:54:14 2000
-+++ antiword.h	Sun Dec 17 05:44:49 2000
-@@ -41,7 +41,9 @@
-  #endif /* __riscos */
- #endif /* !PATH_MAX */
- 
-+#ifndef	SIZE_T_MAX
- #define SIZE_T_MAX		(size_t)UINT_MAX
-+#endif
- 
- #if defined(__riscos)
- #define FILE_SEPARATOR		"."
---- Makefile.orig	Sun Dec 17 05:45:07 2000
-+++ Makefile	Sun Dec 17 05:45:47 2000
-@@ -43,8 +43,7 @@
- 
- kantiword:	Unix-only/KDE-only/kantiword.sh
- 		@rm -f $@
--		echo "#!/bin/sh" > $@
--		cat $? >> $@
-+		@cat $? >> $@
- 		@chmod 750 $@
- 
- .c.o:
diff --git a/textproc/antiword/files/patch-antiword.h b/textproc/antiword/files/patch-antiword.h
new file mode 100644
index 000000000000..6efb054bd72f
--- /dev/null
+++ b/textproc/antiword/files/patch-antiword.h
@@ -0,0 +1,11 @@
+--- 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 ba1f221cbf8c..9de253704084 100644
--- a/textproc/antiword/pkg-plist
+++ b/textproc/antiword/pkg-plist
@@ -1,10 +1,40 @@
 bin/antiword
 bin/kantiword
-share/doc/antiword/COPYING
-share/doc/antiword/ChangeLog
-share/doc/antiword/FAQ
-share/doc/antiword/History
-share/doc/antiword/Netscape
-share/doc/antiword/QandA
-share/doc/antiword/ReadMe
-@dirrm share/doc/antiword
+share/antiword/8859-1.txt
+share/antiword/8859-10.txt
+share/antiword/8859-13.txt
+share/antiword/8859-14.txt
+share/antiword/8859-15.txt
+share/antiword/8859-2.txt
+share/antiword/8859-3.txt
+share/antiword/8859-4.txt
+share/antiword/8859-5.txt
+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/fontnames
+share/antiword/fontnames.russian
+share/antiword/koi8-r.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/QandA
+%%PORTDOCS%%share/doc/antiword/ReadMe
+%%PORTDOCS%%share/doc/antiword/antiword.1
+%%PORTDOCS%%share/doc/antiword/antiword.man
+%%PORTDOCS%%@dirrm share/doc/antiword
+@dirrm share/antiword