Backport a change from 1.5.22 to 1.5.18 that fixes some issues withtv_libtool_1_5_18_tmpdirfix

temp dir creation when using relink-based finalization.

5 files changed, 0 insertions, 149 deletions

diff --git a/emulators/linuxppc_lib/DESCR b/emulators/linuxppc_lib/DESCR
deleted file mode 100644
index 36175e17af1..00000000000
--- a/emulators/linuxppc_lib/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-These libraries are part of the Linux compatibility options
-for NetBSD/powerpc.
-
-The kernel option `COMPAT_LINUX' needs to be in your kernel config
-file for this to work as well.
diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile
deleted file mode 100644
index 2f94d139d5a..00000000000
--- a/emulators/linuxppc_lib/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2005/07/15 18:27:49 jlam Exp $
-
-DISTNAME=		linuxppc_lib-2000.4.6
-CATEGORIES=		emulators
-MASTER_SITES+=		ftp://ftp.linuxppc.org/linuxppc-halloween/software/
-MASTER_SITES+=		http://linuxppc.org/software/java/dl/motif/
-RPMFILES=	glibc-2.1.3-15f.ppc.rpm glib-1.2.8-3.ppc.rpm \
-		libjpeg-6b-13.ppc.rpm libpng-1.0.5-3.ppc.rpm \
-		libstdc++-2.10.0-2n.ppc.rpm libtermcap-2.0.8-20.ppc.rpm \
-		libtiff-3.5.5-2.ppc.rpm XFree86-libs-3.3.6-20b.ppc.rpm \
-		zlib-1.1.3-6.ppc.rpm ldconfig-1.9.5-16.ppc.rpm \
-		libjpeg6a-6a-5.ppc.rpm xpm-3.4k-1.ppc.rpm \
-		ncurses-5.0-12.ppc.rpm readline-2.2.1-7a.ppc.rpm
-DISTFILES+=	${RPMFILES}
-DISTFILES+=	openmotif-2.1.30-3_MLI_jdk.tar.gz
-
-MAINTAINER=		p99dreyf@criens.u-psud.fr
-HOMEPAGE=		http://www.linuxppc.org/
-COMMENT=		Libraries to run Linux binaries on NetBSD/powerpc (includes X11)
-
-BUILD_DEPENDS+=		rpm2pkg-1.2:../../pkgtools/rpm2pkg
-
-CONFLICTS=		suse_base-[0-9]*
-
-ONLY_FOR_PLATFORM=	NetBSD-1.5[U-Z]-powerpc NetBSD-1.5Z[A-Z]-powerpc \
-			NetBSD-1.6*-powerpc NetBSD-[2-9]*-powerpc
-
-WRKSRC=			${WRKDIR}/${DISTNAME}
-SHLIB_HANDLING=		NO
-CHECK_SHLIBS=		NO
-DIST_SUBDIR=		linuxppc_lib
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-USE_TOOLS+=		gtar
-
-EMUL_LINUX=		emul/linux
-LINUX_LDCONFIG=		${PREFIX}/${EMUL_LINUX}/sbin/ldconfig
-RPM2PKG=		rpm2pkg
-SORT=			sort
-RPMARGS+=		-i usr/man -i usr/doc -i usr/info
-.for TEMP in ${RPMFILES}
-RPMARGS+=		${DISTDIR}/${DIST_SUBDIR}/${TEMP}
-.endfor
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-
-do-build:	#do nothing
-
-do-install:
-	${RM} -f ${WRKDIR}/PLIST_DYNAMIC
-	${INSTALL_DATA_DIR} ${PREFIX}/${EMUL_LINUX}
-	${INSTALL_DATA_DIR} /${EMUL_LINUX}
-	${RPM2PKG} -d ${PREFIX} -f ${WRKDIR}/PLIST_DYNAMIC -p emul/linux ${RPMARGS}
-
-	# Fix Linux's ldd paths (ldd is a shell script on Linux)
-	${SED} 's|^\(TEXTDOMAINDIR=\)\(/usr/share/locale\)|\1${PREFIX}/${EMUL_LINUX}\2|; \
-		s|^\(RTLD=\)\(/lib/ld.so.1\)|\1${PREFIX}/${EMUL_LINUX}\2|' \
-		${PREFIX}/${EMUL_LINUX}/usr/bin/ldd > \
-		${PREFIX}/${EMUL_LINUX}/usr/bin/ldd.new
-	${MV} ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd.new \
-	    ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd
-	${CHMOD} 755 ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd
-
-	# Unpack shared libraries for OpenMotif
-	cd ${PREFIX}/${EMUL_LINUX}/usr/X11R6 ; ${GTAR} -x 'lib/*.so*' \
-	    -zvf ${DISTDIR}/${DIST_SUBDIR}/openmotif-2.1.30-3_MLI_jdk.tar.gz | \
-	    ${SED} -e "s|^|${EMUL_LINUX}/usr/X11R6/|" >> ${WRKDIR}/PLIST_DYNAMIC
-
-	# Make the link /usr/pkg/emul/linux -> /emul/linux
-	${TEST} -f /emul/linux/lib/ld.so.1 || ( ${RMDIR} /${EMUL_LINUX} && \
-	    ${LN} -sf ${PREFIX}/${EMUL_LINUX} /${EMUL_LINUX} )
-
-	# Create ld.so.conf and ld.so.cache. (uses Linux's ldconfig)
-	${TOUCH} ${PREFIX}/${EMUL_LINUX}/etc/ld.so.cache~
-	${CP} ${FILESDIR}/ld.so.conf ${PREFIX}/${EMUL_LINUX}/etc/ld.so.conf
-	${LINUX_LDCONFIG} -r ${PREFIX}/${EMUL_LINUX} -v | \
-		${SED} -n '/^\/.*:$$/h; /(changed)$$/{G; \
-		s|[[:blank:]]\([^ ]\{1,\}\) =>.*\n/\(.*\):$$|${EMUL_LINUX}/\2/\1|p;}' \
-		>> ${WRKDIR}/PLIST_DYNAMIC
-	${ECHO} "${EMUL_LINUX}/etc/ld.so.conf" >> ${WRKDIR}/PLIST_DYNAMIC
-	${SORT} -r ${WRKDIR}/PLIST_DYNAMIC > ${WRKDIR}/PLIST_DYNAMIC.sorted
-	${MV} ${WRKDIR}/PLIST_DYNAMIC.sorted ${WRKDIR}/PLIST_DYNAMIC
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/linuxppc_lib/distinfo b/emulators/linuxppc_lib/distinfo
deleted file mode 100644
index 04664f01a67..00000000000
--- a/emulators/linuxppc_lib/distinfo
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 18:49:19 agc Exp $
-
-SHA1 (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 8a73a18041c6b1f41556dc974752dab55f2e125c
-RMD160 (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 7b6a7e784d9aac080abfaa83b3ef2665fd749da0
-Size (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 9503167 bytes
-SHA1 (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = f067429860346dafb3c348eed8d59d370feb671b
-RMD160 (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = d67d41fd8a72a19dd077995d5d6129eb5f9877e1
-Size (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = 142829 bytes
-SHA1 (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = a6b91fcc3348bb6625a70c843478d73dc2032e41
-RMD160 (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = 8454c628897a303eeb1b5500352855555590bb48
-Size (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = 125558 bytes
-SHA1 (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = 92a88a28142bf0698c3a71f82d40ebf86b8d97dc
-RMD160 (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = f1a15dda95fca48d0bb05807c6dab5e52d8fbaeb
-Size (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = 116067 bytes
-SHA1 (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = a8cb630e24a180a0c2fce1fa13e444dab9660fc3
-RMD160 (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = a63fa3107f393a10e9881d0fc46ea49fe382d2c7
-Size (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = 1110869 bytes
-SHA1 (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = 84673baa788a90c00ce4a6f52a5bcba80cf9a19c
-RMD160 (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = d0437e1b8598d02f3c5630fb4faf2ede17a61d76
-Size (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = 57125 bytes
-SHA1 (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = d406ae6353300a0b21c01282a5d2148c63ec05aa
-RMD160 (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = 483c61188a6cd2e7aeaf11c14fac87072585456e
-Size (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = 204823 bytes
-SHA1 (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = 3ed6da7dca7b4fc5ac81acbbbefd0ccfd7b8472a
-RMD160 (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = d91efda504df84ceeeebd01be4e332638904b3b2
-Size (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = 939474 bytes
-SHA1 (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 9a813540e080c5c621b2abb0ada4f48ea274bf09
-RMD160 (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 0da794b1ee885717ff541ffc562c012156c42d42
-Size (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 30894 bytes
-SHA1 (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = 785b2e72bc8cc51ddded7f746f1e4712aeca773b
-RMD160 (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = a92546b1b4d990f7a91743cf79fee7ca415b5bd2
-Size (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = 124309 bytes
-SHA1 (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 633da2a887d03c43acb7ddf9d66b6139c240cccd
-RMD160 (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 39da6439cd0058cfa7184d3b420d3e7fe57f0c11
-Size (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 62388 bytes
-SHA1 (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = 94e080372f65d3dc91570175334d43273e1c216a
-RMD160 (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = e66c42fc168a9b7ea2e388e6505d78d2f758a42f
-Size (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = 73072 bytes
-SHA1 (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 1d5863dfc29473472bda89d237bafd84de602df4
-RMD160 (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 987b45dec71db60bbdefddb45aabfeb6dc8c8fa7
-Size (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 808456 bytes
-SHA1 (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 29458422f6991affc2d88c5eba9c0f7f2c9d796b
-RMD160 (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 91b32ac137fd03353931fa1768a917430a026c73
-Size (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 145051 bytes
-SHA1 (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = b9af158b947829d0bbe2831842ff4f4b4a7313a0
-RMD160 (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = d6aea78941bbffc662c6d540908e3fbf986f684c
-Size (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = 2631074 bytes
-SHA1 (patch-aa) = 04840c534103f659fce4c00b5a6d63f79e03bf08
diff --git a/emulators/linuxppc_lib/files/ld.so.conf b/emulators/linuxppc_lib/files/ld.so.conf
deleted file mode 100644
index eb2ad0fd4f7..00000000000
--- a/emulators/linuxppc_lib/files/ld.so.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-/lib
-/usr/lib
-/usr/X11R6/lib
diff --git a/emulators/linuxppc_lib/patches/patch-aa b/emulators/linuxppc_lib/patches/patch-aa
deleted file mode 100644
index d9934bc5e88..00000000000
--- a/emulators/linuxppc_lib/patches/patch-aa
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/23 22:29:48 manu Exp $
---- etc/ld.so.conf.orig	Sun Jan 14 22:29:50 2001
-+++ etc/ld.so.conf	Sun Jan 14 22:30:05 2001
-@@ -0,0 +1,4 @@
-+/lib
-+/usr/lib
-+/usr/local/lib
-+/usr/X11R6/lib