1 files changed, 74 insertions, 72 deletions

diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile
index 4bc5dad66da3..39b446ececf1 100644
--- a/emulators/linux_base-f9/Makefile
+++ b/emulators/linux_base-f9/Makefile
@@ -1,14 +1,13 @@
-# New ports collection makefile for:	linux_base-fc3
-# Date created:				$Date$
+# New ports collection makefile for:	linux_base-fc4
+# Date created:				2006-31-05
 # Whom:					bsam@ipt.ru
-# based on ports/emulators/linux_base by trevor, netchild and others
+# based on ports/emulators/linux_base-fc3 by netchild and myself
 #
 # $FreeBSD$
 #
 
 PORTNAME=		fc
-PORTVERSION=		3
-PORTREVISION=		3
+PORTVERSION=		4
 CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_FEDORA_LINUX}
 MASTER_SITE_SUBDIR=	${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -23,75 +22,78 @@ EXTRACT_ONLY=		${BIN_DISTFILES}
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode (for i386/amd64)
 
-BIN_DISTFILES=	basesystem-8.0-4.noarch.rpm \
-		bash-3.0-18.${LINUX_RPM_ARCH}.rpm \
-		bzip2-1.0.2-13.${LINUX_RPM_ARCH}.rpm \
-		bzip2-libs-1.0.2-13.${LINUX_RPM_ARCH}.rpm \
-		compat-db-4.1.25-6.${LINUX_RPM_ARCH}.rpm \
-		compat-libstdc++-8-3.3.4.2.${LINUX_RPM_ARCH}.rpm \
-		coreutils-5.2.1-31.${LINUX_RPM_ARCH}.rpm \
-		db4-4.2.52-6.${LINUX_RPM_ARCH}.rpm \
-		elfutils-libelf-0.96-1.${LINUX_RPM_ARCH}.rpm \
-		fedora-release-3-8.${LINUX_RPM_ARCH}.rpm \
-		filesystem-2.3.0-1.${LINUX_RPM_ARCH}.rpm \
-		freetype-2.1.9-1.${LINUX_RPM_ARCH}.rpm \
-		gdbm-1.8.0-24.${LINUX_RPM_ARCH}.rpm \
-		glib-1.2.10-15.${LINUX_RPM_ARCH}.rpm \
-		glibc-2.3.6-0.fc3.1.${LINUX_RPM_ARCH}.rpm \
-		glibc-common-2.3.6-0.fc3.1.${LINUX_RPM_ARCH}.rpm \
-		grep-2.5.1-31.${LINUX_RPM_ARCH}.rpm \
-		info-4.7-5.${LINUX_RPM_ARCH}.rpm \
-		libacl-2.2.23-5.${LINUX_RPM_ARCH}.rpm \
-		libattr-2.4.16-3.${LINUX_RPM_ARCH}.rpm \
-		libgcc-3.4.4-2.fc3.${LINUX_RPM_ARCH}.rpm \
-		libselinux-1.19.1-8.${LINUX_RPM_ARCH}.rpm \
-		libstdc++-3.4.2-6.fc3.${LINUX_RPM_ARCH}.rpm \
-		libtermcap-2.0.8-39.${LINUX_RPM_ARCH}.rpm \
-		ncurses-5.4-13.${LINUX_RPM_ARCH}.rpm \
-		pcre-4.5-3.1.1.fc3.${LINUX_RPM_ARCH}.rpm \
-		popt-1.9.1-21.${LINUX_RPM_ARCH}.rpm \
-		readline-4.3-13.${LINUX_RPM_ARCH}.rpm \
-		rpm-4.3.2-21.${LINUX_RPM_ARCH}.rpm \
-		setserial-2.17-17.${LINUX_RPM_ARCH}.rpm \
-		setup-2.5.36-1.noarch.rpm \
-		slang-1.4.9-13.${LINUX_RPM_ARCH}.rpm \
-		termcap-5.4-4fc3.noarch.rpm \
-		zlib-1.2.1.2-3.fc3.${LINUX_RPM_ARCH}.rpm
+BIN_DISTFILES=	basesystem-8.0-5.noarch.rpm \
+		bash-3.0-31.${LINUX_RPM_ARCH}.rpm \
+		bzip2-1.0.2-16.${LINUX_RPM_ARCH}.rpm \
+		bzip2-libs-1.0.2-16.${LINUX_RPM_ARCH}.rpm \
+		compat-db-4.2.52-2.FC4.${LINUX_RPM_ARCH}.rpm \
+		compat-libstdc++-33-3.2.3-47.fc4.${LINUX_RPM_ARCH}.rpm \
+		coreutils-5.2.1-48.1.${LINUX_RPM_ARCH}.rpm \
+		db4-4.3.27-5.fc4.${LINUX_RPM_ARCH}.rpm \
+		elfutils-libelf-0.108-1.${LINUX_RPM_ARCH}.rpm \
+		fedora-release-4-2.noarch.rpm \
+		filesystem-2.3.4-1.${LINUX_RPM_ARCH}.rpm \
+		freetype-2.1.9-2.${LINUX_RPM_ARCH}.rpm \
+		gdbm-1.8.0-25.${LINUX_RPM_ARCH}.rpm \
+		glib-1.2.10-16.${LINUX_RPM_ARCH}.rpm \
+		glibc-2.3.6-3.${LINUX_RPM_ARCH}.rpm \
+		glibc-common-2.3.6-3.${LINUX_RPM_ARCH}.rpm \
+		grep-2.5.1-48.2.${LINUX_RPM_ARCH}.rpm \
+		info-4.8-8.fc4.1.${LINUX_RPM_ARCH}.rpm \
+		libacl-2.2.32-1.FC4.2.${LINUX_RPM_ARCH}.rpm \
+		libattr-2.4.24-1.FC4.1.${LINUX_RPM_ARCH}.rpm \
+		libgcc-4.0.2-8.fc4.${LINUX_RPM_ARCH}.rpm \
+		libselinux-1.23.11-1.1.${LINUX_RPM_ARCH}.rpm \
+		libstdc++-4.0.2-8.fc4.${LINUX_RPM_ARCH}.rpm \
+		libtermcap-2.0.8-41.${LINUX_RPM_ARCH}.rpm \
+		ncurses-5.4-19.fc4.${LINUX_RPM_ARCH}.rpm \
+		pcre-5.0-4.1.fc4.${LINUX_RPM_ARCH}.rpm \
+		popt-1.10.1-23.${LINUX_RPM_ARCH}.rpm \
+		readline-5.0-3.${LINUX_RPM_ARCH}.rpm \
+		rpm-4.4.1-23.${LINUX_RPM_ARCH}.rpm \
+		setserial-2.17-19.${LINUX_RPM_ARCH}.rpm \
+		setup-2.5.44-1.1.noarch.rpm \
+		slang-1.4.9-17.${LINUX_RPM_ARCH}.rpm \
+		termcap-5.4-7fc4.noarch.rpm \
+		zlib-1.2.2.2-5.fc4.${LINUX_RPM_ARCH}.rpm
 
 .if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= basesystem-8.0-4.src.rpm \
-		bash-3.0-18.src.rpm \
-		bzip2-1.0.2-13.src.rpm \
-		compat-db-4.1.25-6.src.rpm \
-		coreutils-5.2.1-31.src.rpm \
-		db4-4.2.52-6.src.rpm \
-		elfutils-0.96-1.src.rpm \
-		fedora-release-3-8.src.rpm \
-		filesystem-2.3.0-1.src.rpm \
-		freetype-2.1.9-1.src.rpm \
-		gcc-3.4.4-2.fc3.src.rpm \
-		gdbm-1.8.0-24.src.rpm \
-		glib-1.2.10-15.src.rpm \
-		glibc-2.3.6-0.fc3.1.src.rpm \
-		grep-2.5.1-31.src.rpm \
-		libselinux-1.19.1-8.src.rpm \
-		libtermcap-2.0.8-39.src.rpm \
-		ncurses-5.4-13.src.rpm \
-		pcre-4.5-3.src.rpm \
-		readline-4.3-13.src.rpm \
-		rpm-4.3.2-21.src.rpm \
-		setserial-2.17-17.src.rpm \
-		setup-2.5.36-1.src.rpm \
-		slang-1.4.9-13.src.rpm \
-		termcap-5.4-4fc3.src.rpm \
-		zlib-1.2.1.2-3.fc3.src.rpm
-
-ALWAYS_KEEP_DISTFILES=  yes
+
+SRC_DISTFILES+=	basesystem-8.0-5.src.rpm \
+		bash-3.0-31.src.rpm \
+		bzip2-1.0.2-16.src.rpm \
+		compat-db-4.2.52-2.FC4.src.rpm \
+		coreutils-5.2.1-48.1.src.rpm \
+		db4-4.3.27-5.fc4.src.rpm \
+		elfutils-0.108-1.src.rpm \
+		fedora-release-4-2.src.rpm \
+		filesystem-2.3.4-1.src.rpm \
+		freetype-2.1.9-2.src.rpm \
+		gdbm-1.8.0-25.src.rpm \
+		glib-1.2.10-16.src.rpm \
+		glibc-2.3.6-3.src.rpm \
+		grep-2.5.1-48.2.src.rpm \
+		acl-2.2.32-1.FC4.2.src.rpm \
+		attr-2.4.24-1.FC4.1.src.rpm \
+		gcc-4.0.2-8.fc4.src.rpm \
+		libselinux-1.23.11-1.1.src.rpm \
+		libtermcap-2.0.8-41.src.rpm \
+		ncurses-5.4-19.fc4.src.rpm \
+		pcre-5.0-4.1.fc4.src.rpm \
+		readline-5.0-3.src.rpm \
+		rpm-4.4.1-23.src.rpm \
+		setserial-2.17-19.src.rpm \
+		setup-2.5.44-1.1.src.rpm \
+		slang-1.4.9-17.src.rpm \
+		termcap-5.4-7fc4.src.rpm \
+		zlib-1.2.2.2-5.fc4.src.rpm
+
+ALWAYS_KEEP_DISTFILES=	yes
 .endif
 
 CONFLICTS=		linux_base-7* linux_base-deb* linux_base-gentoo* \
 			linux_base-rh-9* linux_base-suse-9* linux_base-8* \
-			linux-libgcc*
+			linux_base-fc3 linux-libgcc*
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
 PREFIX?=		${LINUXBASE}
@@ -101,9 +103,9 @@ NO_WRKSUBDIR=		yes
 MD5_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST_SUB=		GLIBCVER="2.3.6"
 
-RPM2CPIO?=			${LOCALBASE}/bin/rpm2cpio
+RPM2CPIO?=		${LOCALBASE}/bin/rpm2cpio
 
-EXTRACT_DEPENDS+=		${RPM2CPIO}:${PORTSDIR}/archivers/rpm
+EXTRACT_DEPENDS+=	${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 
 EXTRACT_ONLY=		${BIN_DISTFILES}
 EXTRACT_CMD?=		${RPM2CPIO}
@@ -114,8 +116,8 @@ PLIST=			pkg-plist
 
 .include <bsd.port.pre.mk>
 
-REMOVE_DIRS=		boot dev home initrd root tmp var/run var/tmp usr/tmp \
-			usr/local
+REMOVE_DIRS=		boot dev home initrd root tmp var/log var/run var/tmp \
+			usr/local usr/tmp
 REMOVE_FILES=		bin/df bin/su etc/exports etc/group etc/localtime \
 			etc/motd etc/passwd etc/printcap etc/services \
 			etc/protocols