optipng: => 0.6.5

5 files changed, 24 insertions, 46 deletions

diff --git a/graphics/optipng/DETAILS b/graphics/optipng/DETAILS
index 4ab34f70c7..d52208ad5e 100755
--- a/graphics/optipng/DETAILS
+++ b/graphics/optipng/DETAILS
@@ -1,8 +1,8 @@
            SPELL=optipng
-         VERSION=0.6.4
+         VERSION=0.6.5
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:d3d6a6405923428521adad83963daee6ef0aea50dc94219e3788959ad10115c2ea3082b2578884528363827585574e433ba1410e49e2dce00979557feec987c0
+     SOURCE_HASH=sha512:29accf10792c10437e57e04f7b05d2f788b5f6fb1ccfe55f3bd5c1b54989ac455b1d894ba66b06b18834e56400aece5e466547e35fcff82f41a7291721eaf07d
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://optipng.sourceforge.net/
       LICENSE[0]=ZLIB
diff --git a/graphics/optipng/HISTORY b/graphics/optipng/HISTORY
index 644dbc41e3..ff1d74d720 100644
--- a/graphics/optipng/HISTORY
+++ b/graphics/optipng/HISTORY
@@ -1,2 +1,8 @@
+2011-05-29 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 0.6.5
+	* PRE_BUILD: apply another patch
+	* png.patch: added, to fix compilation
+	* build.patch: removed, fixed by upstream
+
 2010-07-16 Vlad Glagolev <stealth@sourcemage.org>
 	* {PRE_,}BUILD, DEPENDS, DETAILS, build.patch: spell created
diff --git a/graphics/optipng/PRE_BUILD b/graphics/optipng/PRE_BUILD
index c2b33528dc..53435be211 100755
--- a/graphics/optipng/PRE_BUILD
+++ b/graphics/optipng/PRE_BUILD
@@ -1,4 +1,4 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/build.patch"
+patch -p0 < "$SPELL_DIRECTORY/png.patch"
diff --git a/graphics/optipng/build.patch b/graphics/optipng/build.patch
deleted file mode 100644
index e51c3c9efa..0000000000
--- a/graphics/optipng/build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/scripts/gcc.mak.in.orig	2009-05-18 04:14:00.000000000 +0400
-+++ src/scripts/gcc.mak.in	2010-07-16 23:46:42.994207283 +0400
-@@ -7,13 +7,13 @@
- prefix=/usr/local
- exec_prefix=$(prefix)
- bindir=$(exec_prefix)/bin
--mandir=$(prefix)/man
-+mandir=$(prefix)/share/man
- man1dir=$(mandir)/man1
- 
- CC = gcc
- LD = $(CC)
--CFLAGS  = -O2 -W -Wall
--LDFLAGS = -s
-+CFLAGS  = ${SPELL_CFLAGS} -W -Wall
-+LDFLAGS = ${SPELL_LDFLAGS}
- 
- OPTIPNG = optipng$(EXE)
- ZLIB    = libz.a
---- lib/pngxtern/scripts/gcc.mak.in.orig	2008-06-18 03:29:00.000000000 +0400
-+++ lib/pngxtern/scripts/gcc.mak.in	2010-07-16 23:48:30.962207545 +0400
-@@ -16,8 +16,8 @@
- 
- CDEBUG = -g
- LDDEBUG =
--CRELEASE = -O2
--LDRELEASE = -s
-+CRELEASE = ${SPELL_CFLAGS}
-+LDRELEASE = ${SPELL_LDFLAGS}
- CFLAGS = -W -Wall $(CRELEASE)
- LDFLAGS = $(LDRELEASE)
- INCS = -I$(ZDIR) -I$(PNGDIR)
---- Makefile.in.orig	2008-07-21 06:28:00.000000000 +0400
-+++ Makefile.in	2010-07-16 23:56:38.089209138 +0400
-@@ -2,7 +2,7 @@
- 
- all:
- 	cd src; \
--	${MAKE} -f @MAKEFILE@ CC="${CC}"; \
-+	${MAKE} -f @MAKEFILE@ CC="${CC}" SPELL_CFLAGS="${CFLAGS}" SPELL_LDFLAGS+="${LDFLAGS}"; \
- 	cd ..
- 
- install:
diff --git a/graphics/optipng/png.patch b/graphics/optipng/png.patch
new file mode 100644
index 0000000000..d3a8c6d039
--- /dev/null
+++ b/graphics/optipng/png.patch
@@ -0,0 +1,15 @@
+--- src/opngoptim.c.orig	2010-12-22 20:08:00.000000000 +0300
++++ src/opngoptim.c	2011-05-29 17:22:56.875029493 +0400
+@@ -18,11 +18,11 @@
+ #include "optipng.h"
+ #include "proginfo.h"
+ 
++#include "png.h"
+ #include "cbitset.h"
+ #include "cexcept.h"
+ #include "opngreduc.h"
+ #include "osys.h"
+-#include "png.h"
+ #include "pngx.h"
+ #include "pngxtern.h"
+ #include "zlib.h"