ports/156376: [PATCH] graphics/optipng: update to 0.6.5

[Anton Yuzhaninov]

The following reply was made to PR ports/156376; it has been noted by GNATS.

From: Anton Yuzhaninov <ayuzhaninov at team.vega.ru>
To: FreeBSD-gnats-submit at FreeBSD.org, freebsd-ports-bugs at FreeBSD.org
Cc:  
Subject: Re: ports/156376: [PATCH] graphics/optipng: update to 0.6.5
Date: Thu, 14 Apr 2011 15:13:43 +0400

 This is a multi-part message in MIME format.
 --------------020200070607010406040406
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 
 corrected patches
 
 --------------020200070607010406040406
 Content-Type: text/plain;
  name="patch-src-scripts-unix.mak.in"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-src-scripts-unix.mak.in"
 
 --- src/scripts/unix.mak.in.orig	2011-04-14 15:07:03.000000000 +0400
 +++ src/scripts/unix.mak.in	2011-04-14 15:08:29.000000000 +0400
 @@ -4,16 +4,16 @@
  # Usage: make -f scripts/unix.mak
  
  
 -prefix=/usr/local
 +prefix=${PREFIX}
  exec_prefix=$(prefix)
  bindir=$(exec_prefix)/bin
  mandir=$(prefix)/man
  man1dir=$(mandir)/man1
  
 -CC = cc
 +CC ?= cc
  LD = $(CC)
 -CFLAGS  = -O
 -LDFLAGS = -s
 +CFLAGS  ?= -O
 +LDFLAGS += -s -L${LOCALBASE}/lib
  
  OPTIPNG = optipng
  ZLIB    = libz.a
 @@ -28,7 +28,7 @@
  BACKDIR = ../../src
  
  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 = -lm
  
 
 --------------020200070607010406040406
 Content-Type: text/plain;
  name="patch-lib-zlib-Makefile.in"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-lib-zlib-Makefile.in"
 
 --- lib/zlib/Makefile.in.orig	2011-04-14 15:10:39.000000000 +0400
 +++ lib/zlib/Makefile.in	2011-04-14 15:11:57.000000000 +0400
 @@ -16,9 +16,9 @@
  # To install in $HOME instead of /usr/local, use:
  #    make install prefix=$HOME
  
 -CC=cc
 +CC?=cc
  
 -CFLAGS=-O
 +CFLAGS?=-O
  #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
  #CFLAGS=-g -DDEBUG
  #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
 @@ -36,11 +36,12 @@
  SHAREDLIBM=libz.so.1
  LIBS=$(STATICLIB) $(SHAREDLIBV)
  
 -AR=ar rc
 -RANLIB=ranlib
 +AR?=ar
 +ARFLAGS?=rc
 +RANLIB?=ranlib
  LDCONFIG=ldconfig
  LDSHAREDLIBC=-lc
 -TAR=tar
 +TAR?=tar
  SHELL=/bin/sh
  EXE=
  
 @@ -108,7 +109,7 @@
  	- at rm -f foo.gz
  
  libz.a: $(OBJS)
 -	$(AR) $@ $(OBJS)
 +	$(AR) $(ARFLAGS) $@ $(OBJS)
  	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
  
  match.o: match.S
 
 --------------020200070607010406040406--