From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 13 19:40:11 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01658106564A for ; Wed, 13 Apr 2011 19:40:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D244D8FC16 for ; Wed, 13 Apr 2011 19:40:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p3DJeASM092426 for ; Wed, 13 Apr 2011 19:40:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p3DJeAJl092425; Wed, 13 Apr 2011 19:40:10 GMT (envelope-from gnats) Resent-Date: Wed, 13 Apr 2011 19:40:10 GMT Resent-Message-Id: <201104131940.p3DJeAJl092425@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Anton Yuzhaninov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 446B21065675 for ; Wed, 13 Apr 2011 19:31:05 +0000 (UTC) (envelope-from ayuzhaninov@team.vega.ru) Received: from mail.vega.ru (mail.vega.ru [90.156.167.5]) by mx1.freebsd.org (Postfix) with ESMTP id D82468FC12 for ; Wed, 13 Apr 2011 19:31:04 +0000 (UTC) Received: from [10.100.124.99] (helo=citrin.office.vega.ru) by mail.vega.ru with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.75 (FreeBSD)) (envelope-from ) id 1QA5bl-000NZV-Ew; Wed, 13 Apr 2011 23:20:10 +0400 Received: by citrin.office.vega.ru (sSMTP sendmail emulation); Wed, 13 Apr 2011 23:20:09 +0400 Message-Id: Date: Wed, 13 Apr 2011 23:20:09 +0400 From: "Anton Yuzhaninov" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: tom@hur.st Subject: ports/156376: [PATCH] graphics/optipng: update to 0.6.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2011 19:40:11 -0000 >Number: 156376 >Category: ports >Synopsis: [PATCH] graphics/optipng: update to 0.6.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Apr 13 19:40:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Anton Yuzhaninov >Release: FreeBSD 9.0-CURRENT i386 >Organization: >Environment: System: FreeBSD citrin.office.vega.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r219710M: Wed Mar 23 15:39:53 MSK >Description: - Update to 0.6.5 Port maintainer (tom@hur.st) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- optipng-0.6.5.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/optipng/Makefile /home/citrin/optipng/Makefile --- /usr/ports/graphics/optipng/Makefile 2010-04-06 00:02:28.000000000 +0400 +++ /home/citrin/optipng/Makefile 2011-04-13 21:17:45.000000000 +0400 @@ -6,7 +6,7 @@ # PORTNAME= optipng -PORTVERSION= 0.6.4 +PORTVERSION= 0.6.5 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/OptiPNG/${PORTNAME}-${PORTVERSION} @@ -26,9 +26,11 @@ .include -CONFIGURE_ARGS= # +HAS_CONFIGURE= yes + .ifndef(WITH_BUNDLED_LIBPNG) CONFIGURE_ARGS+= --with-system-libpng +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png .endif @@ -36,11 +38,6 @@ CONFIGURE_ARGS+= --with-system-zlib .endif -do-configure: - (cd ${WRKSRC} && ./configure ${CONFIGURE_ARGS}) - ${REINPLACE_CMD} -e 's|^INCS =.*|INCS = -I${LOCALBASE}/include|' \ - ${WRKSRC}/lib/pngxtern/scripts/unix.mak - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/optipng ${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/man/optipng.1 ${MAN1PREFIX}/man/man1/ diff -ruN --exclude=CVS /usr/ports/graphics/optipng/distinfo /home/citrin/optipng/distinfo --- /usr/ports/graphics/optipng/distinfo 2010-04-06 00:02:28.000000000 +0400 +++ /home/citrin/optipng/distinfo 2011-04-13 20:37:39.000000000 +0400 @@ -1,3 +1,2 @@ -MD5 (optipng-0.6.4.tar.gz) = d6c10dd8d8f1d5b579221bc9cfbfbcb6 -SHA256 (optipng-0.6.4.tar.gz) = 3000892b1d240351f057fbc8012485c3a1e75b991fa8d54e048273fa0fa87647 -SIZE (optipng-0.6.4.tar.gz) = 1483806 +SHA256 (optipng-0.6.5.tar.gz) = 2998e203941cdb95eb97587a44b02b3b765e85a7d62fe2df076b0123a7ba5b44 +SIZE (optipng-0.6.5.tar.gz) = 1534271 diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std /home/citrin/optipng/files/patch-lib-libpng-scripts-makefile.std --- /usr/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std 2009-01-19 23:44:24.000000000 +0300 +++ /home/citrin/optipng/files/patch-lib-libpng-scripts-makefile.std 2011-04-13 20:43:41.000000000 +0400 @@ -1,6 +1,6 @@ ---- lib/libpng/scripts/makefile.std.orig 2006-03-06 17:06:28.000000000 +0000 -+++ lib/libpng/scripts/makefile.std 2008-11-14 18:00:09.000000000 +0000 -@@ -24,12 +24,16 @@ +--- lib/libpng/scripts/makefile.std.orig 2010-12-09 16:48:13.000000000 +0300 ++++ lib/libpng/scripts/makefile.std 2011-04-13 20:38:46.000000000 +0400 +@@ -27,12 +27,16 @@ ZLIBLIB=../zlib ZLIBINC=../zlib diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in /home/citrin/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in --- /usr/ports/graphics/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in 2010-04-06 00:02:28.000000000 +0400 +++ /home/citrin/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in 2011-04-13 21:06:23.000000000 +0400 @@ -1,5 +1,5 @@ ---- lib/pngxtern/scripts/unix.mak.in.orig 2008-06-18 01:29:00.000000000 +0200 -+++ lib/pngxtern/scripts/unix.mak.in 2010-04-05 21:52:14.000000000 +0200 +--- lib/pngxtern/scripts/unix.mak.in.orig 2008-06-18 03:29:00.000000000 +0400 ++++ lib/pngxtern/scripts/unix.mak.in 2011-04-13 21:06:00.000000000 +0400 @@ -8,8 +8,8 @@ PNGDIR = ../libpng @@ -11,14 +11,16 @@ AR_RC = ar rcs RANLIB = ranlib RM_F = rm -f -@@ -18,8 +18,8 @@ +@@ -18,9 +18,9 @@ LDDEBUG = CRELEASE = -O LDRELEASE = -s -CFLAGS = $(CRELEASE) -LDFLAGS = $(LDRELEASE) +-INCS = -I$(ZDIR) -I$(PNGDIR) +CFLAGS ?= $(CRELEASE) +LDFLAGS ?= $(LDRELEASE) - INCS = -I$(ZDIR) -I$(PNGDIR) ++INCS = -I$(ZDIR) -I$(PNGDIR) -I${LOCALBASE}/include LIBS = -lpng -lz -lm + # File extensions diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in /home/citrin/optipng/files/patch-lib-zlib-Makefile.in --- /usr/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in 2010-04-06 00:02:28.000000000 +0400 +++ /home/citrin/optipng/files/patch-lib-zlib-Makefile.in 2011-04-13 20:41:31.000000000 +0400 @@ -1,5 +1,5 @@ ---- lib/zlib/Makefile.in.orig 2010-03-14 04:10:27.000000000 +0100 -+++ lib/zlib/Makefile.in 2010-04-05 21:25:15.000000000 +0200 +--- lib/zlib/Makefile.in.orig 2010-04-20 08:12:21.000000000 +0400 ++++ lib/zlib/Makefile.in 2011-04-13 20:41:09.000000000 +0400 @@ -16,9 +16,9 @@ # To install in $HOME instead of /usr/local, use: # make install prefix=$HOME @@ -12,21 +12,23 @@ #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ -@@ -36,9 +36,10 @@ +@@ -36,11 +36,12 @@ SHAREDLIBM=libz.so.1 - LIBS=$(STATICLIB) $(SHAREDLIB) $(SHAREDLIBV) + LIBS=$(STATICLIB) $(SHAREDLIBV) -AR=ar rc -RANLIB=ranlib --TAR=tar +AR?=ar +ARFLAGS?=rc +RANLIB?=ranlib + LDCONFIG=ldconfig + LDSHAREDLIBC=-lc +-TAR=tar +TAR?=tar SHELL=/bin/sh EXE= -@@ -105,7 +106,7 @@ +@@ -108,7 +109,7 @@ -@rm -f foo.gz libz.a: $(OBJS) diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-src-opngreduc.c /home/citrin/optipng/files/patch-src-opngreduc.c --- /usr/ports/graphics/optipng/files/patch-src-opngreduc.c 2010-04-06 00:02:28.000000000 +0400 +++ /home/citrin/optipng/files/patch-src-opngreduc.c 2011-04-13 21:03:34.000000000 +0400 @@ -1,11 +1,13 @@ ---- src/opngreduc.c.orig 2010-01-03 06:59:00.000000000 +0100 -+++ src/opngreduc.c 2010-04-05 22:02:26.000000000 +0200 -@@ -23,7 +23,7 @@ - #define PNG_NO_PEDANTIC_WARNINGS - #include "png.h" +--- src/opngreduc.c.orig 2011-01-24 09:05:00.000000000 +0300 ++++ src/opngreduc.c 2011-04-13 21:03:27.000000000 +0400 +@@ -25,9 +25,7 @@ + #include "opngreduc.h" + #if PNG_LIBPNG_VER >= 10400 +-#ifdef PNG_USER_PRIVATEBUILD -#include "pngpriv.h" +-#endif +#include "libpng/pngpriv.h" - #else - #define trans_alpha trans - #define trans_color trans_values + #endif + + #ifndef OPNG_ASSERT diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in /home/citrin/optipng/files/patch-src-scripts-unix.mak.in --- /usr/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in 2009-01-19 23:44:24.000000000 +0300 +++ /home/citrin/optipng/files/patch-src-scripts-unix.mak.in 2011-04-13 20:48:15.000000000 +0400 @@ -1,5 +1,5 @@ ---- src/scripts/unix.mak.in.orig 2008-09-03 23:56:00.000000000 +0100 -+++ src/scripts/unix.mak.in 2008-11-14 18:29:12.000000000 +0000 +--- src/scripts/unix.mak.in.orig 2010-12-22 20:08:00.000000000 +0300 ++++ src/scripts/unix.mak.in 2011-04-13 20:47:51.000000000 +0400 @@ -4,16 +4,16 @@ # Usage: make -f scripts/unix.mak @@ -12,11 +12,10 @@ man1dir=$(mandir)/man1 -CC = cc --LD = $(CC) ++CC ?= cc + LD = $(CC) -CFLAGS = -O -LDFLAGS = -s -+CC ?= cc -+LD = $(CC) +CFLAGS ?= -O +LDFLAGS += -s -L${LOCALBASE}/lib @@ -25,9 +24,9 @@ @@ -28,7 +28,7 @@ BACKDIR = ../../src - OBJS = optipng.o opngoptim.o opngreduc.o cbitset.o osys.o strutil.o + OBJS = optipng.o opngoptim.o opngreduc.o cbitset.o osys.o -INCS = -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) +INCS = -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) -I${LOCALBASE}/include LIBS = $(PNGXDIR)/$(PNGXLIB) $(PNGDIR)/$(PNGLIB) $(ZDIR)/$(ZLIB) - SYSLIBS = + SYSLIBS = -lm --- optipng-0.6.5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: