4 files changed, 57 insertions, 59 deletions

diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 405e4f7796c3..414ba8642b49 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	catdoc
-PORTVERSION=	0.94
+PORTVERSION=	0.94.2
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.45.free.net/pub/catdoc/
 #		${MASTER_SITE_TEX_CTAN:S/$/support\/catdoc\//}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Convert MS Word/Excel documents to plain ASCII or TeX.  TK viewer included
+COMMENT=	MS Word/Excel converter to plain ASCII or TeX. TK viewer included
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 MAN1=		catdoc.1 wordview.1 xls2csv.1 catppt.1
 
 .if !defined(LANG) || ${LANG} != ru_RU.KOI8-R
diff --git a/textproc/catdoc/distinfo b/textproc/catdoc/distinfo
index 80ee3fd0e06c..3182ddcf1e33 100644
--- a/textproc/catdoc/distinfo
+++ b/textproc/catdoc/distinfo
@@ -1,3 +1,3 @@
-MD5 (catdoc-0.94.tar.gz) = f884dabe366d66c6cda35dacb0cdceab
-SHA256 (catdoc-0.94.tar.gz) = 70c05249f22922046bc83384bbcc030488a7647a6ce82fc5ebb6040dc9ce7d77
-SIZE (catdoc-0.94.tar.gz) = 151690
+MD5 (catdoc-0.94.2.tar.gz) = 243e1680bb3e703616f5adecfee24491
+SHA256 (catdoc-0.94.2.tar.gz) = 03c98b103664e5d1b63de110854e93c2453bc10be5634f86c280303eb843d362
+SIZE (catdoc-0.94.2.tar.gz) = 146012
diff --git a/textproc/catdoc/pkg-descr b/textproc/catdoc/pkg-descr
index 55045b76a4b0..b576dc800a07 100644
--- a/textproc/catdoc/pkg-descr
+++ b/textproc/catdoc/pkg-descr
@@ -10,7 +10,7 @@ There are two more utilities, xls2csv and xlsview, for dealing with
 MS Excel spreadsheets.  xls2csv converts an Excel spreadsheet to a plain
 text file with CSV (comma-separated values) lines.
 
-WWW: http://www.45.free.net/~vitus/ice/catdoc/
+WWW: http://www.45.free.net/~vitus/software/catdoc/
 
 - Brion
 brion@queeg.com
diff --git a/textproc/catdoc/pkg-plist b/textproc/catdoc/pkg-plist
index a179940b7870..402064a1f1f2 100644
--- a/textproc/catdoc/pkg-plist
+++ b/textproc/catdoc/pkg-plist
@@ -2,55 +2,54 @@ bin/catdoc
 bin/catppt
 bin/wordview
 bin/xls2csv
-share/catdoc/8859-1.txt
-share/catdoc/8859-10.txt
-share/catdoc/8859-11.txt
-share/catdoc/8859-13.txt
-share/catdoc/8859-14.txt
-share/catdoc/8859-15.txt
-share/catdoc/8859-2.txt
-share/catdoc/8859-3.txt
-share/catdoc/8859-4.txt
-share/catdoc/8859-5.txt
-share/catdoc/8859-6.txt
-share/catdoc/8859-7.txt
-share/catdoc/8859-8.txt
-share/catdoc/8859-9.txt
-share/catdoc/ascii.replchars
-share/catdoc/ascii.specchars
-share/catdoc/cp1250.txt
-share/catdoc/cp1251.txt
-share/catdoc/cp1252.txt
-share/catdoc/cp1253.txt
-share/catdoc/cp1254.txt
-share/catdoc/cp1255.txt
-share/catdoc/cp1256.txt
-share/catdoc/cp1257.txt
-share/catdoc/cp1258.txt
-share/catdoc/cp437.txt
-share/catdoc/cp850.txt
-share/catdoc/cp852.txt
-share/catdoc/cp855.txt
-share/catdoc/cp857.txt
-share/catdoc/cp860.txt
-share/catdoc/cp861.txt
-share/catdoc/cp862.txt
-share/catdoc/cp863.txt
-share/catdoc/cp864.txt
-share/catdoc/cp865.txt
-share/catdoc/cp866.txt
-share/catdoc/cp869.txt
-share/catdoc/cp874.txt
-share/catdoc/koi8-r.txt
-share/catdoc/koi8-u.txt
-share/catdoc/mac-arabic.txt
-share/catdoc/mac-centeuro.txt
-share/catdoc/mac-cyrillic.txt
-share/catdoc/mac-greek.txt
-share/catdoc/mac-hebrew.txt
-share/catdoc/mac-roman.txt
-share/catdoc/tex.replchars
-share/catdoc/tex.specchars
-share/catdoc/us-ascii.txt
-share/catdoc/x-mac-cyrillic.txt
-@dirrm share/catdoc
+%%DATADIR%%/8859-1.txt
+%%DATADIR%%/8859-10.txt
+%%DATADIR%%/8859-11.txt
+%%DATADIR%%/8859-13.txt
+%%DATADIR%%/8859-14.txt
+%%DATADIR%%/8859-15.txt
+%%DATADIR%%/8859-2.txt
+%%DATADIR%%/8859-3.txt
+%%DATADIR%%/8859-4.txt
+%%DATADIR%%/8859-5.txt
+%%DATADIR%%/8859-6.txt
+%%DATADIR%%/8859-7.txt
+%%DATADIR%%/8859-8.txt
+%%DATADIR%%/8859-9.txt
+%%DATADIR%%/ascii.replchars
+%%DATADIR%%/ascii.specchars
+%%DATADIR%%/cp1250.txt
+%%DATADIR%%/cp1251.txt
+%%DATADIR%%/cp1252.txt
+%%DATADIR%%/cp1253.txt
+%%DATADIR%%/cp1254.txt
+%%DATADIR%%/cp1255.txt
+%%DATADIR%%/cp1256.txt
+%%DATADIR%%/cp1257.txt
+%%DATADIR%%/cp1258.txt
+%%DATADIR%%/cp437.txt
+%%DATADIR%%/cp850.txt
+%%DATADIR%%/cp852.txt
+%%DATADIR%%/cp855.txt
+%%DATADIR%%/cp857.txt
+%%DATADIR%%/cp860.txt
+%%DATADIR%%/cp861.txt
+%%DATADIR%%/cp862.txt
+%%DATADIR%%/cp863.txt
+%%DATADIR%%/cp864.txt
+%%DATADIR%%/cp865.txt
+%%DATADIR%%/cp866.txt
+%%DATADIR%%/cp869.txt
+%%DATADIR%%/cp874.txt
+%%DATADIR%%/koi8-r.txt
+%%DATADIR%%/koi8-u.txt
+%%DATADIR%%/mac-arabic.txt
+%%DATADIR%%/mac-centeuro.txt
+%%DATADIR%%/mac-cyrillic.txt
+%%DATADIR%%/mac-greek.txt
+%%DATADIR%%/mac-hebrew.txt
+%%DATADIR%%/mac-roman.txt
+%%DATADIR%%/tex.replchars
+%%DATADIR%%/tex.specchars
+%%DATADIR%%/us-ascii.txt
+@dirrm %%DATADIR%%