From owner-freebsd-ports Tue Aug 17 0:32: 3 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 3CB6B14E0D for ; Tue, 17 Aug 1999 00:32:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id AAA45836; Tue, 17 Aug 1999 00:30:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from neptune.psn.net (neptune.psn.net [207.211.58.16]) by hub.freebsd.org (Postfix) with ESMTP id 7C9C814DFB for ; Tue, 17 Aug 1999 00:22:46 -0700 (PDT) (envelope-from will@shadow.blackdawn.com) Received: from 5042-243.008.popsite.net ([209.224.140.243] helo=shadow.blackdawn.com) by neptune.psn.net with esmtp (PSN Internet Service 2.12 #3) for FreeBSD-gnats-submit@freebsd.org id 11GdZC-0000Ia-00; Tue, 17 Aug 1999 00:21:54 -0700 Received: (from will@localhost) by shadow.blackdawn.com (8.9.3/8.9.2) id DAA14135; Tue, 17 Aug 1999 03:21:51 -0400 (EDT) (envelope-from will) Message-Id: <199908170721.DAA14135@shadow.blackdawn.com> Date: Tue, 17 Aug 1999 03:21:51 -0400 (EDT) From: Will Andrews Reply-To: Will Andrews To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/13188: update port graphics/fly to 1.6.5 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 13188 >Category: ports >Synopsis: update port graphics/fly to 1.6.5 >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: Tue Aug 17 00:30:00 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Will Andrews >Release: FreeBSD 3.2-STABLE i386 >Organization: none >Environment: FreeBSD shadow.blackdawn.com 3.2-STABLE FreeBSD 3.2-STABLE #0: Sun Jul 25 01:17:53 EDT 1999 root@shadow.blackdawn.com:/usr/src/sys/compile/SHADOW i386 >Description: Fly has been updated to 1.6.5. This is the diff for the current port, 1.6.4, updated to use 1.6.5 instead. Too bad none of the mirrors have a copy of the source itself. ;\ >How-To-Repeat: Use the diff below to patch the current port. >Fix: diff -urN fly/Makefile fly-1.6.5/Makefile --- fly/Makefile Sat Dec 19 09:58:00 1998 +++ fly-1.6.5/Makefile Wed Aug 11 16:34:45 1999 @@ -1,19 +1,25 @@ # New ports collection makefile for: fly -# Version required: 1.6.4 +# Version required: 1.6.5 # Date created: 30 December 1997 # Whom: Juergen Unger # # $Id: Makefile,v 1.1.1.1 1998/12/19 14:58:00 jseger Exp $ # -DISTNAME= fly-1.6.4 +DISTNAME= fly-1.6.5 CATEGORIES= graphics -MASTER_SITES= ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/ \ - ftp://ftp.ibrado.com/pub/fly/ +MASTER_SITES= ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/ MAINTAINER= j.unger@choin.net BUILD_DEPENDS= ${PREFIX}/lib/libgd\.a:${PORTSDIR}/graphics/gd + +MAKE_ENV= PREFIX="${PREFIX}" + +# we don't need gd in here.. it gets built by the ports mechanism. +# the Makefile patch removes gd from the make as well. +pre-build: + @${RM} -rf ${WRKSRC}/gd1.3 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fly ${PREFIX}/bin diff -urN fly/files/md5 fly-1.6.5/files/md5 --- fly/files/md5 Fri Feb 12 10:27:48 1999 +++ fly-1.6.5/files/md5 Wed Aug 11 16:11:05 1999 @@ -1 +1 @@ -MD5 (fly-1.6.4.tar.gz) = ff4dcef3eb3ffe9f0559be82d89c0e89 +MD5 (fly-1.6.5.tar.gz) = b96a2a6c566f284923d37f16b64aafec diff -urN fly/patches/patch-aa fly-1.6.5/patches/patch-aa --- fly/patches/patch-aa Sat Dec 19 09:58:00 1998 +++ fly-1.6.5/patches/patch-aa Wed Aug 11 16:26:46 1999 @@ -1,29 +1,41 @@ ---- Makefile.orig Mon Nov 23 16:40:58 1998 -+++ Makefile Sat Dec 19 09:51:31 1998 -@@ -4,17 +4,14 @@ - # If you already have gd installed, use the line below and comment out the - # following line - # GD = /path/to/gd/directory +--- Makefile Thu Jan 14 17:42:34 1999 ++++ Makefile.new Wed Aug 11 16:26:43 1999 +@@ -1,20 +1,14 @@ + #This makefile should suffice on most Unix systems. For other systems, + #you may well need to rewrite it. + # +-# If you already have gd installed, use the line below and comment out the +-# following line +-# GD = /path/to/gd/directory - GD = gd1.3 -+ GD = ${PREFIX}/lib - CC = gcc - #CFLAGS = -O -I$(GD) -- CFLAGS = -O -pedantic -Wall -I$(GD) -+ #CFLAGS = -O -pedantic -Wall -I$(GD) -+CFLAGS+= -I${PREFIX}/include/gd - LIBS = -L$(GD) -lgd -lm - +- CC = gcc +- CFLAGS = -O -I$(GD) +- #CFLAGS = -O -pedantic -Wall -I$(GD) +- LIBS = -L$(GD) -lgd -lm +- -all: gd fly - -gd: $(GD) - cd $(GD); make CC=$(CC) -- ++PREFIX = /usr/local ++ GDLIB = $(PREFIX)/lib ++ GDINC = $(PREFIX)/include/gd ++ CC = gcc ++CFLAGS = -O -I$(GDINC) ++ LIBS = -L$(GDLIB) -lgd -lm + +all: fly fly.o: fly.c fly.h $(CC) -c $(CFLAGS) fly.c -@@ -27,4 +24,3 @@ +@@ -23,8 +17,8 @@ + $(CC) -o fly fly.o $(LIBS) + + mostlyclean: +- rm -f fly.o temp.gif core; cd $(GD); make clean; ++ rm -f fly.o temp.gif core clean: - rm -f fly.o fly temp.gif core; cd $(GD); make clean; -- +- rm -f fly.o fly temp.gif core; cd $(GD); make clean; ++ rm -f fly.o fly temp.gif core + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message