Index: head/graphics/png/Makefile
===================================================================
--- head/graphics/png/Makefile	(revision 38040)
+++ head/graphics/png/Makefile	(revision 38041)
@@ -1,61 +1,53 @@
 # New ports collection makefile for:    PNG images library
 # Date created:         5 Dec 1995
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
 PORTNAME=	png
-PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTVERSION=	1.0.9
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.libpng.org/pub/png/src/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lib${PORTNAME}
 DISTFILES=	lib${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-PATCH_SITES=	ftp://ftp.libpng.org/pub/png/src/
+#PATCH_SITES=	ftp://ftp.libpng.org/pub/png/src/
 #PATCHFILES=
 
 MAINTAINER=	ache@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
 
 INSTALLS_SHLIB=	yes
 SHLIB_VER=	4
 
 MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 
 MAN3=		libpng.3 libpngpf.3
 MAN5=		png.5
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PNG_MMX) && (${ARCH} == "i386")
+.if !defined(WITHOUT_PNG_MMX) && (${ARCH} == "i386")
 MAKE_ENV+=	USE_MMX=yes
-MMX_PATCH=	libpng-mmx-1.0.9pre3.zip
-DISTFILES+=	${MMX_PATCH}
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-EXTRACT_ONLY=	lib${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 
 post-extract:
 # Please don't delete the following line - this link used by ghostscript* ports
 	@${LN} -sf ${WRKSRC} ${WRKDIR}/libpng
 #
-.if defined(WITH_PNG_MMX) && (${ARCH} == "i386")
-	@cd ${WRKDIR} && unzip ${DISTDIR}/${MMX_PATCH} >/dev/null
-	@${CP} ${WRKDIR}/pnggccrd.c ${WRKSRC}/pnggccrd.c
-.elif ${ARCH} == "i386"
+.if !defined(WITHOUT_PNG_MMX) && (${ARCH} == "i386")
 	@${ECHO_MSG}
-	@${ECHO_MSG} " If you have a CPU with MMX instruction set (Pentium/P55C and higher) you can"
-	@${ECHO_MSG} " try to add \"WITH_PNG_MMX=YES\" to /etc/make.conf to build libpng with"
+	@${ECHO_MSG} " If you don't have a CPU with MMX instruction set (Pentium/P55C and higher) you"
+	@${ECHO_MSG} " can add \"WITH_PNG_MMX=YES\" to /etc/make.conf to build libpng without"
 	@${ECHO_MSG} " MMX-optimized assembler routines."
 	@${ECHO_MSG}
 .endif
 
 do-configure:
 	${LN} -sf ${WRKSRC}/scripts/makefile.std ${WRKSRC}/Makefile
 
 .include <bsd.port.post.mk>

Property changes on: head/graphics/png/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.36
\ No newline at end of property
+1.37
\ No newline at end of property
Index: head/graphics/png/distinfo
===================================================================
--- head/graphics/png/distinfo	(revision 38040)
+++ head/graphics/png/distinfo	(revision 38041)
@@ -1,2 +1 @@
-MD5 (libpng-1.0.8.tar.gz) = 5ac355d7ec9e27f20bfe00aa10f9fdde
-MD5 (libpng-mmx-1.0.9pre3.zip) = 24f8a5fa3097fd5deabfefafbd773a70
+MD5 (libpng-1.0.9.tar.gz) = 4e4f5a75058b97ffa9373b4b5ca38ea4

Property changes on: head/graphics/png/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property