Update libpng to 1.5.6.

bump major version of shared libs.
ok naddy@.
This commit is contained in:
rpointel 2011-11-14 17:48:59 +00:00
parent 94bf46494b
commit 883bb752a7
4 changed files with 21 additions and 25 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.81 2011/09/23 21:00:28 sthen Exp $
# $OpenBSD: Makefile,v 1.82 2011/11/14 17:48:59 rpointel Exp $
COMMENT= library for manipulating PNG images
VERSION= 1.5.5
VERSION= 1.5.6
DISTNAME= libpng-${VERSION}
PKGNAME= png-${VERSION}
SHARED_LIBS= png 12.1
SHARED_LIBS= png 13.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/}

View File

@ -1,5 +1,5 @@
MD5 (libpng-1.5.5.tar.gz) = ADvKwCISUCm65IGNdMQqlA==
RMD160 (libpng-1.5.5.tar.gz) = eKOVQ85hTEUN64snn5J4TF536Ds=
SHA1 (libpng-1.5.5.tar.gz) = IIAWj/jnxYDrUEZhAqcAx/r529A=
SHA256 (libpng-1.5.5.tar.gz) = 0xxIfkUFk1dLgvu5wVIFokBCdDn/+R1KAE0gYh4ptPI=
SIZE (libpng-1.5.5.tar.gz) = 1033025
MD5 (libpng-1.5.6.tar.gz) = iwwF7RJjfuHwYN37v1Juow==
RMD160 (libpng-1.5.6.tar.gz) = k+8DwEmdUbqn0Q8oyaZTA0JTqEY=
SHA1 (libpng-1.5.6.tar.gz) = Bo0wioIAPLskYC/9/HOMyEjPTq8=
SHA256 (libpng-1.5.6.tar.gz) = Hc2lannwYYbTBAuAlauAfQdpUrS8t1eZNqohsIGTpUo=
SIZE (libpng-1.5.6.tar.gz) = 1051616

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_libpng_pc_in,v 1.21 2011/09/23 21:00:28 sthen Exp $
--- scripts/libpng.pc.in.orig Thu Sep 22 14:40:25 2011
+++ scripts/libpng.pc.in Fri Sep 23 09:20:51 2011
$OpenBSD: patch-scripts_libpng_pc_in,v 1.22 2011/11/14 17:48:59 rpointel Exp $
--- scripts/libpng.pc.in.orig Thu Nov 3 04:42:52 2011
+++ scripts/libpng.pc.in Thu Nov 3 12:20:06 2011
@@ -1,10 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
@ -10,7 +10,7 @@ $OpenBSD: patch-scripts_libpng_pc_in,v 1.21 2011/09/23 21:00:28 sthen Exp $
Name: libpng
Description: Loads and saves PNG files
Version: 1.5.5
Version: 1.5.6
-Libs: -L${libdir} -lpng15
+Libs: -L${libdir} -lpng -lz -lm
Cflags: -I${includedir}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_makefile_openbsd,v 1.35 2011/09/23 21:00:28 sthen Exp $
--- scripts/makefile.openbsd.orig Thu Sep 22 14:40:25 2011
+++ scripts/makefile.openbsd Fri Sep 23 09:20:15 2011
@@ -7,12 +7,11 @@
$OpenBSD: patch-scripts_makefile_openbsd,v 1.36 2011/11/14 17:48:59 rpointel Exp $
--- scripts/makefile.openbsd.orig Thu Nov 3 04:42:52 2011
+++ scripts/makefile.openbsd Thu Nov 3 12:18:34 2011
@@ -7,8 +7,10 @@
# and license in png.h
PREFIX?= /usr/local
@ -11,13 +11,9 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.35 2011/09/23 21:00:28 sthen Exp $
+MANDIR= ${PREFIX}/man/man
+INCDIR= ${PREFIX}/include/libpng
-SHLIB_MAJOR= 15
-SHLIB_MINOR= 1.5.5
-
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \
@@ -25,12 +24,30 @@ CPPFLAGS+= -I${.CURDIR}
SHLIB_MAJOR= 15
SHLIB_MINOR= 1.5.6
@@ -25,12 +27,30 @@
NOPROFILE= Yes
@ -51,7 +47,7 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.35 2011/09/23 21:00:28 sthen Exp $
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h.prebuilt $@
@@ -41,13 +58,20 @@ pngtest.o: pngtest.c
@@ -41,13 +61,20 @@
pngtest: pngtest.o
${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm
@ -77,7 +73,7 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.35 2011/09/23 21:00:28 sthen Exp $
fi
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
@@ -61,22 +85,19 @@ beforeinstall:
@@ -61,22 +88,19 @@
if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
fi