5 files changed, 19 insertions, 30 deletions

diff --git a/graphics/linux-f8-png/Makefile b/graphics/linux-f8-png/Makefile
index 8f74d06681c2..488daeb85ec3 100644
--- a/graphics/linux-f8-png/Makefile
+++ b/graphics/linux-f8-png/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	png
-PORTVERSION=	1.0.14
-PORTREVISION=	2
+PORTVERSION=	1.2.2
+PORTREVISION=	0
 CATEGORIES=	graphics linux
 MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RPM of the PNG lib
 
-.if (${MACHINE_ARCH} == "i386")
-RPM_SET=	libpng-${PORTVERSION}-0.7x.4.${MACHINE_ARCH}.rpm
-.elif (${MACHINE_ARCH} == "alpha")
-RPM_SET=	libpng-${PORTVERSION}-0.7x.3.${MACHINE_ARCH}.rpm
-.endif
+# no alpha rpm is available
+ONLY_FOR_ARCHS=	i386
+
+BASEVERSION=	8.0
+RPM_SET=	libpng-${PORTVERSION}-8.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-png/distinfo.alpha b/graphics/linux-f8-png/distinfo.alpha
deleted file mode 100644
index 091ee9e60b26..000000000000
--- a/graphics/linux-f8-png/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libpng-1.0.14-0.7x.3.alpha.rpm) = 8a83337f7161079002ea910996364fab
-SIZE (rpm/libpng-1.0.14-0.7x.3.alpha.rpm) = 155829
diff --git a/graphics/linux-f8-png/distinfo.i386 b/graphics/linux-f8-png/distinfo.i386
index 5e85d59032d6..4be3aa162e4a 100644
--- a/graphics/linux-f8-png/distinfo.i386
+++ b/graphics/linux-f8-png/distinfo.i386
@@ -1,2 +1,2 @@
-MD5 (rpm/libpng-1.0.14-0.7x.4.i386.rpm) = 7b1507aa0d479257e888c267deefe757
-SIZE (rpm/libpng-1.0.14-0.7x.4.i386.rpm) = 143350
+MD5 (rpm/libpng-1.2.2-8.i386.rpm) = 65f374f46b9b03de4c162ef0052a6fe1
+SIZE (rpm/libpng-1.2.2-8.i386.rpm) = 154076
diff --git a/graphics/linux-f8-png/pkg-plist.alpha b/graphics/linux-f8-png/pkg-plist.alpha
deleted file mode 100644
index ca46af6a7d60..000000000000
--- a/graphics/linux-f8-png/pkg-plist.alpha
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/lib/libpng.so.2.1.0.14
-@exec ln -sf %D/usr/lib/libpng.so.2.1.0.14 %D/usr/lib/libpng.so.2
-@unexec rm -f %D/usr/lib/libpng.so.2
-usr/share/doc/libpng-1.0.14/CHANGES
-usr/share/doc/libpng-1.0.14/README
-usr/share/doc/libpng-1.0.14/TODO
-usr/share/doc/libpng-1.0.14/example.c
-usr/share/doc/libpng-1.0.14/libpng.txt
-usr/share/man/man5/png.5.gz
-@dirrm usr/share/doc/libpng-1.0.14
diff --git a/graphics/linux-f8-png/pkg-plist.i386 b/graphics/linux-f8-png/pkg-plist.i386
index ca46af6a7d60..81ab555eb70c 100644
--- a/graphics/linux-f8-png/pkg-plist.i386
+++ b/graphics/linux-f8-png/pkg-plist.i386
@@ -1,10 +1,11 @@
-usr/lib/libpng.so.2.1.0.14
-@exec ln -sf %D/usr/lib/libpng.so.2.1.0.14 %D/usr/lib/libpng.so.2
-@unexec rm -f %D/usr/lib/libpng.so.2
-usr/share/doc/libpng-1.0.14/CHANGES
-usr/share/doc/libpng-1.0.14/README
-usr/share/doc/libpng-1.0.14/TODO
-usr/share/doc/libpng-1.0.14/example.c
-usr/share/doc/libpng-1.0.14/libpng.txt
+usr/lib/libpng.so.3
+usr/lib/libpng.so.3.1.2.2
+usr/lib/libpng12.so.0
+usr/lib/libpng12.so.0.1.2.2
+usr/share/doc/libpng-1.2.2/CHANGES
+usr/share/doc/libpng-1.2.2/README
+usr/share/doc/libpng-1.2.2/TODO
+usr/share/doc/libpng-1.2.2/example.c
+usr/share/doc/libpng-1.2.2/libpng.txt
 usr/share/man/man5/png.5.gz
-@dirrm usr/share/doc/libpng-1.0.14
+@dirrm usr/share/doc/libpng-1.2.2