From owner-freebsd-ports Thu Nov 20 09:50:07 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id JAA21246 for ports-outgoing; Thu, 20 Nov 1997 09:50:07 -0800 (PST) (envelope-from owner-freebsd-ports) Received: (from gnats@localhost) by hub.freebsd.org (8.8.7/8.8.7) id JAA21238; Thu, 20 Nov 1997 09:50:02 -0800 (PST) (envelope-from gnats) Date: Thu, 20 Nov 1997 09:50:02 -0800 (PST) Message-Id: <199711201750.JAA21238@hub.freebsd.org> To: freebsd-ports Cc: From: Matthew Hunt Subject: Re: ports/5075: Update: print/c2ps to 4.0 Reply-To: Matthew Hunt Sender: owner-freebsd-ports@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk The following reply was made to PR ports/5075; it has been noted by GNATS. From: Matthew Hunt To: FreeBSD-gnats@FreeBSD.ORG, freebsd-ports@FreeBSD.ORG Cc: Subject: Re: ports/5075: Update: print/c2ps to 4.0 Date: Mon, 17 Nov 1997 23:03:49 -0500 Marc Slemko informs me that the Geocities server is broken, and adding "-t" to the fetch arguments allows the file to be retrieved. I have used FETCH_BEFORE_ARGS to do so. Please apply this patch instead of the one in the PR; thanks. diff -urN /usr/ports/print/c2ps/Makefile c2ps/Makefile --- /usr/ports/print/c2ps/Makefile Mon Mar 24 14:36:55 1997 +++ c2ps/Makefile Mon Nov 17 22:58:38 1997 @@ -1,20 +1,51 @@ # New ports collection makefile for: c2ps -# Version required: 3.0 +# Version required: 4.0 # Date created: 19 March 1997 # Whom: Matthew Hunt # # $Id: Makefile,v 1.1.1.1 1997/03/24 19:36:55 obrien Exp $ # -DISTNAME= c2ps-3.0 +DISTNAME= c2ps-4.0 CATEGORIES= print MASTER_SITES= http://www.geocities.com/SiliconValley/Park/2055/ -DISTFILES= c2ps-30.tgz -# Also: http://www.cs.technion.ac.il/~c0928189/c2ps/c2ps-3.0.tar.Z +DISTFILES= c2ps-40.tgz +# Also: http://www.cs.technion.ac.il/~c0928189/c2ps/c2ps-4.0.tar.Z + +# The Geocities server is broken +FETCH_BEFORE_ARGS= -t MAINTAINER= mph@pobox.com MAN1= c2ps.1 -.include +DEFAULT_PAPER_TYPE?= + +letter:: + $(MAKE) DEFAULT_PAPER_TYPE=LETTER +Letter:: + $(MAKE) DEFAULT_PAPER_TYPE=LETTER + +a4:: + $(MAKE) DEFAULT_PAPER_TYPE=A4 +A4:: + $(MAKE) DEFAULT_PAPER_TYPE=A4 +pre-configure: +.if empty(DEFAULT_PAPER_TYPE) + @echo WARNING: + @echo Making A4 by default. If you prefer US Letter size, run: + @echo ' make letter' + @echo instead. +.elif $(DEFAULT_PAPER_TYPE)!=A4 && $(DEFAULT_PAPER_TYPE)!=LETTER + @echo You must set DEFAULT_PAPER_TYPE to A4 or LETTER, or you + @echo can \"make letter\" or \"make a4\". + @false +.endif + +do-install: + (cd $(WRKSRC) && $(MAKE) 'INSTALL_MAN=$(INSTALL_MAN)'\ + 'INSTALL_PROGRAM=$(INSTALL_PROGRAM)'\ + 'PREFIX=$(PREFIX)' install) + +.include diff -urN /usr/ports/print/c2ps/files/md5 c2ps/files/md5 --- /usr/ports/print/c2ps/files/md5 Thu Mar 27 02:08:24 1997 +++ c2ps/files/md5 Mon Nov 17 21:27:14 1997 @@ -1 +1 @@ -MD5 (c2ps-30.tgz) = 27f07557444a02d56e88012e900a3bb8 +MD5 (c2ps-40.tgz) = 195553258f2f18198f164ea8f66362dc diff -urN /usr/ports/print/c2ps/patches/patch-aa c2ps/patches/patch-aa --- /usr/ports/print/c2ps/patches/patch-aa Mon Mar 24 14:36:56 1997 +++ c2ps/patches/patch-aa Mon Nov 17 21:47:44 1997 @@ -1,7 +1,7 @@ ---- Makefile.orig Thu Jul 18 14:43:18 1996 -+++ Makefile Wed Mar 19 13:19:33 1997 -@@ -1,10 +1,7 @@ - # Makefile for c2ps ver3.0 +--- Makefile.orig Thu May 15 11:50:56 1997 ++++ Makefile Mon Nov 17 21:47:28 1997 +@@ -2,10 +2,7 @@ + # Last modified: Sat Apr 19 1997 RM = rm -f -CC = gcc @@ -11,3 +11,25 @@ BIN = $(PREFIX)/bin MAN = $(PREFIX)/man/man1 +@@ -20,7 +17,7 @@ + FUNCTION_FONT = \"Bookman-LightItalic\" + + COMMENT_DIMMING_DEGREE = 0.75 +-DEFAULT_PAPER_TYPE = A4 ++DEFAULT_PAPER_TYPE ?= A4 + # possible values are A4 and LETTER + + +@@ -39,10 +36,10 @@ + install: bininstall maninstall + + bininstall: c2ps +- install -m 755 c2ps $(BIN) ++ $(INSTALL_PROGRAM) c2ps $(BIN) + + maninstall: c2ps.1 +- install -m 644 c2ps.1 $(MAN) ++ $(INSTALL_MAN) c2ps.1 $(MAN) + + compile: c2ps.c + $(CC) $(PREP_OPTIONS) $(CCFLAGS) -o c2ps c2ps.c