summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/png/Makefile20
-rw-r--r--graphics/png/distinfo3
2 files changed, 7 insertions, 16 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index ebdd7ce2e601..0b8c5b2015e7 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -6,15 +6,14 @@
#
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
@@ -32,25 +31,18 @@ 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
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 5c1b74a50248..7801fbda2a5d 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -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