Date: Fri, 21 Aug 1998 10:10:33 -0500 (CDT) From: stephen farrell <sfarrell@healthquiz.com> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/7706: update for catdoc port Message-ID: <199808211510.KAA01452@couatl.uchicago.edu>
next in thread | raw e-mail | index | archive | help
>Number: 7706 >Category: ports >Synopsis: update for catdoc port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 21 08:20:00 PDT 1998 >Last-Modified: >Originator: stephen farrell >Organization: >Release: FreeBSD 2.2.7-STABLE i386 >Environment: >Description: update of catdoc port... this is an alpha release so it may not be suitable (yet) for fbsd ports--your call. >How-To-Repeat: y'know >Fix: Only in /usr/ports/textproc/catdoc.new: CVS diff -ur /usr/ports/textproc/catdoc/Makefile /usr/ports/textproc/catdoc.new/Makefile --- /usr/ports/textproc/catdoc/Makefile Fri Jul 24 06:48:20 1998 +++ /usr/ports/textproc/catdoc.new/Makefile Fri Aug 21 09:31:42 1998 @@ -6,12 +6,15 @@ # $Id: Makefile,v 1.5 1998/07/24 11:48:20 ache Exp $ # -DISTNAME= catdoc-0.35 +DISTNAME= catdoc-0.90a1 CATEGORIES= textproc -MASTER_SITES= http://www.ice.ru/~vitus/works/ +MASTER_SITES= http://www.ice.ru/~vitus/catdoc/ MAINTAINER= brion@queeg.com +RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80 +WISH= wish8.0 +WRKSRC= $(WRKDIR)/$(PKGNAME)/src MAN1= catdoc.1 .if !defined(LANG) || ${LANG} != ru_RU.KOI8-R @@ -19,15 +22,9 @@ CFLAGS+= -DLATIN1=1 .endif -# The wordview tcl/tk script is small and not required. If the user -# has tk, it will work. It comes preset for tcl/tk-8.0, but works with tcl-76. +# the author seems to have included some .o files for us ;-) +pre-build: + @cd $(WRKSRC); $(MAKE) -k clean -do-build: - (cd ${WRKSRC} && ${CC} ${CFLAGS} -o catdoc catdoc.c) - -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> Only in /usr/ports/textproc/catdoc.new: README.html Only in /usr/ports/textproc/catdoc.new/files: CVS diff -ur /usr/ports/textproc/catdoc/files/md5 /usr/ports/textproc/catdoc.new/files/md5 --- /usr/ports/textproc/catdoc/files/md5 Thu Jun 18 10:16:47 1998 +++ /usr/ports/textproc/catdoc.new/files/md5 Fri Aug 21 09:18:29 1998 @@ -1 +1 @@ -MD5 (catdoc-0.35.tar.gz) = fcc16fbc754df9b1140918bb6074fe71 +MD5 (catdoc-0.90a1.tar.gz) = 7a9d1aed5bccfc58d96ba0a96af5dd4f Only in /usr/ports/textproc/catdoc.new/patches: CVS diff -ur /usr/ports/textproc/catdoc/patches/patch-aa /usr/ports/textproc/catdoc.new/patches/patch-aa --- /usr/ports/textproc/catdoc/patches/patch-aa Fri Jul 24 07:05:01 1998 +++ /usr/ports/textproc/catdoc.new/patches/patch-aa Fri Aug 21 09:56:53 1998 @@ -1,43 +1,8 @@ -*** catdoc.c.bak Fri Jun 5 14:43:35 1998 ---- catdoc.c Fri Jul 24 16:02:09 1998 -*************** -*** 116,130 **** - 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F, - 0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F, - 0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F, -! 0x80,0x81,0x82,0xAA,0x8F,0x90,0xA9,0x93,0x84,0x92,0x91,0x94,0x83,0x95,0x99,0x8B, -! 0x98,0x60,0x27,0x22,0x22,0x9A,0x2D,0x2D,0x9E,0xA6,0x87,0xB0,0x8D,0x97,0x86,0xA2, -! 0x20,0xA7,0xA5,0x88,0xA4,0x8E,0x96,0x85,0xB3,0xA1,0x9F,0x22,0xAB,0xAC,0xAD,0xAE, -! 0xAF,0xB2,0xB1,'i',0xB5,0xB6,0xB7,0xB8,0xA3,0xB9,0xBA,0x22,0xBC,0xBD,0xBE,0x9B, -! 0xE1,0xE2,0xF7,0xE7,0xE4,0xE5,0xF6,0xFA,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0, -! 0xF2,0xF3,0xF4,0xF5,0xE6,0xE8,0xE3,0xFE,0xFB,0xFD,0xFF,0xF9,0xF8,0xFC,0xE0,0xF1, -! 0xC1,0xC2,0xD7,0xC7,0xC4,0xC5,0xD6,0xDA,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0, -! 0xD2,0xD3,0xD4,0xD5,0xC6,0xC8,0xC3,0xDE,0xDB,0xDD,0xDF,0xD9,0xD8,0xDC,0xC0,0xD1}; -! - - #else - ---- 116,138 ---- - 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F, - 0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F, - 0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F, -! 'ÿ', 'ç', ',', 'Ç', ',', '.', '+', '+', /* 80-87 */ -! '#', '%', 'ì', '<', 'î', 'ë', 'h', 'ã', /* 88-8F */ -! 'h', '`', '\'', '"', '"', 0x0095, '-', '-', /* 90-97 */ -! '#', 'Ô', 'Ì', '>', 'Î', 'Ë', 'h', 'Ã', /* 98-9F */ -! 0x009A, 'õ', 'Õ', 'J', '$', 'ç', '|', '$', /* A0-A7 */ -! 0x00B3, 0x00BF, 'å', '"', '^', '-', 'R', 'I', /* A8-AF */ -! 0x009C, '+', 'I', 'i', 'Ç', 'm', 'Ð', 0x009E, /* B0-B7 */ -! 0x00A3, 'N', 'Å', '"', 'j', 'S', 's', 'i', /* B8-BF */ -! 0x00E1, 0x00E2, 0x00F7, 0x00E7, 0x00E4, 0x00E5, 0x00F6, 0x00FA, /* C0-C7 */ -! 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0, /* C8-CF */ -! 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00E6, 0x00E8, 0x00E3, 0x00FE, /* D0-D7 */ -! 0x00FB, 0x00FD, 0x00FF, 0x00F9, 0x00F8, 0x00FC, 0x00E0, 0x00F1, /* D8-DF */ -! 0x00C1, 0x00C2, 0x00D7, 0x00C7, 0x00C4, 0x00C5, 0x00D6, 0x00DA, /* E0-E7 */ -! 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D0, /* E8-EF */ -! 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00C6, 0x00C8, 0x00C3, 0x00DE, /* F0-F7 */ -! 0x00DB, 0x00DD, 0x00DF, 0x00D9, 0x00D8, 0x00DC, 0x00C0, 0x00D1 /* F8-FF */ -! }; - - #else - +--- wordview.tcl.orig Fri Aug 14 07:06:08 1998 ++++ wordview.tcl Fri Aug 21 09:56:37 1998 +@@ -1,4 +1,4 @@ +-#!/usr/bin/wish ++#!/usr/local/bin/wish8.0 + + set font 8x13 + set charset_lib /usr/local/lib/catdoc diff -ur /usr/ports/textproc/catdoc/patches/patch-ab /usr/ports/textproc/catdoc.new/patches/patch-ab --- /usr/ports/textproc/catdoc/patches/patch-ab Thu Feb 12 11:30:29 1998 +++ /usr/ports/textproc/catdoc.new/patches/patch-ab Fri Aug 21 09:57:05 1998 @@ -1,6 +1,59 @@ ---- wordview Thu Feb 12 11:57:05 1998 -+++ wordview Thu Feb 12 12:00:14 1998 -@@ -1,2 +1,2 @@ --#!/usr/local/bin/wish4.2 -+#!/usr/local/bin/wish8.0 +--- Makefile.orig Mon Aug 17 02:40:23 1998 ++++ Makefile Fri Aug 21 09:56:13 1998 +@@ -1,19 +1,19 @@ + # Your C compilier and flags +-CC=shlicc2 ++## CC=shlicc2 + # Flags to pass to your C compilier + # remove -O2 on HP/UX 9. It is known to cause problems +-FLAGS=-Wall -O2 -g ++FLAGS=-Wall -O -g + # BSD compatible install +-INSTALL=/usr/bin/install ++INSTALL=/usr/bin/install -c + #Compile-time configuration of catdoc itself. Edit according to taste + + #Directory, where all system-wide stuff resides +-LIB_DIR=/usr/local/lib/catdoc ++LIB_DIR=$(PREFIX)/lib/catdoc + #directory, where catdoc binary would be placed +-BIN_DIR=/usr/local/bin ++BIN_DIR=$(PREFIX)/bin + #directory where to put man page +-MAN_DIR=/usr/local/man ++MAN_DIR=$(PREFIX)/man + #Section of manual used as extension for manual and for compute name of + #manX subdirectory + MAN_SECT=1 +@@ -58,21 +58,22 @@ + OBJ=catdoc.o charsets.o substmap.o reader.o writer.o fileutil.o + #.c.o: + # $(CC) -c $(CFLAGS) $* ++all: catdoc wordview + catdoc: $(OBJ) + $(CC) -o catdoc $(OBJ) + wordview: wordview.tcl + cp wordview.tcl wordview + install: catdoc wordview +- install -m 0755 catdoc $(BIN_DIR)/catdoc +- install -m 0755 wordview $(BIN_DIR)/wordview ++ $(INSTALL) -m 0755 catdoc $(BIN_DIR)/catdoc ++ $(INSTALL) -m 0755 wordview $(BIN_DIR)/wordview + mkdir -p $(LIB_DIR) + chmod 0755 $(LIB_DIR) +- install -m 0644 ../charsets/*.txt $(LIB_DIR) +- install -m 0644 ../charsets/ascii.spc $(LIB_DIR)/ascii$(SPEC_EXT) +- install -m 0644 ../charsets/ascii.rpl $(LIB_DIR)/ascii$(REPL_EXT) +- install -m 0644 ../charsets/tex.spc $(LIB_DIR)/tex$(SPEC_EXT) +- install -m 0644 ../charsets/tex.rpl $(LIB_DIR)/tex$(REPL_EXT) +- install -m 0644 -o $(MAN_OWNER) ../doc/catdoc.1 $(MAN_DIR)/man$(MAN_SECT)/catdoc.$(MAN_SECT) ++ $(INSTALL) -m 0644 ../charsets/*.txt $(LIB_DIR) ++ $(INSTALL) -m 0644 ../charsets/ascii.spc $(LIB_DIR)/ascii$(SPEC_EXT) ++ $(INSTALL) -m 0644 ../charsets/ascii.rpl $(LIB_DIR)/ascii$(REPL_EXT) ++ $(INSTALL) -m 0644 ../charsets/tex.spc $(LIB_DIR)/tex$(SPEC_EXT) ++ $(INSTALL) -m 0644 ../charsets/tex.rpl $(LIB_DIR)/tex$(REPL_EXT) ++ $(INSTALL) -m 0644 -o $(MAN_OWNER) ../doc/catdoc.1 $(MAN_DIR)/man$(MAN_SECT)/catdoc.$(MAN_SECT) + + clean: + rm *.o catdoc Only in /usr/ports/textproc/catdoc.new/pkg: CVS diff -ur /usr/ports/textproc/catdoc/pkg/DESCR /usr/ports/textproc/catdoc.new/pkg/DESCR --- /usr/ports/textproc/catdoc/pkg/DESCR Thu Jun 18 09:53:05 1998 +++ /usr/ports/textproc/catdoc.new/pkg/DESCR Fri Aug 21 09:29:30 1998 @@ -1,12 +1,15 @@ 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 does not work with MS Word 97 documents. +TeX control sequences. It does work 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. -http://www.ice.ru/~vitus/works/works_unix.html +http://www.ice.ru/~vitus/catdoc/ - Brion brion@queeg.com + +- Steve +steve@farrell.org diff -ur /usr/ports/textproc/catdoc/pkg/PLIST /usr/ports/textproc/catdoc.new/pkg/PLIST --- /usr/ports/textproc/catdoc/pkg/PLIST Wed Aug 19 15:48:43 1998 +++ /usr/ports/textproc/catdoc.new/pkg/PLIST Fri Aug 21 09:49:40 1998 @@ -1,2 +1,12 @@ bin/catdoc bin/wordview +lib/catdoc/cp1251.txt +lib/catdoc/cp866.txt +lib/catdoc/iso8859-5.txt +lib/catdoc/koi8-r.txt +lib/catdoc/x-mac-cyrillic.txt +lib/catdoc/ascii.specchars +lib/catdoc/ascii.replchars +lib/catdoc/tex.specchars +lib/catdoc/tex.replchars +@dirrm lib/catdoc >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199808211510.KAA01452>