Christian Weisgerber <[EMAIL PROTECTED]> wrote:
> Basically a maintenance update to libpng 1.2.16. Changes:
> * One fix regarding some grayscale stuff.
> * Present the same API when built with and without MMX optimization.
> * (Port:) Don't bother installing README, nothing useful there.
And now without a very stupid error (noticed by steven@).
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/png/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile 30 Nov 2006 17:24:13 -0000 1.60
+++ Makefile 11 Feb 2007 13:33:21 -0000
@@ -2,10 +2,10 @@
COMMENT= "library for manipulating PNG images"
-VERSION= 1.2.14
+VERSION= 1.2.16
DISTNAME= libpng-${VERSION}
-PKGNAME= ${DISTNAME:S/lib//}p0
-SHARED_LIBS= png 5.1
+PKGNAME= png-${VERSION}
+SHARED_LIBS= png 5.2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/}
@@ -24,8 +24,5 @@
MAKE_FLAGS= SHLIB_MAJOR=${LIBpng_VERSION:R} \
SHLIB_MINOR=${LIBpng_VERSION:E} \
PNGLIB_VERSION=${VERSION}
-
-post-extract:
- @rm -f ${WRKSRC}/scripts/*.orig
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/png/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 30 Nov 2006 17:24:13 -0000 1.13
+++ distinfo 11 Feb 2007 13:33:21 -0000
@@ -1,4 +1,4 @@
-MD5 (libpng-1.2.14.tar.gz) = bb245c635a9be36e704e2ceccbdf3f7c
-RMD160 (libpng-1.2.14.tar.gz) = 578ff7adbf0113a8a6f12f401299125c5978f12f
-SHA1 (libpng-1.2.14.tar.gz) = 8caa4a6dab2cd04980f7ee3106f6ccd8db403315
-SIZE (libpng-1.2.14.tar.gz) = 828377
+MD5 (libpng-1.2.16.tar.gz) = f49d9e4af485a7b0f238c1343213232a
+RMD160 (libpng-1.2.16.tar.gz) = d1f5cedbdea9120e98888148df40cdce13585fdd
+SHA1 (libpng-1.2.16.tar.gz) = c11ac2848658cce4173a041bdd5b21efa2b7d98e
+SIZE (libpng-1.2.16.tar.gz) = 829526
Index: patches/patch-pngconf_h
===================================================================
RCS file: patches/patch-pngconf_h
diff -N patches/patch-pngconf_h
--- patches/patch-pngconf_h 13 May 2006 13:52:48 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-pngconf_h,v 1.4 2006/05/13 13:52:48 bernd Exp $
---- pngconf.h.orig Sun Apr 23 20:45:34 2006
-+++ pngconf.h Fri May 12 10:16:39 2006
-@@ -720,6 +720,13 @@
- # define PNG_EASY_ACCESS_SUPPORTED
- #endif
-
-+/*
-+ * Disable assembler and MMX code on OpenBSD
-+ */
-+#ifndef PNG_NO_ASSEMBLER_CODE
-+# define PNG_NO_ASSEMBLER_CODE
-+#endif
-+
- /* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
- even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined */
- #if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
Index: patches/patch-scripts_libpng_pc_in
===================================================================
RCS file: /cvs/ports/graphics/png/patches/patch-scripts_libpng_pc_in,v
retrieving revision 1.6
diff -u -r1.6 patch-scripts_libpng_pc_in
--- patches/patch-scripts_libpng_pc_in 30 Nov 2006 11:25:32 -0000 1.6
+++ patches/patch-scripts_libpng_pc_in 11 Feb 2007 13:33:21 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_libpng_pc_in,v 1.6 2006/11/30 11:25:32 bernd Exp $
---- scripts/libpng.pc.in.orig Fri Nov 17 10:33:10 2006
-+++ scripts/libpng.pc.in Fri Nov 17 10:33:33 2006
+--- scripts/libpng.pc.in.orig Sat Feb 10 18:19:11 2007
++++ scripts/libpng.pc.in Sat Feb 10 18:19:51 2007
@@ -1,10 +1,10 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -10,7 +10,7 @@
Name: libpng
Description: Loads and saves PNG files
- Version: 1.2.14
+ Version: 1.2.16
-Libs: -L${libdir} -lpng12
+Libs: -L${libdir} -lpng -lz -lm
Cflags: -I${includedir}
Index: patches/patch-scripts_makefile_openbsd
===================================================================
RCS file: /cvs/ports/graphics/png/patches/patch-scripts_makefile_openbsd,v
retrieving revision 1.18
diff -u -r1.18 patch-scripts_makefile_openbsd
--- patches/patch-scripts_makefile_openbsd 30 Nov 2006 11:25:32 -0000
1.18
+++ patches/patch-scripts_makefile_openbsd 11 Feb 2007 13:33:21 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_makefile_openbsd,v 1.18 2006/11/30 11:25:32 bernd Exp $
---- scripts/makefile.openbsd.orig Wed Nov 15 13:51:31 2006
-+++ scripts/makefile.openbsd Fri Nov 17 10:37:08 2006
-@@ -3,11 +3,12 @@
+--- scripts/makefile.openbsd.orig Wed Jan 31 14:22:38 2007
++++ scripts/makefile.openbsd Sat Feb 10 20:26:09 2007
+@@ -4,11 +4,12 @@
# For conditions of distribution and use, see copyright notice in png.h
PREFIX?= /usr/local
@@ -12,16 +12,11 @@
+DOCDIR= ${PREFIX}/share/doc/png
-SHLIB_MAJOR= 0
--SHLIB_MINOR= 1.2.14
+-SHLIB_MINOR= 1.2.16
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
-@@ -17,28 +18,46 @@ SRCS= png.c pngerror.c pnggccrd.c pngget
- HDRS= png.h pngconf.h
-
- CFLAGS+= -Wall
--CPPFLAGS+= -I${.CURDIR} -DPNG_NO_ASSEMBLER_CODE -DPNG_USE_PNGGCCRD
-+CPPFLAGS+= -I${.CURDIR}
+@@ -22,24 +23,42 @@ CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_COD
NOPROFILE= Yes
@@ -30,7 +25,7 @@
MAN= libpng.3 libpngpf.3 png.5
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
libpng.txt
-+DOCS = README libpng.txt
++DOCS = libpng-1.2.16.txt
+all: ${_LIBS} libpng-config libpng.pc
+
@@ -69,7 +64,7 @@
fi
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
-@@ -52,21 +71,24 @@ beforeinstall:
+@@ -53,21 +72,24 @@ beforeinstall:
if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
fi
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/png/pkg/PLIST,v
retrieving revision 1.19
diff -u -r1.19 PLIST
--- pkg/PLIST 17 Apr 2005 13:37:42 -0000 1.19
+++ pkg/PLIST 11 Feb 2007 13:33:21 -0000
@@ -12,5 +12,4 @@
@man man/cat3/libpngpf.0
@man man/cat5/png.0
share/doc/png/
-share/doc/png/README
-share/doc/png/libpng.txt
+share/doc/png/libpng-1.2.16.txt
--
Christian "naddy" Weisgerber [EMAIL PROTECTED]
