Index: head/graphics/png/Makefile
===================================================================
--- head/graphics/png/Makefile	(revision 31039)
+++ head/graphics/png/Makefile	(revision 31040)
@@ -1,36 +1,50 @@
 # New ports collection makefile for:    PNG images library
 # ftp://ftp.libpng.org/pub/png/libpng.html
 # Date created:         5 Dec 1995
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 # PLEASE update print/ghostscript5 (there's a symlink that uses a hardwired
 # png version number) when updating this port.  Thank you.
 
 PORTNAME=	png
-PORTVERSION=    1.0.7
+PORTVERSION=    1.0.8
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.libpng.org/pub/png/src/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lib${PORTNAME}
 DISTNAME=       lib${PKGNAME}
 
 PATCH_SITES=    ftp://ftp.libpng.org/pub/png/src/
 #PATCHFILES=
 
 MAINTAINER=     ache@FreeBSD.org
 
 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_MMX) && (${ARCH} == "i386")
+MAKE_ENV+=	USE_MMX=yes
+.endif
+
+.if !defined(WITH_MMX) && (${ARCH} == "i386")
+post-extract:
+	@${ECHO_MSG}
+	@${ECHO_MSG} " If you have a CPU with MMX instruction set (Pentium/P55C and higher) you can"
+	@${ECHO_MSG} " try to add \"-DWITH_MMX\" to build libpng with MMX-optimized assembler routines."
+	@${ECHO_MSG}
+.endif
+
 do-configure:
-	cd ${WRKSRC} && ${CP} scripts/makefile.std Makefile
+	${LN} -sf ${WRKSRC}/scripts/makefile.std ${WRKSRC}/Makefile
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Property changes on: head/graphics/png/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.29
\ No newline at end of property
+1.30
\ No newline at end of property
Index: head/graphics/png/distinfo
===================================================================
--- head/graphics/png/distinfo	(revision 31039)
+++ head/graphics/png/distinfo	(revision 31040)
@@ -1,4 +1 @@
-MD5 (libpng-1.0.7.tar.gz) = e238fce0af74f4c68a97cf303e01ca96
-MD5 (libpng-1.0.6-patch-a.txt.gz) = 03ba973e3b9110198a7e4965360fe0e1
-MD5 (libpng-1.0.6-patch-b.txt.gz) = de2aad6bd0f03b84d2c013eb8b59e653
-MD5 (libpng-1.0.6-patch-c.txt.gz) = 12ef2b1c2410721ff69dbcdb862cfc3c
+MD5 (libpng-1.0.8.tar.gz) = 5ac355d7ec9e27f20bfe00aa10f9fdde

Property changes on: head/graphics/png/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/graphics/png/files/patch-aa
===================================================================
--- head/graphics/png/files/patch-aa	(revision 31039)
+++ head/graphics/png/files/patch-aa	(revision 31040)
@@ -1,84 +1,95 @@
 --- scripts/makefile.std.orig	Thu Dec  9 01:44:40 1999
-+++ scripts/makefile.std	Tue Jul  4 09:16:46 2000
++++ scripts/makefile.std	Wed Jul 26 10:00:14 2000
 @@ -2,18 +2,30 @@
  # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
  # For conditions of distribution and use, see copyright notice in png.h
  
 +# read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 +# have to change it.
 +# I bump PNGMAJ to 3, because imlib can't work with png 1.0.2.
 +# I should bump PNGMAJ for ports depend.
 +PNGMAJ = $(SHLIB_VER)
 +.if (${PORTOBJFORMAT} == "elf")
 +PNGVER = $(PNGMAJ)
 +.else
 +PNGMIN = 0
 +PNGVER = $(PNGMAJ).$(PNGMIN)
 +.endif
 +
  # where make install puts libpng.a and png.h
 -prefix=/usr/local
 +prefix=${PREFIX}
  
  # Where the zlib library and include files are located
  #ZLIBLIB=/usr/local/lib
  #ZLIBINC=/usr/local/include
 -ZLIBLIB=../zlib
 -ZLIBINC=../zlib
 +#ZLIBLIB=../zlib
 +#ZLIBINC=../zlib
  
 -CC=cc
 -CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 +#CC=cc
 +CFLAGS+=-I.
 +LDFLAGS+=-L. -lpng -lz -lm -static
  
  #RANLIB=echo
  RANLIB=ranlib
-@@ -22,12 +34,24 @@
+@@ -22,12 +34,29 @@
  	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
  	pngwtran.o pngmem.o pngerror.o pngpread.o
  
 -all: libpng.a pngtest
++.if defined(USE_MMX)
++CFLAGS+=-DPNG_USE_PNGGCCRD -funroll-loops -fomit-frame-pointer
++OBJS+=pnggccrd.o
++.endif
++
 +.SUFFIXES: .c .so .o
 +
 +.c.so:
 +	${CC} ${CFLAGS} -fPIC -DPIC -o $@ -c $<
 +
 +all: libpng.a libpng.so.${PNGVER}
  
  libpng.a: $(OBJS)
  	ar rc $@  $(OBJS)
  	$(RANLIB) $@
  
 +libpng.so.${PNGVER}: $(OBJS:S/o$/so/g)
 +.if (${PORTOBJFORMAT} == "elf")
 +	${CC} -shared -Wl,-x -Wl,-assert -Wl,pure-text -Wl,-soname,$@ -o $@ $(OBJS:S/o$/so/g) -lz -lm
 +.else
 +	${CC} -shared -Wl,-x -Wl,-assert -Wl,pure-text -o $@ $(OBJS:S/o$/so/g) -lz -lm
 +.endif
 +
  pngtest: pngtest.o libpng.a
  	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
  
-@@ -37,12 +61,12 @@
+@@ -37,12 +66,12 @@
  install: libpng.a
  	-@mkdir $(prefix)/include
  	-@mkdir $(prefix)/lib
 -	cp png.h $(prefix)/include
 -	cp pngconf.h $(prefix)/include
 -	chmod 644 $(prefix)/include/png.h
 -	chmod 644 $(prefix)/include/pngconf.h
 -	cp libpng.a $(prefix)/lib
 -	chmod 644 $(prefix)/lib/libpng.a
 +	${BSD_INSTALL_DATA} png.h pngconf.h $(prefix)/include
 +	${BSD_INSTALL_DATA} libpng.a libpng.so.${PNGVER} $(prefix)/lib
 +	ln -sf libpng.so.${PNGVER} $(prefix)/lib/libpng.so
 +	ranlib $(prefix)/lib/libpng.a
 +	${BSD_INSTALL_MAN} libpng.3 libpngpf.3 $(prefix)/man/man3
 +	${BSD_INSTALL_MAN} png.5 $(prefix)/man/man5
  
  clean:
  	rm -f *.o libpng.a pngtest pngout.png
+@@ -69,4 +98,5 @@
+ pngwtran.o: png.h pngconf.h
+ pngwutil.o: png.h pngconf.h
+ pngpread.o: png.h pngconf.h
++pnggccrd.o: png.h pngconf.h pngasmrd.h
+ 

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