maintenance update to 1.2.20

This commit is contained in:
naddy 2007-10-06 19:33:28 +00:00
parent 343aa51ffa
commit e0a69b4d6a
6 changed files with 27 additions and 28 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.64 2007/09/15 20:09:42 simon Exp $ # $OpenBSD: Makefile,v 1.65 2007/10/06 19:33:28 naddy Exp $
COMMENT= library for manipulating PNG images COMMENT= library for manipulating PNG images
VERSION= 1.2.18 VERSION= 1.2.20
DISTNAME= libpng-${VERSION} DISTNAME= libpng-${VERSION}
PKGNAME= png-${VERSION} PKGNAME= png-${VERSION}
SHARED_LIBS= png 5.2 SHARED_LIBS= png 6.0
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/}
@ -17,6 +17,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
SUBST_VARS= VERSION
FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR="${WRKINST}" PREFIX="${PREFIX}" FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR="${WRKINST}" PREFIX="${PREFIX}"
MAKE_ENV= CC="${CC}" MAKE_ENV= CC="${CC}"

View File

@ -1,5 +1,5 @@
MD5 (libpng-1.2.18.tar.gz) = vQilXjGQIqfNxuOILWuUlw== MD5 (libpng-1.2.20.tar.gz) = q70oGsogUOyy0cjkm41ppQ==
RMD160 (libpng-1.2.18.tar.gz) = HKNmrkAFkQ6ZYP3JUPasi3et0o8= RMD160 (libpng-1.2.20.tar.gz) = I+jTWoRQj5T18ODMcjXgKxvQ/7A=
SHA1 (libpng-1.2.18.tar.gz) = GTOHrxBzWoKEw5awdLW2CeaqLjA= SHA1 (libpng-1.2.20.tar.gz) = DFOiEIoFiEH60CvBgsKhvHAuMVI=
SHA256 (libpng-1.2.18.tar.gz) = QwlxssydLYNl8V77TC58lrQ+qF77cTZhHhV5uwSxSck= SHA256 (libpng-1.2.20.tar.gz) = 9trX9P4R44/EV7tgo3iEZ8191Ucb12oDIo0WD1++sVw=
SIZE (libpng-1.2.18.tar.gz) = 830456 SIZE (libpng-1.2.20.tar.gz) = 801778

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pngconf_h,v 1.6 2007/04/08 15:02:36 naddy Exp $ $OpenBSD: patch-pngconf_h,v 1.7 2007/10/06 19:33:28 naddy Exp $
--- pngconf.h.orig Wed Jan 31 14:22:33 2007 --- pngconf.h.orig Sat Sep 8 05:22:56 2007
+++ pngconf.h Sat Mar 31 20:51:57 2007 +++ pngconf.h Wed Oct 3 17:20:54 2007
@@ -37,6 +37,14 @@ @@ -37,6 +37,11 @@
#endif #endif
#endif #endif
@ -9,9 +9,6 @@ $OpenBSD: patch-pngconf_h,v 1.6 2007/04/08 15:02:36 naddy Exp $
+#ifndef PNG_NO_MMX_CODE +#ifndef PNG_NO_MMX_CODE
+# define PNG_NO_MMX_CODE +# define PNG_NO_MMX_CODE
+#endif +#endif
+#ifndef PNG_USE_PNGGCCRD
+# define PNG_USE_PNGGCCRD
+#endif
+ +
/* /*
* Added at libpng-1.2.8 * Added at libpng-1.2.8

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_libpng_pc_in,v 1.8 2007/05/16 19:47:00 naddy Exp $ $OpenBSD: patch-scripts_libpng_pc_in,v 1.9 2007/10/06 19:33:28 naddy Exp $
--- scripts/libpng.pc.in.orig Wed May 16 17:07:18 2007 --- scripts/libpng.pc.in.orig Sat Sep 8 05:23:01 2007
+++ scripts/libpng.pc.in Wed May 16 17:07:37 2007 +++ scripts/libpng.pc.in Wed Oct 3 17:20:11 2007
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
@ -10,7 +10,7 @@ $OpenBSD: patch-scripts_libpng_pc_in,v 1.8 2007/05/16 19:47:00 naddy Exp $
Name: libpng Name: libpng
Description: Loads and saves PNG files Description: Loads and saves PNG files
Version: 1.2.18 Version: 1.2.20
-Libs: -L${libdir} -lpng12 -Libs: -L${libdir} -lpng12
+Libs: -L${libdir} -lpng -lz -lm +Libs: -L${libdir} -lpng -lz -lm
Cflags: -I${includedir} Cflags: -I${includedir}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_makefile_openbsd,v 1.21 2007/05/16 19:47:00 naddy Exp $ $OpenBSD: patch-scripts_makefile_openbsd,v 1.22 2007/10/06 19:33:28 naddy Exp $
--- scripts/makefile.openbsd.orig Wed Jan 31 14:22:38 2007 --- scripts/makefile.openbsd.orig Sat Sep 8 05:23:02 2007
+++ scripts/makefile.openbsd Sat Mar 31 20:47:38 2007 +++ scripts/makefile.openbsd Wed Oct 3 17:20:11 2007
@@ -4,11 +4,12 @@ @@ -4,11 +4,12 @@
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
@ -12,11 +12,11 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.21 2007/05/16 19:47:00 naddy Exp $
+DOCDIR= ${PREFIX}/share/doc/png +DOCDIR= ${PREFIX}/share/doc/png
-SHLIB_MAJOR= 0 -SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.18 -SHLIB_MINOR= 1.2.20
LIB= png LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
@@ -22,24 +23,42 @@ CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE -DPNG_USE_PN @@ -22,24 +23,42 @@ CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE
NOPROFILE= Yes NOPROFILE= Yes
@ -25,7 +25,7 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.21 2007/05/16 19:47:00 naddy Exp $
MAN= libpng.3 libpngpf.3 png.5 MAN= libpng.3 libpngpf.3 png.5
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO libpng.txt -DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO libpng.txt
+DOCS = libpng-1.2.18.txt +DOCS = libpng-1.2.20.txt
+all: ${_LIBS} libpng-config libpng.pc +all: ${_LIBS} libpng-config libpng.pc
+ +

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2007/05/16 19:47:00 naddy Exp $ @comment $OpenBSD: PLIST,v 1.22 2007/10/06 19:33:28 naddy Exp $
%%SHARED%% %%SHARED%%
bin/libpng-config bin/libpng-config
include/libpng/ include/libpng/
@ -12,4 +12,4 @@ lib/pkgconfig/libpng.pc
@man man/cat3/libpngpf.0 @man man/cat3/libpngpf.0
@man man/cat5/png.0 @man man/cat5/png.0
share/doc/png/ share/doc/png/
share/doc/png/libpng-1.2.18.txt share/doc/png/libpng-${VERSION}.txt