- Update to 0.5.4

Approved by:	Thomas 'Freaky' Hurst <tom@hur.st> (maintainer timeout, since Jul 24)

4 files changed, 41 insertions, 31 deletions

diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index 097c774..8eb1591 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	optipng
-PORTVERSION=	0.5.3
+PORTVERSION=	0.5.4
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	freaky@aagh.net
 COMMENT=	An optimizer for PNG files
 
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+
 BUILD_WRKSRC=	${WRKSRC}/src
-MAKEFILE=	scripts/gcc-syslib.mak
+MAKEFILE=	scripts/unix-secure.mak
 ALL_TARGET=	${PORTNAME}
 PLIST_FILES=	bin/optipng
 MAN1=		optipng.1
diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
index 2df2bc9..855d4a3 100644
--- a/graphics/optipng/distinfo
+++ b/graphics/optipng/distinfo
@@ -1,3 +1,3 @@
-MD5 (optipng-0.5.3.tar.gz) = a6f3234a47464ecc1f455b52f0769492
-SHA256 (optipng-0.5.3.tar.gz) = fa910c7dc8dbe29323494097255f034d374f8ef0e42ace3e3855408e014319e5
-SIZE (optipng-0.5.3.tar.gz) = 1090872
+MD5 (optipng-0.5.4.tar.gz) = 8d989971e674a06b55e17fc5b70c41aa
+SHA256 (optipng-0.5.4.tar.gz) = 3074f7ebac74683c12b805d58f836400cbec51355fad13f47d46775792ad35ab
+SIZE (optipng-0.5.4.tar.gz) = 1094572
diff --git a/graphics/optipng/files/patch-src__scripts__gcc-syslib.mak b/graphics/optipng/files/patch-src__scripts__gcc-syslib.mak
deleted file mode 100644
index b37cbb3..0000000
--- a/graphics/optipng/files/patch-src__scripts__gcc-syslib.mak
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./src/scripts/gcc-syslib.mak.orig	Mon Jul 24 20:49:09 2006
-+++ ./src/scripts/gcc-syslib.mak	Mon Jul 24 20:53:49 2006
-@@ -15,18 +15,16 @@
- # Usage: make -f scripts/gcc-syslib.mak
- 
- 
--prefix=/usr/local
-+prefix=${PREFIX}
- exec_prefix=${prefix}
- bindir=${exec_prefix}/bin
--mandir=${prefix}/man
--man1dir=${mandir}/man1
-+man1dir=${MAN1PREFIX}/man/man1
- 
--CC = gcc
- LD = $(CC)
--CFLAGS  = -O2 -Wall
--LDFLAGS = -s
-+CFLAGS  ?= -O2 -Wall
-+LDFLAGS += -s
- 
--OPTIPNG  = optipng$(EXE)
-+OPTIPNG  = optipng
- PNGLIB   = libpng.a
- PNGXLIB  = pngxtern.a
- PNGMAK   = scripts/makefile.gcc
diff --git a/graphics/optipng/files/patch-src__scripts__unix-secure.mak b/graphics/optipng/files/patch-src__scripts__unix-secure.mak
new file mode 100644
index 0000000..ba0debf
--- /dev/null
+++ b/graphics/optipng/files/patch-src__scripts__unix-secure.mak
@@ -0,0 +1,34 @@
+--- ./src/scripts/unix-secure.mak.orig	Fri Aug 11 19:08:00 2006
++++ ./src/scripts/unix-secure.mak	Sat Aug 12 10:56:39 2006
+@@ -12,17 +12,14 @@
+ # Usage: make -f scripts/unix-secure.mak
+ 
+ 
+-prefix=/usr/local
++prefix=${PREFIX}
+ exec_prefix=${prefix}
+ bindir=${exec_prefix}/bin
+-mandir=${prefix}/man
+-man1dir=${mandir}/man1
++man1dir=${MAN1PREFIX}/man/man1
+ 
+-CC = cc
+-LD = $(CC)
+-MAKE = make
+-CFLAGS  = -O
+-LDFLAGS = -s
++CFLAGS  ?= -O
++LDFLAGS += -s -L${LOCALBASE}/lib
++CFLAGS  += -I${LOCALBASE}/include
+ 
+ OPTIPNG  = optipng
+ PNGXLIB  = pngxtern.a
+@@ -35,7 +32,7 @@
+ 
+ 
+ $(OPTIPNG): $(OBJS) $(LIBS)
+-	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
++	$(CC) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
+ 
+ 
+ .c.o: