Date: Sat, 29 Mar 2008 03:19:24 GMT From: bf <bf2006a@yahoo.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/122219: [PATCH]textproc/catdoc: fix Tcl/Tk dependency handling, pkg-descr Message-ID: <200803290319.m2T3JOSf029091@www.freebsd.org> Resent-Message-ID: <200803290320.m2T3K0kZ063857@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 122219 >Category: ports >Synopsis: [PATCH]textproc/catdoc: fix Tcl/Tk dependency handling, pkg-descr >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Mar 29 03:20:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: bf >Release: 7-STABLE i386 >Organization: - >Environment: >Description: Make wordview an OPTION, and take advantage of bsd.tcl.mk. (The Tk version can now be specified by user, and 8.5 can be used.) Fix pkg-descr to account for earlier changes in the port website and component programs. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -druN catdoc.orig/Makefile catdoc/Makefile --- catdoc.orig/Makefile 2008-02-18 13:22:23.000000000 -0500 +++ catdoc/Makefile 2008-03-28 22:57:32.960907975 -0400 @@ -7,6 +7,7 @@ PORTNAME= catdoc PORTVERSION= 0.94.2 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.amdmi3.ru/distfiles/ \ ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ \ @@ -19,7 +20,9 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -MAN1= catdoc.1 wordview.1 xls2csv.1 catppt.1 +MAN1= catdoc.1 xls2csv.1 catppt.1 + +OPTIONS= WORDVIEW "Build Tcl/Tk document viewer" On .if !defined(LANG) || ${LANG} != ru_RU.KOI8-R # Remove the below line to get Cyrillic code page support instead @@ -31,11 +34,15 @@ .include <bsd.port.pre.mk> -.for i in 0 1 2 3 4 -.if exists(${LOCALBASE}/bin/wish8.${i}) -CONFIGURE_ARGS= --with-wish=${LOCALBASE}/bin/wish8.${i} -RUN_DEPENDS+= ${LOCALBASE}/bin/wish8.${i}:${PORTSDIR}/x11-toolkits/tk8${i} +.if defined(WITH_WORDVIEW) +USE_TK= 80+ +.include "${PORTSDIR}/Mk/bsd.tcl.mk" +CONFIGURE_ARGS+= --with-wish=${WISH} +PLIST_SUB+= WORDVIEW="" +MAN1+= wordview.1 +.else +CONFIGURE_ARGS+= --disable-wordview +PLIST_SUB+= WORDVIEW="@comment " .endif -.endfor .include <bsd.port.post.mk> diff -druN catdoc.orig/pkg-descr catdoc/pkg-descr --- catdoc.orig/pkg-descr 2006-03-21 07:45:25.000000000 -0500 +++ catdoc/pkg-descr 2008-03-28 22:57:32.960907975 -0400 @@ -1,19 +1,10 @@ -This is a program for viewing MS Word documents. It produces plain -text output and can optionally convert non-standard characters into -TeX control sequences. It works with MS Word 97 documents. - -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. - -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/software/catdoc/ - -- Brion -brion@queeg.com +This is a program for viewing RTF and MS Word 97 documents. It produces +plain text output and can optionally convert some non-standard characters +into TeX control sequences. It has rudimentary table handling in TeX +mode. Also included are: +- wordview, a small GUI frontend to catdoc that works with Tcl/Tk 7.6 and up; +- xls2csv, which converts Excel spreadsheets to plain text files with CSV + (comma-separated value) lines; and +- catppt, which extracts text from PowerPoint files. -- Steve -steve@farrell.org +WWW: http://wagner.pp.ru/~vitus/software/catdoc/ diff -druN catdoc.orig/pkg-plist catdoc/pkg-plist --- catdoc.orig/pkg-plist 2006-03-21 07:45:25.000000000 -0500 +++ catdoc/pkg-plist 2008-03-28 22:57:32.960907975 -0400 @@ -1,6 +1,6 @@ bin/catdoc bin/catppt -bin/wordview +%%WORDVIEW%%bin/wordview bin/xls2csv %%DATADIR%%/8859-1.txt %%DATADIR%%/8859-10.txt >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803290319.m2T3JOSf029091>