From owner-freebsd-ports Fri Aug 21 11:30:07 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id LAA13044 for freebsd-ports-outgoing; Fri, 21 Aug 1998 11:30:07 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id LAA13039 for ; Fri, 21 Aug 1998 11:30:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id LAA26610; Fri, 21 Aug 1998 11:30:01 -0700 (PDT) Date: Fri, 21 Aug 1998 11:30:01 -0700 (PDT) Message-Id: <199808211830.LAA26610@freefall.freebsd.org> To: freebsd-ports@FreeBSD.ORG From: Tim Vanderhoek Subject: Re: ports/7706: update for catdoc port Reply-To: Tim Vanderhoek Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR ports/7706; it has been noted by GNATS. From: Tim Vanderhoek To: stephen farrell Cc: FreeBSD-gnats-submit@FreeBSD.ORG Subject: Re: ports/7706: update for catdoc port Date: Fri, 21 Aug 1998 14:23:47 -0400 (EDT) On Fri, 21 Aug 1998, stephen farrell wrote: > MAINTAINER= brion@queeg.com > +RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80 > +WISH= wish8.0 Please don't add this. Unless catdoc has changed drastically, this is only needed to use an extra bonus script and is by no means a dependency. I may be wrong and catdoc may have changed drastically. That would be unfortunate. > -# 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. > -TeX control sequences. It does not work with MS Word 97 documents. > +TeX control sequences. It does work with MS Word 97 documents. Maybe "It works with MS Word 97..."? :-) > - Brion > brion@queeg.com > + > +- Steve > +steve@farrell.org You didn't change the MAINTAINER variable. You didn't say whether you have asked Brion, brion@queeg.com, for his permission to change the MAINTAINER. 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, Are you sure this patch is no longer necessary? If you're not sure, you should talk to Andrey, ache@FreeBSD.ORG, since he was the one who added it. Also, for the sake of reading the cvs log, it makes things nicer if the new patch is committed as patch-ac, or, alternatively, if patch-aa is first removed and then the new patch is re-added as patch-aa. This saves unnecessary confusion (sometimes much unnecessary confusion for me, at least :) when reading the cvs logs. +--- 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 Okay, I'm not very good at reading patches greater than depth 1, but it looks like you've essentially renamed patch-ab to patch-aa. Don't do this. Leave patch-ab as patch-ab. +--- Makefile.orig Mon Aug 17 02:40:23 1998 ++++ Makefile Fri Aug 21 09:56:13 1998 +@@ -1,19 +1,19 @@ And then this (what you submitted as patch-ab) would become either patch-ac or patch-ad. + # remove -O2 on HP/UX 9. It is known to cause problems +-FLAGS=-Wall -O2 -g ++FLAGS=-Wall -O -g Ack! Does this respect CFLAGS, or does it need to be labelled NO_PACKAGE, now? Would it work to use FLAGS=${CFLAGS} + #Directory, where all system-wide stuff resides +-LIB_DIR=/usr/local/lib/catdoc ++LIB_DIR=$(PREFIX)/lib/catdoc If you're changing this already, might as well make it something more appropriate (as per instructions in hier(8)). Maybe share/catdoc/? + wordview: wordview.tcl + cp wordview.tcl wordview It doesn't look like catdoc has changed too drastically. + 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 Well, since the author specifies that $(INSTALL) is supposed to refer to a BSD compatible install (he defined INSTALL but then ignored it!?), you might as well go all the way and use $(BSD_INSTALL_SCRIPT), $(BSD_INSTALL_PROGRAM), $(BSD_INSTALL_MAN), and $(BSD_INSTALL_DATA). You are, of course, submitting these patches to the author. I can verify that he responds quickly and positively. :-) Thanks, -- This .sig is not innovative, witty, or profund. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message