4 files changed, 13 insertions, 55 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index f2b12760f2d4..564c3c25cf1d 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	png
-PORTVERSION=    1.2.2
-PORTREVISION=   4
+PORTVERSION=    1.2.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libpng.org/pub/png/src/ \
 		ftp://swrinde.nde.swri.edu/pub/png/src/ \
@@ -37,9 +36,6 @@ post-extract:
 # Please don't delete the following line - this link used by ghostscript* ports
 	@${LN} -sf ${WRKSRC} ${WRKDIR}/libpng
 
-post-patch:
-	${CP} ${FILESDIR}/makefile.freebsd ${WRKSRC}/scripts/
-
 pre-install:
 	@[ -d ${PREFIX}/include/libpng ] || ${MKDIR} ${PREFIX}/include/libpng
 
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index e7b14b028c8d..3665b04f2827 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1 +1 @@
-MD5 (libpng-1.2.2.tar.gz) = 4a23be1a1752537ec3bf210bb3fd03ad
+MD5 (libpng-1.2.3.tar.gz) = 2d002712d5486554f047a17c321a5e4d
diff --git a/graphics/png/files/makefile.freebsd b/graphics/png/files/makefile.freebsd
deleted file mode 100644
index fb11ad93d813..000000000000
--- a/graphics/png/files/makefile.freebsd
+++ /dev/null
@@ -1,49 +0,0 @@
-# makefile for libpng under FreeBSD
-# Copyright (C) 2002 Glenn Randers-Pehrson and Andrey A. Chernov
-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
-
-PREFIX?=        /usr/local
-SHLIB_VER?=     5
-
-LIB=		png
-SHLIB_MAJOR=	${SHLIB_VER}
-SHLIB_MINOR=	0
-NOPROFILE=	YES
-NOOBJ=          YES
-
-# where make install puts libpng.a and png.h
-DESTDIR=	${PREFIX}
-LIBDIR=		/lib
-INCS=		png.h pngconf.h
-INCSDIR=	/include/libpng
-INCDIR=		${INCSDIR}		# for 4.x bsd.lib.mk
-MAN=		libpng.3 libpngpf.3 png.5
-MANDIR=		/man/man
-SYMLINKS=       libpng/png.h ${INCSDIR}/../png.h \
-		libpng/pngconf.h ${INCSDIR}/../pngconf.h
-LDADD+=         -lm -lz
-DPADD+=         ${LIBM} ${LIBZ}
-
-CFLAGS+= -I. -DPNG_USE_PNGGCCRD
-.if (${ARCH} != "i386")
-CFLAGS+= -DPNG_NO_ASSEMBLER_CODE
-.endif
-
-SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
-	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
-	pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c
-
-pngtest: pngtest.o libpng.a
-	${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -lpng -lz -lm
-
-CLEANFILES= pngtest pngtest.o pngout.png
-
-test: pngtest
-	./pngtest
-
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
-writelock:
-	chmod a-w *.[ch35] $(DOCS) scripts/*
-
-.include <bsd.lib.mk>
diff --git a/graphics/png/files/patch-aa b/graphics/png/files/patch-aa
new file mode 100644
index 000000000000..1d3c9840bfe1
--- /dev/null
+++ b/graphics/png/files/patch-aa
@@ -0,0 +1,11 @@
+--- scripts/makefile.freebsd.bak	Sat May 18 18:46:45 2002
++++ scripts/makefile.freebsd	Thu May 30 08:55:41 2002
+@@ -25,7 +25,7 @@
+ DPADD+=         ${LIBM} ${LIBZ}
+ 
+ CFLAGS+= -I. -DPNG_USE_PNGGCCRD
+-.if (${MACHINE_ARCH} != "i386")
++.if (${ARCH} != "i386")
+ CFLAGS+= -DPNG_NO_ASSEMBLER_CODE
+ .endif
+