6 files changed, 50 insertions, 25 deletions

diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index 15b27d5bd2c3..9182e0562096 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	optipng
-PORTVERSION=	0.6.3
-PORTREVISION=	1
+PORTVERSION=	0.6.4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/OptiPNG/${PORTNAME}-${PORTVERSION}
 
@@ -39,6 +38,8 @@ CONFIGURE_ARGS+=	--with-system-zlib
 
 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/
diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
index 2d628451c84f..8dad48548f17 100644
--- a/graphics/optipng/distinfo
+++ b/graphics/optipng/distinfo
@@ -1,3 +1,3 @@
-MD5 (optipng-0.6.3.tar.gz) = 6cef405197a878acff4c6216cf38e871
-SHA256 (optipng-0.6.3.tar.gz) = d11630955e2e72f07dd0aa1270f9d20caaef41796fdbfbbc1caad5b931fdf721
-SIZE (optipng-0.6.3.tar.gz) = 1060571
+MD5 (optipng-0.6.4.tar.gz) = d6c10dd8d8f1d5b579221bc9cfbfbcb6
+SHA256 (optipng-0.6.4.tar.gz) = 3000892b1d240351f057fbc8012485c3a1e75b991fa8d54e048273fa0fa87647
+SIZE (optipng-0.6.4.tar.gz) = 1483806
diff --git a/graphics/optipng/files/patch-configure b/graphics/optipng/files/patch-configure
deleted file mode 100644
index 63bcfd529de0..000000000000
--- a/graphics/optipng/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2008-07-21 03:32:00.000000000 +0100
-+++ configure	2008-11-14 18:58:23.000000000 +0000
-@@ -49,7 +49,7 @@
- then
-     sed -e "$zlib_inc_del" -e "$libpng_inc_del" \
-         -e "$zlib_lib_del" -e "$libpng_lib_del" \
--        -e "$zlib_sys_ins" -e "$libpng_sys_ins" \
-+        -e "$libpng_sys_ins" -e "$zlib_sys_ins" \
-         src/scripts/unix.mak.in > src/scripts/unix.mak
-     sed -e "$zlib_inc_del" -e "$libpng_inc_del" \
-         -e "$zlib_lib_del" -e "$libpng_lib_del" \
diff --git a/graphics/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in b/graphics/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in
new file mode 100644
index 000000000000..fbe9476f1cd9
--- /dev/null
+++ b/graphics/optipng/files/patch-lib-pngxtern-scripts-unix.mak.in
@@ -0,0 +1,24 @@
+--- 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
+@@ -8,8 +8,8 @@
+ PNGDIR = ../libpng
+ 
+ # Compiler, linker, librarian and other tools
+-CC = cc
+-LD = $(CC)
++CC ?= cc
++LD ?= $(CC)
+ AR_RC = ar rcs
+ RANLIB = ranlib
+ RM_F = rm -f
+@@ -18,8 +18,8 @@
+ LDDEBUG =
+ CRELEASE = -O
+ LDRELEASE = -s
+-CFLAGS = $(CRELEASE)
+-LDFLAGS = $(LDRELEASE)
++CFLAGS ?= $(CRELEASE)
++LDFLAGS ?= $(LDRELEASE)
+ INCS = -I$(ZDIR) -I$(PNGDIR)
+ LIBS = -lpng -lz -lm
+ 
diff --git a/graphics/optipng/files/patch-lib-zlib-Makefile.in b/graphics/optipng/files/patch-lib-zlib-Makefile.in
index bc53b49e5778..2d68d7eb3a25 100644
--- a/graphics/optipng/files/patch-lib-zlib-Makefile.in
+++ b/graphics/optipng/files/patch-lib-zlib-Makefile.in
@@ -1,5 +1,5 @@
---- lib/zlib/Makefile.in.orig	2005-07-18 03:25:21.000000000 +0100
-+++ lib/zlib/Makefile.in	2008-11-14 18:07:42.000000000 +0000
+--- 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
 @@ -16,9 +16,9 @@
  # To install in $HOME instead of /usr/local, use:
  #    make install prefix=$HOME
@@ -12,9 +12,9 @@
  #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
  #CFLAGS=-g -DDEBUG
  #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-@@ -33,9 +33,10 @@
- SHAREDLIBV=libz.so.1.2.3
+@@ -36,9 +36,10 @@
  SHAREDLIBM=libz.so.1
+ LIBS=$(STATICLIB) $(SHAREDLIB) $(SHAREDLIBV)
  
 -AR=ar rc
 -RANLIB=ranlib
@@ -26,12 +26,12 @@
  SHELL=/bin/sh
  EXE=
  
-@@ -68,7 +69,7 @@
- 	fi
+@@ -105,7 +106,7 @@
+ 	-@rm -f foo.gz
  
- libz.a: $(OBJS) $(OBJA)
--	$(AR) $@ $(OBJS) $(OBJA)
-+	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
+ libz.a: $(OBJS)
+-	$(AR) $@ $(OBJS)
++	$(AR) $(ARFLAGS) $@ $(OBJS)
  	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
  
  match.o: match.S
diff --git a/graphics/optipng/files/patch-src-opngreduc.c b/graphics/optipng/files/patch-src-opngreduc.c
new file mode 100644
index 000000000000..d9f9200f5e0b
--- /dev/null
+++ b/graphics/optipng/files/patch-src-opngreduc.c
@@ -0,0 +1,11 @@
+--- 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"
+ #if PNG_LIBPNG_VER >= 10400
+-#include "pngpriv.h"
++#include "libpng/pngpriv.h"
+ #else
+ #define trans_alpha trans
+ #define trans_color trans_values