5 files changed, 142 insertions, 145 deletions

diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index 0e39182eae57..2d37552db061 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -1,72 +1,67 @@
-# New ports collection makefile for:	linux_base-suse-9.1
-# Date created:				2004-12-19
+# New ports collection makefile for:	linux_base-suse-9.2
+# Date created:				2005-01-11
 # Whom:					trevor
 # based on ports/emulators/linux_base by Marcel Moolenaar and others
 #
 # $FreeBSD$
+# $FreeBSD$
 #
 
 PORTNAME=		linux_base-suse
-PORTVERSION=		9.1
+PORTVERSION=		9.2
 CATEGORIES=		emulators linux
-MASTER_SITES=		${MASTER_SITE_SUSE}
-MASTER_SITE_SUBDIR=	i386/9.1/suse/i586
-DISTFILES=	suse-release-9.1-0.i586.rpm \
-		glibc-locale-2.3.3-98.i586.rpm \
-		glibc-2.3.3-98.i586.rpm \
-		filesystem-9.1-0.i586.rpm \
-		libattr-2.4.12-56.i586.rpm \
-		db-4.2.52-85.i586.rpm \
-		gdbm-1.8.3-225.i586.rpm \
-		glib-1.2.10-586.i586.rpm \
-		bash-2.05b-305.i586.rpm \
-		ncurses-5.4-59.i586.rpm \
-		readline-4.3-306.i586.rpm \
-		zlib-1.2.1-70.i586.rpm \
-		info-4.6-61.i586.rpm \
-		grep-2.5.1-416.i586.rpm \
-		desktop-file-utils-0.3.0.cvs20030807-221.i586.rpm \
-		coreutils-5.2.1-23.i586.rpm \
-		popt-1.7-176.i586.rpm \
-		insserv-1.00.2-85.i586.rpm \
-		setserial-2.17-577.i586.rpm \
-		libstdc++-3.3.3-41.i586.rpm \
-		slang-1.4.9-121.i586.rpm \
-		bzip2-1.0.2-344.i586.rpm \
-		libacl-2.2.21-54.i586.rpm \
-		libselinux-1.8-16.i586.rpm \
-		rpm-4.1.1-177.i586.rpm \
-		libgcc-3.3.3-41.i586.rpm \
-		termcap-2.0.8-876.i586.rpm \
-		freetype2-2.1.7-53.i586.rpm
+MASTER_SITES=		${MASTER_SITE_SUSE} ${MASTER_SITE_SUSE:S/$/:update/}
+MASTER_SITE_SUBDIR=	i386/9.2/suse/i586 i386/update/9.2/rpm/i586/:update
+DISTFILES=	\
+	suse-release-9.2-3.1.i586.rpm \
+	glibc-locale-2.3.3-118.i586.rpm \
+	glibc-2.3.3-118.i586.rpm \
+	filesystem-9.2-2.1.i586.rpm \
+	libattr-2.4.16-2.i586.rpm \
+	db-4.2.52-90.i586.rpm \
+	compat-gdbm-1.8.0-4.i586.rpm \
+	glib-1.2.10-589.i586.rpm \
+	bash-3.0-8.2.i586.rpm:update \
+	ncurses-5.4-65.i586.rpm \
+	readline-5.0-1.2.i586.rpm:update \
+	zlib-1.2.1-74.i586.rpm \
+	bzip2-1.0.2-347.i586.rpm \
+	libzio-0.1-4.i586.rpm \
+	info-4.7-6.i586.rpm \
+	grep-2.5.1-431.i586.rpm \
+	desktop-file-utils-0.7-2.1.i586.rpm \
+	coreutils-5.2.1-32.i586.rpm \
+	popt-1.7-190.i586.rpm \
+	insserv-1.00.5-6.2.i586.rpm \
+	setserial-2.17-579.i586.rpm \
+	libstdc++-3.3.4-11.i586.rpm \
+	slang-1.4.9-123.i586.rpm \
+	libacl-2.2.25-2.i586.rpm \
+	libselinux-1.16-3.i586.rpm \
+	rpm-4.1.1-191.i586.rpm \
+	libgcc-3.3.4-11.i586.rpm \
+	termcap-2.0.8-878.i586.rpm
 
-MAINTAINER=	trevor@FreeBSD.org
-COMMENT=	Basic packages for Linux mode from SUSE 9.1/i386
+MAINTAINER=		trevor@FreeBSD.org
+COMMENT=		Basic packages for Linux mode from SUSE 9.2/i386
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
-CONFLICTS=	linux_base-6* linux_base-7* linux_base-debian* \
-		linux_base-gentoo* linux_base-rh-9*
+CONFLICTS=		linux_base-6* linux_base-7* linux_base-debian* \
+			linux_base-gentoo* linux_base-rh* linux_base-suse-9.1*
 
-RESTRICTED=		"binaries under GNU GPL without accompanying source"
-ONLY_FOR_ARCHS=		i386
-DIST_SUBDIR=		rpm/${MACHINE_ARCH}/suse
+RESTRICTED=	"binaries under GNU GPL:  http://www.gnu.org/licenses/gpl.txt"
+ONLY_FOR_ARCHS=		amd64 i386
+DIST_SUBDIR=		rpm/i386/suse/9.2
 PREFIX=			${LINUXBASE}
-NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
 NO_MTREE=		yes
-PLIST=			${WRKDIR}/pkg-plist
+PLIST=			${WRKDIR}/plist
 
-.ifdef USE_LINUX
-.error You have `USE_LINUX' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
+# Avoid cyclic dependency.
+.undef USE_LINUX
 
 .include <bsd.port.pre.mk>
-DBPATH=			/var/lib/rpm
-RPM=			LC_ALL=C rpm
-RPMFLAGS=		--root ${WRKSRC} --dbpath ${DBPATH} --nodeps \
-			--replacepkgs --ignoreos --ignorearch
-RPMDIR=			${DISTDIR}/${DIST_SUBDIR}
 REMOVE_DIRS=		boot dev home initrd 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 \
@@ -86,32 +81,27 @@ do-extract:
 #
 # Handle the loading of the linux loadable kernel module if required.
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	@${MKDIR} ${WRKSRC}/${DBPATH} ${WRKSRC}/var/tmp ${WRKSRC}/lib
+	@${MKDIR} ${WRKSRC}/var/lib/rpm ${WRKSRC}/var/tmp ${WRKSRC}/lib
 	@cd ${WRKSRC}/lib && ${LN} -sf libtermcap.so.2.0.8 libtermcap.so.2
-	@${RPM} --initdb --root ${WRKSRC} --dbpath ${DBPATH}
-#
-# Make sure we have a /dev/null in the chrooted environment.
-	@${MKDIR} ${WRKSRC}/dev
-	@${RM} -f ${WRKSRC}/dev/null
-	@mknod ${WRKSRC}/dev/null c 2 2
-	@${CHMOD} 666 ${WRKSRC}/dev/null
+	LC_ALL=C rpm --initdb --root ${WRKSRC} --dbpath /var/lib/rpm
 #
 # 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.
+# anything special to run statically linked binaries.
 	@/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${LINUX_ELF}
-	@for R in ${DISTFILES:S/:new//}; do \
-		${ECHO} $$R; \
-		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
+	@for ii in ${DISTFILES:S/:update//}; do \
+		LC_ALL=C rpm -U --root ${WRKSRC} --dbpath /var/lib/rpm \
+			--nodeps --replacepkgs --ignoreos --ignorearch \
+			${DISTDIR}/${DIST_SUBDIR}/$$ii; \
 	done
 	@for F in ${BRAND_FILES}; do \
-		brandelf -t Linux ${WRKSRC}/$$F; \
+		${BRANDELF} -t Linux ${WRKSRC}/$$F; \
 	done
 	@/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${PREVIOUS_ELF}
 #
-# Install yp.conf as a hint to NIS users and make sure there's a
+# Install yp.conf as a hint to NIS users and make sure there's an
 # mtab in etc, albeit an empty one. This is needed in a couple of
-# cases. Most notably staroffice6.
+# cases, notably staroffice6.
 #
 	${INSTALL} ${COPY} -m 644 ${FILESDIR}/yp.conf ${WRKSRC}/etc
 	${TOUCH} ${WRKSRC}/etc/mtab ${WRKSRC}/etc/host.conf
@@ -126,19 +116,22 @@ do-extract:
 	done
 	@${LN} -sf /var/tmp ${WRKSRC}/usr/tmp
 
-pre-install:
-	${RM} -f ${PLIST}
-	cd ${WRKSRC} && ${FIND} -s . -type f -o -type l | \
-		${CUT} -c3-999 >> ${PLIST} \
+do-build:
+#
+# Generate packing list.
+	cd ${WRKSRC} && ${FIND} -s * -type f -o -type l > ${PLIST} \
 		&& ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
 do-install:
+#
+# Try to hard-link the contents of the work directory to the installation
+# directory.  If hard-linking is possible (installing to the same mount point),
+# no disk space is consumed in the installation step.  The fallback is to copy,
+# and cpio is noisy in this case.
 	cd ${WRKSRC} && ${FIND} * | ${CPIO} -dlmp ${PREFIX}
 	${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
 
 post-install:
-	@${ECHO} ''
-	@fmt ${PKGMESSAGE}
-	@${ECHO} ''
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/emulators/linux_base-suse-9.2/distinfo b/emulators/linux_base-suse-9.2/distinfo
index c3165de1aedb..f010d9aadbfd 100644
--- a/emulators/linux_base-suse-9.2/distinfo
+++ b/emulators/linux_base-suse-9.2/distinfo
@@ -1,56 +1,56 @@
-MD5 (rpm/i386/suse/suse-release-9.1-0.i586.rpm) = 64c7f2a65b24be66745ab2ee1b5e89b4
-SIZE (rpm/i386/suse/suse-release-9.1-0.i586.rpm) = 3030
-MD5 (rpm/i386/suse/glibc-locale-2.3.3-98.i586.rpm) = 0dd987d1c41cb0c24ae8f1437a4cb5fe
-SIZE (rpm/i386/suse/glibc-locale-2.3.3-98.i586.rpm) = 10393732
-MD5 (rpm/i386/suse/glibc-2.3.3-98.i586.rpm) = 15ed4f06fa275c2fe708a65ded7e8efe
-SIZE (rpm/i386/suse/glibc-2.3.3-98.i586.rpm) = 1455673
-MD5 (rpm/i386/suse/filesystem-9.1-0.i586.rpm) = cb5c967c87558b9c70083764a8336e59
-SIZE (rpm/i386/suse/filesystem-9.1-0.i586.rpm) = 41238
-MD5 (rpm/i386/suse/libattr-2.4.12-56.i586.rpm) = af5c308fa2a126706d2ea8c026868ef4
-SIZE (rpm/i386/suse/libattr-2.4.12-56.i586.rpm) = 11086
-MD5 (rpm/i386/suse/db-4.2.52-85.i586.rpm) = 9a644221e434ab8b67260391bd7fbba1
-SIZE (rpm/i386/suse/db-4.2.52-85.i586.rpm) = 775965
-MD5 (rpm/i386/suse/gdbm-1.8.3-225.i586.rpm) = 9520e2d862887c650033a8a69ff3bad9
-SIZE (rpm/i386/suse/gdbm-1.8.3-225.i586.rpm) = 27027
-MD5 (rpm/i386/suse/glib-1.2.10-586.i586.rpm) = f8545f68e60d7bf27f0f3b988b27f276
-SIZE (rpm/i386/suse/glib-1.2.10-586.i586.rpm) = 124852
-MD5 (rpm/i386/suse/bash-2.05b-305.i586.rpm) = 21c636daa38c1406d7add2a69416578a
-SIZE (rpm/i386/suse/bash-2.05b-305.i586.rpm) = 636675
-MD5 (rpm/i386/suse/ncurses-5.4-59.i586.rpm) = 5d3b5ddb2508853af9f738968696b257
-SIZE (rpm/i386/suse/ncurses-5.4-59.i586.rpm) = 790419
-MD5 (rpm/i386/suse/readline-4.3-306.i586.rpm) = 26c47a9f0472d0d946cd5c495c790dc5
-SIZE (rpm/i386/suse/readline-4.3-306.i586.rpm) = 151357
-MD5 (rpm/i386/suse/zlib-1.2.1-70.i586.rpm) = 021fa0b41c54e916cd1d1d4f96d37c2c
-SIZE (rpm/i386/suse/zlib-1.2.1-70.i586.rpm) = 63453
-MD5 (rpm/i386/suse/info-4.6-61.i586.rpm) = f205c1491ce440410aa47048a608c0bb
-SIZE (rpm/i386/suse/info-4.6-61.i586.rpm) = 144064
-MD5 (rpm/i386/suse/grep-2.5.1-416.i586.rpm) = b7fb42f3915a67d8d26347e87fc81bc3
-SIZE (rpm/i386/suse/grep-2.5.1-416.i586.rpm) = 169601
-MD5 (rpm/i386/suse/desktop-file-utils-0.3.0.cvs20030807-221.i586.rpm) = 85360525dfad7c3e806dda689dbe3709
-SIZE (rpm/i386/suse/desktop-file-utils-0.3.0.cvs20030807-221.i586.rpm) = 148110
-MD5 (rpm/i386/suse/coreutils-5.2.1-23.i586.rpm) = 2408d42377ed371ac7d322d37994e155
-SIZE (rpm/i386/suse/coreutils-5.2.1-23.i586.rpm) = 1982252
-MD5 (rpm/i386/suse/popt-1.7-176.i586.rpm) = 7f675630429ba0c800569ac99e3a9ca4
-SIZE (rpm/i386/suse/popt-1.7-176.i586.rpm) = 52024
-MD5 (rpm/i386/suse/insserv-1.00.2-85.i586.rpm) = c051fb7190d644c4eeb51f5db5537c8f
-SIZE (rpm/i386/suse/insserv-1.00.2-85.i586.rpm) = 23065
-MD5 (rpm/i386/suse/setserial-2.17-577.i586.rpm) = 47b759eeb2ef816cd1d9384943b3bd32
-SIZE (rpm/i386/suse/setserial-2.17-577.i586.rpm) = 23898
-MD5 (rpm/i386/suse/libstdc++-3.3.3-41.i586.rpm) = c89536486be1657bcd3f941deb5a265b
-SIZE (rpm/i386/suse/libstdc++-3.3.3-41.i586.rpm) = 301785
-MD5 (rpm/i386/suse/slang-1.4.9-121.i586.rpm) = 99279709a3dedfbc38859878f18cb97e
-SIZE (rpm/i386/suse/slang-1.4.9-121.i586.rpm) = 233659
-MD5 (rpm/i386/suse/bzip2-1.0.2-344.i586.rpm) = 5a1b566f07e9cc9e3f43647f446a57d5
-SIZE (rpm/i386/suse/bzip2-1.0.2-344.i586.rpm) = 221961
-MD5 (rpm/i386/suse/libacl-2.2.21-54.i586.rpm) = e07c7272a1b7fd2db1ec87f82c6dc4d3
-SIZE (rpm/i386/suse/libacl-2.2.21-54.i586.rpm) = 18239
-MD5 (rpm/i386/suse/libselinux-1.8-16.i586.rpm) = 89e848b1c6db7aa7801469131e6446a4
-SIZE (rpm/i386/suse/libselinux-1.8-16.i586.rpm) = 47298
-MD5 (rpm/i386/suse/rpm-4.1.1-177.i586.rpm) = 9850bf427d6bec63ac33d1bf6b9fb563
-SIZE (rpm/i386/suse/rpm-4.1.1-177.i586.rpm) = 2182035
-MD5 (rpm/i386/suse/libgcc-3.3.3-41.i586.rpm) = 89bb43e9f4ebcd61635cb2a1e9266f96
-SIZE (rpm/i386/suse/libgcc-3.3.3-41.i586.rpm) = 51314
-MD5 (rpm/i386/suse/termcap-2.0.8-876.i586.rpm) = 50ec2b05091222e358816b82dca8e0e2
-SIZE (rpm/i386/suse/termcap-2.0.8-876.i586.rpm) = 60887
-MD5 (rpm/i386/suse/freetype2-2.1.7-53.i586.rpm) = b253ef843317ab50f12054aaf4a89a49
-SIZE (rpm/i386/suse/freetype2-2.1.7-53.i586.rpm) = 503443
+MD5 (rpm/i386/suse/9.2/suse-release-9.2-3.1.i586.rpm) = ac6e730255eb40a269c535e26d9f0219
+SIZE (rpm/i386/suse/9.2/suse-release-9.2-3.1.i586.rpm) = 3397
+MD5 (rpm/i386/suse/9.2/glibc-locale-2.3.3-118.i586.rpm) = d65119224f0af88a2b5cf91ba988f044
+SIZE (rpm/i386/suse/9.2/glibc-locale-2.3.3-118.i586.rpm) = 10421947
+MD5 (rpm/i386/suse/9.2/glibc-2.3.3-118.i586.rpm) = a8bcf2dace372a79446d2550f0faca1f
+SIZE (rpm/i386/suse/9.2/glibc-2.3.3-118.i586.rpm) = 2164164
+MD5 (rpm/i386/suse/9.2/filesystem-9.2-2.1.i586.rpm) = f6a00e58f0b994bfa67fb30cbce20b08
+SIZE (rpm/i386/suse/9.2/filesystem-9.2-2.1.i586.rpm) = 42160
+MD5 (rpm/i386/suse/9.2/libattr-2.4.16-2.i586.rpm) = d8588c8d751478edfd36054118a7313b
+SIZE (rpm/i386/suse/9.2/libattr-2.4.16-2.i586.rpm) = 11229
+MD5 (rpm/i386/suse/9.2/db-4.2.52-90.i586.rpm) = 961cb3b22d52329d248f112b1a36eb22
+SIZE (rpm/i386/suse/9.2/db-4.2.52-90.i586.rpm) = 1546961
+MD5 (rpm/i386/suse/9.2/compat-gdbm-1.8.0-4.i586.rpm) = 0880c0f33dc54990e03282d4132f95c7
+SIZE (rpm/i386/suse/9.2/compat-gdbm-1.8.0-4.i586.rpm) = 33781
+MD5 (rpm/i386/suse/9.2/glib-1.2.10-589.i586.rpm) = 7d54a19381166a8de96792d650fdc44d
+SIZE (rpm/i386/suse/9.2/glib-1.2.10-589.i586.rpm) = 125083
+MD5 (rpm/i386/suse/9.2/bash-3.0-8.2.i586.rpm) = e0153fb04671465c652ace59d2c322e0
+SIZE (rpm/i386/suse/9.2/bash-3.0-8.2.i586.rpm) = 718905
+MD5 (rpm/i386/suse/9.2/ncurses-5.4-65.i586.rpm) = d5a6534ed6bf21e27710b035a5b3e423
+SIZE (rpm/i386/suse/9.2/ncurses-5.4-65.i586.rpm) = 793431
+MD5 (rpm/i386/suse/9.2/readline-5.0-1.2.i586.rpm) = 44b6eb67921d1833682d1b3fc26fb19a
+SIZE (rpm/i386/suse/9.2/readline-5.0-1.2.i586.rpm) = 173935
+MD5 (rpm/i386/suse/9.2/zlib-1.2.1-74.i586.rpm) = fd6300d65994f13b479161cb6930f6c9
+SIZE (rpm/i386/suse/9.2/zlib-1.2.1-74.i586.rpm) = 63579
+MD5 (rpm/i386/suse/9.2/bzip2-1.0.2-347.i586.rpm) = 8468ec523c33d4559fb967ec916c2628
+SIZE (rpm/i386/suse/9.2/bzip2-1.0.2-347.i586.rpm) = 221859
+MD5 (rpm/i386/suse/9.2/libzio-0.1-4.i586.rpm) = 277f05b2ecd45a2b0088c7e045124297
+SIZE (rpm/i386/suse/9.2/libzio-0.1-4.i586.rpm) = 17991
+MD5 (rpm/i386/suse/9.2/info-4.7-6.i586.rpm) = fabe2a1b37575d3ea6847626b067fade
+SIZE (rpm/i386/suse/9.2/info-4.7-6.i586.rpm) = 151079
+MD5 (rpm/i386/suse/9.2/grep-2.5.1-431.i586.rpm) = f2f1d59e5c9a4ec81e5c8d67698b991c
+SIZE (rpm/i386/suse/9.2/grep-2.5.1-431.i586.rpm) = 170613
+MD5 (rpm/i386/suse/9.2/desktop-file-utils-0.7-2.1.i586.rpm) = 53c1872498adea24084ffe12b167aab3
+SIZE (rpm/i386/suse/9.2/desktop-file-utils-0.7-2.1.i586.rpm) = 174729
+MD5 (rpm/i386/suse/9.2/coreutils-5.2.1-32.i586.rpm) = f5f8fed7738007df5db3374a2d61c148
+SIZE (rpm/i386/suse/9.2/coreutils-5.2.1-32.i586.rpm) = 1984866
+MD5 (rpm/i386/suse/9.2/popt-1.7-190.i586.rpm) = 248ef2cc0513b505eab464e4641f45ed
+SIZE (rpm/i386/suse/9.2/popt-1.7-190.i586.rpm) = 56646
+MD5 (rpm/i386/suse/9.2/insserv-1.00.5-6.2.i586.rpm) = 8f8543ac0be6e1b16034c9cfb8c40292
+SIZE (rpm/i386/suse/9.2/insserv-1.00.5-6.2.i586.rpm) = 25559
+MD5 (rpm/i386/suse/9.2/setserial-2.17-579.i586.rpm) = 189d00077f799b6cb16596ca0466d1a6
+SIZE (rpm/i386/suse/9.2/setserial-2.17-579.i586.rpm) = 23993
+MD5 (rpm/i386/suse/9.2/libstdc++-3.3.4-11.i586.rpm) = eb835b4422a99a18f4ab80ea6eb25b2f
+SIZE (rpm/i386/suse/9.2/libstdc++-3.3.4-11.i586.rpm) = 307043
+MD5 (rpm/i386/suse/9.2/slang-1.4.9-123.i586.rpm) = fdc940570ada56f5f219b9b987e8e9c2
+SIZE (rpm/i386/suse/9.2/slang-1.4.9-123.i586.rpm) = 234160
+MD5 (rpm/i386/suse/9.2/libacl-2.2.25-2.i586.rpm) = 33e666756aff6b7d18bb2df6d85bebcf
+SIZE (rpm/i386/suse/9.2/libacl-2.2.25-2.i586.rpm) = 18746
+MD5 (rpm/i386/suse/9.2/libselinux-1.16-3.i586.rpm) = d96ae07933f3c96efbdb67c78e2f861f
+SIZE (rpm/i386/suse/9.2/libselinux-1.16-3.i586.rpm) = 60838
+MD5 (rpm/i386/suse/9.2/rpm-4.1.1-191.i586.rpm) = e9f77ab26547660a2189e9a4113fbbfc
+SIZE (rpm/i386/suse/9.2/rpm-4.1.1-191.i586.rpm) = 2195082
+MD5 (rpm/i386/suse/9.2/libgcc-3.3.4-11.i586.rpm) = 2e94704e5d4d7dcf00dffa133cfa18de
+SIZE (rpm/i386/suse/9.2/libgcc-3.3.4-11.i586.rpm) = 54112
+MD5 (rpm/i386/suse/9.2/termcap-2.0.8-878.i586.rpm) = b88f9fc04f343c10e6a5c867b3e1f519
+SIZE (rpm/i386/suse/9.2/termcap-2.0.8-878.i586.rpm) = 60970
diff --git a/emulators/linux_base-suse-9.2/pkg-descr b/emulators/linux_base-suse-9.2/pkg-descr
index 26b96e088f3e..e3e208892faf 100644
--- a/emulators/linux_base-suse-9.2/pkg-descr
+++ b/emulators/linux_base-suse-9.2/pkg-descr
@@ -1,9 +1,12 @@
-This port contains packages from a near-minimal installation of SUSE Linux
-9.1.  These packages, in conjunction with the linux module, form the basis of
-the Linux compatibility environment.
+This port installs a few frequently-needed packages from  SuSE Linux 9.2.  These
+packages, in conjunction with the linux.ko kernel module, form the basis of the
+Linux compatibility environment.
 
-This port is only available for the i386 architecture.  If you use an Alpha
-computer, please install the linux_base port instead of this one.
+This port is available for the i386 architecture and experimentally for amd64.
+If you use an Alpha computer, please install the linux_base-debian or
+linux_base-gentoo-stage1 port instead.
 
 If you want to run Linux X11 applications, please install the
 x11/linux-XFree86-libs port.
+
+WWW:	http://www.novell.com/linux/suse
diff --git a/emulators/linux_base-suse-9.2/pkg-install b/emulators/linux_base-suse-9.2/pkg-install
index b4d717c72915..90ac97be2fe8 100644
--- a/emulators/linux_base-suse-9.2/pkg-install
+++ b/emulators/linux_base-suse-9.2/pkg-install
@@ -1,9 +1,10 @@
 #!/bin/sh
+# $FreeBSD$
 # an installation script for linux_base
 
 case "$2" in
 PRE-INSTALL)
-	if [ -z "`kldstat -v | grep -E 'linux(aout|elf)'`" ]; then
+	if [ -z "`kldstat -v | grep linux`" ]; then
 		echo 'Linux mode is not enabled.'
 		echo 'Loading linux kernel module now...'
 		if ! kldload linux; then
@@ -26,7 +27,7 @@ POST-INSTALL)
 		echo 'Re-mounting linprocfs...'
 		mount linprocfs
 	fi
-	if [ -n "`grep -w ^linprocfs /etc/fstab`" ]; then
+	if [ -n "`grep -w ^linproc /etc/fstab`" ]; then
 		echo 'Re-mounting linproc...'
 		mount linproc
 	fi
diff --git a/emulators/linux_base-suse-9.2/pkg-message b/emulators/linux_base-suse-9.2/pkg-message
index b7d8d197ca8f..5498322afbe0 100644
--- a/emulators/linux_base-suse-9.2/pkg-message
+++ b/emulators/linux_base-suse-9.2/pkg-message
@@ -1,12 +1,12 @@
-This software is based in part on the work of the FreeType Team.
-See <URL:http://www.freetype.org/>.
+Installation of the Linux base system is finished. The Linux kernel mode, which
+must be enabled for Linux binaries to run, is now enabled.  Linux mode can be
+enabled permanently with the linux_enable variable of rc.conf(5).
 
-Installation of the Linux base system is
-finished. The Linux kernel mode, which
-must be enabled for Linux binaries to run,
-is now enabled. Linux mode can be enabled
-permanently with the linux_enable variable
-of rc.conf(5).
+When using NIS, be sure to edit yp.conf in /compat/linux/etc/.
 
-When using NIS, don't forget to edit
-yp.conf in /compat/linux/etc.
+You may wish to create and populate /compat/linux/dev/ if you plan to chroot
+into your Linux installation.  For example:
+
+	mkdir /compat/linux/dev
+	mknod /compat/linux/dev/null c 2 2
+	chmod 666 /compat/linux/dev/null