add support for Tru64, patches provided by Tobias Nygren

<tnn at netilium dot org> with minor changes by me.

tested on Tru64 5.0 and 5.1B.

5 files changed, 237 insertions, 5 deletions

diff --git a/bootstrap/README.OSF1 b/bootstrap/README.OSF1
new file mode 100644
index 00000000000..52eb3bb3420
--- /dev/null
+++ b/bootstrap/README.OSF1
@@ -0,0 +1,26 @@
+$NetBSD: README.OSF1,v 1.1 2004/11/20 04:31:35 grant Exp $
+
+To use the native compiler, set PKGSRC_COMPILER=ccc in mk.conf. Use
+the native compiler whenever possible for performance reasons.
+
+If you need the C++ Compiler it is available from
+
+	ftp://ftp.compaq.com/pub/products/C-CXX/tru64/cxx/
+
+It may need a separate license to run.
+
+Should you need gcc, install lang/gcc34. When you switch between
+compilers, you must rebuild libtool-base.
+
+Some packages require a BSD-style install, but will not use the INSTALL
+environment variable. If you get install-related errors, try:
+# ln -s /usr/pkg/bin/install-sh /usr/pkg/bin/install
+$ PATH=/usr/pkg/bin:$PATH; export PATH
+
+Other suggestions to make the system more well-behaved:
+
+	MANPATH=/usr/pkg/share/man:/usr/share/man
+	PAGER=less
+	stty status ""
+
+Bootstrap tested on AlphaServer 4100 with Tru64 5.1B PK4 and DS10 with PK3.
diff --git a/bootstrap/bmake/ranlib.h b/bootstrap/bmake/ranlib.h
index 76d201eb6e8..f3ca51f42e7 100644
--- a/bootstrap/bmake/ranlib.h
+++ b/bootstrap/bmake/ranlib.h
@@ -1,5 +1,5 @@
 /*	@(#)ranlib.h 1.6 88/08/19 SMI; from UCB 4.1 83/05/03	*/
-/*	$Id: ranlib.h,v 1.1.1.1 2004/03/11 13:04:12 grant Exp $	*/
+/*	$Id: ranlib.h,v 1.2 2004/11/20 04:31:35 grant Exp $	*/
 
 /*
  * Structure of the __.SYMDEF table of contents for an archive.
@@ -10,7 +10,7 @@
  * The ran_strx fields index the string table whose first byte is numbered 0.
  */
 
-#ifndef IRIX
+#if !defined(IRIX) && !defined(__digital__)
 #ifndef _ranlib_h
 #define _ranlib_h
 
diff --git a/bootstrap/bmake/trace.h b/bootstrap/bmake/trace.h
index 96b7d39d324..8ca64f8bcda 100644
--- a/bootstrap/bmake/trace.h
+++ b/bootstrap/bmake/trace.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: trace.h,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $	*/
+/*	$NetBSD: trace.h,v 1.2 2004/11/20 04:31:35 grant Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@ typedef enum {
 	MAKEERROR,
 	JOBSTART,
 	JOBEND,
-	MAKEINTR,
+	MAKEINTR
 } TrEvent;
 
 void Trace_Init(const char *);
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index fbccf5c1e1b..0e047a68691 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.23 2004/10/31 22:04:26 wiz Exp $
+# $NetBSD: bootstrap,v 1.24 2004/11/20 04:31:35 grant Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -138,6 +138,11 @@ opsys_finish()
 		patch -d / --forward --quiet -E -p0 \
 			< files/irix.patch 2>/dev/null || true
 		;;
+	OSF1)
+		if [ ! -e /usr/X11R6 ]; then
+			ln -sf /usr /usr/X11R6
+		fi
+		;;
 	esac
 }
 
@@ -336,6 +341,14 @@ UnixWare)
 	set_opsys=no
 	CC="gcc -DUNIXWARE"; export CC
 	;;
+OSF1)
+	root_group=system
+	need_pax=yes
+	need_mtree=yes
+	need_bsd_install=yes
+	need_sed=yes
+	set_opsys=no
+	;;
 *)
 	echo "This platform ($opsys) is untried - good luck, and thanks for using pkgsrc"
 	root_group=wheel
diff --git a/bootstrap/mods/mk/OSF1.sys.mk b/bootstrap/mods/mk/OSF1.sys.mk
new file mode 100644
index 00000000000..258cf43eca4
--- /dev/null
+++ b/bootstrap/mods/mk/OSF1.sys.mk
@@ -0,0 +1,193 @@
+#	$NetBSD: OSF1.sys.mk,v 1.1 2004/11/20 04:31:35 grant Exp $
+#	@(#)sys.mk	8.2 (Berkeley) 3/21/94
+
+unix?=		We run Unix
+OS!=		uname -s
+
+.SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h
+.SUFFIXES: .sh .m4
+
+.LIBS:		.a
+
+AR?=		ar
+ARFLAGS?=	rl
+RANLIB?=	ranlib
+
+AS?=		as
+AFLAGS?=
+COMPILE.s?=	${CC} ${AFLAGS} -c
+LINK.s?=	${CC} ${AFLAGS} ${LDFLAGS}
+COMPILE.S?=	${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
+LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
+
+CC?=		cc
+NOGCCERROR?=	# defined
+DBG?=		-O2
+CFLAGS?=	${DBG}
+COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
+LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
+
+CXX?=		cxx
+CXXFLAGS?=	${CFLAGS}
+COMPILE.cc?=	${CXX} ${CXXFLAGS} ${CPPFLAGS} -c
+LINK.cc?=	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
+
+OBJC?=		${CC}
+OBJCFLAGS?=	${CFLAGS}
+COMPILE.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c
+LINK.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
+
+CPP?=		CC
+CPPFLAGS?=	
+
+FC?=		f77
+FFLAGS?=	-O
+RFLAGS?=
+COMPILE.f?=	${FC} ${FFLAGS} -c
+LINK.f?=	${FC} ${FFLAGS} ${LDFLAGS}
+COMPILE.F?=	${FC} ${FFLAGS} ${CPPFLAGS} -c
+LINK.F?=	${FC} ${FFLAGS} ${CPPFLAGS} ${LDFLAGS}
+COMPILE.r?=	${FC} ${FFLAGS} ${RFLAGS} -c
+LINK.r?=	${FC} ${FFLAGS} ${RFLAGS} ${LDFLAGS}
+
+INSTALL?=	${PREFIX}/bin/install-sh
+
+LEX?=		lex
+LFLAGS?=
+LEX.l?=		${LEX} ${LFLAGS}
+
+LD?=		ld
+LDFLAGS?=
+
+LINT?=		lint
+LINTFLAGS?=	-chapbxzF
+
+LORDER?=	lorder
+
+MAKE?=		make
+
+NM?=		nm
+
+PC?=		pc
+PFLAGS?=
+COMPILE.p?=	${PC} ${PFLAGS} ${CPPFLAGS} -c
+LINK.p?=	${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
+
+SHELL?=		sh
+
+SIZE?=		size
+
+TSORT?= 	tsort
+
+YACC?=		yacc
+YFLAGS?=
+YACC.y?=	${YACC} ${YFLAGS}
+
+# C
+.c:
+	${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.c.o:
+	${COMPILE.c} ${.IMPSRC}
+.c.a:
+	${COMPILE.c} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+.c.ln:
+	${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC}
+
+# C++
+.cc .cpp .cxx .C:
+	${LINK.cc} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.cc.o .cpp.o .cxx.o .C.o:
+	${COMPILE.cc} ${.IMPSRC}
+.cc.a .cpp.a .cxx.a .C.a:
+	${COMPILE.cc} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+# Fortran/Ratfor
+.f:
+	${LINK.f} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.f.o:
+	${COMPILE.f} ${.IMPSRC}
+.f.a:
+	${COMPILE.f} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+.F:
+	${LINK.F} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.F.o:
+	${COMPILE.F} ${.IMPSRC}
+.F.a:
+	${COMPILE.F} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+.r:
+	${LINK.r} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.r.o:
+	${COMPILE.r} ${.IMPSRC}
+.r.a:
+	${COMPILE.r} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+# Pascal
+.p:
+	${LINK.p} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.p.o:
+	${COMPILE.p} ${.IMPSRC}
+.p.a:
+	${COMPILE.p} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+# Assembly
+.s:
+	${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.s.o:
+	${COMPILE.s} ${.IMPSRC}
+.s.a:
+	${COMPILE.s} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+.S:
+	${LINK.S} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.S.o:
+	${COMPILE.S} ${.IMPSRC}
+.S.a:
+	${COMPILE.S} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+# Lex
+.l:
+	${LEX.l} ${.IMPSRC}
+	${LINK.c} -o ${.TARGET} lex.yy.c ${LDLIBS} -ll
+	rm -f lex.yy.c
+.l.c:
+	${LEX.l} ${.IMPSRC}
+	mv lex.yy.c ${.TARGET}
+.l.o:
+	${LEX.l} ${.IMPSRC}
+	${COMPILE.c} -o ${.TARGET} lex.yy.c 
+	rm -f lex.yy.c
+
+# Yacc
+.y:
+	${YACC.y} ${.IMPSRC}
+	${LINK.c} -o ${.TARGET} y.tab.c ${LDLIBS}
+	rm -f y.tab.c
+.y.c:
+	${YACC.y} ${.IMPSRC}
+	mv y.tab.c ${.TARGET}
+.y.o:
+	${YACC.y} ${.IMPSRC}
+	${COMPILE.c} -o ${.TARGET} y.tab.c
+	rm -f y.tab.c
+
+# Shell
+.sh:
+	rm -f ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}