Change catdoc from using a FLAVOR to provide the Tk "wordview" user interface

to using a subpackage instead. From Dmitrij D. Czarkoff, small tweak from me.

textproc/catdoc/Makefile

@@ -1,9 +1,14 @@
-# $OpenBSD: Makefile,v 1.33 2013/03/11 11:42:40 espie Exp $
+# $OpenBSD: Makefile,v 1.34 2015/01/20 11:08:41 sthen Exp $
 
-COMMENT=	MS Word, Excel, Powerpoint ==> ASCII or TeX
+COMMENT-main=	convert MS Word, Excel, Powerpoint to ASCII or TeX
+COMMENT-tk=	viewer for MS Word files
 
-DISTNAME=	catdoc-0.94.2
-REVISION=	3
+V=		0.94.2
+DISTNAME=	catdoc-$V
+PKGNAME-main=	catdoc-$V
+PKGNAME-tk=	wordview-$V
+PKG_ARCH-tk=	*
+REVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.wagner.pp.ru/pub/catdoc/
 
@@ -12,19 +17,23 @@ HOMEPAGE=	http://wagner.pp.ru/~vitus/software/catdoc/
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	c m
-
-FLAVORS=	tk
+MULTI_PACKAGES=	-main
+PSEUDO_FLAVORS=	no_x11
 FLAVOR?=
 
-.if ${FLAVOR:Mtk}
-MODULES=	x11/tk
-RUN_DEPENDS=	${MODTK_RUN_DEPENDS}
-CONFIGURE_ARGS+=--with-wish=${MODTK_BIN}
-.else
+WANTLIB-main=	c m
+
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS+=--disable-wordview
+.else
+MODULES=	x11/tk
+MULTI_PACKAGES+=-tk
+CONFIGURE_ARGS+=--with-wish=${MODTK_BIN}
 .endif
 
+RUN_DEPENDS-tk=	textproc/catdoc,-main \
+		${MODTK_RUN_DEPENDS}
+
 CONFIGURE_STYLE=gnu dest
 
 NO_TEST=	Yes

textproc/catdoc/pkg/DESCR-main

@@ -8,6 +8,4 @@ comma-separated value file.
 catppt is a utility to extract textual information from MS Powerpoint
 files.
 
-Flavors:
-        tk - a Tcl/Tk GUI frontend to catdoc for viewing MS Word
-             documents
+Tcl/Tk-based user interface for catdoc is provided in "wordview" package.

textproc/catdoc/pkg/DESCR-tk

@@ -0,0 +1 @@
+a Tcl/Tk GUI frontend to catdoc for viewing MS Word documents

textproc/catdoc/pkg/MESSAGE-main

@@ -0,0 +1,2 @@
+"tk" flavor of catdoc was dropped in favor of separate "wordview" subpackage,
+which has to be installed explicitly.

textproc/catdoc/pkg/PFRAG.tk

@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.tk,v 1.2 2006/10/27 20:41:47 steven Exp $
-bin/wordview
-@man man/man1/wordview.1

textproc/catdoc/pkg/PLIST-main

@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.5 2012/08/26 17:41:17 stu Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2015/01/20 11:08:42 sthen Exp $
+@pkgpath textproc/catdoc
+@pkgpath textproc/catdoc,tk
 @bin bin/catdoc
 @bin bin/catppt
 @bin bin/xls2csv
@@ -56,4 +58,3 @@ share/catdoc/mac-roman.txt
 share/catdoc/tex.replchars
 share/catdoc/tex.specchars
 share/catdoc/us-ascii.txt
-%%tk%%

textproc/catdoc/pkg/PLIST-tk

@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-tk,v 1.1 2015/01/20 11:08:42 sthen Exp $
+@conflict catdoc-*-tk
+bin/wordview
+@man man/man1/wordview.1