From 400870d2bbe2e78bb5b04b810951f5e577d8df5f Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Wed, 17 Jul 2002 22:39:03 +0000
Subject: [PATCH] upgrade to png 1.2.4 -- compat symlinks have been removed.

---
 graphics/png/Makefile                              | 13 ++-----------
 graphics/png/distinfo                              |  6 +++---
 .../png/patches/patch-scripts_makefile_openbsd     | 14 ++++++++------
 graphics/png/pkg/PFRAG.shared                      |  4 ++--
 graphics/png/pkg/PLIST                             |  4 +---
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 7acf4ce28fe..9ad05f369bf 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.39 2002/05/13 23:31:24 espie Exp $
+# $OpenBSD: Makefile,v 1.40 2002/07/17 22:39:03 brad Exp $
 
 COMMENT=	"library for manipulating PNG images"
 
-DISTNAME=	libpng-1.2.2
+DISTNAME=	libpng-1.2.4
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	graphics
-NEED_VERSION=	1.522
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/}
 
 HOMEPAGE=	http://www.libpng.org/pub/png/libpng.html
@@ -24,12 +23,4 @@ MAKE_FILE=	scripts/makefile.openbsd
 
 REGRESS_TARGET=	test
 
-# short term compatibility sym-links
-# will be removed once all ports have been checked
-# for proper operation without the sym-links
-post-install:
-	@cd ${PREFIX}/include && \
-		ln -sf libpng/png.h png.h && \
-		ln -sf libpng/pngconf.h pngconf.h
-
 .include <bsd.port.mk>
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index f7b4e6cb34e..ea9e5492ea7 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,3 +1,3 @@
-MD5 (libpng-1.2.2.tar.gz) = 4a23be1a1752537ec3bf210bb3fd03ad
-RMD160 (libpng-1.2.2.tar.gz) = 036c5bf28086cb2369760052781a686e3ee3784d
-SHA1 (libpng-1.2.2.tar.gz) = 0eae122ed275320056c7eb7046fc30f68c828399
+MD5 (libpng-1.2.4.tar.gz) = 6a5609d704bc6674339d77a11d44cbaf
+RMD160 (libpng-1.2.4.tar.gz) = 0a6e6088250c07e898f5c8c7dafd853bcfcf2232
+SHA1 (libpng-1.2.4.tar.gz) = 245fdfbe51cb3ff96639bfbc99ff8c9d681cdde1
diff --git a/graphics/png/patches/patch-scripts_makefile_openbsd b/graphics/png/patches/patch-scripts_makefile_openbsd
index dee0ee9e50e..f969e1fb97f 100644
--- a/graphics/png/patches/patch-scripts_makefile_openbsd
+++ b/graphics/png/patches/patch-scripts_makefile_openbsd
@@ -1,6 +1,6 @@
-$OpenBSD: patch-scripts_makefile_openbsd,v 1.1 2002/04/26 02:19:04 brad Exp $
---- scripts/makefile.openbsd.orig	Mon Apr 15 10:25:46 2002
-+++ scripts/makefile.openbsd	Sun Apr 21 16:16:34 2002
+$OpenBSD: patch-scripts_makefile_openbsd,v 1.2 2002/07/17 22:39:03 brad Exp $
+--- scripts/makefile.openbsd.orig	Wed May 22 21:35:26 2002
++++ scripts/makefile.openbsd	Wed May 22 21:41:41 2002
 @@ -1,13 +1,15 @@
 -# makefile for libpng
 +# makefile for libpng under OpenBSD
@@ -15,9 +15,9 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.1 2002/04/26 02:19:04 brad Exp $
 +DOCDIR=	${PREFIX}/share/doc/png
  
 -SHLIB_MAJOR=	0
--SHLIB_MINOR=	1.2.2
+-SHLIB_MINOR=	1.2.4
 +SHLIB_MAJOR=	3
-+SHLIB_MINOR=	0
++SHLIB_MINOR=	1
  
  LIB=	png
  SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
@@ -40,7 +40,7 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.1 2002/04/26 02:19:04 brad Exp $
  	fi
  	if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
  	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
-@@ -52,19 +55,17 @@ beforeinstall:
+@@ -52,21 +55,17 @@ beforeinstall:
  	if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
  	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
  	fi
@@ -60,6 +60,8 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.1 2002/04/26 02:19:04 brad Exp $
 -		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include/libpng
 +		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${INCDIR}
  	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
+-		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
+-	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
 -		-m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png
 +		-m ${NONBINMODE} ${DOCS} ${DESTDIR}${DOCDIR}
  
diff --git a/graphics/png/pkg/PFRAG.shared b/graphics/png/pkg/PFRAG.shared
index 4be760882c2..356c5e2b9e8 100644
--- a/graphics/png/pkg/PFRAG.shared
+++ b/graphics/png/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.7 2001/11/19 02:40:52 brad Exp $
-lib/libpng.so.3.0
+@comment $OpenBSD: PFRAG.shared,v 1.8 2002/07/17 22:39:03 brad Exp $
+lib/libpng.so.3.1
 DYNLIBDIR(%B)
diff --git a/graphics/png/pkg/PLIST b/graphics/png/pkg/PLIST
index 3f953c3310d..8bfbe61aa88 100644
--- a/graphics/png/pkg/PLIST
+++ b/graphics/png/pkg/PLIST
@@ -1,6 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2002/04/26 02:19:04 brad Exp $
-include/png.h
-include/pngconf.h
+@comment $OpenBSD: PLIST,v 1.14 2002/07/17 22:39:03 brad Exp $
 include/libpng/png.h
 include/libpng/pngconf.h
 lib/libpng.a