summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/png/Makefile20
-rw-r--r--graphics/png/distinfo5
-rw-r--r--graphics/png/files/patch-aa17
3 files changed, 32 insertions, 10 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 16aac1cee717..0e3a9046f332 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -9,7 +9,7 @@
# 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}
@@ -30,7 +30,21 @@ 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>
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 9ad6694abf41..119a20ad681e 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -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
diff --git a/graphics/png/files/patch-aa b/graphics/png/files/patch-aa
index 566d7e34121c..9c9c33309f1f 100644
--- a/graphics/png/files/patch-aa
+++ b/graphics/png/files/patch-aa
@@ -1,5 +1,5 @@
--- 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
@@ -37,11 +37,16 @@
#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:
@@ -63,7 +68,7 @@
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
@@ -82,3 +87,9 @@
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
+