Make these install into /usr on most platforms, and into /emul/aout/usr

on platforms transitioning to ELF (currently only i386).  The /emul/aout
installation occurs much like the suse_linux and freebsd_lib packages.

Also add SHLIB_HANDLING=NO to ensure library links aren't clobbered.

This should fix PR#9011.

3 files changed, 94 insertions, 7 deletions

diff --git a/emulators/compat13/pkg/DEINSTALL b/emulators/compat13/pkg/DEINSTALL
new file mode 100644
index 00000000000..56b12c40956
--- /dev/null
+++ b/emulators/compat13/pkg/DEINSTALL
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2000/10/13 23:36:40 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	MACHINE_ARCH=@MACHINE_ARCH@
+	COMPAT_LIBDIR=@COMPAT_LIBDIR@
+
+	if [ "${MACHINE_ARCH}" = "mipsel" ]
+	then
+		rm -f ${PKG_PREFIX}/libexec/ld.so
+		rmdir -p ${PKG_PREFIX}/libexec 2>/dev/null || true
+	fi
+
+	rmdir -p ${PKG_PREFIX}/${COMPAT_LIBDIR} 2>/dev/null || true
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/emulators/compat13/pkg/INSTALL b/emulators/compat13/pkg/INSTALL
new file mode 100644
index 00000000000..2f16d9a74c6
--- /dev/null
+++ b/emulators/compat13/pkg/INSTALL
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2000/10/13 23:36:40 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+POST-INSTALL)
+	MACHINE_ARCH=@MACHINE_ARCH@
+	OBJECT_FMT=@OBJECT_FMT@
+
+	if [ "${MACHINE_ARCH}" = "mipsel" ]
+	then
+		ln -sf ld.elf_so /usr/libexec/ld.so
+	fi
+
+	# Only create the symlink on certain platform/object combinations.
+	#
+	create_emul_symlink=0
+	if [ "${MACHINE_ARCH}" = "i386" -a "${OBJECT_FMT}" = "ELF" ]
+	then
+		create_emul_symlink=1
+	fi
+
+	if [ ${create_emul_symlink} = 1 ]
+	then
+		# Create a symlink from /emul/aout --> ${PKG_PREFIX}/emul/out
+		# if it doesn't already exist.  Warn if we can't do this.
+		#
+		emul=aout
+		if [ "`cd /etc && cd ${PKG_PREFIX}/emul/$emul 2>/dev/null && pwd -P`" \
+		     != "`cd / && cd /emul/$emul 2>/dev/null && pwd -P`" ]
+		then
+			if [ -e /emul/$emul -o -L /emul/$emul ] || \
+			   [ \( -e /emul -o -L /emul \) -a ! -d /emul ]
+			then
+				cat <<EOF
+==============================================================================
+	IMPORTANT:  You must create a symbolic link from /emul/$emul
+	to ${PKG_PREFIX}/emul/$emul in order for this package to work
+	properly.
+
+	(It seems there is something else located at /emul/$emul.)
+==============================================================================
+EOF
+			else
+				mkdir -p /emul
+				ln -sf ${PKG_PREFIX}/emul/$emul /emul/$emul
+			fi
+		fi
+	fi
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/emulators/compat13/pkg/PLIST b/emulators/compat13/pkg/PLIST
index 0a6be230c35..cec75812d64 100644
--- a/emulators/compat13/pkg/PLIST
+++ b/emulators/compat13/pkg/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 1999/04/27 11:52:38 tv Exp $
-lib/libedit.so.1.0
-lib/libg++.so.4.0
-lib/libstdc++.so.0.1
-lib/libutil.so.4.2
-@exec [ `sysctl -n hw.machine_arch` != mipsel ] || ln -sf ld.elf_so /usr/libexec/ld.so
-@unexec [ `sysctl -n hw.machine_arch` != mipsel ] || rm -f /usr/libexec/ld.so
+@comment $NetBSD: PLIST,v 1.3 2000/10/13 23:36:40 jlam Exp $
+${COMPAT_LIBDIR}/libedit.so.1.0
+${COMPAT_LIBDIR}/libg++.so.4.0
+${COMPAT_LIBDIR}/libstdc++.so.0.1
+${COMPAT_LIBDIR}/libutil.so.4.2