--- png/Makefile	Wed May 16 17:25:36 2007
+++ png/Makefile	Wed May 16 17:31:27 2007
@@ -6,7 +6,7 @@ 
 #
 
 PORTNAME=	png
-PORTVERSION=	1.2.14
+PORTVERSION=	1.2.18
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lib${PORTNAME}
--- png/distinfo	Wed May 16 17:25:36 2007
+++ png/distinfo	Wed May 16 17:31:19 2007
@@ -1,3 +1,3 @@ 
-MD5 (libpng-1.2.14.tar.bz2) = 2ec1e1beb2e6376b09d090f74d259160
-SHA256 (libpng-1.2.14.tar.bz2) = 2678855a235ed02d5b30831a70dff84d5b562c5de388f1323bd680ac5cdd1722
-SIZE (libpng-1.2.14.tar.bz2) = 620379
+MD5 (libpng-1.2.18.tar.bz2) = 25a7f2f101eaaf2eb18c4987e0fbe39d
+SHA256 (libpng-1.2.18.tar.bz2) = 6fce62f9e67e951c38672bf520c062a2be742e893d240d150748a00c32f20c62
+SIZE (libpng-1.2.18.tar.bz2) = 623690
--- png/files/patch-aa	Wed May 16 17:25:36 2007
+++ png/files/patch-aa	Wed May 16 17:43:11 2007
@@ -31,7 +31,7 @@ 
  
 -CFLAGS+= -I. -DPNG_USE_PNGGCCRD
 -.if (${MACHINE_ARCH} != "i386")
--CFLAGS+= -DPNG_NO_ASSEMBLER_CODE
+-CFLAGS+= -DPNG_NO_MMX_CODE
 -.endif
 -
  SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
--- png/files/patch-ab	Wed May 16 17:25:36 2007
+++ png/files/patch-ab	Wed May 16 17:46:18 2007
@@ -12,7 +12,7 @@ 
  
  Name: libpng
  Description: Loads and saves PNG files
- Version: 1.2.14
+ Version: 1.2.18
 -Libs: -L${libdir} -lpng12
 +Libs: -L${libdir} -lpng -lz -lm
  Cflags: -I${includedir}
--- png/files/patch-ad	Wed May 16 17:25:36 2007
+++ png/files/patch-ad	Wed May 16 17:50:14 2007
@@ -1,9 +1,9 @@ 
---- pngconf.h.bak	Wed Jun 28 00:22:34 2006
-+++ pngconf.h	Thu Jul 27 22:01:04 2006
-@@ -722,7 +722,7 @@
- 
- /* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0 
-    even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined */
+--- pngconf.h.orig	Tue May 15 16:52:22 2007
++++ pngconf.h	Wed May 16 17:49:51 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.
+ */
 -#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