Subject: Fixes to make jan 9th -current make & install on sparc
To: None <current-users@NetBSD.ORG>
From: David Brownlee <D.K.Brownlee@city.ac.uk>
List: current-users
Date: 01/10/1995 18:58:53
    Trying a 'make' & 'make install' on Jan 9th -current,
    came up with a couple of problems - is this the right place to mail
    about them?

    I've included quick (& seemingly reasonable) patches for the non regress
    problems - again - hope this is the right place to mail & hope they are
    of some use! Pretty sure nothing is sparc specific!

			David

    'make'

	usr.sbin/named/ns_main.c	Needed nfds moved from inside a
					function to being a global.

	gnu/usr.bin/gdb/bfd/libbfd.c	Needed to #include <stdio.h>. Otherwise
					when it tried to '#include "bfd.h"',
					which mentioned 'FILE'.... Blam...

	regress/lib/libc/sigsetjmp	Blew up in jmptest.o: "Undefined symbol
					`_sigsetjmp' & `_siglongjmp'. I simply
					decided not to compile the regress
					stuff... :)

    'make install'
	
	usr.bin/vi/USD.doc/vi.ref/Makefile mentions ref.so in its SRCS line,
					and then tries to install it... but
					there is no ref.so in the directory,
					so it chokes & dies...
	
	lib/libc/Makefile		Line 74 consists of just a single
					tab, which the -current make doesn't
					like at all! Funny... the previous
					version didn't complain... still...

	share/termcap/Makefile		Another single tab line...
	games/boggle/Makefile		Ditto!


*** usr.sbin/named/ns_main.c.orig	Tue Jan 10 09:45:19 1995
--- usr.sbin/named/ns_main.c	Tue Jan 10 09:46:07 1995
***************
*** 149,154 ****
--- 149,155 ----
  struct	netinfo *findnetinfo();
  u_long	net_mask();
  u_short	ns_port;
+ int	nfds;
  struct	sockaddr_in from_addr;		/* Source addr of last packet */
  int	from_len;			/* Source addr size of last packet */
  time_t	boottime, resettime;		/* Used by ns_stats */
***************
*** 176,182 ****
  	register struct qstream *sp;
  	register struct qdatagram *dqp;
  	struct qstream *nextsp;
- 	int nfds;
  	int on = 1;
  	int rfd, size;
  	u_long lasttime, maxctime;
--- 177,182 ----



*** gnu/usr.bin/gdb/bfd/libbfd.c.orig	Tue Jan 10 14:06:50 1995
--- gnu/usr.bin/gdb/bfd/libbfd.c	Tue Jan 10 14:07:23 1995
***************
*** 21,26 ****
--- 21,28 ----
  	$Id: libbfd.c,v 1.1 1994/01/28 12:37:56 pk Exp $
  */
  
+ #include <stdio.h>
+ 
  #include "bfd.h"
  #include "sysdep.h"
  #include "libbfd.h"



*** usr.bin/vi/USD.doc/vi.ref/Makefile.orig	Tue Jan 10 17:11:57 1995
--- usr.bin/vi/USD.doc/vi.ref/Makefile	Tue Jan 10 17:12:24 1995
***************
*** 1,7 ****
  #	@(#)Makefile	8.16 (Berkeley) 8/15/94
  
  DIR=	usd/13.viref
! SRCS=	vi.ref ex.cmd.roff set.opt.roff vi.cmd.roff ref.so
  EXTRA=	merge.awk spell.ok
  MACROS=	-me
  CLEANFILES+=vi.ref.txt index index.so
--- 1,7 ----
  #	@(#)Makefile	8.16 (Berkeley) 8/15/94
  
  DIR=	usd/13.viref
! SRCS=	vi.ref ex.cmd.roff set.opt.roff vi.cmd.roff
  EXTRA=	merge.awk spell.ok
  MACROS=	-me
  CLEANFILES+=vi.ref.txt index index.so



*** lib/libc/Makefile.orig	Tue Jan 10 17:21:21 1995
--- lib/libc/Makefile	Tue Jan 10 17:21:26 1995
***************
*** 71,75 ****
  .if defined(KMSRCS) && !empty(KMSRCS)
  	for i in ${KMSRCS}; do rm -f ${LIBKERN}/arch/${MACHINE_ARCH}/$$i; done
  .endif
! 	
  .include <bsd.lib.mk>
--- 71,75 ----
  .if defined(KMSRCS) && !empty(KMSRCS)
  	for i in ${KMSRCS}; do rm -f ${LIBKERN}/arch/${MACHINE_ARCH}/$$i; done
  .endif
! 
  .include <bsd.lib.mk>



*** share/termcap/Makefile.orig	Tue Jan 10 17:52:22 1995
--- share/termcap/Makefile	Tue Jan 10 17:52:29 1995
***************
*** 24,28 ****
  	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/map3270 \
  	     ${DESTDIR}${BINDIR}/misc
  
! 	
  .include <bsd.prog.mk>
--- 24,28 ----
  	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/map3270 \
  	     ${DESTDIR}${BINDIR}/misc
  
! 
  .include <bsd.prog.mk>



*** games/boggle/Makefile.orig	Tue Jan 10 18:27:40 1995
--- games/boggle/Makefile	Tue Jan 10 18:27:44 1995
***************
*** 17,21 ****
  	chmod 444 ${DESTDIR}/usr/share/games/boggle/dictionary
  	chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/share/games/boggle/dictindex
  	chmod 444 ${DESTDIR}/usr/share/games/boggle/dictindex
! 	
  .include <bsd.subdir.mk>
--- 17,21 ----
  	chmod 444 ${DESTDIR}/usr/share/games/boggle/dictionary
  	chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/share/games/boggle/dictindex
  	chmod 444 ${DESTDIR}/usr/share/games/boggle/dictindex
! 
  .include <bsd.subdir.mk>



  D.K.Brownlee@city.ac.uk (MIME). Network Analyst. Postmaster. Hostmaster.
              (>=-=<)   Telephone: (+44) 171 477 8186.   (>=-=<)
  Computing Services, City University, Northampton Square, London EC1V 0HB.
 .------------------------------------------------------------------------.
  \ Gratuitous advertising      Monochrome BBS      telnet mono.city.ac.uk \
   `------------------------------------------------------------------------'