From 134dda2f1dbd9ae32e10a5f4c0d6f0216d222c1b Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Thu, 14 Dec 1995 03:42:17 +0000
Subject: [PATCH] update from netbsd; parallel make stuff

---
 gnu/lib/libg++/g++-include/Makefile       |  4 ++--
 gnu/libexec/uucp/Makefile.inc             |  9 ++++++---
 gnu/usr.bin/Makefile                      | 10 ++++++++--
 gnu/usr.bin/gcc2/Makefile.cc1             |  5 +++--
 gnu/usr.bin/gcc2/libgcc/Makefile          | 16 +++++++++-------
 gnu/usr.bin/gdb/gdb/Makefile              | 12 ++++++++----
 gnu/usr.bin/gdb/gdb/arch/i386/i386b-nat.c |  2 +-
 gnu/usr.bin/gdb/gdb/arch/i386/nm.h        |  2 +-
 gnu/usr.bin/gdb/gdb/arch/i386/tm.h        |  2 +-
 gnu/usr.bin/gdb/objdump/Makefile          |  8 +++++---
 gnu/usr.bin/gzip/Makefile                 |  8 +++++---
 gnu/usr.bin/rcs/Makefile.inc              |  5 +++--
 gnu/usr.bin/send-pr/send-pr.sh            | 13 ++++++++-----
 13 files changed, 60 insertions(+), 36 deletions(-)

diff --git a/gnu/lib/libg++/g++-include/Makefile b/gnu/lib/libg++/g++-include/Makefile
index b14ea3cd93b..47f5da60a25 100644
--- a/gnu/lib/libg++/g++-include/Makefile
+++ b/gnu/lib/libg++/g++-include/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1995/10/18 08:38:17 deraadt Exp $
+#	$Id: Makefile,v 1.2 1995/12/14 03:42:17 deraadt Exp $
 
 LIB=		g++
 
@@ -26,6 +26,6 @@ DPADD=		${DESTDIR}/usr/lib/c++rt0.o ${LIBCURSES}
 NOMAN=		noman
 .PATH:		$(.CURDIR)/../iostream 
 LIBCURSES!=	printf "xxx:\n\techo \$${LIBCURSES}\n.include <bsd.prog.mk>" |\
-			$(MAKE) -r -s -f - xxx
+			$(MAKE) -r -s -f - xxx | grep curses
 
 .include <bsd.lib.mk>
diff --git a/gnu/libexec/uucp/Makefile.inc b/gnu/libexec/uucp/Makefile.inc
index 1a413e7cb5d..6516abf9c93 100644
--- a/gnu/libexec/uucp/Makefile.inc
+++ b/gnu/libexec/uucp/Makefile.inc
@@ -1,11 +1,14 @@
 LIBUNIX!=cd $(.CURDIR)/../libunix; \
-	printf "xxx:\n\techo \$${.OBJDIR}/libunix.a\n" | ${MAKE} -r -s -f - xxx
+	printf "xxx:\n\techo \$${.OBJDIR}/libunix.a\n" | \
+	${MAKE} -r -s -f - xxx | grep libunix
 
 LIBUUCONF!=cd $(.CURDIR)/../libuuconf; \
-	printf "xxx:\n\techo \$${.OBJDIR}/libuuconf.a\n" | ${MAKE} -r -s -f - xxx
+	printf "xxx:\n\techo \$${.OBJDIR}/libuuconf.a\n" | \
+	${MAKE} -r -s -f - xxx | grep libuuconf
 
 LIBUUCP!=cd $(.CURDIR)/../libuucp; \
-	printf "xxx:\n\techo \$${.OBJDIR}/libuucp.a\n" | ${MAKE} -r -s -f - xxx
+	printf "xxx:\n\techo \$${.OBJDIR}/libuucp.a\n" | \
+	${MAKE} -r -s -f - xxx | grep libuucp
 
 VERSION=	1.06.1
 owner=		uucp
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 96c4dd66209..185ee261ebe 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,13 +1,19 @@
-#	$NetBSD: Makefile,v 1.24 1995/09/27 12:46:07 cgd Exp $
+#	$NetBSD: Makefile,v 1.27 1995/12/07 07:26:32 phil Exp $
 
 SUBDIR+=	bc cpio dc diff diff3 gawk grep groff
 SUBDIR+=	gzip rcs sdiff send-pr sort tar
 
 # some ports don't use the tool chain in /usr/src
-.if (${MACHINE_ARCH} != "alpha") && (${MACHINE_ARCH} != "mips")
+.if (${MACHINE_ARCH} != "alpha") && (${MACHINE_ARCH} != "mips") && \
+	(${MACHINE_ARCH} != "vax") && (${MACHINE_ARCH} != "ns32k")
 SUBDIR+=	gas gcc2 gdb ld
 .endif
 
+# ns32k and vax wants newer gcc
+.if (${MACHINE_ARCH} == "ns32k") || (${MACHINE_ARCH} == "vax")
+SUBDIR+=        gas gcc gdb ld
+.endif
+
 # XXX alpha still needs the /usr/bin/cpp script.
 .if (${MACHINE_ARCH} == "alpha")
 afterinstall:
diff --git a/gnu/usr.bin/gcc2/Makefile.cc1 b/gnu/usr.bin/gcc2/Makefile.cc1
index 30f914ebf29..1b4843b65e7 100644
--- a/gnu/usr.bin/gcc2/Makefile.cc1
+++ b/gnu/usr.bin/gcc2/Makefile.cc1
@@ -1,4 +1,4 @@
-#	$Id: Makefile.cc1,v 1.1.1.1 1995/10/18 08:39:15 deraadt Exp $
+#	$Id: Makefile.cc1,v 1.2 1995/12/14 03:42:27 deraadt Exp $
 
 NOMAN=
 
@@ -9,7 +9,8 @@ CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../common \
 YFLAGS=
 
 LIBCC1!= cd $(.CURDIR)/../common; \
-	printf "xxx:\n\techo \$${.OBJDIR}/libcc1.a\n" | ${MAKE} -r -s -f - xxx
+	printf "xxx:\n\techo \$${.OBJDIR}/libcc1.a\n" | \
+	${MAKE} -r -s -f - xxx | grep libcc1
 
 LDADD+=${LIBCC1} -lgnumalloc
 DPADD+= /usr/lib/libgnumalloc.a
diff --git a/gnu/usr.bin/gcc2/libgcc/Makefile b/gnu/usr.bin/gcc2/libgcc/Makefile
index b3cfe83ea1c..8a022986f89 100644
--- a/gnu/usr.bin/gcc2/libgcc/Makefile
+++ b/gnu/usr.bin/gcc2/libgcc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1995/10/18 08:39:48 deraadt Exp $
+#	$Id: Makefile,v 1.2 1995/12/14 03:42:30 deraadt Exp $
 
 LIB=	gcc
 NOPROFILE=
@@ -34,14 +34,16 @@ OBJS= ${LIB1OBJS} ${LIB2OBJS}
 LIB2SOBJS=${LIB2OBJS:.o=.so}
 
 #${LIB1OBJS}: libgcc1.c
-#	${COMPILE.c} -DL${.PREFIX} -o ${.TARGET} ${.CURDIR}/libgcc1.c
-#	@${LD} -x -r ${.TARGET}
-#	@mv a.out ${.TARGET}
+#	@echo "${COMPILE.c} -DL${.PREFIX} -o ${.TARGET} ${.CURDIR}/libgcc1.c"
+#	@${COMPILE.c} -DL${.PREFIX} -o ${.TARGET}.o ${.CURDIR}/libgcc1.c
+#	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+#	@rm -f ${.TARGET}.o
 
 ${LIB2OBJS}: libgcc2.c
-	${COMPILE.c} -DL${.PREFIX} -o ${.TARGET} ${.CURDIR}/libgcc2.c
-	@${LD} -x -r ${.TARGET}
-	@mv a.out ${.TARGET}
+	@echo "${COMPILE.c} -DL${.PREFIX} -o ${.TARGET} ${.CURDIR}/libgcc2.c"
+	@${COMPILE.c} -DL${.PREFIX} -o ${.TARGET}.o ${.CURDIR}/libgcc2.c
+	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
 
 #${LIB1SOBJS}: libgcc1.c
 #	${COMPILE.c} -fpic -DL${.PREFIX} -o ${.TARGET} ${.CURDIR}/libgcc1.c
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index 7f8ae530cf0..80ed95079ee 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -1,15 +1,19 @@
-# $Id: Makefile,v 1.1.1.1 1995/10/18 08:39:56 deraadt Exp $
+# $Id: Makefile,v 1.2 1995/12/14 03:42:35 deraadt Exp $
 
 # Paths to libraries
 #
+PARALLEL=yes
 LIBBFD!=cd $(.CURDIR)/../bfd; \
-	printf "xxx:\n\techo \$${.OBJDIR}/libbfd.a\n" | ${MAKE} -r -s -f - xxx
+	printf "xxx:\n\techo \$${.OBJDIR}/libbfd.a\n" | \
+	${MAKE} -r -s -f - xxx | grep libbfd
 
 LIBREADLINE!=cd $(.CURDIR)/../readline; \
-	printf "xxx:\n\techo \$${.OBJDIR}/libreadline.a\n" | ${MAKE} -r -s -f - xxx
+	printf "xxx:\n\techo \$${.OBJDIR}/libreadline.a\n" | \
+	${MAKE} -r -s -f - xxx | grep libreadline
 
 LIBIBERTY!=cd $(.CURDIR)/../libiberty; \
-	printf "xxx:\n\techo \$${.OBJDIR}/libiberty.a\n" | ${MAKE} -r -s -f - xxx
+	printf "xxx:\n\techo \$${.OBJDIR}/libiberty.a\n" | \
+	${MAKE} -r -s -f - xxx | grep libiberty
 
 
 PROG=		gdb
diff --git a/gnu/usr.bin/gdb/gdb/arch/i386/i386b-nat.c b/gnu/usr.bin/gdb/gdb/arch/i386/i386b-nat.c
index 4a553f6c6fa..3fde9914787 100644
--- a/gnu/usr.bin/gdb/gdb/arch/i386/i386b-nat.c
+++ b/gnu/usr.bin/gdb/gdb/arch/i386/i386b-nat.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-	$Id: i386b-nat.c,v 1.3 1995/11/23 15:56:20 deraadt Exp $
+	$Id: i386b-nat.c,v 1.4 1995/12/14 03:42:37 deraadt Exp $
 */
 
 #include <sys/types.h>
diff --git a/gnu/usr.bin/gdb/gdb/arch/i386/nm.h b/gnu/usr.bin/gdb/gdb/arch/i386/nm.h
index a30ae014c73..b519824d3c6 100644
--- a/gnu/usr.bin/gdb/gdb/arch/i386/nm.h
+++ b/gnu/usr.bin/gdb/gdb/arch/i386/nm.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-	$Id: nm.h,v 1.2 1995/11/23 15:56:21 deraadt Exp $
+	$Id: nm.h,v 1.3 1995/12/14 03:42:38 deraadt Exp $
 */
 
 #ifndef NM_I386BSD_H
diff --git a/gnu/usr.bin/gdb/gdb/arch/i386/tm.h b/gnu/usr.bin/gdb/gdb/arch/i386/tm.h
index dba13496319..aba3be8283c 100644
--- a/gnu/usr.bin/gdb/gdb/arch/i386/tm.h
+++ b/gnu/usr.bin/gdb/gdb/arch/i386/tm.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-	$Id: tm.h,v 1.2 1995/11/23 15:56:22 deraadt Exp $
+	$Id: tm.h,v 1.3 1995/12/14 03:42:39 deraadt Exp $
 */
 
 /* Override number of expected traps from sysv. */
diff --git a/gnu/usr.bin/gdb/objdump/Makefile b/gnu/usr.bin/gdb/objdump/Makefile
index 2a42fbbf3a5..4640efba150 100644
--- a/gnu/usr.bin/gdb/objdump/Makefile
+++ b/gnu/usr.bin/gdb/objdump/Makefile
@@ -1,12 +1,14 @@
-# $Id: Makefile,v 1.1.1.1 1995/10/18 08:40:13 deraadt Exp $
+# $Id: Makefile,v 1.2 1995/12/14 03:42:41 deraadt Exp $
 
 # Paths to libraries
 #
 LIBBFD!=cd $(.CURDIR)/../bfd; \
-	printf "xxx:\n\techo \$${.OBJDIR}/libbfd.a\n" | make -r -s -f - xxx
+	printf "xxx:\n\techo \$${.OBJDIR}/libbfd.a\n" | \
+	${MAKE} -r -s -f - xxx | grep libbfd
 
 LIBIBERTY!=cd $(.CURDIR)/../libiberty; \
-	printf "xxx:\n\techo \$${.OBJDIR}/libiberty.a\n" | make -r -s -f - xxx
+	printf "xxx:\n\techo \$${.OBJDIR}/libiberty.a\n" | \
+	${MAKE} -r -s -f - xxx | grep libiberty
 
 
 PROG=		objdump
diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile
index 706725da795..b8fa10a85c6 100644
--- a/gnu/usr.bin/gzip/Makefile
+++ b/gnu/usr.bin/gzip/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 1995/04/23 07:58:45 cgd Exp $
+#	$NetBSD: Makefile,v 1.17 1995/10/24 22:18:34 jtc Exp $
 
 PROG=	gzip
 SRCS=	gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
@@ -15,12 +15,14 @@ LDSTATIC= -static
 LDADD+=	-lgnumalloc
 DPADD+=	/usr/lib/libgnumalloc.a
 
-MLINKS= gzip.1 gunzip.1 gzip.1 gzcat.1 gzip.1 zcat.1
+MLINKS+= gzip.1 gunzip.1 gzip.1 gzcat.1 gzip.1 zcat.1
+MLINKS+= zdiff.1 zcmp.1
 #MLINKS+= gzip.1 uncompress.1
 LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip
 LINKS+= ${BINDIR}/gzip ${BINDIR}/gzcat
-#LINKS+= ${BINDIR}/gzip ${BINDIR}/uncompress
 LINKS+= ${BINDIR}/gzip ${BINDIR}/zcat
+LINKS+=	${BINDIR}/zdiff ${BINDIR}/zcmp
+#LINKS+= ${BINDIR}/gzip ${BINDIR}/uncompress
 
 afterinstall:
 	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/gnu/usr.bin/rcs/Makefile.inc b/gnu/usr.bin/rcs/Makefile.inc
index fd9dd28a11a..be47173c73f 100644
--- a/gnu/usr.bin/rcs/Makefile.inc
+++ b/gnu/usr.bin/rcs/Makefile.inc
@@ -1,4 +1,5 @@
-#	$Id: Makefile.inc,v 1.1.1.1 1995/10/18 08:40:59 deraadt Exp $
+#	$Id: Makefile.inc,v 1.2 1995/12/14 03:43:17 deraadt Exp $
 
 LIBRCS!=cd $(.CURDIR)/../lib; \
-	printf "xxx:\n\techo \$${.OBJDIR}/librcs.a\n" | ${MAKE} -r -s -f - xxx
+	printf "xxx:\n\techo \$${.OBJDIR}/librcs.a\n" | \
+	${MAKE} -r -s -f - xxx | grep librcs
diff --git a/gnu/usr.bin/send-pr/send-pr.sh b/gnu/usr.bin/send-pr/send-pr.sh
index 48bd9d3a715..0ee74f88030 100644
--- a/gnu/usr.bin/send-pr/send-pr.sh
+++ b/gnu/usr.bin/send-pr/send-pr.sh
@@ -106,11 +106,14 @@ if [ -n "$NAME" ]; then
 elif [ -f $HOME/.fullname ]; then
   ORIGINATOR="`sed -e '1q' $HOME/.fullname`"
 else
-  # Must use temp file due to incompatibilities in quoting behavior
-  # and to protect shell metacharacters in the expansion of $LOGNAME
-  $PASSWD | grep "^$LOGNAME:" | awk -F: '{print $5}' | sed -e 's/,.*//' > $TEMP
-  ORIGINATOR="`cat $TEMP`"
-  rm -f $TEMP
+  ORIGINATOR=`$PASSWD | sed -e /"$LOGNAME"/'{s/^[^:]*:[^:]*:[^:]*:[^:]*:\([^,:;]*\).*$/\1/' -e q -e } -e d`
+  case "$ORIGINATOR" in
+  *'&'*)
+    TEMP=`echo $LOGNAME | tr '[a-z]' '[A-Z]'`
+    TEMP=`echo $TEMP $LOGNAME | sed 's/^\(.\)[^ ]* ./\1/'`
+    ORIGINATOR=`echo "$ORIGINATOR" | sed "s/&/$TEMP/"`
+    ;;
+  esac
 fi
 
 if [ -n "$ORGANIZATION" ]; then
-- 
2.20.1