From 002b97ec9a997ad9b3b4e0b3eaae86e0107ec6bf Mon Sep 17 00:00:00 2001
From: jasoni <jasoni@openbsd.org>
Date: Tue, 29 May 2001 23:22:44 +0000
Subject: [PATCH] - update to 0.90.3 - tidy - take over maintainership (ok
 angelos@)

---
 textproc/catdoc/Makefile                   | 19 +++++++------------
 textproc/catdoc/files/md5                  |  6 +++---
 textproc/catdoc/patches/patch-aa           | 20 --------------------
 textproc/catdoc/patches/patch-src_catdoc_h | 21 +++++++++++++++++++++
 textproc/catdoc/pkg/DESCR                  |  2 +-
 5 files changed, 32 insertions(+), 36 deletions(-)
 delete mode 100644 textproc/catdoc/patches/patch-aa
 create mode 100644 textproc/catdoc/patches/patch-src_catdoc_h

diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index c447f8a101d..372deaaa413 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,28 +1,23 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 04:11:40 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/05/29 23:22:44 jasoni Exp $
 
 COMMENT=	"MS Word ==> ASCII or TeX, Tk viewer included"
 
-DISTNAME=	catdoc-0.90b4
+DISTNAME=	catdoc-0.90.3
 CATEGORIES=	textproc
 NEED_VERSION=	1.402
+MASTER_SITES=	ftp://ftp.ice.ru/pub/vitus/
 
-MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>
+HOMEPAGE=	http://www.fe.msk.ru/~vitus/catdoc/index.html	
+
+MAINTAINER=	Jason Ish <jasoni@openbsd.org>
 
-LICENSE_TYPE=		NONE
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	ftp://ftp.ice.ru/pub/vitus/
-
-RUN_DEPENDS=	wish8.0::x11/tk/8.0
+RUN_DEPENDS=   wish8.0::x11/tk/8.0
 
 CONFIGURE_STYLE=gnu dest
 
-#do-install:
-#	${INSTALL_PROGRAM} ${WRKSRC}/catdoc ${PREFIX}/bin
-#	${INSTALL_SCRIPT} ${WRKSRC}/wordview ${PREFIX}/bin
-#	${INSTALL_MAN} ${WRKSRC}/catdoc.1 ${PREFIX}/man/man1/catdoc.1
-
 .include <bsd.port.mk>
diff --git a/textproc/catdoc/files/md5 b/textproc/catdoc/files/md5
index b27b30c76e8..148ab4d38b4 100644
--- a/textproc/catdoc/files/md5
+++ b/textproc/catdoc/files/md5
@@ -1,3 +1,3 @@
-MD5 (catdoc-0.90b4.tar.gz) = bfd53126a609d721aff4b0a734ca1e20
-RMD160 (catdoc-0.90b4.tar.gz) = 47956e4d974e08918bfa76d74e7a63c807771ce4
-SHA1 (catdoc-0.90b4.tar.gz) = 765dd09e6acb86b90e779e03f03f5dfaffc0ed37
+MD5 (catdoc-0.90.3.tar.gz) = 54f3b3789d241a346378a13023f624b7
+RMD160 (catdoc-0.90.3.tar.gz) = d4cbc6c93203818916ff597650ea8fd69243c973
+SHA1 (catdoc-0.90.3.tar.gz) = bf5e2912e6a7196dd236486fc1b00fcedaecfa4b
diff --git a/textproc/catdoc/patches/patch-aa b/textproc/catdoc/patches/patch-aa
deleted file mode 100644
index b6e58a2e421..00000000000
--- a/textproc/catdoc/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/catdoc.h.orig	Fri Sep 11 07:32:23 1998
-+++ src/catdoc.h	Sun Oct 31 04:34:19 1999
-@@ -6,7 +6,7 @@
-  * User customization
-  *
-  */
--#ifdef __unix
-+#ifdef __unix__
- #ifndef USERC
- #define USERRC ".catdocrc"
- #endif
-@@ -37,7 +37,7 @@
- #endif
- 
- #define CHARSET_EXT ".txt"
--#ifdef __unix
-+#ifdef __unix__
- #ifndef TARGET_CHARSET
- #define TARGET_CHARSET "koi8-r"
- #endif
diff --git a/textproc/catdoc/patches/patch-src_catdoc_h b/textproc/catdoc/patches/patch-src_catdoc_h
new file mode 100644
index 00000000000..35ed9f5abf9
--- /dev/null
+++ b/textproc/catdoc/patches/patch-src_catdoc_h
@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_catdoc_h,v 1.1 2001/05/29 23:22:44 jasoni Exp $
+--- src/catdoc.h.orig	Tue May 29 13:05:03 2001
++++ src/catdoc.h	Tue May 29 13:06:42 2001
+@@ -8,7 +8,7 @@
+  *
+  */
+ 
+-#ifdef __unix
++#ifdef __unix__
+ #ifndef USERC
+ #define USERRC ".catdocrc"
+ #endif
+@@ -39,7 +39,7 @@ char *add_exe_path(const char* name);
+ #endif
+ 
+ #define CHARSET_EXT ".txt"
+-#ifdef __unix
++#ifdef __unix__
+ #ifndef TARGET_CHARSET
+ #define TARGET_CHARSET "koi8-r"
+ #endif
diff --git a/textproc/catdoc/pkg/DESCR b/textproc/catdoc/pkg/DESCR
index 988887787f8..52793bcfb42 100644
--- a/textproc/catdoc/pkg/DESCR
+++ b/textproc/catdoc/pkg/DESCR
@@ -6,7 +6,7 @@ There is also a cute little Tcl/Tk program included called wordview, which
 is basically a small GUI frontend to catdoc for viewing word documents.
 The wordview program works with Tcl 7.6 and up, but uses Tk 8.0 by default.
 
-http://www.ice.ru/~vitus/works/works_unix.html
+WWW: ${HOMEPAGE}
 
 - Brion
 brion@queeg.com