13 files changed, 74 insertions, 98 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index 063bf1bce188..a55fe7ab3608 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -60,6 +60,8 @@
     SUBDIR += librtfcomp
     SUBDIR += libunrar
     SUBDIR += libzip
+    SUBDIR += linux-f8-ucl
+    SUBDIR += linux-f8-upx
     SUBDIR += linux-par2cmdline
     SUBDIR += linux-ucl
     SUBDIR += linux-upx
diff --git a/archivers/linux-f10-ucl/Makefile b/archivers/linux-f10-ucl/Makefile
index b672de7a3ebe..14ef5f64bead 100644
--- a/archivers/linux-f10-ucl/Makefile
+++ b/archivers/linux-f10-ucl/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:	archivers/linux-ucl
-# Date created:				03 Jun 2007
-# Whom:					Boris Samorodov <bsam@FreeBSD.org>
+# New ports collection makefile for:	archivers/linux-f8-ucl
+# Date created:				2008-04-03
+# Whom:					bsam
 #
 # $FreeBSD$
 #
@@ -8,17 +8,20 @@
 PORTNAME=		ucl
 PORTVERSION=		1.03
 CATEGORIES=		archivers linux
-MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
+PKGNAMEPREFIX=		linux-f8-
 DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=		emulation@FreeBSD.org
-COMMENT=		RPM of UCL, a lossless data compression library
+COMMENT=		UCL, a lossless data compression library (Linux Fedora 8)
 
 USE_LINUX_RPM=		yes
-RPMVERSION=		3
-LINUX_DIST_VER=		4
+LINUX_DIST_VER=		8
+RPMVERSION=		7.fc8
 USE_LDCONFIG=		yes
-MASTER_SITE_SRC_SUBDIR=	../extras/${LINUX_DIST_VER}/SRPMS
+
+PLIST_FILES=		usr/lib/libucl.so.1 usr/lib/libucl.so.1.0.0
+DOCSDIR=		${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=		COPYING NEWS README THANKS TODO
 DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/archivers/linux-f10-ucl/distinfo.i386 b/archivers/linux-f10-ucl/distinfo.i386
index 8cc185901263..c7de726b6713 100644
--- a/archivers/linux-f10-ucl/distinfo.i386
+++ b/archivers/linux-f10-ucl/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/4/ucl-1.03-3.i386.rpm) = b7f40738979cc70a7be8d7d6cfcabbd1
-SHA256 (rpm/i386/fedora/4/ucl-1.03-3.i386.rpm) = 88c2f68182609f91ca4a6423e6fb507b28dd63d448fef4c6a60ee7644ba3e727
-SIZE (rpm/i386/fedora/4/ucl-1.03-3.i386.rpm) = 36991
-MD5 (rpm/i386/fedora/4/ucl-1.03-3.src.rpm) = 060d72aab858a30641c56e20b4e4dcce
-SHA256 (rpm/i386/fedora/4/ucl-1.03-3.src.rpm) = 56575ec5f22a1ff27ccd1ed14712509eb2dfa263388267563f90a721ac1c3f13
-SIZE (rpm/i386/fedora/4/ucl-1.03-3.src.rpm) = 536554
+MD5 (rpm/i386/fedora/8/ucl-1.03-7.fc8.i386.rpm) = a7a4c147fa9c3dcd9f05b233844f78f1
+SHA256 (rpm/i386/fedora/8/ucl-1.03-7.fc8.i386.rpm) = 359038a38eef34c1baf66d81fc45d93b59735048057195226baae3369afb01d0
+SIZE (rpm/i386/fedora/8/ucl-1.03-7.fc8.i386.rpm) = 39499
+MD5 (rpm/i386/fedora/8/ucl-1.03-7.fc8.src.rpm) = 0d8434664ea6f141e1a3a72ee15b4d08
+SHA256 (rpm/i386/fedora/8/ucl-1.03-7.fc8.src.rpm) = d927857de03bf8a231b6909f54948404c5018f14bb900f13ce4fffa4fca9c3dd
+SIZE (rpm/i386/fedora/8/ucl-1.03-7.fc8.src.rpm) = 535642
diff --git a/archivers/linux-f10-ucl/pkg-plist b/archivers/linux-f10-ucl/pkg-plist
deleted file mode 100644
index 3ef5de9940e6..000000000000
--- a/archivers/linux-f10-ucl/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/lib/libucl.so.1
-usr/lib/libucl.so.1.0.0
-usr/share/doc/ucl-1.03/COPYING
-usr/share/doc/ucl-1.03/NEWS
-usr/share/doc/ucl-1.03/README
-usr/share/doc/ucl-1.03/THANKS
-usr/share/doc/ucl-1.03/TODO
-@dirrm usr/share/doc/ucl-1.03
diff --git a/archivers/linux-f10-upx/Makefile b/archivers/linux-f10-upx/Makefile
index e5abf413f4db..a681d2679b28 100644
--- a/archivers/linux-f10-upx/Makefile
+++ b/archivers/linux-f10-upx/Makefile
@@ -1,25 +1,29 @@
-# New ports collection makefile for:	archivers/linux-upx
-# Date created:				03 Jun 2007
-# Whom:					Boris Samorodov <bsam@FreeBSD.org>
+# New ports collection makefile for:	archivers/linux-f8-upx
+# Date created:				2008-04-03
+# Whom:					bsam
 #
 # $FreeBSD$
 #
 
 PORTNAME=		upx
-PORTVERSION=		1.25
+PORTVERSION=		3.02
 CATEGORIES=		archivers linux
-MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
+PKGNAMEPREFIX=		linux-f8-
 DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=		emulation@FreeBSD.org
-COMMENT=		RPM of UPX, a high-performance executable packer
+COMMENT=		UPX, a high-performance executable packer (Linux Fedora 8)
 
 USE_LINUX_RPM=		yes
 USE_LINUX_APPS=		ucl
-RPMVERSION=		4
-LINUX_DIST_VER=		4
+LINUX_DIST_VER=		8
+RPMVERSION=		1.fc8
 BRANDELF_FILES=		usr/bin/upx
-MASTER_SITE_SRC_SUBDIR=	../extras/${LINUX_DIST_VER}/SRPMS
+
+PLIST_FILES=		usr/bin/upx usr/share/man/man1/upx.1.gz
+DOCSDIR=		${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=		BUGS COPYING LICENSE NEWS PROJECTS README README.1ST \
+			THANKS TODO elf-to-mem.txt filter.txt loader.txt selinux.txt
 DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/archivers/linux-f10-upx/distinfo.i386 b/archivers/linux-f10-upx/distinfo.i386
index 6adc4bbb7b54..9dfee3387bf7 100644
--- a/archivers/linux-f10-upx/distinfo.i386
+++ b/archivers/linux-f10-upx/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/4/upx-1.25-4.i386.rpm) = 2d2755c25f8e283f87ca7d1eb75ec9bf
-SHA256 (rpm/i386/fedora/4/upx-1.25-4.i386.rpm) = 5423141f4b88034a462f0c1c8d2510a049a6a7c6820eb2691b06afc9aa2fcfaa
-SIZE (rpm/i386/fedora/4/upx-1.25-4.i386.rpm) = 134516
-MD5 (rpm/i386/fedora/4/upx-1.25-4.src.rpm) = 5061118dfaeeb1686cd93d2b97d78ce5
-SHA256 (rpm/i386/fedora/4/upx-1.25-4.src.rpm) = 75e9b75455794745e641400f5bf80895e52c5be01d181684d77b61df279f39b4
-SIZE (rpm/i386/fedora/4/upx-1.25-4.src.rpm) = 255425
+MD5 (rpm/i386/fedora/8/upx-3.02-1.fc8.i386.rpm) = 9a577b268796c29638663a44bdd80c18
+SHA256 (rpm/i386/fedora/8/upx-3.02-1.fc8.i386.rpm) = 1caa1eff2546b7537f8463a39e9b02f1305b599316c205cbd17842cfbe54b120
+SIZE (rpm/i386/fedora/8/upx-3.02-1.fc8.i386.rpm) = 371543
+MD5 (rpm/i386/fedora/8/upx-3.02-1.fc8.src.rpm) = 03b4b4b968f543d9f6c0672b605bf07a
+SHA256 (rpm/i386/fedora/8/upx-3.02-1.fc8.src.rpm) = 57270213f48a60cca35823b50788537c04eadbde8738c4547cf9ec3185f1f2f5
+SIZE (rpm/i386/fedora/8/upx-3.02-1.fc8.src.rpm) = 744595
diff --git a/archivers/linux-f10-upx/pkg-plist b/archivers/linux-f10-upx/pkg-plist
deleted file mode 100644
index a622d7b8bd35..000000000000
--- a/archivers/linux-f10-upx/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-usr/bin/upx
-usr/share/doc/upx-1.25/BUGS
-usr/share/doc/upx-1.25/COPYING
-usr/share/doc/upx-1.25/LICENSE
-usr/share/doc/upx-1.25/NEWS
-usr/share/doc/upx-1.25/PROJECTS
-usr/share/doc/upx-1.25/README
-usr/share/doc/upx-1.25/THANKS
-usr/share/doc/upx-1.25/loader.txt
-usr/share/doc/upx-1.25/upx.html
-usr/share/man/man1/upx.1.gz
-@dirrm usr/share/doc/upx-1.25
diff --git a/archivers/linux-f8-ucl/Makefile b/archivers/linux-f8-ucl/Makefile
index b672de7a3ebe..14ef5f64bead 100644
--- a/archivers/linux-f8-ucl/Makefile
+++ b/archivers/linux-f8-ucl/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:	archivers/linux-ucl
-# Date created:				03 Jun 2007
-# Whom:					Boris Samorodov <bsam@FreeBSD.org>
+# New ports collection makefile for:	archivers/linux-f8-ucl
+# Date created:				2008-04-03
+# Whom:					bsam
 #
 # $FreeBSD$
 #
@@ -8,17 +8,20 @@
 PORTNAME=		ucl
 PORTVERSION=		1.03
 CATEGORIES=		archivers linux
-MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
+PKGNAMEPREFIX=		linux-f8-
 DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=		emulation@FreeBSD.org
-COMMENT=		RPM of UCL, a lossless data compression library
+COMMENT=		UCL, a lossless data compression library (Linux Fedora 8)
 
 USE_LINUX_RPM=		yes
-RPMVERSION=		3
-LINUX_DIST_VER=		4
+LINUX_DIST_VER=		8
+RPMVERSION=		7.fc8
 USE_LDCONFIG=		yes
-MASTER_SITE_SRC_SUBDIR=	../extras/${LINUX_DIST_VER}/SRPMS
+
+PLIST_FILES=		usr/lib/libucl.so.1 usr/lib/libucl.so.1.0.0
+DOCSDIR=		${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=		COPYING NEWS README THANKS TODO
 DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/archivers/linux-f8-ucl/distinfo.i386 b/archivers/linux-f8-ucl/distinfo.i386
index 8cc185901263..c7de726b6713 100644
--- a/archivers/linux-f8-ucl/distinfo.i386
+++ b/archivers/linux-f8-ucl/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/4/ucl-1.03-3.i386.rpm) = b7f40738979cc70a7be8d7d6cfcabbd1
-SHA256 (rpm/i386/fedora/4/ucl-1.03-3.i386.rpm) = 88c2f68182609f91ca4a6423e6fb507b28dd63d448fef4c6a60ee7644ba3e727
-SIZE (rpm/i386/fedora/4/ucl-1.03-3.i386.rpm) = 36991
-MD5 (rpm/i386/fedora/4/ucl-1.03-3.src.rpm) = 060d72aab858a30641c56e20b4e4dcce
-SHA256 (rpm/i386/fedora/4/ucl-1.03-3.src.rpm) = 56575ec5f22a1ff27ccd1ed14712509eb2dfa263388267563f90a721ac1c3f13
-SIZE (rpm/i386/fedora/4/ucl-1.03-3.src.rpm) = 536554
+MD5 (rpm/i386/fedora/8/ucl-1.03-7.fc8.i386.rpm) = a7a4c147fa9c3dcd9f05b233844f78f1
+SHA256 (rpm/i386/fedora/8/ucl-1.03-7.fc8.i386.rpm) = 359038a38eef34c1baf66d81fc45d93b59735048057195226baae3369afb01d0
+SIZE (rpm/i386/fedora/8/ucl-1.03-7.fc8.i386.rpm) = 39499
+MD5 (rpm/i386/fedora/8/ucl-1.03-7.fc8.src.rpm) = 0d8434664ea6f141e1a3a72ee15b4d08
+SHA256 (rpm/i386/fedora/8/ucl-1.03-7.fc8.src.rpm) = d927857de03bf8a231b6909f54948404c5018f14bb900f13ce4fffa4fca9c3dd
+SIZE (rpm/i386/fedora/8/ucl-1.03-7.fc8.src.rpm) = 535642
diff --git a/archivers/linux-f8-ucl/pkg-plist b/archivers/linux-f8-ucl/pkg-plist
deleted file mode 100644
index 3ef5de9940e6..000000000000
--- a/archivers/linux-f8-ucl/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/lib/libucl.so.1
-usr/lib/libucl.so.1.0.0
-usr/share/doc/ucl-1.03/COPYING
-usr/share/doc/ucl-1.03/NEWS
-usr/share/doc/ucl-1.03/README
-usr/share/doc/ucl-1.03/THANKS
-usr/share/doc/ucl-1.03/TODO
-@dirrm usr/share/doc/ucl-1.03
diff --git a/archivers/linux-f8-upx/Makefile b/archivers/linux-f8-upx/Makefile
index e5abf413f4db..a681d2679b28 100644
--- a/archivers/linux-f8-upx/Makefile
+++ b/archivers/linux-f8-upx/Makefile
@@ -1,25 +1,29 @@
-# New ports collection makefile for:	archivers/linux-upx
-# Date created:				03 Jun 2007
-# Whom:					Boris Samorodov <bsam@FreeBSD.org>
+# New ports collection makefile for:	archivers/linux-f8-upx
+# Date created:				2008-04-03
+# Whom:					bsam
 #
 # $FreeBSD$
 #
 
 PORTNAME=		upx
-PORTVERSION=		1.25
+PORTVERSION=		3.02
 CATEGORIES=		archivers linux
-MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
+PKGNAMEPREFIX=		linux-f8-
 DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=		emulation@FreeBSD.org
-COMMENT=		RPM of UPX, a high-performance executable packer
+COMMENT=		UPX, a high-performance executable packer (Linux Fedora 8)
 
 USE_LINUX_RPM=		yes
 USE_LINUX_APPS=		ucl
-RPMVERSION=		4
-LINUX_DIST_VER=		4
+LINUX_DIST_VER=		8
+RPMVERSION=		1.fc8
 BRANDELF_FILES=		usr/bin/upx
-MASTER_SITE_SRC_SUBDIR=	../extras/${LINUX_DIST_VER}/SRPMS
+
+PLIST_FILES=		usr/bin/upx usr/share/man/man1/upx.1.gz
+DOCSDIR=		${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=		BUGS COPYING LICENSE NEWS PROJECTS README README.1ST \
+			THANKS TODO elf-to-mem.txt filter.txt loader.txt selinux.txt
 DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/archivers/linux-f8-upx/distinfo.i386 b/archivers/linux-f8-upx/distinfo.i386
index 6adc4bbb7b54..9dfee3387bf7 100644
--- a/archivers/linux-f8-upx/distinfo.i386
+++ b/archivers/linux-f8-upx/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/4/upx-1.25-4.i386.rpm) = 2d2755c25f8e283f87ca7d1eb75ec9bf
-SHA256 (rpm/i386/fedora/4/upx-1.25-4.i386.rpm) = 5423141f4b88034a462f0c1c8d2510a049a6a7c6820eb2691b06afc9aa2fcfaa
-SIZE (rpm/i386/fedora/4/upx-1.25-4.i386.rpm) = 134516
-MD5 (rpm/i386/fedora/4/upx-1.25-4.src.rpm) = 5061118dfaeeb1686cd93d2b97d78ce5
-SHA256 (rpm/i386/fedora/4/upx-1.25-4.src.rpm) = 75e9b75455794745e641400f5bf80895e52c5be01d181684d77b61df279f39b4
-SIZE (rpm/i386/fedora/4/upx-1.25-4.src.rpm) = 255425
+MD5 (rpm/i386/fedora/8/upx-3.02-1.fc8.i386.rpm) = 9a577b268796c29638663a44bdd80c18
+SHA256 (rpm/i386/fedora/8/upx-3.02-1.fc8.i386.rpm) = 1caa1eff2546b7537f8463a39e9b02f1305b599316c205cbd17842cfbe54b120
+SIZE (rpm/i386/fedora/8/upx-3.02-1.fc8.i386.rpm) = 371543
+MD5 (rpm/i386/fedora/8/upx-3.02-1.fc8.src.rpm) = 03b4b4b968f543d9f6c0672b605bf07a
+SHA256 (rpm/i386/fedora/8/upx-3.02-1.fc8.src.rpm) = 57270213f48a60cca35823b50788537c04eadbde8738c4547cf9ec3185f1f2f5
+SIZE (rpm/i386/fedora/8/upx-3.02-1.fc8.src.rpm) = 744595
diff --git a/archivers/linux-f8-upx/pkg-plist b/archivers/linux-f8-upx/pkg-plist
deleted file mode 100644
index a622d7b8bd35..000000000000
--- a/archivers/linux-f8-upx/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-usr/bin/upx
-usr/share/doc/upx-1.25/BUGS
-usr/share/doc/upx-1.25/COPYING
-usr/share/doc/upx-1.25/LICENSE
-usr/share/doc/upx-1.25/NEWS
-usr/share/doc/upx-1.25/PROJECTS
-usr/share/doc/upx-1.25/README
-usr/share/doc/upx-1.25/THANKS
-usr/share/doc/upx-1.25/loader.txt
-usr/share/doc/upx-1.25/upx.html
-usr/share/man/man1/upx.1.gz
-@dirrm usr/share/doc/upx-1.25