frob the global paths in the man page as well

4 files changed, 29 insertions, 8 deletions

diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index cc6768b056d..efa5e27168f 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/17 08:43:25 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/17 08:52:03 lukem Exp $
 #
 
 DISTNAME=	antiword-0.32
@@ -12,8 +12,10 @@ 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
+	${MV} antiword.h antiword.h.orig ; \
+	${SED} -e "s|@@PREFIX@@|${PREFIX}|g" antiword.h.orig > antiword.h ; \
+	${MV} Docs/antiword.1 Docs/antiword.1.orig ; \
+	${SED} -e "s|@@PREFIX@@|${PREFIX}|g" Docs/antiword.1.orig > \
+	    Docs/antiword.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo
index 2a102097047..63735ca8f7a 100644
--- a/textproc/antiword/distinfo
+++ b/textproc/antiword/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2001/10/17 08:43:25 lukem Exp $
+$NetBSD: distinfo,v 1.6 2001/10/17 08:52:03 lukem Exp $
 
 SHA1 (antiword-0.32.tar.gz) = e8e839fe0934e5dc7269456dec7744c463ec98d9
 Size (antiword-0.32.tar.gz) = 193697 bytes
 SHA1 (patch-aa) = 6d1dfe2907170ab4dc6d16552c157515f5956e97
-SHA1 (patch-ab) = 25f74c1b88bb068b5cf8e4e60b4e02fd2230f70c
+SHA1 (patch-ab) = eebff5de23991f00ecf101e8c0ab9ef5c31bf704
+SHA1 (patch-ac) = b41d4b2f517febd942d8b826910fe1ed48ccf2d1
diff --git a/textproc/antiword/patches/patch-ab b/textproc/antiword/patches/patch-ab
index 3c7ba998706..4a718f8ee78 100644
--- a/textproc/antiword/patches/patch-ab
+++ b/textproc/antiword/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2001/10/17 08:43:26 lukem Exp $
+$NetBSD: patch-ab,v 1.4 2001/10/17 08:52:04 lukem Exp $
 
 --- antiword.h.orig	Wed Sep 26 05:36:47 2001
 +++ antiword.h	Wed Oct 17 18:33:47 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.3 2001/10/17 08:43:26 lukem Exp $
  #define FONTNAMES_FILE		"fontname.txt"
  #else
 -#define GLOBAL_ANTIWORD_DIR	"/opt/antiword/share"
-+#define GLOBAL_ANTIWORD_DIR	"@@ANTIWORD_DIR@@"
++#define GLOBAL_ANTIWORD_DIR	"@@PREFIX@@/share/antiword"
  #define ANTIWORD_DIR		".antiword"
  #define FONTNAMES_FILE		"fontnames"
  #endif /* __dos */
diff --git a/textproc/antiword/patches/patch-ac b/textproc/antiword/patches/patch-ac
new file mode 100644
index 00000000000..9d55f2cfc13
--- /dev/null
+++ b/textproc/antiword/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2001/10/17 08:52:04 lukem Exp $
+
+--- Docs/antiword.1.orig	Fri Oct  5 05:05:18 2001
++++ Docs/antiword.1	Wed Oct 17 18:45:31 2001
+@@ -75,11 +75,11 @@
+ .RE
+ .SH FILES
+ .TP
+-$/opt/antiword/share/8859-1.txt, $HOME/.antiword/8859-1.txt and friends:
++@@PREFIX@@/share/antiword/8859-1.txt, $HOME/.antiword/8859-1.txt and friends:
+ .br
+ Global and local mapping files (see -m option)
+ .TP
+-/opt/antiword/share/fontnames, $HOME/.antiword/fontnames:
++@@PREFIX@@/share/antiword/fontnames, $HOME/.antiword/fontnames:
+ .br
+ Global and local versions of the fontnames file.
+ This file contains the translation table from font names as used by MS Word to