To avoid security bug, use RPMs from Fedora Core 3.

Remove conflict between linux-png and linux-png10.
Use DOCSDIR, PORTDOCS and PLIST_FILES macros.

21 files changed, 72 insertions, 150 deletions

diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile
index 8d65084af494..87ddd8a8f85a 100644
--- a/graphics/linux-f10-png/Makefile
+++ b/graphics/linux-f10-png/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	png
-PORTVERSION=	1.2.2
-PORTREVISION=	0
+PORTVERSION=	1.2.7
 CATEGORIES=	graphics linux
-MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
-
-DEPRECATED=	http://vuxml.freebsd.org/f9e3e60b-e650-11d8-9b0a-000347a4fa7d.html (security)
-EXPIRATION_DATE=November 21, 2004
+MASTER_SITES=	http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
+		http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RPM of the PNG lib
 
-CONFLICTS=	linux-png-1.0.*
-
+DIST_SUBDIR=	rpm/i386/fc3
 # no alpha rpm is available
 ONLY_FOR_ARCHS=	i386
+RPM_SET=	libpng-${PORTVERSION}-1.i386.rpm
 
-BASEVERSION=	8.0
-RPM_SET=	libpng-${PORTVERSION}-8.${MACHINE_ARCH}.rpm
+PLIST_FILES=	usr/lib/libpng12.so.0.1.2.7 \
+		usr/share/man/man5/png.5.gz
+DOCSDIR=	${PREFIX}/usr/share/doc/libpng-1.2.27
+PORTDOCS=	CHANGES LICENSE README TODO example.c libpng.txt
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f10-png/distinfo.i386 b/graphics/linux-f10-png/distinfo.i386
index 4be3aa162e4a..8a74060b6924 100644
--- a/graphics/linux-f10-png/distinfo.i386
+++ b/graphics/linux-f10-png/distinfo.i386
@@ -1,2 +1,2 @@
-MD5 (rpm/libpng-1.2.2-8.i386.rpm) = 65f374f46b9b03de4c162ef0052a6fe1
-SIZE (rpm/libpng-1.2.2-8.i386.rpm) = 154076
+MD5 (rpm/i386/fc3/libpng-1.2.7-1.i386.rpm) = 47d1b7cfeb21648e620127adbf036150
+SIZE (rpm/i386/fc3/libpng-1.2.7-1.i386.rpm) = 158081
diff --git a/graphics/linux-f10-png/pkg-plist.i386 b/graphics/linux-f10-png/pkg-plist.i386
deleted file mode 100644
index 81ab555eb70c..000000000000
--- a/graphics/linux-f10-png/pkg-plist.i386
+++ /dev/null
@@ -1,11 +0,0 @@
-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.2.2
diff --git a/graphics/linux-f10-png10/Makefile b/graphics/linux-f10-png10/Makefile
index 471358b7d90e..0a69d6a3fab8 100644
--- a/graphics/linux-f10-png10/Makefile
+++ b/graphics/linux-f10-png10/Makefile
@@ -6,24 +6,22 @@
 #
 
 PORTNAME=	png
-PORTVERSION=	1.0.14
-PORTREVISION=	3
+PORTVERSION=	1.0.16
 CATEGORIES=	graphics linux
-MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
-
-DEPRECATED=     http://vuxml.freebsd.org/f9e3e60b-e650-11d8-9b0a-000347a4fa7d.html (security)
-EXPIRATION_DATE=November 21, 2004
+MASTER_SITES=	http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
+		http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	RPM of the PNG lib
+COMMENT=	RPM of the PNG lib (old 1.0 version)
 
-CONFLICTS=	linux-png-1.2.*
 LATEST_LINK=	linux-png10
 
-.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
+DIST_SUBDIR=	rpm/i386/fc3
+ONLY_FOR_ARCHS=	i386
+RPM_SET=	libpng10-${PORTVERSION}-1.i386.rpm
+
+PLIST_FILES=	usr/lib/libpng.so.2.1.0.16
+DOCSDIR=	${PREFIX}/usr/share/doc/libpng10-1.0.16
+PORTDOCS=	CHANGES LICENSE README TODO example.c libpng.txt
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f10-png10/distinfo.alpha b/graphics/linux-f10-png10/distinfo.alpha
deleted file mode 100644
index 091ee9e60b26..000000000000
--- a/graphics/linux-f10-png10/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-f10-png10/distinfo.i386 b/graphics/linux-f10-png10/distinfo.i386
index 5e85d59032d6..3fb95b9032b2 100644
--- a/graphics/linux-f10-png10/distinfo.i386
+++ b/graphics/linux-f10-png10/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/i386/fc3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
+SIZE (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = 150813
diff --git a/graphics/linux-f10-png10/pkg-plist.alpha b/graphics/linux-f10-png10/pkg-plist.alpha
deleted file mode 100644
index ca46af6a7d60..000000000000
--- a/graphics/linux-f10-png10/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/Makefile b/graphics/linux-f8-png/Makefile
index 8d65084af494..87ddd8a8f85a 100644
--- a/graphics/linux-f8-png/Makefile
+++ b/graphics/linux-f8-png/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	png
-PORTVERSION=	1.2.2
-PORTREVISION=	0
+PORTVERSION=	1.2.7
 CATEGORIES=	graphics linux
-MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
-
-DEPRECATED=	http://vuxml.freebsd.org/f9e3e60b-e650-11d8-9b0a-000347a4fa7d.html (security)
-EXPIRATION_DATE=November 21, 2004
+MASTER_SITES=	http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
+		http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RPM of the PNG lib
 
-CONFLICTS=	linux-png-1.0.*
-
+DIST_SUBDIR=	rpm/i386/fc3
 # no alpha rpm is available
 ONLY_FOR_ARCHS=	i386
+RPM_SET=	libpng-${PORTVERSION}-1.i386.rpm
 
-BASEVERSION=	8.0
-RPM_SET=	libpng-${PORTVERSION}-8.${MACHINE_ARCH}.rpm
+PLIST_FILES=	usr/lib/libpng12.so.0.1.2.7 \
+		usr/share/man/man5/png.5.gz
+DOCSDIR=	${PREFIX}/usr/share/doc/libpng-1.2.27
+PORTDOCS=	CHANGES LICENSE README TODO example.c libpng.txt
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-png/distinfo.i386 b/graphics/linux-f8-png/distinfo.i386
index 4be3aa162e4a..8a74060b6924 100644
--- a/graphics/linux-f8-png/distinfo.i386
+++ b/graphics/linux-f8-png/distinfo.i386
@@ -1,2 +1,2 @@
-MD5 (rpm/libpng-1.2.2-8.i386.rpm) = 65f374f46b9b03de4c162ef0052a6fe1
-SIZE (rpm/libpng-1.2.2-8.i386.rpm) = 154076
+MD5 (rpm/i386/fc3/libpng-1.2.7-1.i386.rpm) = 47d1b7cfeb21648e620127adbf036150
+SIZE (rpm/i386/fc3/libpng-1.2.7-1.i386.rpm) = 158081
diff --git a/graphics/linux-f8-png/pkg-plist.i386 b/graphics/linux-f8-png/pkg-plist.i386
deleted file mode 100644
index 81ab555eb70c..000000000000
--- a/graphics/linux-f8-png/pkg-plist.i386
+++ /dev/null
@@ -1,11 +0,0 @@
-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.2.2
diff --git a/graphics/linux-f8-png10/Makefile b/graphics/linux-f8-png10/Makefile
index 471358b7d90e..0a69d6a3fab8 100644
--- a/graphics/linux-f8-png10/Makefile
+++ b/graphics/linux-f8-png10/Makefile
@@ -6,24 +6,22 @@
 #
 
 PORTNAME=	png
-PORTVERSION=	1.0.14
-PORTREVISION=	3
+PORTVERSION=	1.0.16
 CATEGORIES=	graphics linux
-MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
-
-DEPRECATED=     http://vuxml.freebsd.org/f9e3e60b-e650-11d8-9b0a-000347a4fa7d.html (security)
-EXPIRATION_DATE=November 21, 2004
+MASTER_SITES=	http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
+		http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	RPM of the PNG lib
+COMMENT=	RPM of the PNG lib (old 1.0 version)
 
-CONFLICTS=	linux-png-1.2.*
 LATEST_LINK=	linux-png10
 
-.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
+DIST_SUBDIR=	rpm/i386/fc3
+ONLY_FOR_ARCHS=	i386
+RPM_SET=	libpng10-${PORTVERSION}-1.i386.rpm
+
+PLIST_FILES=	usr/lib/libpng.so.2.1.0.16
+DOCSDIR=	${PREFIX}/usr/share/doc/libpng10-1.0.16
+PORTDOCS=	CHANGES LICENSE README TODO example.c libpng.txt
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-png10/distinfo.alpha b/graphics/linux-f8-png10/distinfo.alpha
deleted file mode 100644
index 091ee9e60b26..000000000000
--- a/graphics/linux-f8-png10/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-png10/distinfo.i386 b/graphics/linux-f8-png10/distinfo.i386
index 5e85d59032d6..3fb95b9032b2 100644
--- a/graphics/linux-f8-png10/distinfo.i386
+++ b/graphics/linux-f8-png10/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/i386/fc3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
+SIZE (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = 150813
diff --git a/graphics/linux-f8-png10/pkg-plist.alpha b/graphics/linux-f8-png10/pkg-plist.alpha
deleted file mode 100644
index ca46af6a7d60..000000000000
--- a/graphics/linux-f8-png10/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-png/Makefile b/graphics/linux-png/Makefile
index 8d65084af494..87ddd8a8f85a 100644
--- a/graphics/linux-png/Makefile
+++ b/graphics/linux-png/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	png
-PORTVERSION=	1.2.2
-PORTREVISION=	0
+PORTVERSION=	1.2.7
 CATEGORIES=	graphics linux
-MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
-
-DEPRECATED=	http://vuxml.freebsd.org/f9e3e60b-e650-11d8-9b0a-000347a4fa7d.html (security)
-EXPIRATION_DATE=November 21, 2004
+MASTER_SITES=	http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
+		http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RPM of the PNG lib
 
-CONFLICTS=	linux-png-1.0.*
-
+DIST_SUBDIR=	rpm/i386/fc3
 # no alpha rpm is available
 ONLY_FOR_ARCHS=	i386
+RPM_SET=	libpng-${PORTVERSION}-1.i386.rpm
 
-BASEVERSION=	8.0
-RPM_SET=	libpng-${PORTVERSION}-8.${MACHINE_ARCH}.rpm
+PLIST_FILES=	usr/lib/libpng12.so.0.1.2.7 \
+		usr/share/man/man5/png.5.gz
+DOCSDIR=	${PREFIX}/usr/share/doc/libpng-1.2.27
+PORTDOCS=	CHANGES LICENSE README TODO example.c libpng.txt
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-png/distinfo.i386 b/graphics/linux-png/distinfo.i386
index 4be3aa162e4a..8a74060b6924 100644
--- a/graphics/linux-png/distinfo.i386
+++ b/graphics/linux-png/distinfo.i386
@@ -1,2 +1,2 @@
-MD5 (rpm/libpng-1.2.2-8.i386.rpm) = 65f374f46b9b03de4c162ef0052a6fe1
-SIZE (rpm/libpng-1.2.2-8.i386.rpm) = 154076
+MD5 (rpm/i386/fc3/libpng-1.2.7-1.i386.rpm) = 47d1b7cfeb21648e620127adbf036150
+SIZE (rpm/i386/fc3/libpng-1.2.7-1.i386.rpm) = 158081
diff --git a/graphics/linux-png/pkg-plist.i386 b/graphics/linux-png/pkg-plist.i386
deleted file mode 100644
index 81ab555eb70c..000000000000
--- a/graphics/linux-png/pkg-plist.i386
+++ /dev/null
@@ -1,11 +0,0 @@
-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.2.2
diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile
index 471358b7d90e..0a69d6a3fab8 100644
--- a/graphics/linux-png10/Makefile
+++ b/graphics/linux-png10/Makefile
@@ -6,24 +6,22 @@
 #
 
 PORTNAME=	png
-PORTVERSION=	1.0.14
-PORTREVISION=	3
+PORTVERSION=	1.0.16
 CATEGORIES=	graphics linux
-MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
-
-DEPRECATED=     http://vuxml.freebsd.org/f9e3e60b-e650-11d8-9b0a-000347a4fa7d.html (security)
-EXPIRATION_DATE=November 21, 2004
+MASTER_SITES=	http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
+		http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	RPM of the PNG lib
+COMMENT=	RPM of the PNG lib (old 1.0 version)
 
-CONFLICTS=	linux-png-1.2.*
 LATEST_LINK=	linux-png10
 
-.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
+DIST_SUBDIR=	rpm/i386/fc3
+ONLY_FOR_ARCHS=	i386
+RPM_SET=	libpng10-${PORTVERSION}-1.i386.rpm
+
+PLIST_FILES=	usr/lib/libpng.so.2.1.0.16
+DOCSDIR=	${PREFIX}/usr/share/doc/libpng10-1.0.16
+PORTDOCS=	CHANGES LICENSE README TODO example.c libpng.txt
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-png10/distinfo.alpha b/graphics/linux-png10/distinfo.alpha
deleted file mode 100644
index 091ee9e60b26..000000000000
--- a/graphics/linux-png10/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-png10/distinfo.i386 b/graphics/linux-png10/distinfo.i386
index 5e85d59032d6..3fb95b9032b2 100644
--- a/graphics/linux-png10/distinfo.i386
+++ b/graphics/linux-png10/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/i386/fc3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
+SIZE (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = 150813
diff --git a/graphics/linux-png10/pkg-plist.alpha b/graphics/linux-png10/pkg-plist.alpha
deleted file mode 100644
index ca46af6a7d60..000000000000
--- a/graphics/linux-png10/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