changes to allow global configuration to work correctly, eliminating

the need to setup per-user ~/.antiword/ directories:
	- install resources (fontnames, etc) into ${PREFIX}/share/antiword
	  instead of ${PREFIX}/share/examples/antiword
	- modify GLOBAL_ANTIWORD_DIR from /opt/antiword/share to
	  ${PREFIX}/share/antiword

6 files changed, 55 insertions, 48 deletions

diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index 4399f8b36c1..cc6768b056d 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/17 06:22:38 rh Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/17 08:43:25 lukem Exp $
 #
 
 DISTNAME=	antiword-0.32
@@ -10,4 +10,10 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.winfield.demon.nl/index.html
 COMMENT=	free converter MS Word to text and Postscript converter
 
+post-patch:
+	cd ${WRKSRC} ; \
+	    ${MV} antiword.h antiword.h.orig ; \
+	    ${SED} -e "s|@@ANTIWORD_DIR@@|${PREFIX}/share/antiword|g" \
+		antiword.h.orig > antiword.h
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo
index ad713d19fbd..2a102097047 100644
--- a/textproc/antiword/distinfo
+++ b/textproc/antiword/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/10/17 06:22:38 rh Exp $
+$NetBSD: distinfo,v 1.5 2001/10/17 08:43:25 lukem Exp $
 
 SHA1 (antiword-0.32.tar.gz) = e8e839fe0934e5dc7269456dec7744c463ec98d9
 Size (antiword-0.32.tar.gz) = 193697 bytes
-SHA1 (patch-aa) = 75e72814951479511d7233a4907b588a8c080b5c
+SHA1 (patch-aa) = 6d1dfe2907170ab4dc6d16552c157515f5956e97
+SHA1 (patch-ab) = 25f74c1b88bb068b5cf8e4e60b4e02fd2230f70c
diff --git a/textproc/antiword/patches/patch-aa b/textproc/antiword/patches/patch-aa
index 2bc085537e6..c99ac6b2c9d 100644
--- a/textproc/antiword/patches/patch-aa
+++ b/textproc/antiword/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2001/10/17 06:22:38 rh Exp $
+$NetBSD: patch-aa,v 1.5 2001/10/17 08:43:25 lukem Exp $
 
---- Makefile.orig	Sat Jul 21 21:58:03 2001
-+++ Makefile
+--- Makefile.orig	Sun Jul 22 05:58:03 2001
++++ Makefile	Wed Oct 17 18:31:16 2001
 @@ -8,7 +8,7 @@
  # must be equal to DEBUG or NDEBUG
  DB	= NDEBUG
@@ -36,9 +36,9 @@ $NetBSD: patch-aa,v 1.4 2001/10/17 06:22:38 rh Exp $
 +		${BSD_INSTALL_DATA} Docs/${file} ${PREFIX}/share/doc/antiword
 +.endfor
 +		${BSD_INSTALL_MAN} Docs/antiword.1 ${PREFIX}/man/man1/antiword.1
-+		${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/antiword
++		${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/antiword
 +		for i in Resources/* ; do				\
-+			${BSD_INSTALL_DATA} $$i ${PREFIX}/share/examples/antiword ; \
++			${BSD_INSTALL_DATA} $$i ${PREFIX}/share/antiword ; \
 +		done
  
  clean:
diff --git a/textproc/antiword/patches/patch-ab b/textproc/antiword/patches/patch-ab
new file mode 100644
index 00000000000..3c7ba998706
--- /dev/null
+++ b/textproc/antiword/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2001/10/17 08:43:26 lukem Exp $
+
+--- antiword.h.orig	Wed Sep 26 05:36:47 2001
++++ antiword.h	Wed Oct 17 18:33:47 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	"@@ANTIWORD_DIR@@"
+ #define ANTIWORD_DIR		".antiword"
+ #define FONTNAMES_FILE		"fontnames"
+ #endif /* __dos */
diff --git a/textproc/antiword/pkg/MESSAGE b/textproc/antiword/pkg/MESSAGE
deleted file mode 100644
index e79d619b46a..00000000000
--- a/textproc/antiword/pkg/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: MESSAGE,v 1.1 2001/10/17 06:22:38 rh Exp $
-==========================================================================
-
-  antiword has now been installed in ${PREFIX}.
-
-  Before using this package for the first time, each user has to install
-  configuration files in his ${HOME}/.antiword directory.  The easiest
-  way to do this is to use the provided example configuration files:
-
-	mkdir ~/.antiword
-	cp ${PREFIX}/share/examples/antiword/* ~/.antiword
-
-==========================================================================
diff --git a/textproc/antiword/pkg/PLIST b/textproc/antiword/pkg/PLIST
index 1163c5eff6e..a964daebc62 100644
--- a/textproc/antiword/pkg/PLIST
+++ b/textproc/antiword/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/10/17 06:22:38 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/10/17 08:43:26 lukem Exp $
 bin/antiword
 bin/kantiword
 share/doc/antiword/COPYING
@@ -8,31 +8,31 @@ share/doc/antiword/History
 share/doc/antiword/Netscape
 share/doc/antiword/QandA
 share/doc/antiword/ReadMe
-share/examples/antiword/8859-1.txt
-share/examples/antiword/8859-10.txt
-share/examples/antiword/8859-13.txt
-share/examples/antiword/8859-14.txt
-share/examples/antiword/8859-15.txt
-share/examples/antiword/8859-2.txt
-share/examples/antiword/8859-3.txt
-share/examples/antiword/8859-4.txt
-share/examples/antiword/8859-5.txt
-share/examples/antiword/8859-6.txt
-share/examples/antiword/8859-7.txt
-share/examples/antiword/8859-8.txt
-share/examples/antiword/8859-9.txt
-share/examples/antiword/Default
-share/examples/antiword/Example
-share/examples/antiword/MacRoman.txt
-share/examples/antiword/UTF-8.txt
-share/examples/antiword/Unicode
-share/examples/antiword/cp1250.txt
-share/examples/antiword/cp1251.txt
-share/examples/antiword/cp1252.txt
-share/examples/antiword/fontnames
-share/examples/antiword/fontnames.russian
-share/examples/antiword/koi8-r.txt
-share/examples/antiword/roman.txt
+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
 man/man1/antiword.1
-@dirrm share/examples/antiword
+@dirrm share/antiword
 @dirrm share/doc/antiword