Update to png-1.2.10 and better DESCR.

ok naddy@
This commit is contained in:
bernd 2006-05-10 13:50:01 +00:00
parent 60b2eff919
commit 63b1790f76
5 changed files with 50 additions and 49 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.54 2005/12/26 22:33:17 steven Exp $ # $OpenBSD: Makefile,v 1.55 2006/05/10 13:50:01 bernd Exp $
COMMENT= "library for manipulating PNG images" COMMENT= "library for manipulating PNG images"
DISTNAME= libpng-1.2.8 VERSION= 1.2.10
DISTNAME= libpng-${VERSION}
PKGNAME= ${DISTNAME:S/lib//} PKGNAME= ${DISTNAME:S/lib//}
SHARED_LIBS= png 4.2 SHARED_LIBS= png 4.3
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/}
@ -21,6 +22,10 @@ FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR="${WRKINST}" PREFIX="${PREFIX}"
MAKE_ENV= CC="${CC}" MAKE_ENV= CC="${CC}"
MAKE_FILE= scripts/makefile.openbsd MAKE_FILE= scripts/makefile.openbsd
MAKE_FLAGS= SHLIB_MAJOR=${LIBpng_VERSION:R} \ MAKE_FLAGS= SHLIB_MAJOR=${LIBpng_VERSION:R} \
SHLIB_MINOR=${LIBpng_VERSION:E} SHLIB_MINOR=${LIBpng_VERSION:E} \
PNGLIB_VERSION=${VERSION}
post-extract:
@rm -f ${WRKSRC}/scripts/*.orig
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (libpng-1.2.8.tar.gz) = cac1512878fb98f2456df6dc50bc9bc7 MD5 (libpng-1.2.10.tar.gz) = 720b4d636482405939dbdaa56ed2b8f6
RMD160 (libpng-1.2.8.tar.gz) = b25f0f5044302eaa56ebcd997c2d090013c0f41a RMD160 (libpng-1.2.10.tar.gz) = 4694e8d6e05d6b7ccd4cf29c484556355ecde4ad
SHA1 (libpng-1.2.8.tar.gz) = a7e6c56a9b2100797a3712363e007526c94f594a SHA1 (libpng-1.2.10.tar.gz) = e9550b607c6e177f23c0837b19ac310a5f44e652
SIZE (libpng-1.2.8.tar.gz) = 510681 SIZE (libpng-1.2.10.tar.gz) = 832213

View File

@ -1,14 +1,16 @@
--- scripts/libpng.pc.in.orig Thu Dec 2 19:14:31 2004 $OpenBSD: patch-scripts_libpng_pc_in,v 1.3 2006/05/10 13:50:01 bernd Exp $
+++ scripts/libpng.pc.in Sun Jul 24 00:42:53 2005 --- scripts/libpng.pc.in.orig Fri Mar 3 03:48:03 2006
@@ -4,8 +4,8 @@ exec_prefix=${prefix} +++ scripts/libpng.pc.in Tue May 9 14:57:35 2006
libdir=${exec_prefix}/lib @@ -1,10 +1,10 @@
includedir=${exec_prefix}/include prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@/libpng@PNGLIB_MAJOR@
+includedir=@includedir@
-Name: libpng12 Name: libpng
+Name: libpng
Description: Loads and saves PNG files Description: Loads and saves PNG files
Version: 1.2.8 Version: @PNGLIB_VERSION@
-Libs: -L${libdir} -lpng12 -lz -lm -Libs: -L${libdir} -lpng@PNGLIB_MAJOR@
-Cflags: -I${includedir}/libpng12
+Libs: -L${libdir} -lpng -lz -lm +Libs: -L${libdir} -lpng -lz -lm
+Cflags: -I${includedir}/libpng Cflags: -I${includedir}

View File

@ -1,26 +1,23 @@
--- scripts/makefile.openbsd.orig Fri Dec 3 01:14:31 2004 $OpenBSD: patch-scripts_makefile_openbsd,v 1.14 2006/05/10 13:50:01 bernd Exp $
+++ scripts/makefile.openbsd Mon Dec 26 22:46:14 2005 --- scripts/makefile.openbsd.orig Sun Apr 23 20:45:40 2006
@@ -1,14 +1,14 @@ +++ scripts/makefile.openbsd Tue May 9 15:07:40 2006
-# makefile for libpng @@ -3,12 +3,12 @@
+# makefile for libpng under OpenBSD
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# For conditions of distribution and use, see copyright notice in png.h # For conditions of distribution and use, see copyright notice in png.h
PREFIX?= /usr/local PREFIX?= /usr/local
+BINDIR= ${PREFIX}/bin +BINDIR= ${PREFIX}/bin
LIBDIR= ${PREFIX}/lib LIBDIR= ${PREFIX}/lib
-MANDIR= ${PREFIX}/man/cat MANDIR= ${PREFIX}/man/cat
+MANDIR= ${PREFIX}/man/cat
+INCDIR= ${PREFIX}/include/libpng +INCDIR= ${PREFIX}/include/libpng
+DOCDIR= ${PREFIX}/share/doc/png +DOCDIR= ${PREFIX}/share/doc/png
-SHLIB_MAJOR= 0 -SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.8 -SHLIB_MINOR= 1.2.10
- -
LIB= png LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \ pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \
@@ -21,24 +21,39 @@ CPPFLAGS+= -I${.CURDIR} -DPNG_NO_ASSEMBL @@ -21,24 +21,42 @@ CPPFLAGS+= -I${.CURDIR} -DPNG_NO_ASSEMBL
NOPROFILE= Yes NOPROFILE= Yes
@ -28,18 +25,16 @@
+CLEANFILES+= pngtest.o pngtest libpng-config +CLEANFILES+= pngtest.o pngtest libpng-config
MAN= libpng.3 libpngpf.3 png.5 MAN= libpng.3 libpngpf.3 png.5
-DOCS= ANNOUNCE CHANGES LICENSE README libpng.txt -DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO libpng.txt
+DOCS= README libpng.txt +DOCS = README libpng.txt
-pngtest.o: pngtest.c
+all: ${_LIBS} libpng-config libpng.pc +all: ${_LIBS} libpng-config libpng.pc
+ +
+pngtest.o: pngtest.c
${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
-pngtest: pngtest.o
+libpng.pc: +libpng.pc:
+ cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(PREFIX)! > libpng.pc + cat scripts/libpng.pc.in | sed -e s\!@prefix@!$(PREFIX)! \
+ -e s\!@exec_prefix@!$(BINDIR)! -e s\!@libdir@!$(LIBDIR)! \
+ -e s\!@includedir@!$(INCDIR)! \
+ -e s\!@PNGLIB_VERSION@!$(PNGLIB_VERSION)!> libpng.pc
+ +
+libpng-config: +libpng-config:
+ ( cat scripts/libpng-config-head.in; \ + ( cat scripts/libpng-config-head.in; \
@ -51,11 +46,14 @@
+ cat scripts/libpng-config-body.in ) > libpng-config + cat scripts/libpng-config-body.in ) > libpng-config
+ chmod +x libpng-config + chmod +x libpng-config
+ +
+pngtest: pngtest.o pngtest.o: pngtest.c
${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
pngtest: pngtest.o
${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm ${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm
-test: pngtest -test: pngtest
+test regress: pngtest +test regress: pngtest
cd ${.OBJDIR} && env \ cd ${.OBJDIR} && env \
LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest
@ -67,7 +65,7 @@
fi fi
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \ if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \ ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
@@ -52,21 +67,24 @@ beforeinstall: @@ -52,21 +70,24 @@ beforeinstall:
if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \ if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \ ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
fi fi

View File

@ -1,8 +1,4 @@
Libpng was written as a companion to the PNG specification, as a libpng (PNG library) is a collection of routines used to create and
way to reduce the amount of time and effort it takes to support manipulate PNG format graphics files. The PNG format was designed as a
the PNG file format in application programs. Most users will not replacement for GIF and, to a lesser extent, TIFF, with many
have to modify the library significantly; advanced users may want improvements and extensions.
to modify it more. The library was coded for both users. All
attempts were made to make it as complete as possible, while
keeping the code easy to understand. Currently, this library
only supports C. Support for other languages is being considered.