upgrade to gif2png 0.7

graphics/gif2png/Makefile

@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 1999/09/06 23:40:07 brad Exp $
+# $OpenBSD: Makefile,v 1.2 1999/09/20 20:23:51 brad Exp $
 
 DISTNAME=	gif2png-0.6
+PKGNAME=	gif2png-0.7
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://swrinde.nde.swri.edu/pub/png/applications/
+DISTFILES=	gif2png-0.6.zip gif2png-0.6-0.7.patch.gz
 
 NEED_VERSION=	1.91
 
@@ -10,9 +12,15 @@ MAINTAINER=	brad@openbsd.org
 
 LIB_DEPENDS=	png.1.3:${PORTSDIR}/graphics/png
 
+EXTRACT_ONLY=	gif2png-0.6.zip
+
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/gif2png
 
+post-extract:
+	@cd ${WRKSRC}; ${GZCAT} ${DISTDIR}/gif2png-0.6-0.7.patch.gz \
+	| ${PATCH} --quiet -p1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gif2png ${PREFIX}/bin
 

graphics/gif2png/files/md5

@@ -1,3 +1,6 @@
+MD5 (gif2png-0.6-0.7.patch.gz) = 6475bb6a5e1330dd724fb6bb916eda96
 MD5 (gif2png-0.6.zip) = 2fce3354f80826a83e02d3893d1e7ddb
+RMD160 (gif2png-0.6-0.7.patch.gz) = 70e37f968515ddd00966a96812506adc5d55cf1b
 RMD160 (gif2png-0.6.zip) = 6b57a696b484a1aee0782b26df28f878d3d72332
+SHA1 (gif2png-0.6-0.7.patch.gz) = 8bfe6e70045e65bca9aae91f36fccfa3a30080cc
 SHA1 (gif2png-0.6.zip) = 635fe3a83c482d7ed21d65c3e8a29a3cea4f8f22

graphics/gif2png/patches/patch-aa

@@ -1,30 +1,42 @@
---- Makefile.orig	Mon Sep  6 19:13:42 1999
-+++ Makefile	Mon Sep  6 19:15:22 1999
-@@ -1,17 +1,17 @@
+--- Makefile.orig	Mon Sep 20 16:15:44 1999
++++ Makefile	Mon Sep 20 16:19:10 1999
+@@ -1,5 +1,5 @@
  
 -CC=gcc
 +#CC=gcc
  
  #required for djgpp, you can also use copy /b go32.exe+gif2png gif2png.exe
  #COFF2EXE=coff2exe
- COFF2EXE=@echo >/dev/null
+@@ -7,22 +7,22 @@
  
--PNGLIB=libpng-0.81
--ZLIB=zlib-0.95
-+#PNGLIB=libpng-0.81
-+#ZLIB=zlib-0.95
+ #PNGINC=libpng-0.81
+ #PNGLIB=libpng-0.81
+-PNGINC=/usr/include
+-PNGLIB=/usr/lib
++PNGINC=${LOCALBASE}/include
++PNGLIB=${LOCALBASE}/lib
  
+ #ZINC=zlib-0.95
+ #ZLIB=zlib-0.95
+ ZINC=/usr/include
+ ZLIB=/usr/lib
+ 
+-INCLUDE=-I$(PNGINC) -I$(ZINC)
 -LIBS=$(PNGLIB)/libpng.a $(ZLIB)/libz.a
--INCLUDE=-I$(PNGLIB) -I$(ZLIB)
-+LIBS=-L${LOCALBASE}/lib -lpng -lz
 +INCLUDE=-I${LOCALBASE}/include
++LIBS=-L${LOCALBASE}/lib -lpng -lz
  
--CFLAGS=$(INCLUDE) -g -O -Wall
+ #CFLAGS=$(INCLUDE) -g -O -Wall
+ #LDFLAGS=-g
+ 
+-CFLAGS=$(INCLUDE) -O3 -Wall
+-LDFLAGS=-s
 +CFLAGS+=$(INCLUDE) -Wall
- LDFLAGS=-g
++#LDFLAGS=-s
  
- #CFLAGS=$(INCLUDE) -O -Wall
-@@ -23,7 +23,7 @@
+ OBJS=gif2png.o gifread.o version.o 437_l1.o memory.o
+ 
+@@ -30,7 +30,7 @@
  
  all-lib: libpng zlib all
  

graphics/gif2png/patches/patch-ab

@@ -1,15 +1,15 @@
---- version.c.orig	Mon Sep  6 19:19:29 1999
-+++ version.c	Mon Sep  6 19:20:30 1999
-@@ -6,10 +6,10 @@
- 
+--- version.c.orig	Mon Sep 20 16:13:46 1999
++++ version.c	Mon Sep 20 16:14:07 1999
+@@ -9,10 +9,10 @@
+ #include "png.h"
  
  #ifndef PNGLIB
--#define PNGLIB "pnglib (unknown version)"
-+#define PNGLIB "pnglib (as installed)"
+-#  define PNGLIB "pnglib (unknown version)"
++#  define PNGLIB "pnglib (as installed)"
  #endif
  #ifndef ZLIB
--#define ZLIB "zlib (unknown version)"
-+#define ZLIB "zlib (as installed)"
+-#  define ZLIB "zlib (unknown version)"
++#  define ZLIB "zlib (as installed)"
  #endif
  
- const char version[]="gif2png 0.6 (beta)";
+ const char version[]="gif2png 0.7,";

graphics/gif2png/patches/patch-ac

@@ -1,10 +0,0 @@
---- gif2png.c.orig	Mon Sep  6 19:18:38 1999
-+++ gif2png.c	Mon Sep  6 19:18:58 1999
-@@ -7,6 +7,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #define PNG_INTERNAL
- #include "gif2png.h"
-