From eb4272d1c36bef89147410860fd2eec7301573f4 Mon Sep 17 00:00:00 2001
From: jasoni <jasoni@openbsd.org>
Date: Mon, 29 Oct 2001 19:12:34 +0000
Subject: [PATCH] - update to 0.91.4 - add a tk flavour

---
 textproc/Makefile                             |  3 ++-
 textproc/catdoc/Makefile                      | 13 +++++++++---
 textproc/catdoc/files/md5                     |  6 +++---
 textproc/catdoc/patches/patch-src_Makefile_in | 18 ++++++++--------
 textproc/catdoc/patches/patch-src_catdoc_h    | 21 -------------------
 textproc/catdoc/pkg/PFRAG.tk                  |  3 +++
 textproc/catdoc/pkg/PLIST                     |  8 +++++--
 7 files changed, 33 insertions(+), 39 deletions(-)
 delete mode 100644 textproc/catdoc/patches/patch-src_catdoc_h
 create mode 100644 textproc/catdoc/pkg/PFRAG.tk

diff --git a/textproc/Makefile b/textproc/Makefile
index 244310a5a74..5b512eb3ad5 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2001/09/20 13:33:21 shell Exp $
+# $OpenBSD: Makefile,v 1.69 2001/10/29 19:12:34 jasoni Exp $
 # $FreeBSD: Makefile,v 1.15 1997/11/22 00:31:24 jseger Exp $
 #
 
@@ -8,6 +8,7 @@
      SUBDIR += aspell
      SUBDIR += c2html
      SUBDIR += catdoc
+     SUBDIR += catdoc,tk
      SUBDIR += clo++
      SUBDIR += docbook
      SUBDIR += docbook-dsssl
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 372deaaa413..aa95e51d77e 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2001/05/29 23:22:44 jasoni Exp $
+# $OpenBSD: Makefile,v 1.15 2001/10/29 19:12:34 jasoni Exp $
 
 COMMENT=	"MS Word ==> ASCII or TeX, Tk viewer included"
 
-DISTNAME=	catdoc-0.90.3
+DISTNAME=	catdoc-0.91.4
 CATEGORIES=	textproc
 NEED_VERSION=	1.402
 MASTER_SITES=	ftp://ftp.ice.ru/pub/vitus/
@@ -16,7 +16,14 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-RUN_DEPENDS=   wish8.0::x11/tk/8.0
+FLAVORS=	tk
+FLAVOR?=
+
+.if ${FLAVOR:L:Mtk}
+RUN_DEPENDS=	wish8.0::x11/tk/8.0
+.else
+CONFIGURE_ARGS+=--disable-wordview
+.endif
 
 CONFIGURE_STYLE=gnu dest
 
diff --git a/textproc/catdoc/files/md5 b/textproc/catdoc/files/md5
index 148ab4d38b4..d40b1e2660d 100644
--- a/textproc/catdoc/files/md5
+++ b/textproc/catdoc/files/md5
@@ -1,3 +1,3 @@
-MD5 (catdoc-0.90.3.tar.gz) = 54f3b3789d241a346378a13023f624b7
-RMD160 (catdoc-0.90.3.tar.gz) = d4cbc6c93203818916ff597650ea8fd69243c973
-SHA1 (catdoc-0.90.3.tar.gz) = bf5e2912e6a7196dd236486fc1b00fcedaecfa4b
+MD5 (catdoc-0.91.4.tar.gz) = 7ca7feaea0fe3d047eaa3d9aa3d467d1
+RMD160 (catdoc-0.91.4.tar.gz) = 9d831a24e9c496358e4d22dce54e8510495bc5ef
+SHA1 (catdoc-0.91.4.tar.gz) = cefd48dcffe72834a29c6d9659708cde0654e25a
diff --git a/textproc/catdoc/patches/patch-src_Makefile_in b/textproc/catdoc/patches/patch-src_Makefile_in
index ecdb23b0ba2..25829bfe6c4 100644
--- a/textproc/catdoc/patches/patch-src_Makefile_in
+++ b/textproc/catdoc/patches/patch-src_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2001/03/17 15:47:59 wilfried Exp $
---- src/Makefile.in.orig	Thu Sep 17 21:37:05 1998
-+++ src/Makefile.in	Fri Mar 16 20:29:27 2001
-@@ -60,7 +60,7 @@ DEFINES=-DSYSTEMRC=\"$(SYSTEMRC)\" -DUSE
+$OpenBSD: patch-src_Makefile_in,v 1.2 2001/10/29 19:12:34 jasoni Exp $
+--- src/Makefile.in.orig	Mon Oct 29 10:40:34 2001
++++ src/Makefile.in	Mon Oct 29 10:41:05 2001
+@@ -61,7 +61,7 @@ DEFINES=-DSYSTEMRC=\"$(SYSTEMRC)\" -DUSE
   -DREPL_EXT=\"$(REPL_EXT)\" -DUNKNOWN_CHAR=\'$(UNKNOWN_CHAR)\'\
   -DSOURCE_CHARSET=\"$(SOURCE_CHARSET)\" -DTARGET_CHARSET=\"$(TARGET_CHARSET)\"
  
--CFLAGS=$(FLAGS) $(DEFINES)
-+CFLAGS=@CFLAGS@ $(DEFINES)
- OBJ=catdoc.o charsets.o substmap.o reader.o writer.o fileutil.o
- #.c.o:
- #	$(CC) -c $(CFLAGS) $*
+-CFLAGS=$(FLAGS) $(DEFINES) @DEFS@
++CFLAGS=@CFLAGS@ $(FLAGS) $(DEFINES) @DEFS@
+ OBJ=catdoc.o charsets.o substmap.o reader.o writer.o fileutil.o\
+ 	confutil.o analyze.o rtfreader.o
+ 
diff --git a/textproc/catdoc/patches/patch-src_catdoc_h b/textproc/catdoc/patches/patch-src_catdoc_h
deleted file mode 100644
index 35ed9f5abf9..00000000000
--- a/textproc/catdoc/patches/patch-src_catdoc_h
+++ /dev/null
@@ -1,21 +0,0 @@
-$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/PFRAG.tk b/textproc/catdoc/pkg/PFRAG.tk
new file mode 100644
index 00000000000..b1d9cc74490
--- /dev/null
+++ b/textproc/catdoc/pkg/PFRAG.tk
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.tk,v 1.1 2001/10/29 19:12:34 jasoni Exp $
+bin/wordview
+bin/xlsview
diff --git a/textproc/catdoc/pkg/PLIST b/textproc/catdoc/pkg/PLIST
index 90f2a86bc02..f240aed2b49 100644
--- a/textproc/catdoc/pkg/PLIST
+++ b/textproc/catdoc/pkg/PLIST
@@ -1,6 +1,7 @@
+@comment $OpenBSD: PLIST,v 1.2 2001/10/29 19:12:34 jasoni Exp $
 bin/catdoc
-bin/wordview
-man/man1/catdoc.1
+bin/xls2csv
+%%tk%%
 lib/catdoc/8859-1.txt
 lib/catdoc/8859-2.txt
 lib/catdoc/8859-3.txt
@@ -36,8 +37,11 @@ lib/catdoc/cp866.txt
 lib/catdoc/cp869.txt
 lib/catdoc/cp874.txt
 lib/catdoc/koi8-r.txt
+lib/catdoc/koi8-u.txt
 lib/catdoc/tex.replchars
 lib/catdoc/tex.specchars
 lib/catdoc/us-ascii.txt
 lib/catdoc/x-mac-cyrillic.txt
+man/man1/catdoc.1
+man/man1/xls2csv.1
 @dirrm lib/catdoc