--kORqDWCi7qDJ0mEj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

* On 2003-09-15 at 06:31 BST, grant beattie wrote:

> I've just imported the latest versions of libnbcompat, mtree, pax,
> pkg_install and tnftp into bootstrap-pkgsrc for your enjoyment. I've
> tested this on Darwin 6.6, FreeBSD 4.6 and Linux, and the components
> are known to build on IRIX (6.5? Jan?)
> 
> as usual, please report any problems with send-pr(1), or send mail to
> this list (tech-pkg@NetBSD.org).

The attached patch is needed for Solaris support.

 1) Decided to provide vwarnx() for possible future use rather than
    rewrite (both copies of!) mtree_err to use warnx(), and save
    gratuitous diffs to basesrc.

 2) /usr/ccs/bin/make requires whitespace around macro appends.

-- 
Jonathan Perkin                         <jonathan@perkin.org.uk>
BBC Internet Services         http://www.perkin.org.uk/jonathan/

--kORqDWCi7qDJ0mEj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="bootstrap.diff"

Index: libnbcompat/err.c
===================================================================
RCS file: /cvsroot/othersrc/bootstrap-pkgsrc/libnbcompat/err.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 err.c
--- libnbcompat/err.c	2003/09/14 07:37:34	1.1.1.1
+++ libnbcompat/err.c	2003/09/15 15:15:16
@@ -62,6 +62,15 @@
 }
 
 void
+vwarnx(const char *fmt, va_list ap)
+{
+	(void)fprintf(stderr, "%s: ", getprogname());
+	if (fmt != NULL)
+		(void)vfprintf(stderr, fmt, ap);
+	(void)fprintf(stderr, "\n");
+}
+
+void
 warn(const char *fmt, ...)
 {
 	va_list	ap;
Index: pax/Makefile.in
===================================================================
RCS file: /cvsroot/othersrc/bootstrap-pkgsrc/pax/Makefile.in,v
retrieving revision 1.12
diff -u -r1.12 Makefile.in
--- pax/Makefile.in	2003/09/15 04:44:52	1.12
+++ pax/Makefile.in	2003/09/15 15:15:16
@@ -25,7 +25,7 @@
 SRCS=	ar_io.c ar_subs.c buf_subs.c cpio.c file_subs.c ftree.c \
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c tables.c \
 	tar.c tty_subs.c
-SRCS+=	getid.c spec.c misc.c stat_flags.c pack_dev.c
+SRCS +=	getid.c spec.c misc.c stat_flags.c pack_dev.c
 OBJS=	$(SRCS:.c=.o)
 
 .PHONY: all clean install

--kORqDWCi7qDJ0mEj--