Upgrade to 1.2.0

PR:		30356
Submitted by:	partially by KATO Tsuguru <tkato@prontomail.com>

3 files changed, 13 insertions, 31 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 4d0a495eb57f..3296b9462240 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	png
-PORTVERSION=	1.0.12
+PORTVERSION=	1.2.0
 CATEGORIES=	graphics
-MASTER_SITES=   http://www.libpng.org/pub/png/src/ \
+MASTER_SITES=	http://www.libpng.org/pub/png/src/ \
 		ftp://swrinde.nde.swri.edu/pub/png/src/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lib${PORTNAME}
-DISTFILES=	lib${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
 #PATCH_SITES=	ftp://ftp.libpng.org/pub/png/src/
 #PATCHFILES=
 
 MAINTAINER=	ache@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
-
+MAKEFILE=	${WRKSRC}/scripts/makefile.std
 INSTALLS_SHLIB=	yes
-SHLIB_VER=	4
+SHLIB_VER=	5
 
 MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
@@ -32,25 +31,8 @@ MAN5=		png.5
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PNG_MMX) && (${ARCH} == "i386")
-MAKE_ENV+=	USE_MMX=yes
-.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")
-	@${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} " MMX-optimized assembler routines. Please beware that it would make impossible"
-	@${ECHO_MSG} " to use resulting png library on processors without MMX instruction set"
-	@${ECHO_MSG} " (486 and downward, old Pentiums and clones, PentiumPro etc.)."
-	@${ECHO_MSG}
-.endif
-
-do-configure:
-	${LN} -sf ${WRKSRC}/scripts/makefile.std ${WRKSRC}/Makefile
 
 .include <bsd.port.post.mk>
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 9cedd8ed1935..c78a5e7c31b1 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1 +1 @@
-MD5 (libpng-1.0.12.tar.gz) = 3329b745968e41f6f9e55a4d04a4964c
+MD5 (libpng-1.2.0.tar.gz) = 0768b511b9cabb052c72146dd0de79d8
diff --git a/graphics/png/files/patch-aa b/graphics/png/files/patch-aa
index 9c9c33309f1f..68afc9966bd9 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	Wed Jul 26 10:00:14 2000
+--- scripts/makefile.std.orig	Sat Jan  6 03:25:50 2001
++++ scripts/makefile.std	Tue Sep 11 05:44:27 2001
 @@ -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
@@ -42,8 +42,8 @@
  	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
++.if (${ARCH} == "i386")
++CFLAGS+=-DPNG_USE_PNGGCCRD
 +OBJS+=pnggccrd.o
 +.endif
 +
@@ -60,9 +60,9 @@
  
 +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
++	${CC} -shared -Wl,-x,-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
++	${CC} -shared -Wl,-x -o $@ $(OBJS:S/o$/so/g) -lz -lm
 +.endif
 +
  pngtest: pngtest.o libpng.a
@@ -81,7 +81,7 @@
 +	${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
++	$(RANLIB) $(prefix)/lib/libpng.a
 +	${BSD_INSTALL_MAN} libpng.3 libpngpf.3 $(prefix)/man/man3
 +	${BSD_INSTALL_MAN} png.5 $(prefix)/man/man5