From owner-freebsd-ports Thu Jan 21 04:00:03 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id EAA25565 for freebsd-ports-outgoing; Thu, 21 Jan 1999 04:00:03 -0800 (PST) (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 EAA25496 for ; Thu, 21 Jan 1999 04:00:00 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id EAA00527; Thu, 21 Jan 1999 04:00:01 -0800 (PST) Received: from shale.csir.co.za (shale.csir.co.za [146.64.46.5]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id DAA24820 for ; Thu, 21 Jan 1999 03:55:09 -0800 (PST) (envelope-from reg@shale.csir.co.za) Received: (from reg@localhost) by shale.csir.co.za (8.9.2/8.9.2) id NAA84024; Thu, 21 Jan 1999 13:54:54 +0200 (SAT) (envelope-from reg) Message-Id: <199901211154.NAA84024@shale.csir.co.za> Date: Thu, 21 Jan 1999 13:54:54 +0200 (SAT) From: reg@shale.csir.co.za Reply-To: reg@shale.csir.co.za To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/9601: Upgrade graphics/png to 1.0.3 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9601 >Category: ports >Synopsis: Upgrade graphics/png to 1.0.3 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jan 21 04:00:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Jeremy Lea >Release: FreeBSD 3.0-CURRENT i386 >Organization: Arb's Inc. >Environment: FreeBSD Ports collection >Description: Attached are patches to upgrade the PNG port to 1.0.3, and to fix the two ghostscript ports which would be broken by this. PNG 1.0.3 is apparently completely backwards compatible with 1.0.2. Maintainer contacted with no response. >How-To-Repeat: Over and over... >Fix: Index: Makefile =================================================================== RCS file: /usr/home/ncvs/ports/graphics/png/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- Makefile 1998/09/17 06:30:34 1.16 +++ Makefile 1999/01/19 13:07:32 @@ -6,8 +6,8 @@ # $Id: Makefile,v 1.16 1998/09/17 06:30:34 tg Exp $ # -DISTNAME= libpng-1.0.2 -PKGNAME= png-1.0.2 +DISTNAME= libpng-1.0.3 +PKGNAME= png-1.0.3 CATEGORIES= graphics MASTER_SITES= ftp://ftp.uu.net/graphics/png/src/ Index: files/md5 =================================================================== RCS file: /usr/home/ncvs/ports/graphics/png/files/md5,v retrieving revision 1.7 diff -u -r1.7 md5 --- md5 1998/07/09 23:39:43 1.7 +++ md5 1999/01/19 13:39:38 @@ -1 +1 @@ -MD5 (libpng-1.0.2.tar.gz) = a8b093154f07f7b82e5c9bb77c11a0c4 +MD5 (libpng-1.0.3.tar.gz) = 06be53a1c46c4093c5c6b471cd9e4187 Index: patches/patch-aa =================================================================== RCS file: /usr/home/ncvs/ports/graphics/png/patches/patch-aa,v retrieving revision 1.11 diff -u -r1.11 patch-aa --- patch-aa 1998/09/17 00:51:27 1.11 +++ patch-aa 1999/01/19 13:54:26 @@ -1,7 +1,13 @@ -*** scripts/makefile.std.orig Wed Apr 1 04:49:34 1998 ---- scripts/makefile.std Fri Jul 10 03:34:22 1998 +*** scripts/makefile.std.orig Fri Jul 31 17:15:22 1998 +--- scripts/makefile.std Tue Jan 19 15:53:48 1999 *************** -*** 5,33 **** +*** 2,19 **** + # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. + # For conditions of distribution and use, see copyright notice in png.h + + # where make install puts libpng.a and png.h +! prefix=/usr/local + # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib #ZLIBINC=/usr/local/include @@ -14,24 +20,23 @@ #RANLIB=echo RANLIB=ranlib +--- 2,29 ---- + # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. + # For conditions of distribution and use, see copyright notice in png.h ++ # read libpng.txt or png.h to see why PNGMAJ is 2. You should not ++ # have to change it. ++ PNGMAJ = 2 ++ .if (${PORTOBJFORMAT} == "elf") ++ PNGVER = $(PNGMAJ) ++ .else ++ PNGMIN = 1 ++ PNGVER = $(PNGMAJ).$(PNGMIN) ++ .endif ++ # where make install puts libpng.a and png.h -! prefix=/usr/local - - OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ - pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ - pngwtran.o pngmem.o pngerror.o pngpread.o - -! all: libpng.a pngtest - - libpng.a: $(OBJS) - ar rc $@ $(OBJS) - $(RANLIB) $@ - - pngtest: pngtest.o libpng.a - $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) +! prefix=${PREFIX} ---- 5,55 ---- # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib #ZLIBINC=/usr/local/include @@ -44,21 +49,21 @@ #RANLIB=echo RANLIB=ranlib +*************** +*** 22,33 **** + pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ + pngwtran.o pngmem.o pngerror.o pngpread.o -+ # read libpng.txt or png.h to see why PNGMAJ is 2. You should not -+ # have to change it. -+ PNGMAJ = 2 -+ .if (${PORTOBJFORMAT} == "elf") -+ PNGVER = $(PNGMAJ) -+ .else -+ PNGMIN = 1 -+ PNGVER = $(PNGMAJ).$(PNGMIN) -+ .endif -+ - # where make install puts libpng.a and png.h -! prefix=${PREFIX} +! all: libpng.a pngtest + + libpng.a: $(OBJS) + ar rc $@ $(OBJS) + $(RANLIB) $@ + + pngtest: pngtest.o libpng.a + $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) - OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ +--- 32,55 ---- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o Index: pkg/PLIST =================================================================== RCS file: /usr/home/ncvs/ports/graphics/png/pkg/PLIST,v retrieving revision 1.14 diff -u -r1.14 PLIST --- PLIST 1998/09/17 00:51:29 1.14 +++ PLIST 1999/01/19 13:53:58 @@ -1,7 +1,6 @@ include/png.h include/pngconf.h lib/libpng.a -@exec ranlib %D/%F lib/libpng.so.2.1 lib/libpng.so @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B Index: ghostscript5/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/print/ghostscript5/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- Makefile 1999/01/04 03:34:01 1.28 +++ Makefile 1999/01/19 14:28:44 @@ -39,7 +39,7 @@ post-extract: ${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg - ${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/png/work/libpng-1.0.2 ${WRKSRC}/libpng + ${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/png/work/libpng-1.0.3 ${WRKSRC}/libpng # additional PCL3 driver $(EXTRACT_CMD) -xvf ${WRKDIR}/hpdj-2.5/hpdj.tar -C $(WRKSRC) ${PATCH} --directory=${WRKSRC} <${WRKSRC}/devs.mak-5.10.diff Index: ghostscript55/Makefile =================================================================== RCS file: /usr/home/ncvs/ports/print/ghostscript55/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- Makefile 1999/01/13 07:24:57 1.30 +++ Makefile 1999/01/19 14:24:47 @@ -58,7 +58,7 @@ post-extract: ${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg - ${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/png/work/libpng-1.0.2 ${WRKSRC}/libpng + ${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/png/work/libpng-1.0.3 ${WRKSRC}/libpng ${MV} ${WRKSRC}/devs.mak ${WRKSRC}/devs.mak.bak cd ${WRKSRC} && unzip -Lao ${DISTDIR}/${HP850_DRV} ${MV} ${WRKSRC}/devs.mak.bak ${WRKSRC}/devs.mak >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message