diff options
Diffstat (limited to 'graphics/png/files')
| -rw-r--r-- | graphics/png/files/patch-libpng.pc.in | 18 | ||||
| -rw-r--r-- | graphics/png/files/patch-makefile.freebsd | 14 | ||||
| -rw-r--r-- | graphics/png/files/patch-pngrutil.c | 20 |
3 files changed, 7 insertions, 45 deletions
diff --git a/graphics/png/files/patch-libpng.pc.in b/graphics/png/files/patch-libpng.pc.in deleted file mode 100644 index 372f46391835..000000000000 --- a/graphics/png/files/patch-libpng.pc.in +++ /dev/null @@ -1,18 +0,0 @@ ---- scripts/libpng.pc.in.orig 2009-12-03 02:46:02.000000000 +0100 -+++ scripts/libpng.pc.in 2010-01-12 13:49:36.000000000 +0100 -@@ -1,10 +1,10 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@/libpng14 -+prefix=@PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include/libpng - - Name: libpng - Description: Loads and saves PNG files - Version: 1.4.11 --Libs: -L${libdir} -lpng14 -+Libs: -L${libdir} -lpng -lz -lm - Cflags: -I${includedir} diff --git a/graphics/png/files/patch-makefile.freebsd b/graphics/png/files/patch-makefile.freebsd index d81023af2185..e35f35b313ba 100644 --- a/graphics/png/files/patch-makefile.freebsd +++ b/graphics/png/files/patch-makefile.freebsd @@ -1,5 +1,5 @@ ---- scripts/makefile.freebsd.orig 2010-01-03 06:05:38.000000000 +0100 -+++ scripts/makefile.freebsd 2010-01-18 13:25:13.000000000 +0100 +--- scripts/makefile.freebsd.orig 2011-01-06 14:02:38.000000000 +0100 ++++ scripts/makefile.freebsd 2011-01-07 11:16:17.000000000 +0100 @@ -11,17 +11,17 @@ LIB= png SHLIB_MAJOR= ${SHLIB_VER} @@ -14,7 +14,7 @@ -LIBDIR= /lib +#DESTDIR= ${PREFIX} +LIBDIR= ${PREFIX}/lib - INCS= png.h pngconf.h pngpriv.h + INCS= png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -INCSDIR= /include/libpng +INCSDIR= ${PREFIX}/include/libpng INCDIR= ${INCSDIR} # for 4.x bsd.lib.mk @@ -22,9 +22,9 @@ -MANDIR= /man/man +MANDIR= ${PREFIX}/man/man SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \ - libpng/pngconf.h ${INCSDIR}/../pngconf.h - LDADD+= -lm -lz -@@ -45,4 +45,22 @@ + libpng/pngconf.h ${INCSDIR}/../pngconf.h \ + libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h +@@ -50,4 +50,22 @@ writelock: chmod a-w *.[ch35] $(DOCS) scripts/* @@ -44,6 +44,6 @@ +beforeinstall: libpng-config + ${BSD_INSTALL_SCRIPT} \ + libpng-config ${PREFIX}/bin -+ ln -sf libpng-config ${PREFIX}/bin/libpng14-config ++ ln -sf libpng-config ${PREFIX}/bin/libpng15-config + .include <bsd.lib.mk> diff --git a/graphics/png/files/patch-pngrutil.c b/graphics/png/files/patch-pngrutil.c deleted file mode 100644 index 677cbfd3919b..000000000000 --- a/graphics/png/files/patch-pngrutil.c +++ /dev/null @@ -1,20 +0,0 @@ ----pngrutil.c.orig 2012/02/10 19:43:42 121491 -+++ pngrutil.c 2012/02/10 19:45:46 121492 -@@ -363,8 +363,15 @@ - { - /* Success (maybe) - really uncompress the chunk. */ - png_size_t new_size = 0; -- png_charp text = png_malloc_warn(png_ptr, -- prefix_size + expanded_size + 1); -+ png_charp text = NULL; -+ /* Need to check for both truncation (64-bit platforms) and integer -+ * overflow. -+ */ -+ if (prefix_size + expanded_size > prefix_size && -+ prefix_size + expanded_size < 0xffffffffU) -+ { -+ text = png_malloc_warn(png_ptr, prefix_size + expanded_size + 1); -+ } - - if (text != NULL) - { |