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.

10 files changed, 0 insertions, 302 deletions

diff --git a/sysutils/mtools/DESCR b/sysutils/mtools/DESCR
deleted file mode 100644
index 5cd82b60d2c..00000000000
--- a/sysutils/mtools/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-These tools allow you to access MS-DOS or other FAT disks without mounting
-them. You can copy from or to BSD files, list directories, or run various
-other MS-DOS-style file / disk access tool imitates, (in general with an 'm'
-prepended to their name).
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
deleted file mode 100644
index eb68b58f2f4..00000000000
--- a/sysutils/mtools/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.36 2005/10/23 21:17:07 rillig Exp $
-
-DISTNAME=	mtools-3.9.10
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.tux.org/pub/knaff/mtools/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	is@NetBSD.org
-HOMEPAGE=	http://www.tux.org/pub/knaff/mtools/
-COMMENT=	FAT (MS-DOS, Atari) disk access tools
-
-NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64	# LP64 problem
-
-GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
-USE_MAKEINFO=		YES
-INFO_FILES=		mtools.info
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(MTOOLS_ENABLE_FLOPPYD) && !empty(MTOOLS_ENABLE_FLOPPYD:M[Yy][Ee][Ss])
-.include "../../mk/x11.buildlink3.mk"
-CPPFLAGS+=		-I${X11BASE}/include
-CONFIGURE_ARGS+=	--enable-floppyd
-PLIST_SUBST+=		NOFLOPPYD=
-.else
-CONFIGURE_ARGS+=	--disable-floppyd
-PLIST_SUBST+=		NOFLOPPYD="@comment "
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mtools/PLIST b/sysutils/mtools/PLIST
deleted file mode 100644
index 5ef68892774..00000000000
--- a/sysutils/mtools/PLIST
+++ /dev/null
@@ -1,63 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2005/04/04 08:56:18 adam Exp $
-bin/amuFormat.sh
-${NOFLOPPYD}bin/floppyd
-${NOFLOPPYD}bin/floppyd_installtest
-bin/lz
-bin/mattrib
-bin/mbadblocks
-bin/mcat
-bin/mcd
-bin/mcheck
-bin/mclasserase
-bin/mcomp
-bin/mcopy
-bin/mdel
-bin/mdeltree
-bin/mdir
-bin/mdu
-bin/mformat
-bin/minfo
-bin/mkmanifest
-bin/mlabel
-bin/mmd
-bin/mmount
-bin/mmove
-bin/mpartition
-bin/mrd
-bin/mren
-bin/mshowfat
-bin/mtools
-bin/mtoolstest
-bin/mtype
-bin/mxtar
-bin/mzip
-bin/tgz
-bin/uz
-${NOFLOPPYD}man/man1/floppyd.1
-${NOFLOPPYD}man/man1/floppyd_installtest.1
-man/man1/mattrib.1
-man/man1/mbadblocks.1
-man/man1/mcat.1
-man/man1/mcd.1
-man/man1/mclasserase.1
-man/man1/mcopy.1
-man/man1/mdel.1
-man/man1/mdeltree.1
-man/man1/mdir.1
-man/man1/mdu.1
-man/man1/mformat.1
-man/man1/minfo.1
-man/man1/mkmanifest.1
-man/man1/mlabel.1
-man/man1/mmd.1
-man/man1/mmount.1
-man/man1/mmove.1
-man/man1/mpartition.1
-man/man1/mrd.1
-man/man1/mren.1
-man/man1/mshowfat.1
-man/man1/mtools.1
-man/man1/mtoolstest.1
-man/man1/mtype.1
-man/man1/mzip.1
-man/man5/mtools.5
diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo
deleted file mode 100644
index f1e170839a1..00000000000
--- a/sysutils/mtools/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/04/04 08:56:18 adam Exp $
-
-SHA1 (mtools-3.9.10.tar.bz2) = f916e54e1bff599946bb1e72601f99096ea79456
-RMD160 (mtools-3.9.10.tar.bz2) = 566d3f3e3c6201cfe750ba05826f8013778f90b9
-Size (mtools-3.9.10.tar.bz2) = 291876 bytes
-SHA1 (patch-aa) = 5fa8d178bf4da73813a8857412e9369762d3dce1
-SHA1 (patch-ab) = 222ec2dac5cacc8d54eb685ce73124b1c312d93e
-SHA1 (patch-ac) = 84d959c35ec65679e003f50ef6a6fb2e62ff272e
-SHA1 (patch-ad) = d599f6b184c6da84abf4392b44d243b7b62bac3e
-SHA1 (patch-ae) = 5281829c8c79f95ff4672fabb53acd22685c17bb
-SHA1 (patch-af) = 0e2e1037be4da5f7c876cb5c9f54950e4726f6d0
diff --git a/sysutils/mtools/patches/patch-aa b/sysutils/mtools/patches/patch-aa
deleted file mode 100644
index 1bde311d4ec..00000000000
--- a/sysutils/mtools/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2005/04/04 08:56:18 adam Exp $
-
---- Makefile.in.orig	2004-02-28 19:06:35.000000000 +0000
-+++ Makefile.in
-@@ -11,7 +11,6 @@ USERCFLAGS = 
- USERLDFLAGS =
- USERLDLIBS =
- 
--MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- TEXI2PDF = texi2pdf
- TEXI2HTML = texi2html
-@@ -49,6 +48,7 @@ LN_S        = @LN_S@
- 
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT  = ${BSD_INSTALL_SCRIPT}
- INSTALL_DATA    = @INSTALL_DATA@
- INSTALL_INFO	= @INSTALL_INFO@
- 
-@@ -56,7 +56,7 @@ INSTALL_INFO	= @INSTALL_INFO@
- .SUFFIXES: .o .c
- .SUFFIXES: .o .c
- 
--MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
-+MAN1 = @MANFLOPPYD@ @MANFLOPPYD_INSTTEST@ mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
- mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1  minfo.1 \
- mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
- mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
-@@ -258,7 +258,7 @@ install-links: $(bindir)/mtools
- install-scripts: $(bindir)/mtools
- 	@$(top_srcdir)/mkinstalldirs $(bindir)
- 	@for j in $(SCRIPTS) ; do \
--		$(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
-+		$(INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
- 		echo $(bindir)/$$j ; \
- 	done
- 	rm -f $(bindir)/lz
diff --git a/sysutils/mtools/patches/patch-ab b/sysutils/mtools/patches/patch-ab
deleted file mode 100644
index fdff93a17f7..00000000000
--- a/sysutils/mtools/patches/patch-ab
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2005/04/04 08:56:18 adam Exp $
-
---- configure.orig	2005-02-28 22:10:33.000000000 +0000
-+++ configure
-@@ -5938,7 +5938,7 @@ if [ $host_os3 = hpux ] ; then
- fi
- 
- 
--if [ $host_vendor = linux ] ; then
-+if [ "$host_vendor" = linux ] ; then
-     LDFLAGS="$LDFLAGS -z"
- fi
- 
-@@ -6221,7 +6221,7 @@ else
- 
-   # It would also be nice to do this for all -L options, not just this one.
-   if test -n "$x_libraries"; then
--    X_LIBS="$X_LIBS -L$x_libraries"
-+    X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries -L$x_libraries"
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
-     case `(uname -sr) 2>/dev/null` in
-@@ -7281,7 +7281,7 @@ fi
- 
-   # Check for libraries that X11R6 Xt/Xaw programs need.
-   ac_save_LDFLAGS=$LDFLAGS
--  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS ${COMPILER_RPATH_FLAG}$x_libraries -L$x_libraries"
-   # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-   # check for ICE first), but we must link in the order -lSM -lICE or
-   # we get undefined symbols.  So assume we have SM if we have ICE.
-@@ -7738,6 +7738,8 @@ if test X$use_floppyd = Xyes; then
-     fi
-     FLOPPYD="floppyd floppyd_installtest"
-     BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest"
-+    MANFLOPPYD="floppyd.1"
-+    MANFLOPPYD_INSTTEST="floppyd_installtest.1"
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_FLOPPYD 1
-@@ -7746,6 +7748,8 @@ _ACEOF
- else
-     FLOPPYD=
-     BINFLOPPYD=
-+    MANFLOPPYD=
-+    MANFLOPPYD_INSTTEST=
- fi
- 
- 
-@@ -8401,6 +8405,8 @@ s,@X_LIBS@,$X_LIBS,;t t
- s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
- s,@FLOPPYD@,$FLOPPYD,;t t
- s,@BINFLOPPYD@,$BINFLOPPYD,;t t
-+s%@MANFLOPPYD@%$MANFLOPPYD%g
-+s%@MANFLOPPYD_INSTTEST@%$MANFLOPPYD_INSTTEST%g
- s,@extraincludedir@,$extraincludedir,;t t
- s,@extralibdir@,$extralibdir,;t t
- s,@MACHDEPLIBS@,$MACHDEPLIBS,;t t
diff --git a/sysutils/mtools/patches/patch-ac b/sysutils/mtools/patches/patch-ac
deleted file mode 100644
index 43a1f533e3b..00000000000
--- a/sysutils/mtools/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2003/12/11 16:05:40 adam Exp $
-
---- floppyd.c.orig	2002-11-02 10:55:24.000000000 +0000
-+++ floppyd.c
-@@ -583,7 +583,7 @@ static uid_t getuserid(char *user)
- 		}
- 	else
- 		{
--			uid = 65535;
-+			uid = getuserid("nobody");
- 		}
- 
- #if DEBUG
-@@ -609,7 +609,7 @@ static uid_t getgroupid(uid_t uid)
- 		}
- 	else
- 		{
--			gid = 65535;
-+			gid = getgroupid(uid);
- 		}
- 
- #if DEBUG
diff --git a/sysutils/mtools/patches/patch-ad b/sysutils/mtools/patches/patch-ad
deleted file mode 100644
index 498f5974a89..00000000000
--- a/sysutils/mtools/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2005/04/04 08:56:18 adam Exp $
-
---- devices.c.orig	2003-05-24 20:54:27.000000000 +0000
-+++ devices.c
-@@ -807,7 +807,7 @@ struct device devices[] = {
- #endif /* __FreeBSD__ */
-  
- /*** /jes -- for ALR 486 DX4/100 ***/
--#if defined(OS_netbsd)
-+#if defined(OS_netbsd) || defined(OS_netbsdelf)
- #define predefined_devices
- struct device devices[] = {
- 	{"/dev/rfd0a", 'A', FHD312},
diff --git a/sysutils/mtools/patches/patch-ae b/sysutils/mtools/patches/patch-ae
deleted file mode 100644
index 7b70b0a5fdf..00000000000
--- a/sysutils/mtools/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/12/11 17:14:22 adam Exp $
-
---- privileges.c.orig	2003-12-11 18:07:44.000000000 +0000
-+++ privileges.c
-@@ -68,7 +68,7 @@ void reclaim_privs(void)
- {
- 	if(noPrivileges)
- 		return;
--	setgid(egid);
-+	setegid(egid);
- 	Setuid(euid);
- 	print_privs("after reclaim privs, both uids should be 0 ");
- }
-@@ -76,7 +76,7 @@ void reclaim_privs(void)
- void drop_privs(void)
- {
- 	Setuid(ruid);
--	setgid(rgid);
-+	setegid(rgid);
- 	print_privs("after drop_privs, real should be 0, effective should not ");
- }
- 
diff --git a/sysutils/mtools/patches/patch-af b/sysutils/mtools/patches/patch-af
deleted file mode 100644
index 563ca9ecf05..00000000000
--- a/sysutils/mtools/patches/patch-af
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/12/07 14:11:37 is Exp $
-
---- init.c.orig	Fri Mar 19 09:57:59 1999
-+++ init.c
-@@ -27,15 +27,30 @@
-  */
- static int read_boot(Stream_t *Stream, struct bootsector * boot, int size)
- {	
-+	int rc;
-+	char *buf;
-+
-+	buf = (char *)boot;
-+
- 	/* read the first sector, or part of it */
- 	if(!size)
- 		size = BOOTSIZE;
--	if(size > 1024)
--		size = 1024;
- 
--	if (force_read(Stream, (char *) boot, 0, size) != size)
--		return -1;
--	return 0;
-+	if (size > sizeof(struct bootsector)) {
-+		buf = malloc(size);
-+		if (!buf)
-+			return(-1);
-+	}
-+
-+	rc = 0;
-+	if (force_read(Stream, buf, 0, size) != size)
-+		rc = -1;
-+	
-+	if (buf != (char *)boot) {
-+		memcpy(boot, buf, sizeof(struct bootsector));
-+		free(buf);
-+	}
-+	return rc;
- }
- 
- static int fs_flush(Stream_t *Stream)