1 files changed, 85 insertions, 118 deletions

diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index 813e2a78fec1..e767da3661c7 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -1,17 +1,43 @@
 # New ports collection makefile for:    linux_base
-# Date created:         Jul 7, 1999
+# Date created:         Oct 3, 2001
 # Whom:                 marcel@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=		linux_base
-PORTVERSION=		6.1
-PORTREVISION=		1
+PORTVERSION=		7.1
+PORTREVISION=		0
 CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
-DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
-			${RPM_RPM} ${RPM_SET3}
+DISTFILES=		${RPM_GLIBC_COMMON} \
+			redhat-release-7.1-1.noarch.rpm \
+			${RPM_SETUP} \
+			filesystem-2.0.7-1.noarch.rpm \
+			basesystem-7.0-2.noarch.rpm \
+			${RPM_GLIBC} \
+			termcap-11.0.1-8.noarch.rpm \
+			db1-1.85-5.${MACHINE_ARCH}.rpm \
+			db3-3.1.17-7.${MACHINE_ARCH}.rpm \
+			${RPM_GDBM} \
+			glib-1.2.9-1.${MACHINE_ARCH}.rpm \
+			libtermcap-2.0.8-26.${MACHINE_ARCH}.rpm \
+			bash-2.04-21.${MACHINE_ARCH}.rpm \
+			${RPM_BZIP2} \
+			${RPM_LIBSTDCXX} \
+			${RPM_COMPAT_LIBSTDCXX} \
+			ncurses-5.2-8.${MACHINE_ARCH}.rpm \
+			info-4.0-20.${MACHINE_ARCH}.rpm \
+			fileutils-4.0.36-4.${MACHINE_ARCH}.rpm \
+			grep-2.4.2-5.${MACHINE_ARCH}.rpm \
+			popt-1.6.2-8.${MACHINE_ARCH}.rpm \
+			readline-4.1-9.${MACHINE_ARCH}.rpm \
+			${RPM_SETSERIAL} \
+			slang-1.4.2-2.${MACHINE_ARCH}.rpm \
+			sh-utils-2.0-13.${MACHINE_ARCH}.rpm \
+			rpm-4.0.2-8.${MACHINE_ARCH}.rpm \
+			${RPM_FREETYPE} \
+			${RPM_XFREE86_LIBS}
 
 PATCH_SITES=		${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
 PATCHFILES=		${UPDATES}
@@ -30,108 +56,70 @@ NO_MTREE=		yes
 PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
+# Let's avoid hardcoding 'en' as the language.
+LANG=			en
+
+# XXX - Increase the number of mirrors. Favor those that also hold
+#	the IA-64 packages.
 RPM_MIRRORS=		\
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
-	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
-	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
-	ftp://mirror.nucba.ac.jp/mirror/redhat/__DIR__/ \
-	ftp://ftp.mirror.ac.uk/sites/ftp.redhat.com/pub/redhat/__DIR__/ \
-	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
-	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
+	ftp://ftp.mirror.ac.uk/sites/ftp.redhat.com/pub/redhat/__DIR__/
 
-STDDIR=			linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR=			linux/updates/6.2/en/os/${MACHINE_ARCH}
+STDDIR=		linux/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR=		linux/updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}
 
 .include <bsd.port.pre.mk>
 
-UPDATES=		zlib-1.1.3-25.6.${MACHINE_ARCH}.rpm
+UPDATES=		zlib-1.1.3-25.7.${MACHINE_ARCH}.rpm
 .if (${MACHINE_ARCH} == "i386")
-LIBC5_COMPAT=		ld.so-1.9.5-11.i386.rpm libc-5.3.12-31.i386.rpm
-RPM_BINUTILS=		binutils-2.9.1.0.23-6.i386.rpm
-RPM_GLIB=
-RPM_GLIBC=		glibc-2.1.2-11.i386.rpm
-RPM_LDCONFIG=		ldconfig-1.9.5-15.i386.rpm
-RPM_RPM=		rpm-3.0.3-2.i386.rpm
-RPM_X_LIBS=		XFree86-libs-3.3.5-3.i386.rpm
-UPDATES+=		glib-1.2.6-2.i386.rpm
+RPM_BZIP2=		bzip2-1.0.1-3.i386.rpm
+RPM_FREETYPE=		freetype-2.0.1-4.i386.rpm
+RPM_GDBM=		gdbm-1.8.0-5.i386.rpm
+RPM_GLIBC=		glibc-2.2.2-10.i386.rpm
+RPM_GLIBC_COMMON=	glibc-common-2.2.2-10.i386.rpm
+RPM_LIBSTDCXX=
+RPM_COMPAT_LIBSTDCXX=	compat-libstdc++-6.2-2.9.0.14.i386.rpm
+RPM_SETSERIAL=		setserial-2.17-2.i386.rpm
+RPM_SETUP=		setup-2.4.7-1.noarch.rpm
+RPM_XFREE86_LIBS=	XFree86-libs-4.0.3-5.i386.rpm
+UPDATES+=		libstdc++-2.96-85.i386.rpm
 .else
-LIBC5_COMPAT=
-RPM_BINUTILS=		binutils-2.9.1.0.23-7.alpha.rpm
-RPM_GLIB=		glib-1.2.6-2.alpha.rpm
-RPM_GLIBC=		glibc-2.1.2-17.alpha.rpm
-RPM_LDCONFIG=		ldconfig-1.9.5-16.alpha.rpm
-RPM_RPM=		rpm-3.0.3-6.alpha.rpm
-RPM_X_LIBS=		XFree86-libs-3.3.5-17.alpha.rpm
+RPM_BZIP2=		bzip2-1.0.1-4.alpha.rpm
+RPM_FREETYPE=		freetype-2.0.1-5.alpha.rpm
+RPM_GDBM=		gdbm-1.8.0-6.alpha.rpm
+RPM_GLIBC=		glibc-2.2.3-11.alpha.rpm
+RPM_GLIBC_COMMON=	glibc-common-2.2.3-11.alpha.rpm
+RPM_LIBSTDCXX=		libstdc++-2.96-87.alpha.rpm
+RPM_COMPAT_LIBSTDCXX=	
+RPM_SETSERIAL=		setserial-2.17-3.alpha.rpm
+RPM_SETUP=		setup-2.4.7-2.noarch.rpm
+RPM_XFREE86_LIBS=	XFree86-libs-4.0.3-21.alpha.rpm
 UPDATES+=
 .endif
 
-#
-# The file files/pkg-list lists all rpms that are installed by this port
-# versus all rpms installed by a minimal Redhat installation.
-#
-RPM_SET1=		setup-2.0.5-1.noarch.rpm \
-			filesystem-1.3.5-1.noarch.rpm \
-			basesystem-6.0-4.noarch.rpm
-RPM_SET2=		${RPM_GLIBC} \
-			termcap-9.12.6-15.${MACHINE_ARCH}.rpm \
-			libtermcap-2.0.8-18.${MACHINE_ARCH}.rpm \
-			bash-1.14.7-16.${MACHINE_ARCH}.rpm \
-			ncurses-4.2-25.${MACHINE_ARCH}.rpm \
-			info-3.12h-2.${MACHINE_ARCH}.rpm \
-			fileutils-4.0-8.${MACHINE_ARCH}.rpm \
-			grep-2.3-2.${MACHINE_ARCH}.rpm \
-			${RPM_BINUTILS} \
-			gd-1.3-5.${MACHINE_ARCH}.rpm \
-			gdbm-1.8.0-2.${MACHINE_ARCH}.rpm \
-			${RPM_GLIB} \
-			${LIBC5_COMPAT} \
-			libstdc++-2.9.0-24.${MACHINE_ARCH}.rpm \
-			sh-utils-2.0-1.${MACHINE_ARCH}.rpm \
-			readline-2.2.1-5.${MACHINE_ARCH}.rpm \
-			redhat-release-6.1-1.noarch.rpm
-RPM_SET3=		setserial-2.15-2.${MACHINE_ARCH}.rpm \
-			slang-1.2.2-4.${MACHINE_ARCH}.rpm \
-			stat-1.5-11.${MACHINE_ARCH}.rpm \
-			tcsh-6.08.00-6.${MACHINE_ARCH}.rpm \
-			${RPM_X_LIBS} \
-			xpm-3.4k-1.${MACHINE_ARCH}.rpm
-
 DBPATH=			/var/lib/rpm
 RPM=			LC_ALL=C rpm
-RPMFLAGS=		--ignoreos --root ${LINUXBASE} --dbpath ${DBPATH} \
-			--nodeps --replacepkgs
+RPMFLAGS=		--root ${LINUXBASE} --dbpath ${DBPATH} --nodeps \
+			--replacepkgs --ignoreos --ignorearch
 RPMDIR=			${DISTDIR}/${DIST_SUBDIR}
 
-REMOVE_DIRS=		/dev /home /root /tmp /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
+REMOVE_DIRS=		boot dev home root tmp 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
+BRAND_FILES=		bin/rpm sbin/ldconfig sbin/sln
 
-.if ${OSVERSION} <= 320001
-#
-# Hack to let the rpm installer run.  The actual kernel change occurred after
-# 400008 on 4.0-current and well after 320001, but we'll assume people running
-# -current and -stable stay reasonably up-to-date.
-#
-# Define this if you get messages that look like
-#
-# --
-# ELF interpreter /compat/linux/lib/ld-linux.so.2 not found
-# execution of script failed
-# --
-#
-NEEDLOADLINK=		true
-.endif
+FALLBACK_ELF_MIB=	kern.fallback_elf_brand
+LINUX_ELF=		3
+PREVIOUS_ELF!=		/sbin/sysctl -n ${FALLBACK_ELF_MIB}
 
 do-patch:
 	@${DO_NADA}
 
 pre-install:
 #
-# Handle the loading of the linux loadable kernel module if
-# required.
-#
+# Handle the loading of the linux loadable kernel module if required.
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
@@ -140,69 +128,48 @@ do-install:
 	@${RPM} --initdb --root ${LINUXBASE} --dbpath ${DBPATH}
 #
 # Make sure we have a /dev/null in the chrooted environment.
-#
 	@${MKDIR} ${LINUXBASE}/dev
 	@${RM} -f ${LINUXBASE}/dev/null
 	@mknod ${LINUXBASE}/dev/null c 2 2
 	@${CHMOD} 666 ${LINUXBASE}/dev/null
-.if defined(NEEDLOADLINK)
-	@${MKDIR} ${LINUXBASE}/compat
-	@${LN} -s / ${LINUXBASE}/compat/linux
-.endif
-#
-# Install all packages. Ignore dependencies just
-# like the Red Hat installer.
 #
-	@for R in ${RPM_SET1}; do \
-		${ECHO} $$R; \
-		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
-	done
-	@${ECHO} ${RPM_LDCONFIG}
-	@${RPM} -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG}
-	@brandelf -t Linux ${LINUXBASE}/sbin/ldconfig
-	@${LINUXBASE}/sbin/ldconfig
-	@${TOUCH} ${LINUXBASE}/etc/ld.so.conf
-	@for R in ${RPM_SET2}; do \
+# Install all packages. Ignore dependencies just like the Red Hat installer.
+# Also, set the ELF fallback brand to Linux, so that we don't have to do
+# anything special to run staticly linked binaries.
+	@/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${LINUX_ELF}
+	@for R in ${DISTFILES}; do \
 		${ECHO} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
-	@${ECHO} ${RPM_RPM}
-	@${RPM} -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM}
-	@brandelf -t Linux ${LINUXBASE}/bin/rpm
-	@for R in ${RPM_SET3}; do \
-		${ECHO} $$R; \
-		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
+	@for F in ${BRAND_FILES}; do \
+		brandelf -t Linux ${LINUXBASE}/$$F; \
 	done
 #
 # Install updates
-#
 	@for R in ${PATCHFILES}; do \
 		${ECHO} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
+	@/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${PREVIOUS_ELF}
 #
-# Install yp.conf as a hint to NIS users
+# Install yp.conf as a hint to NIS users and make sure there's a
+# mtab in etc, albeit an empty one. This is needed in a couple of
+# cases. Most notably staroffice6.
 #
 	${INSTALL} ${COPY} -m 644 ${FILESDIR}/yp.conf ${LINUXBASE}/etc
+	${TOUCH} ${LINUXBASE}/etc/mtab
 #
 # Finish
 #
-.if defined(NEEDLOADLINK)
-	@${RM} -rf ${LINUXBASE}/compat
-.endif
 	@for D in ${REMOVE_DIRS}; do \
 		${RM} -rf ${LINUXBASE}/$$D; \
 	done
 	@for F in ${REMOVE_FILES}; do \
-		${RM} ${LINUXBASE}/$$F; \
+		${RM} -f ${LINUXBASE}/$$F; \
 	done
 	@${LN} -s /var/tmp ${LINUXBASE}/usr/tmp
 
 post-install:
-# Fix unknown uid/gids that come out of the RPMs, to avoid
-# the quotacheck warning about unknown owners.
-	@${CHOWN} root:wheel ${LINUXBASE}/usr/man/man8/setserial.8
-	@${CHGRP} mail ${LINUXBASE}/var/spool/mail
 	@${ECHO} ''
 	@fmt ${PKGMESSAGE}
 	@${ECHO} ''