Upgrade to 1.2.21

6 files changed, 27 insertions, 47 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index ec474deab1cc..ded5dc477e94 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	png
-PORTVERSION=	1.2.18
+PORTVERSION=	1.2.21
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lib${PORTNAME}
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 7f2c876f1692..0c71bd57c8db 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,3 +1,3 @@
-MD5 (libpng-1.2.18.tar.bz2) = 25a7f2f101eaaf2eb18c4987e0fbe39d
-SHA256 (libpng-1.2.18.tar.bz2) = 6fce62f9e67e951c38672bf520c062a2be742e893d240d150748a00c32f20c62
-SIZE (libpng-1.2.18.tar.bz2) = 623690
+MD5 (libpng-1.2.21.tar.bz2) = b0cda5e10e8165e5f151e674e1a67983
+SHA256 (libpng-1.2.21.tar.bz2) = 3b4f186e5dd1e683178d58d45db16f4fd9203f6518037ff28b4505ec35246953
+SIZE (libpng-1.2.21.tar.bz2) = 614352
diff --git a/graphics/png/files/patch-aa b/graphics/png/files/patch-aa
index e42a97dc39d6..396cec04bdf7 100644
--- a/graphics/png/files/patch-aa
+++ b/graphics/png/files/patch-aa
@@ -1,47 +1,45 @@
---- scripts/makefile.freebsd.orig	Sat Feb 25 15:37:11 2006
-+++ scripts/makefile.freebsd	Thu Jul 27 22:03:50 2006
-@@ -8,27 +8,26 @@
+--- scripts/makefile.freebsd.orig	2007-06-21 02:10:26.000000000 +0400
++++ scripts/makefile.freebsd	2007-10-13 17:24:24.000000000 +0400
+@@ -8,26 +8,27 @@
  LIB=		png
  SHLIB_MAJOR=	${SHLIB_VER}
  SHLIB_MINOR=	0
+-NOPROFILE=	YES
 +.if (${OSVERSION} > 600007)
-+NO_PROFILE=	YES
-+NO_OBJ=		YES
++NO_PROFILE=     YES
++NO_OBJ=         YES
 +.else
- NOPROFILE=	YES
--NOOBJ=          YES
-+NOOBJ=		YES
++NOPROFILE=      YES
+ NOOBJ=          YES
 +.endif
  
  # where make install puts libpng.a and png.h
 -DESTDIR=	${PREFIX}
 -LIBDIR=		/lib
-+LIBDIR=		${PREFIX}/lib
++LIBDIR=         ${PREFIX}/lib
  INCS=		png.h pngconf.h
 -INCSDIR=	/include/libpng
-+INCSDIR=	${PREFIX}/include/libpng
++INCSDIR=        ${PREFIX}/include/libpng
  INCDIR=		${INCSDIR}		# for 4.x bsd.lib.mk
  MAN=		libpng.3 libpngpf.3 png.5
 -MANDIR=		/man/man
-+MANDIR=		${PREFIX}/man/man
++MANDIR=         ${PREFIX}/man/man
  SYMLINKS=       libpng/png.h ${INCSDIR}/../png.h \
  		libpng/pngconf.h ${INCSDIR}/../pngconf.h
  LDADD+=         -lm -lz
  DPADD+=         ${LIBM} ${LIBZ}
  
--CFLAGS+= -I. -DPNG_USE_PNGGCCRD
+ CFLAGS+= -I.
 -.if (${MACHINE_ARCH} != "i386")
 -CFLAGS+= -DPNG_NO_MMX_CODE
 -.endif
--
+ 
  SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
  	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
- 	pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c
-@@ -44,5 +43,23 @@
- DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
+@@ -45,4 +46,22 @@
  writelock:
  	chmod a-w *.[ch35] $(DOCS) scripts/*
-+
+ 
 +libpng-config:
 +	( cat scripts/libpng-config-head.in; \
 +	echo prefix=\"${PREFIX}\"; \
@@ -59,5 +57,5 @@
 +	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 +		libpng-config ${PREFIX}/bin
 +	ln -sf libpng-config ${PREFIX}/bin/libpng12-config
- 
++
  .include <bsd.lib.mk>
diff --git a/graphics/png/files/patch-ab b/graphics/png/files/patch-ab
index e07387daf8ef..2e9a50ebc280 100644
--- a/graphics/png/files/patch-ab
+++ b/graphics/png/files/patch-ab
@@ -12,7 +12,7 @@
  
  Name: libpng
  Description: Loads and saves PNG files
- Version: 1.2.18
+ Version: 1.2.21
 -Libs: -L${libdir} -lpng12
 +Libs: -L${libdir} -lpng -lz -lm
  Cflags: -I${includedir}
diff --git a/graphics/png/files/patch-ad b/graphics/png/files/patch-ad
index 08efacae5b75..a0fae6a011ee 100644
--- a/graphics/png/files/patch-ad
+++ b/graphics/png/files/patch-ad
@@ -1,9 +1,9 @@
---- pngconf.h.orig	Wed May 16 03:52:22 2007
-+++ pngconf.h	Mon May 21 13:25:03 2007
-@@ -729,7 +729,7 @@
-  * PNG_NO_MMX_CODE disables the use of MMX code without changing the API.
-  * When MMX code is off, then optimized C replacement functions are used.
- */
+--- pngconf.h.orig	2007-10-04 15:53:09.000000000 +0400
++++ pngconf.h	2007-10-13 17:31:06.000000000 +0400
+@@ -737,7 +737,7 @@
+ #  endif
+ #endif
+ 
 -#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
 +#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__)
  #  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
diff --git a/graphics/png/files/patch-ae b/graphics/png/files/patch-ae
deleted file mode 100644
index cb24f17da2b1..000000000000
--- a/graphics/png/files/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
---- pnggccrd.c.bak	Wed May 16 03:52:23 2007
-+++ pnggccrd.c	Mon May 21 13:04:54 2007
-@@ -359,6 +359,7 @@
-    _pctemp = _pctemp;
-    _MMXLength = _MMXLength;
- #endif
-+#if 0
-    _const4  = _const4;
-    _const6  = _const6;
-    _mask8_0  = _mask8_0;
-@@ -377,6 +378,7 @@
-    _mask48_2 = _mask48_2;
-    _mask48_1 = _mask48_1;
-    _mask48_0 = _mask48_0;
-+#endif
- }
- #endif /* PNG_MMX_CODE_SUPPORTED */
-