Remove compat14-crypto and make compat14 also install the crypto libraries.

The distinction is pointless nowadays.

11 files changed, 24 insertions, 215 deletions

diff --git a/emulators/compat14-crypto/DEINSTALL b/emulators/compat14-crypto/DEINSTALL
deleted file mode 100644
index 752c24352aa..00000000000
--- a/emulators/compat14-crypto/DEINSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:00:03 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	COMPAT_LIBDIR=@COMPAT_LIBDIR@
-	COMPAT_XLIBDIR=@COMPAT_XLIBDIR@
-
-	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} ${PKG_PREFIX}/${COMPAT_XLIBDIR} 2>/dev/null || ${TRUE}
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat14-crypto/DESCR b/emulators/compat14-crypto/DESCR
deleted file mode 100644
index 6bfe6baf113..00000000000
--- a/emulators/compat14-crypto/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This package supplies the user files necessary for full compatibility with
-dynamically linked executables compiled under NetBSD 1.4.  You still need
-the option COMPAT_14 in your kernel configuration (and probably others;
-see options(4) for more information) to make use of NetBSD 1.4 binaries.
-This package includes the crypto-enabled "domestic" set libraries.
diff --git a/emulators/compat14-crypto/INSTALL b/emulators/compat14-crypto/INSTALL
deleted file mode 100644
index 7e66f1e0e74..00000000000
--- a/emulators/compat14-crypto/INSTALL
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 19:00:03 jlam Exp $
-
-case ${STAGE} in
-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.  Note
-	# that sparc64 a.out compatibility lives in /emul/aout, not /emul/netbsd32.
-	#
-	create_emul_symlink=0
-	if [ "${OBJECT_FMT}" = "ELF" ] && \
-	   [ "${MACHINE_ARCH}" = "i386" -o "${MACHINE_ARCH}" = "sparc" ]
-	then
-		create_emul_symlink=1
-	fi
-
-	if [ ${create_emul_symlink} = 1 ]
-	then
-		# Create a symlink from /emul/aout --> ${PKG_PREFIX}/emul/aout
-		# 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
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile
deleted file mode 100644
index b821b21756f..00000000000
--- a/emulators/compat14-crypto/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2006/10/19 19:37:38 wiz Exp $
-#
-
-DISTNAME=		compat14-crypto-${MACHINE_ARCH}-${VERSION}
-PKGNAME=		compat14-crypto-${VERSION}
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.4/index.html
-COMMENT=		Shared libraries for NetBSD 1.4 (and earlier) compatibility
-
-VERSION=		1.4.3.1
-
-CONFLICTS=		compat14-[0-9]*
-
-ONLY_FOR_PLATFORM=	NetBSD-*-sparc NetBSD-*-i386
-NOT_FOR_PLATFORM=	NetBSD-1.3*-* NetBSD-1.4*-*
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
-CRYPTO=			YES
-
-NO_MTREE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS_SUPPORTED=	no
-
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
-FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-# This installs in /usr (or /emul/aout/usr) to avoid dynamic linker annoyances
-.if ${OBJECT_FMT} == "ELF" && \
-    (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc")
-EMULSUBDIR=		emul/aout
-COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
-COMPAT_XLIBDIR=		${EMULSUBDIR}/usr/X11R6/lib
-.elif ${OPSYS} == "NetBSD"
-LOCALBASE=		/usr
-COMPAT_LIBDIR=		lib
-COMPAT_XLIBDIR=		X11R6/lib
-.endif
-
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
-
-# note that the INSTALL_DATA for the lib*.so symlinks will copy the file, not the symlink.
-# FIXME.
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/lib/lib*.so* ${PREFIX}/${COMPAT_LIBDIR}
-	if [ -d ${WRKDIR}/X11R6/lib ]; then \
-		${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_XLIBDIR}; \
-		${INSTALL_DATA} ${WRKDIR}/X11R6/lib/lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \
-	fi
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat14-crypto/PLIST b/emulators/compat14-crypto/PLIST
deleted file mode 100644
index 0a06f5e1f82..00000000000
--- a/emulators/compat14-crypto/PLIST
+++ /dev/null
@@ -1,48 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/13 03:15:24 jdarrow Exp $
-${COMPAT_LIBDIR}/libacl.so.2.0
-${COMPAT_LIBDIR}/libamu.so.1.1
-${COMPAT_LIBDIR}/libbfd.so.3.0
-${COMPAT_LIBDIR}/libbz2.so.0.0
-${COMPAT_LIBDIR}/libc.so.12.40.2
-${COMPAT_LIBDIR}/libcom_err.so.2.0
-${COMPAT_LIBDIR}/libcrypt.so.0.0
-${COMPAT_LIBDIR}/libcurses.so.2.2
-${COMPAT_LIBDIR}/libdes.so.2.0
-${COMPAT_LIBDIR}/libedit.so.2.2
-${COMPAT_LIBDIR}/libg2c.so.0.0
-${COMPAT_LIBDIR}/libgnumalloc.so.0.0
-${COMPAT_LIBDIR}/libkadm.so.2.0
-${COMPAT_LIBDIR}/libkafs.so.3.0
-${COMPAT_LIBDIR}/libkdb.so.2.0
-${COMPAT_LIBDIR}/libkrb.so.2.0
-${COMPAT_LIBDIR}/libkstream.so.0.0
-${COMPAT_LIBDIR}/libkvm.so.5.0
-${COMPAT_LIBDIR}/libm.so.0.1
-${COMPAT_LIBDIR}/libntp.so.0.0
-${COMPAT_LIBDIR}/libobjc.so.0.0
-${COMPAT_LIBDIR}/libossaudio.so.0.0
-${COMPAT_LIBDIR}/libpcap.so.0.0
-${COMPAT_LIBDIR}/libposix.so.0.1
-${COMPAT_LIBDIR}/libresolv.so.1.0
-${COMPAT_LIBDIR}/libskey.so.0.0
-${COMPAT_LIBDIR}/libss.so.2.0
-${COMPAT_LIBDIR}/libstdc++.so.2.0
-${COMPAT_LIBDIR}/libtelnet.so.1.0
-${COMPAT_LIBDIR}/libtermcap.so.0.0
-${COMPAT_LIBDIR}/libtermlib.so.0.0
-${COMPAT_LIBDIR}/libutil.so.5.0
-${COMPAT_LIBDIR}/libwrap.so.0.0
-${COMPAT_LIBDIR}/libz.so.0.1
-${COMPAT_XLIBDIR}/libICE.so.6.3
-${COMPAT_XLIBDIR}/libPEX5.so.6.0
-${COMPAT_XLIBDIR}/libSM.so.6.0
-${COMPAT_XLIBDIR}/libX11.so.6.1
-${COMPAT_XLIBDIR}/libXIE.so.6.0
-${COMPAT_XLIBDIR}/libXaw.so.6.1
-${COMPAT_XLIBDIR}/libXext.so.6.3
-${COMPAT_XLIBDIR}/libXi.so.6.0
-${COMPAT_XLIBDIR}/libXmu.so.6.0
-${COMPAT_XLIBDIR}/libXp.so.6.2
-${COMPAT_XLIBDIR}/libXt.so.6.0
-${COMPAT_XLIBDIR}/libXtst.so.6.1
-${COMPAT_XLIBDIR}/liboldX.so.6.0
diff --git a/emulators/compat14-crypto/PLIST.i386 b/emulators/compat14-crypto/PLIST.i386
deleted file mode 100644
index 4d7ccccac47..00000000000
--- a/emulators/compat14-crypto/PLIST.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.1.1.1 2002/08/13 03:15:24 jdarrow Exp $
-${COMPAT_LIBDIR}/libi386.so.0.2
-${COMPAT_LIBDIR}/libkeycap.so.0.0
diff --git a/emulators/compat14-crypto/distinfo b/emulators/compat14-crypto/distinfo
deleted file mode 100644
index 407baf570b3..00000000000
--- a/emulators/compat14-crypto/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/05/25 11:57:12 wiz Exp $
-
-SHA1 (compat14-crypto-i386-1.4.3.1.tar.gz) = 2b35c35de47b8c0be42813cb6e56e154e98ebfd5
-RMD160 (compat14-crypto-i386-1.4.3.1.tar.gz) = 5a28f1c5218eccd925bba73b7c9a1a2d3fd6c2b8
-Size (compat14-crypto-i386-1.4.3.1.tar.gz) = 1729167 bytes
-SHA1 (compat14-crypto-sparc-1.4.3.1.tar.gz) = 41d5937f5e1f40193c6363a9978fe6373d43e679
-RMD160 (compat14-crypto-sparc-1.4.3.1.tar.gz) = bbe9bcbf05328cb9829d192ef6a0be1479b9cdbe
-Size (compat14-crypto-sparc-1.4.3.1.tar.gz) = 1921545 bytes
diff --git a/emulators/compat14/DESCR b/emulators/compat14/DESCR
index 31b3a3a4f3e..6bfe6baf113 100644
--- a/emulators/compat14/DESCR
+++ b/emulators/compat14/DESCR
@@ -2,3 +2,4 @@ This package supplies the user files necessary for full compatibility with
 dynamically linked executables compiled under NetBSD 1.4.  You still need
 the option COMPAT_14 in your kernel configuration (and probably others;
 see options(4) for more information) to make use of NetBSD 1.4 binaries.
+This package includes the crypto-enabled "domestic" set libraries.
diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile
index 8dcf86ee130..04b5fae2e79 100644
--- a/emulators/compat14/Makefile
+++ b/emulators/compat14/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2006/10/19 19:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/08/16 14:00:12 jlam Exp $
 #
 
-DISTNAME=		compat14-${MACHINE_ARCH}-${VERSION}
+DISTNAME=		compat14-crypto-${MACHINE_ARCH}-${VERSION}
 PKGNAME=		compat14-${VERSION}
 PKGREVISION=		1
 CATEGORIES=		emulators
@@ -13,15 +13,16 @@ COMMENT=		Shared libraries for NetBSD 1.4 (and earlier) compatibility
 
 VERSION=		1.4.3.1
 
-CONFLICTS=		compat14-crypto-[0-9]*
+CONFLICTS=		compat14-[0-9]*
 
 ONLY_FOR_PLATFORM=	NetBSD-*-sparc NetBSD-*-i386
 NOT_FOR_PLATFORM=	NetBSD-1.3*-* NetBSD-1.4*-*
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
-NO_MTREE=		yes
-NO_BUILD=		yes
+CRYPTO=			YES
+
 CHECK_SHLIBS_SUPPORTED=	no
+BUILD_DIRS=		# empty
 
 FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
 FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
diff --git a/emulators/compat14/PLIST b/emulators/compat14/PLIST
index eccc60d754e..8625bf3ae25 100644
--- a/emulators/compat14/PLIST
+++ b/emulators/compat14/PLIST
@@ -1,13 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:28 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/08/16 14:00:12 jlam Exp $
+${COMPAT_LIBDIR}/libacl.so.2.0
 ${COMPAT_LIBDIR}/libamu.so.1.1
 ${COMPAT_LIBDIR}/libbfd.so.3.0
 ${COMPAT_LIBDIR}/libbz2.so.0.0
 ${COMPAT_LIBDIR}/libc.so.12.40.2
+${COMPAT_LIBDIR}/libcom_err.so.2.0
 ${COMPAT_LIBDIR}/libcrypt.so.0.0
 ${COMPAT_LIBDIR}/libcurses.so.2.2
+${COMPAT_LIBDIR}/libdes.so.2.0
 ${COMPAT_LIBDIR}/libedit.so.2.2
 ${COMPAT_LIBDIR}/libg2c.so.0.0
 ${COMPAT_LIBDIR}/libgnumalloc.so.0.0
+${COMPAT_LIBDIR}/libkadm.so.2.0
+${COMPAT_LIBDIR}/libkafs.so.3.0
+${COMPAT_LIBDIR}/libkdb.so.2.0
+${COMPAT_LIBDIR}/libkrb.so.2.0
+${COMPAT_LIBDIR}/libkstream.so.0.0
 ${COMPAT_LIBDIR}/libkvm.so.5.0
 ${COMPAT_LIBDIR}/libm.so.0.1
 ${COMPAT_LIBDIR}/libntp.so.0.0
@@ -17,6 +25,7 @@ ${COMPAT_LIBDIR}/libpcap.so.0.0
 ${COMPAT_LIBDIR}/libposix.so.0.1
 ${COMPAT_LIBDIR}/libresolv.so.1.0
 ${COMPAT_LIBDIR}/libskey.so.0.0
+${COMPAT_LIBDIR}/libss.so.2.0
 ${COMPAT_LIBDIR}/libstdc++.so.2.0
 ${COMPAT_LIBDIR}/libtelnet.so.1.0
 ${COMPAT_LIBDIR}/libtermcap.so.0.0
diff --git a/emulators/compat14/distinfo b/emulators/compat14/distinfo
index fc2ee32e8e3..bdd73c3f04b 100644
--- a/emulators/compat14/distinfo
+++ b/emulators/compat14/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/05/25 11:58:39 wiz Exp $
+$NetBSD: distinfo,v 1.5 2007/08/16 14:00:12 jlam Exp $
 
-SHA1 (compat14-i386-1.4.3.1.tar.gz) = 7c00ede3cf18bfc437e9262f0e583bde5f134004
-RMD160 (compat14-i386-1.4.3.1.tar.gz) = 7e1aba3308a3efec20384a1170f4b7b2d5e7ac72
-Size (compat14-i386-1.4.3.1.tar.gz) = 1646083 bytes
-SHA1 (compat14-sparc-1.4.3.1.tar.gz) = 9c0e46ced11f1f56fde79158edebb12898ea4ffa
-RMD160 (compat14-sparc-1.4.3.1.tar.gz) = 02a4eb94bb962889a74e9439fbb108b3b3d3e883
-Size (compat14-sparc-1.4.3.1.tar.gz) = 1831758 bytes
+SHA1 (compat14-crypto-i386-1.4.3.1.tar.gz) = 2b35c35de47b8c0be42813cb6e56e154e98ebfd5
+RMD160 (compat14-crypto-i386-1.4.3.1.tar.gz) = 5a28f1c5218eccd925bba73b7c9a1a2d3fd6c2b8
+Size (compat14-crypto-i386-1.4.3.1.tar.gz) = 1729167 bytes
+SHA1 (compat14-crypto-sparc-1.4.3.1.tar.gz) = 41d5937f5e1f40193c6363a9978fe6373d43e679
+RMD160 (compat14-crypto-sparc-1.4.3.1.tar.gz) = bbe9bcbf05328cb9829d192ef6a0be1479b9cdbe
+Size (compat14-crypto-sparc-1.4.3.1.tar.gz) = 1921545 bytes