diff options
Diffstat (limited to 'gnu')
27 files changed, 152 insertions, 621 deletions
diff --git a/gnu/lib/libgmp/Makefile b/gnu/lib/libgmp/Makefile index 37e390f392c3d..4621b00710b29 100644 --- a/gnu/lib/libgmp/Makefile +++ b/gnu/lib/libgmp/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.20 1998/12/16 04:59:53 imp Exp $ +# $Id: Makefile,v 1.18 1998/05/24 21:51:50 eivind Exp $ # LIB= gmp @@ -23,13 +23,6 @@ CFLAGS+= -I${GMPDIR}/mpn/x86 MPN_SRC_ASM= add_n.S addmul_1.S lshift.S mul_1.S rshift.S sub_n.S submul_1.S -.elif ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" -.PATH: ${GMPDIR}/mpn/mips3 ${GMPDIR}/mpn/generic - -CFLAGS+= -I${GMPDIR}/mpn/mips3 - -MPN_SRC_ASM= add_n.s addmul_1.s lshift.s mul_1.s rshift.s sub_n.s submul_1.s - .elif ${MACHINE_ARCH} == "m68k" .PATH: ${GMPDIR}/mpn/m68k ${GMPDIR}/mpn/generic @@ -143,5 +136,18 @@ beforeinstall: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ ${GMPDIR}/gmp.h ${DESTDIR}/usr/include +.S.o: + ${CC} ${SFLAGS} ${CFLAGS:M-[ID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET} + +.s.o: + ${AS} ${SFLAGS} ${CFLAGS:M-[ID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET} + +.S.po: + ${CC} -DPROF ${SFLAGS} ${CFLAGS:M-[ID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET} + +.S.so: + ${CC} -fpic -DPIC ${SFLAGS} ${CFLAGS:M-[ID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET} + @${LD} -O ${.TARGET} -x -r ${.TARGET} + .include "Makefile.inc" .include <bsd.lib.mk> diff --git a/gnu/lib/libmp/Makefile b/gnu/lib/libmp/Makefile index 5f922d26d9a47..f0c1eece40cef 100644 --- a/gnu/lib/libmp/Makefile +++ b/gnu/lib/libmp/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.16 1998/08/30 01:57:55 jb Exp $ +# $Id: Makefile,v 1.15 1998/05/15 06:42:37 jb Exp $ # LIB= mp @@ -22,13 +22,6 @@ CFLAGS+= -I${GMPDIR}/mpn/x86 -I${GMPDIR}/mpz -DBERKELEY_MP MPN_SRC_ASM= add_n.S addmul_1.S lshift.S mul_1.S rshift.S sub_n.S submul_1.S -.elif ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" -.PATH: ${GMPDIR} ${GMPDIR}/mpn ${GMPDIR}/mpn/mips3 ${GMPDIR}/mpn/generic \ - ${GMPDIR}/mpbsd - -CFLAGS+= -I${GMPDIR}/mpn/mips3 -I${GMPDIR}/mpz -DBERKELEY_MP - -MPN_SRC_ASM= add_n.s addmul_1.s lshift.s mul_1.s rshift.s sub_n.s submul_1.s .elif ${MACHINE_ARCH} == "m68k" .PATH: ${GMPDIR} ${GMPDIR}/mpn ${GMPDIR}/mpn/m68k ${GMPDIR}/mpn/generic \ ${GMPDIR}/mpbsd diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile index b8059d4231fa6..891dfa3d7e3d9 100644 --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.11 1998/12/27 17:25:27 bde Exp $ +# $Id: Makefile,v 1.9 1998/03/20 15:10:59 bde Exp $ # GPPDIR= ${.CURDIR}/../../../contrib/libg++ @@ -93,40 +93,32 @@ beforeinstall: # ======== typeinfoi.o, stdexcepti.o ======== .for file in typeinfoi stdexcepti -CLEANFILES+= ${file}.o.tmp ${file}.po.tmp ${file}.so.tmp ${file}.o: ${file}.cc ${CXX} ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} + @${LD} -O ${.TARGET} -x -r ${.TARGET} -${file}.So: ${file}.cc +${file}.so: ${file}.cc ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} + @${LD} -O ${.TARGET} -x -r ${.TARGET} ${file}.po: ${file}.cc ${CXX} -p ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} + @${LD} -O ${.TARGET} -X -r ${.TARGET} .endfor # ======== exceptioni.o ======== .for file in exceptioni -CLEANFILES+= ${file}.o.tmp ${file}.po.tmp ${file}.so.tmp ${file}.o: ${file}.cc ${CXX} ${CXXFLAGS} -O0 -frtti -fhandle-exceptions -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} + @${LD} -O ${.TARGET} -x -r ${.TARGET} -${file}.So: ${file}.cc +${file}.so: ${file}.cc ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -O0 -frtti -fhandle-exceptions -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} + @${LD} -O ${.TARGET} -x -r ${.TARGET} ${file}.po: ${file}.cc ${CXX} -p ${CXXFLAGS} -O0 -frtti -fhandle-exceptions -c ${DIR}/${file}.cc -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} + @${LD} -O ${.TARGET} -X -r ${.TARGET} .endfor # ======== cstrmain.o ======== diff --git a/gnu/usr.bin/binutils/doc/inc-hist.diff b/gnu/usr.bin/binutils/doc/inc-hist.diff deleted file mode 100644 index fdd212081cd34..0000000000000 --- a/gnu/usr.bin/binutils/doc/inc-hist.diff +++ /dev/null @@ -1,24 +0,0 @@ -*** hsuser.texinfo Fri May 1 23:48:48 1998 ---- inc-hist.texi Mon Jun 30 22:57:58 1997 -*************** -*** 34,42 **** - @end ifset - @ifclear BashFeatures - This chapter describes how to use the GNU History Library interactively, -! from a user's standpoint. It should be considered a user's guide. For -! information on using the GNU History Library in your own programs, -! @pxref{Programming with GNU History}. - @end ifclear - - @ifset BashFeatures ---- 34,43 ---- - @end ifset - @ifclear BashFeatures - This chapter describes how to use the GNU History Library interactively, -! from a user's standpoint. -! @c It should be considered a user's guide. For -! @c information on using the GNU History Library in your own programs, -! @c @pxref{Programming with GNU History}. - @end ifclear - - @ifset BashFeatures diff --git a/gnu/usr.bin/binutils/gdb/gdb.1 b/gnu/usr.bin/binutils/gdb/gdb.1 deleted file mode 100644 index f07c89135b1d7..0000000000000 --- a/gnu/usr.bin/binutils/gdb/gdb.1 +++ /dev/null @@ -1,385 +0,0 @@ -.\" Copyright (c) 1991 Free Software Foundation -.\" See section COPYING for conditions for redistribution -.\" $Id: gdb.1,v 1.3 1991/12/13 22:22:58 pesch Exp $ -.TH gdb 1 "4nov1991" "GNU Tools" "GNU Tools" -.SH NAME -gdb \- The GNU Debugger -.SH SYNOPSIS -.na -.TP -.B gdb -.RB "[\|" \-help "\|]" -.RB "[\|" \-nx "\|]" -.RB "[\|" \-q "\|]" -.RB "[\|" \-batch "\|]" -.RB "[\|" \-cd=\c -.I dir\c -\|] -.RB "[\|" \-f "\|]" -.RB "[\|" \-k "\|]" -.RB "[\|" \-wcore "\|]" -.RB "[\|" "\-b\ "\c -.IR bps "\|]" -.RB "[\|" "\-tty="\c -.IR dev "\|]" -.RB "[\|" "\-s "\c -.I symfile\c -\&\|] -.RB "[\|" "\-e "\c -.I prog\c -\&\|] -.RB "[\|" "\-se "\c -.I prog\c -\&\|] -.RB "[\|" "\-c "\c -.I core\c -\&\|] -.RB "[\|" "\-x "\c -.I cmds\c -\&\|] -.RB "[\|" "\-d "\c -.I dir\c -\&\|] -.RB "[\|" \c -.I prog\c -.RB "[\|" \c -.IR core \||\| procID\c -\&\|]\&\|] -.ad b -.SH DESCRIPTION -The purpose of a debugger such as GDB is to allow you to see what is -going on ``inside'' another program while it executes\(em\&or what another -program was doing at the moment it crashed. - -GDB can do four main kinds of things (plus other things in support of -these) to help you catch bugs in the act: - -.TP -\ \ \ \(bu -Start your program, specifying anything that might affect its behavior. - -.TP -\ \ \ \(bu -Make your program stop on specified conditions. - -.TP -\ \ \ \(bu -Examine what has happened, when your program has stopped. - -.TP -\ \ \ \(bu -Change things in your program, so you can experiment with correcting the -effects of one bug and go on to learn about another. -.PP - -You can use GDB to debug programs written in C, C++, and Modula-2. -Fortran support will be added when a GNU Fortran compiler is ready. - -GDB is invoked with the shell command \c -.B gdb\c -\&. Once started, it reads -commands from the terminal until you tell it to exit with the GDB -command \c -.B quit\c -\&. You can get online help from \c -.B gdb\c -\& itself -by using the command \c -.B help\c -\&. - -You can run \c -.B gdb\c -\& with no arguments or options; but the most -usual way to start GDB is with one argument or two, specifying an -executable program as the argument: -.sp -.br -gdb\ program -.br -.sp - -You can also start with both an executable program and a core file specified: -.sp -.br -gdb\ program\ core -.br -.sp - -You can, instead, specify a process ID as a second argument, if you want -to debug a running process: -.sp -.br -gdb\ program\ 1234 -.br -.sp - -would attach GDB to process \c -.B 1234\c -\& (unless you also have a file -named `\|\c -.B 1234\c -\&\|'; GDB does check for a core file first). - -Here are some of the most frequently needed GDB commands: -.TP -.B break \fR[\|\fIfile\fB:\fR\|]\fIfunction -\& -Set a breakpoint at \c -.I function\c -\& (in \c -.I file\c -\&). -.TP -.B run \fR[\|\fIarglist\fR\|] -Start your program (with \c -.I arglist\c -\&, if specified). -.TP -.B bt -Backtrace: display the program stack. -.TP -.BI print " expr"\c -\& -Display the value of an expression. -.TP -.B c -Continue running your program (after stopping, e.g. at a breakpoint). -.TP -.B next -Execute next program line (after stopping); step \c -.I over\c -\& any -function calls in the line. -.TP -.B step -Execute next program line (after stopping); step \c -.I into\c -\& any -function calls in the line. -.TP -.B help \fR[\|\fIname\fR\|] -Show information about GDB command \c -.I name\c -\&, or general information -about using GDB. -.TP -.B quit -Exit from GDB. -.PP -For full details on GDB, see \c -.I -Using GDB: A Guide to the GNU Source-Level Debugger\c -\&, by Richard M. Stallman and Roland H. Pesch. The same text is available online -as the \c -.B gdb\c -\& entry in the \c -.B info\c -\& program. -.SH OPTIONS -Any arguments other than options specify an executable -file and core file (or process ID); that is, the first argument -encountered with no -associated option flag is equivalent to a `\|\c -.B \-se\c -\&\|' option, and the -second, if any, is equivalent to a `\|\c -.B \-c\c -\&\|' option if it's the name of a file. Many options have -both long and short forms; both are shown here. The long forms are also -recognized if you truncate them, so long as enough of the option is -present to be unambiguous. (If you prefer, you can flag option -arguments with `\|\c -.B +\c -\&\|' rather than `\|\c -.B \-\c -\&\|', though we illustrate the -more usual convention.) - -All the options and command line arguments you give are processed -in sequential order. The order makes a difference when the -`\|\c -.B \-x\c -\&\|' option is used. - -.TP -.B \-help -.TP -.B \-h -List all options, with brief explanations. - -.TP -.BI "\-symbols=" "file"\c -.TP -.BI "\-s " "file"\c -\& -Read symbol table from file \c -.I file\c -\&. - -.TP -.BI "\-exec=" "file"\c -.TP -.BI "\-e " "file"\c -\& -Use file \c -.I file\c -\& as the executable file to execute when -appropriate, and for examining pure data in conjunction with a core -dump. - -.TP -.BI "\-se=" "file"\c -\& -Read symbol table from file \c -.I file\c -\& and use it as the executable -file. - -.TP -.BI "\-core=" "file"\c -.TP -.BI "\-c " "file"\c -\& -Use file \c -.I file\c -\& as a core dump to examine. - -.TP -.BI "\-command=" "file"\c -.TP -.BI "\-x " "file"\c -\& -Execute GDB commands from file \c -.I file\c -\&. - -.TP -.BI "\-directory=" "directory"\c -.TP -.BI "\-d " "directory"\c -\& -Add \c -.I directory\c -\& to the path to search for source files. -.PP - -.TP -.B \-nx -.TP -.B \-n -Do not execute commands from any `\|\c -.B .gdbinit\c -\&\|' initialization files. -Normally, the commands in these files are executed after all the -command options and arguments have been processed. - - -.TP -.B \-quiet -.TP -.B \-q -``Quiet''. Do not print the introductory and copyright messages. These -messages are also suppressed in batch mode. - -.TP -.B \-batch -Run in batch mode. Exit with status \c -.B 0\c -\& after processing all the command -files specified with `\|\c -.B \-x\c -\&\|' (and `\|\c -.B .gdbinit\c -\&\|', if not inhibited). -Exit with nonzero status if an error occurs in executing the GDB -commands in the command files. - -Batch mode may be useful for running GDB as a filter, for example to -download and run a program on another computer; in order to make this -more useful, the message -.sp -.br -Program\ exited\ normally. -.br -.sp - -(which is ordinarily issued whenever a program running under GDB control -terminates) is not issued when running in batch mode. - -.TP -.BI "\-cd=" "directory"\c -\& -Run GDB using \c -.I directory\c -\& as its working directory, -instead of the current directory. - -.TP -.B \-fullname -.TP -.B \-f -Emacs sets this option when it runs GDB as a subprocess. It tells GDB -to output the full file name and line number in a standard, -recognizable fashion each time a stack frame is displayed (which -includes each time the program stops). This recognizable format looks -like two `\|\c -.B \032\c -\&\|' characters, followed by the file name, line number -and character position separated by colons, and a newline. The -Emacs-to-GDB interface program uses the two `\|\c -.B \032\c -\&\|' characters as -a signal to display the source code for the frame. - -.TP -.B \-kernel -.TP -.B \-k -Use gdb in kernel debugging mode. The prompt is set to ``(kgdb)''. - -.TP -.B \-wcore -This option may only be used in kernel debugging mode while -debugging a ``live'' kernel and makes the corefile (/dev/mem) -writable. - -.TP -.BI "\-b " "bps"\c -\& -Set the line speed (baud rate or bits per second) of any serial -interface used by GDB for remote debugging. - -.TP -.BI "\-tty=" "device"\c -\& -Run using \c -.I device\c -\& for your program's standard input and output. -.PP - -.SH "SEE ALSO" -.RB "`\|" gdb "\|'" -entry in -.B info\c -\&; -.I -Using GDB: A Guide to the GNU Source-Level Debugger\c -, Richard M. Stallman and Roland H. Pesch, July 1991. -.SH COPYING -Copyright (c) 1991 Free Software Foundation, Inc. -.PP -Permission is granted to make and distribute verbatim copies of -this manual provided the copyright notice and this permission notice -are preserved on all copies. -.PP -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided that the -entire resulting derived work is distributed under the terms of a -permission notice identical to this one. -.PP -Permission is granted to copy and distribute translations of this -manual into another language, under the above conditions for modified -versions, except that this permission notice may be included in -translations approved by the Free Software Foundation instead of in -the original English. diff --git a/gnu/usr.bin/binutils/gdb/i386/xm.h b/gnu/usr.bin/binutils/gdb/i386/xm.h deleted file mode 100644 index 8a852a29787cc..0000000000000 --- a/gnu/usr.bin/binutils/gdb/i386/xm.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Host-dependent definitions for Intel 386 running BSD Unix, for GDB. - Copyright 1986, 1987, 1989, 1992 Free Software Foundation, Inc. - -This file is part of GDB. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#define HOST_BYTE_ORDER LITTLE_ENDIAN - -#include <machine/limits.h> /* for INT_MIN, to avoid "INT_MIN - redefined" warnings from defs.h */ diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile index 13cc895720fdd..455de6d6a0d75 100644 --- a/gnu/usr.bin/binutils/strip/Makefile +++ b/gnu/usr.bin/binutils/strip/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.4 1998/06/03 18:01:04 peter Exp $ +# $Id: Makefile,v 1.3 1998/03/12 02:55:43 jdp Exp $ # .include "../Makefile.inc0" @@ -24,7 +24,7 @@ maybe_stripped: strip cp strip maybe_stripped .if defined(STRIP) .if ${STRIP:M-s} != "" - -strip maybe_stripped + strip maybe_stripped .endif .endif diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index 105c183844220..f5c9c2b66fb0b 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -1,5 +1,5 @@ # -# $Id: Makefile.inc,v 1.24 1998/10/26 18:27:32 imp Exp $ +# $Id: Makefile.inc,v 1.22 1998/01/25 09:49:00 jb Exp $ # # Sometimes this is .include'd several times... @@ -15,6 +15,22 @@ OUT_FILE= ${MACHINE_ARCH}.c OUT_OBJ= ${MACHINE_ARCH} .PATH: ${GCCDIR}/config/${MACHINE_ARCH} +.if ${MACHINE} == "alpha" +BINFORMAT= elf +.else +# Pick aout for now. the elf config is not binary compatable. +BINFORMAT?= aout +#BINFORMAT?= elf +.endif + +# same backend, just change compiled-in default. +.if ${BINFORMAT} == aout +CFLAGS+= -DFREEBSD_AOUT +.endif +.if ${BINFORMAT} == elf +CFLAGS+= -DFREEBSD_ELF +.endif + target= ${MACHINE_ARCH}-unknown-freebsd version!= sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${GCCDIR}/version.c diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile index 3c0f2e8f2b823..3b085c6eb3b9e 100644 --- a/gnu/usr.bin/cc/cc_int/Makefile +++ b/gnu/usr.bin/cc/cc_int/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.14 1997/02/22 15:44:57 peter Exp $ +# $Id$ # .include "../Makefile.inc" @@ -24,6 +24,6 @@ NOPIC= YES install: @true -${OUT_OBJ}.o ${OUT_OBJ}.So: ${OUT_FILE} +${OUT_OBJ}.o ${OUT_OBJ}.so: ${OUT_FILE} .include <bsd.lib.mk> diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile index 72e563c16d80c..42a13c8c6a3ee 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.13 1998/08/20 21:45:46 jb Exp $ +# $Id: Makefile,v 1.12 1998/07/07 01:46:41 bde Exp $ # # @@ -124,18 +124,18 @@ CLEANFILES+= objc-parse.y # insurance #----------------------------------------------------------------------- # the host/target compiler config. -COMMONHDRS= config.h hconfig.h options.h specs.h tconfig.h tm.h -GENSRCS+= ${COMMONHDRS} +COMMONHDRS= config.h hconfig.h tconfig.h tm.h options.h specs.h + +${COMMONHDRS}: + echo '#include "${MACHINE_ARCH}/freebsd.h"' > tm.h + echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > config.h + echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > hconfig.h + echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > tconfig.h + echo '#include "cp/lang-options.h"' > options.h + echo '#include "cp/lang-specs.h"' > specs.h + echo '#include "f2c-specs.h"' >> specs.h -config.h hconfig.h tconfig.h: - echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > ${.TARGET} -options.h: - echo '#include "cp/lang-options.h"' > ${.TARGET} -specs.h: - echo '#include "cp/lang-specs.h"'> ${.TARGET} - echo '#include "f2c-specs.h"' >> ${.TARGET} -tm.h: - echo '#include "${MACHINE_ARCH}/freebsd.h"' > ${.TARGET} +GENSRCS+= ${COMMONHDRS} #----------------------------------------------------------------------- # General things. diff --git a/gnu/usr.bin/cc/libgcc/Makefile b/gnu/usr.bin/cc/libgcc/Makefile index 260001aaab491..cbae22a28c54b 100644 --- a/gnu/usr.bin/cc/libgcc/Makefile +++ b/gnu/usr.bin/cc/libgcc/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.18 1998/10/06 11:28:29 peter Exp $ +# $Id: Makefile,v 1.17 1998/07/08 00:45:50 bde Exp $ # LIB= gcc @@ -50,8 +50,8 @@ CLEANFILES+= ${COMMONHDRS} LIB1OBJS= ${LIB1FUNCS:S/$/.o/} LIB2OBJS= ${LIB2FUNCS:S/$/.o/} -LIB1SOBJS= ${LIB1FUNCS:S/$/.So/} -LIB2SOBJS= ${LIB2FUNCS:S/$/.So/} +LIB1SOBJS= ${LIB1FUNCS:S/$/.so/} +LIB2SOBJS= ${LIB2FUNCS:S/$/.so/} LIB1POBJS= ${LIB1FUNCS:S/$/.po/} LIB2POBJS= ${LIB2FUNCS:S/$/.po/} diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile index 3657b36769c51..a758287a093df 100644 --- a/gnu/usr.bin/grep/Makefile +++ b/gnu/usr.bin/grep/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.13 1998/10/02 07:14:32 obrien Exp $ +# $Id: Makefile,v 1.12 1998/03/07 16:13:57 wosch Exp $ GREP_LIBZ= YES GREP_FTS= YES @@ -7,7 +7,7 @@ PROG= grep SRCS= dfa.c grep.c getopt.c kwset.c obstack.c search.c CFLAGS+=-DGREP -DHAVE_STRING_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_UNISTD_H=1 \ -DHAVE_GETPAGESIZE=1 -DHAVE_MEMCHR=1 -DHAVE_STRERROR=1 \ - -DHAVE_VALLOC=1 -DHAVE_WORKING_MMAP=1 + -DHAVE_VALLOC=1 LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/fgrep diff --git a/gnu/usr.bin/man/man/man.man b/gnu/usr.bin/man/man/man.man index b597929ecdb84..d16a59a45fc5f 100644 --- a/gnu/usr.bin/man/man/man.man +++ b/gnu/usr.bin/man/man/man.man @@ -132,10 +132,7 @@ is used. .Xr whatis 1 , .Xr manpath 1 , .Xr more 1 , -.Xr groff 1 , -.Xr man 7 , -.Xr mdoc 7 , -.Xr mdoc.samples 7 +.Xr groff 1 .Sh BUGS The .Fl t diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile index 2d92a903186c6..100d3dd2e5909 100644 --- a/gnu/usr.bin/perl/libperl/Makefile +++ b/gnu/usr.bin/perl/libperl/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.4 1998/09/16 17:25:51 markm Exp $ +# $Id: Makefile,v 1.3 1998/09/12 19:16:32 markm Exp $ # LIB= perl @@ -21,7 +21,7 @@ CLEANFILES+= config.h config.sh config_h.sh .SUFFIXES: -.SUFFIXES: .o .po .So .s .S .c +.SUFFIXES: .o .po .so .s .S .c .PATH: ${PERL5SRC} diff --git a/gnu/usr.bin/perl/libperl/config.SH-aout.i386 b/gnu/usr.bin/perl/libperl/config.SH-aout.i386 index aa510e3221a73..60b24d7e9673d 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-aout.i386 +++ b/gnu/usr.bin/perl/libperl/config.SH-aout.i386 @@ -5,12 +5,12 @@ # do not forget to propagate your changes by running "Configure -der". You may # instead choose to run each of the .SH files by yourself, or "Configure -S". # -# $Id: config.SH-aout.i386,v 1.9 1999/01/15 04:14:52 ache Exp $ +# $Id: config.SH-aout.i386,v 1.5 1998/09/26 16:17:04 markm Exp $ # # Package name : perl5 # Source directory : . -# Configuration time: $Date: 1999/01/15 04:14:52 $ +# Configuration time: $Date: 1998/09/26 16:17:04 $ # Configured by : markm # Target system : freebsd 3.0-current #0: @@ -55,7 +55,7 @@ ccdlflags=' ' ccflags='' cf_by='markm' cf_email='markm@freebsd.org' -cf_time='$Date: 1999/01/15 04:14:52 $' +cf_time='$Date: 1998/09/26 16:17:04 $' chgrp='' chmod='' chown='' @@ -322,7 +322,7 @@ full_csh='/bin/csh' full_sed='sed' gccversion='2.7.2.1' gidtype='gid_t' -glibpth='/usr/lib/aout' +glibpth='/usr/lib /usr/lib/elf /usr/lib/aout' grep='grep' groupcat='cat /etc/group' groupstype='gid_t' @@ -389,11 +389,11 @@ i_vfork='undef' incpath='' inews='' installarchlib='/usr/libdata/perl/5.00502/mach' -installbin='/usr/local/bin' -installman1dir='/usr/local/man/man1' +installbin='/usr/bin' +installman1dir='/usr/share/man/man1' installman3dir='/usr/local/lib/perl5/5.00502/man/man3' installprivlib='/usr/libdata/perl/5.00502' -installscript='/usr/local/bin' +installscript='/usr/bin' installsitearch='/usr/local/lib/perl5/site_perl/5.005/i386-freebsd' installsitelib='/usr/local/lib/perl5/site_perl/5.005' intsize='4' @@ -407,7 +407,7 @@ less='less' lib_ext='.a' libc='undef' libperl='libperl.so.3.0' -libpth='/usr/lib/aout' +libpth='/usr/lib /usr/lib/elf /usr/lib/aout' libs='-lm -lc -lcrypt' libswanted='sfio socket inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' line='line' @@ -431,8 +431,8 @@ make_set_make='#' mallocobj='' mallocsrc='' malloctype='void *' -man1dir='/usr/local/man/man1' -man1direxp='/usr/local/man/man1' +man1dir='/usr/share/man/man1' +man1direxp='/usr/share/man/man1' man1ext='1' man3dir='/usr/share/perl/man/man3' man3direxp='/usr/share/perl/man/man3' @@ -536,7 +536,7 @@ stdio_ptr='((fp)->_ptr)' strings='/usr/include/string.h' submit='' subversion='2' -sysman='/usr/local/man/man1' +sysman='/usr/share/man/man1' tail='' tar='' tbl='' @@ -566,19 +566,19 @@ uuname='' version='5.00502' vi='' voidflags='15' -xlibpth='' +xlibpth='/usr/lib/386 /lib/386' zcat='' zip='zip' # Configure command line arguments. config_arg0='Configure' -config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' +config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' config_argc=11 config_arg1='-Dprefix=/usr' config_arg2='-Darchlib=/usr/libdata/perl/5.00502/mach' config_arg3='-Dprivlib=/usr/libdata/perl/5.00502' config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd' config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.005' -config_arg6='-Dman1dir=/usr/local/man/man1' +config_arg6='-Dman1dir=/usr/share/man/man1' config_arg7='-Dman3dir=/usr/share/perl/man/man3' config_arg8='-des' config_arg9='-Ulocincpth=' diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha index 9d41d8b9afab6..fa114ab30f8e3 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha +++ b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha @@ -5,12 +5,12 @@ # do not forget to propagate your changes by running "Configure -der". You may # instead choose to run each of the .SH files by yourself, or "Configure -S". # -# $Id: config.SH-elf.alpha,v 1.10 1999/01/15 04:14:52 ache Exp $ +# $Id: config.SH-elf.alpha,v 1.6 1998/09/26 16:17:05 markm Exp $ # # Package name : perl5 # Source directory : . -# Configuration time: $Date: 1999/01/15 04:14:52 $ +# Configuration time: $Date: 1998/09/26 16:17:05 $ # Configured by : markm # Target system : freebsd 3.0-current #0: @@ -55,7 +55,7 @@ ccdlflags=' ' ccflags='' cf_by='markm' cf_email='markm@freebsd.org' -cf_time='$Date: 1999/01/15 04:14:52 $' +cf_time='$Date: 1998/09/26 16:17:05 $' chgrp='' chmod='' chown='' @@ -322,7 +322,7 @@ full_csh='/bin/csh' full_sed='sed' gccversion='2.7.2.1' gidtype='gid_t' -glibpth="/usr/lib" +glibpth="/usr/lib /usr/local/lib" grep='grep' groupcat='cat /etc/group' groupstype='gid_t' @@ -389,11 +389,11 @@ i_vfork='undef' incpath='' inews='' installarchlib='/usr/libdata/perl/5.00502/mach' -installbin='/usr/local/bin' -installman1dir='/usr/local/man/man1' +installbin='/usr/bin' +installman1dir='/usr/share/man/man1' installman3dir='/usr/local/lib/perl5/5.00502/man/man3' installprivlib='/usr/libdata/perl/5.00502' -installscript='/usr/local/bin' +installscript='/usr/bin' installsitearch='/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd' installsitelib='/usr/local/lib/perl5/site_perl/5.005' intsize='4' @@ -407,7 +407,7 @@ less='less' lib_ext='.a' libc='undef' libperl='libperl.so.3' -libpth="/usr/lib" +libpth="/usr/lib /usr/local/lib" libs='-lm -lc -lcrypt' libswanted='sfio socket inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' line='line' @@ -431,8 +431,8 @@ make_set_make='#' mallocobj='' mallocsrc='' malloctype='void *' -man1dir='/usr/local/man/man1' -man1direxp='/usr/local/man/man1' +man1dir='/usr/share/man/man1' +man1direxp='/usr/share/man/man1' man1ext='1' man3dir='/usr/share/perl/man/man3' man3direxp='/usr/share/perl/man/man3' @@ -536,7 +536,7 @@ stdio_ptr='((fp)->_ptr)' strings='/usr/include/string.h' submit='' subversion='2' -sysman='/usr/local/man/man1' +sysman='/usr/share/man/man1' tail='' tar='' tbl='' @@ -566,19 +566,19 @@ uuname='' version='5.00502' vi='' voidflags='15' -xlibpth='' +xlibpth='/usr/lib/386 /lib/386' zcat='' zip='zip' # Configure command line arguments. config_arg0='Configure' -config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' +config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' config_argc=11 config_arg1='-Dprefix=/usr' config_arg2='-Darchlib=/usr/libdata/perl/5.00502/mach' config_arg3='-Dprivlib=/usr/libdata/perl/5.00502' config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd' config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.005' -config_arg6='-Dman1dir=/usr/local/man/man1' +config_arg6='-Dman1dir=/usr/share/man/man1' config_arg7='-Dman3dir=/usr/share/perl/man/man3' config_arg8='-des' config_arg9='-Ulocincpth=' diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 b/gnu/usr.bin/perl/libperl/config.SH-elf.i386 index 026bf5b4733be..948577a3075b6 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 +++ b/gnu/usr.bin/perl/libperl/config.SH-elf.i386 @@ -5,12 +5,12 @@ # do not forget to propagate your changes by running "Configure -der". You may # instead choose to run each of the .SH files by yourself, or "Configure -S". # -# $Id: config.SH-elf.i386,v 1.9 1999/01/15 04:14:52 ache Exp $ +# $Id: config.SH-elf.i386,v 1.5 1998/09/26 16:17:05 markm Exp $ # # Package name : perl5 # Source directory : . -# Configuration time: $Date: 1999/01/15 04:14:52 $ +# Configuration time: $Date: 1998/09/26 16:17:05 $ # Configured by : markm # Target system : freebsd 3.0-current #0: @@ -55,7 +55,7 @@ ccdlflags=' ' ccflags='' cf_by='markm' cf_email='markm@freebsd.org' -cf_time='$Date: 1999/01/15 04:14:52 $' +cf_time='$Date: 1998/09/26 16:17:05 $' chgrp='' chmod='' chown='' @@ -322,7 +322,7 @@ full_csh='/bin/csh' full_sed='sed' gccversion='2.7.2.1' gidtype='gid_t' -glibpth="/usr/lib" +glibpth="/usr/lib /usr/local/lib" grep='grep' groupcat='cat /etc/group' groupstype='gid_t' @@ -389,11 +389,11 @@ i_vfork='undef' incpath='' inews='' installarchlib='/usr/libdata/perl/5.00502/mach' -installbin='/usr/local/bin' -installman1dir='/usr/local/man/man1' +installbin='/usr/bin' +installman1dir='/usr/share/man/man1' installman3dir='/usr/local/lib/perl5/5.00502/man/man3' installprivlib='/usr/libdata/perl/5.00502' -installscript='/usr/local/bin' +installscript='/usr/bin' installsitearch='/usr/local/lib/perl5/site_perl/5.005/i386-freebsd' installsitelib='/usr/local/lib/perl5/site_perl/5.005' intsize='4' @@ -407,7 +407,7 @@ less='less' lib_ext='.a' libc='undef' libperl='libperl.so.3' -libpth="/usr/lib" +libpth="/usr/lib /usr/local/lib" libs='-lm -lc -lcrypt' libswanted='sfio socket inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' line='line' @@ -431,8 +431,8 @@ make_set_make='#' mallocobj='' mallocsrc='' malloctype='void *' -man1dir='/usr/local/man/man1' -man1direxp='/usr/local/man/man1' +man1dir='/usr/share/man/man1' +man1direxp='/usr/share/man/man1' man1ext='1' man3dir='/usr/share/perl/man/man3' man3direxp='/usr/share/perl/man/man3' @@ -536,7 +536,7 @@ stdio_ptr='((fp)->_ptr)' strings='/usr/include/string.h' submit='' subversion='2' -sysman='/usr/local/man/man1' +sysman='/usr/share/man/man1' tail='' tar='' tbl='' @@ -566,19 +566,19 @@ uuname='' version='5.00502' vi='' voidflags='15' -xlibpth='' +xlibpth='/usr/lib/386 /lib/386' zcat='' zip='zip' # Configure command line arguments. config_arg0='Configure' -config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' +config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' config_argc=11 config_arg1='-Dprefix=/usr' config_arg2='-Darchlib=/usr/libdata/perl/5.00502/mach' config_arg3='-Dprivlib=/usr/libdata/perl/5.00502' config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd' config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.005' -config_arg6='-Dman1dir=/usr/local/man/man1' +config_arg6='-Dman1dir=/usr/share/man/man1' config_arg7='-Dman3dir=/usr/share/perl/man/man3' config_arg8='-des' config_arg9='-Ulocincpth=' diff --git a/gnu/usr.bin/perl/suidperl/Makefile b/gnu/usr.bin/perl/suidperl/Makefile index 0bf9af5e796a7..5194251fb65e7 100644 --- a/gnu/usr.bin/perl/suidperl/Makefile +++ b/gnu/usr.bin/perl/suidperl/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.5 1998/10/11 18:13:42 markm Exp $ +# $Id: Makefile,v 1.4 1998/09/22 12:00:58 markm Exp $ # PROG= suidperl @@ -11,8 +11,6 @@ DPADD= lib/auto/DynaLoader/DynaLoader.a ${LIBPERL} ${LIBM} ${LIBCRYPT} LDADD= lib/auto/DynaLoader/DynaLoader.a -lperl -lm -lcrypt BINOWN= root BINMODE=4511 -LINKS= ${BINDIR}/${PROG} ${BINDIR}/sperl5.00502 - CLEANFILES= config.h config.sh config_h.sh writemain writemain.sh \ Config.pm cflags cflags.sh myconfig perlmain.c miniperlmain.c \ diff --git a/gnu/usr.bin/tar/getdate.y b/gnu/usr.bin/tar/getdate.y index 63ac7f7c942bd..cc415776917d9 100644 --- a/gnu/usr.bin/tar/getdate.y +++ b/gnu/usr.bin/tar/getdate.y @@ -1,5 +1,5 @@ %{ -/* $Revision: 1.2.8.3 $ +/* $Revision: 1.2 $ ** ** Originally written by Steven M. Bellovin <smb@research.att.com> while ** at the University of North Carolina at Chapel Hill. Later tweaked by @@ -98,7 +98,7 @@ extern struct tm *localtime(); #if !defined(lint) && !defined(SABER) static char RCS[] = - "$Header: /home/ncvs/src/gnu/usr.bin/tar/getdate.y,v 1.2.8.3 1999/01/13 06:27:34 danny Exp $"; + "$Header: /home/ncvs/src/gnu/usr.bin/tar/getdate.y,v 1.2 1994/11/04 02:12:22 jkh Exp $"; #endif /* !defined(lint) && !defined(SABER) */ @@ -613,18 +613,11 @@ Convert(Month, Day, Year, Hours, Minutes, Seconds, Meridian, DSTmode) if (Year < 0) Year = -Year; - - /* Might as well allow up to 2069, as the code below has - * never worked for dates prior to 1970. - */ - if (Year > 69 && Year < 100) + if (Year < 100) Year += 1900; - else if (Year < 70) - Year += 2000; - DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 29 : 28; - if (Year < EPOCH || Year > 2069 /* Code not valid past 2069 */ + if (Year < EPOCH || Year > 1999 || Month < 1 || Month > 12 /* Lint fluff: "conversion from long may lose accuracy" */ || Day < 1 || Day > DaysInMonth[(int)--Month]) @@ -633,7 +626,7 @@ Convert(Month, Day, Year, Hours, Minutes, Seconds, Meridian, DSTmode) for (Julian = Day - 1, i = 0; i < Month; i++) Julian += DaysInMonth[i]; for (i = EPOCH; i < Year; i++) - Julian += 365 + (i % 4 == 0); /* Not valid in 2100 - Not leap year */ + Julian += 365 + (i % 4 == 0); Julian *= SECSPERDAY; Julian += yyTimezone * 60L; if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) < 0) diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile index bd696f27ef04b..f1539d5a2903e 100644 --- a/gnu/usr.bin/texinfo/Makefile +++ b/gnu/usr.bin/texinfo/Makefile @@ -2,6 +2,6 @@ # $Id$ # -SUBDIR= libtxi libintl makeinfo info install-info doc +SUBDIR= libtxi makeinfo info install-info doc .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc index 08a475c92413f..5ee8874939a64 100644 --- a/gnu/usr.bin/texinfo/Makefile.inc +++ b/gnu/usr.bin/texinfo/Makefile.inc @@ -1,17 +1,11 @@ -# $Id: Makefile.inc,v 1.8 1999/01/14 20:00:26 markm Exp $ +# $Id$ -TXIDIR= ${.CURDIR}/../../../../contrib/texinfo - -.if exists(${.OBJDIR}/../libintl) -LIBINTL= ${.OBJDIR}/../libintl/libintl.a -.else -LIBINTL= ${.CURDIR}/../libintl/libintl.a -.endif +TXIDIR= ${.CURDIR}/../../../../contrib/texinfo .if exists(${.OBJDIR}/../libtxi) -LIBTXI= ${.OBJDIR}/../libtxi/libtxi.a +LIBTXI= ${.OBJDIR}/../libtxi/libtxi.a .else -LIBTXI= ${.CURDIR}/../libtxi/libtxi.a +LIBTXI= ${.CURDIR}/../libtxi/libtxi.a .endif -.include "../Makefile.inc" +.include "../../Makefile.inc" diff --git a/gnu/usr.bin/texinfo/doc/Makefile b/gnu/usr.bin/texinfo/doc/Makefile index 65e8fa6a621aa..3416ad3bcb64f 100644 --- a/gnu/usr.bin/texinfo/doc/Makefile +++ b/gnu/usr.bin/texinfo/doc/Makefile @@ -1,12 +1,7 @@ -# $Id: Makefile,v 1.9 1999/01/14 20:00:43 markm Exp $ +# $Id$ -INFO= info info-stnd texinfo - -CLEANFILES= texinfo.texi - -texinfo.texi: texinfo.txi - ln -fs ${.ALLSRC} ${.TARGET} +INFO= texinfo info info-stnd makeinfo .include <bsd.info.mk> -.PATH: ${TXIDIR}/doc +.PATH: ${TXIDIR} ${TXIDIR}/info ${TXIDIR}/makeinfo diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile index 2e291d6a2c7fb..2ba6f067c55e0 100644 --- a/gnu/usr.bin/texinfo/info/Makefile +++ b/gnu/usr.bin/texinfo/info/Makefile @@ -1,23 +1,21 @@ # $Id$ PROG= info -NOMAN= yes -SRCS= dir.c display.c display.h doc.c doc.h dribble.c dribble.h -SRCS+= echo-area.c echo-area.h filesys.c filesys.h footnotes.c -SRCS+= footnotes.h funs.h gc.c gc.h indices.c indices.h -SRCS+= info-utils.c info-utils.h info.c info.h infodoc.c -SRCS+= infomap.c infomap.h m-x.c man.c man.h nodemenu.c nodes.c -SRCS+= nodes.h search.c search.h session.c session.h signals.c -SRCS+= signals.h termdep.h terminal.c terminal.h tilde.c tilde.h -SRCS+= variables.c variables.h window.c window.h +SRCS= dir.c display.c doc.c echo_area.c filesys.c info-utils.c info.c infodoc.c infomap.c +SRCS+= m-x.c nodes.c search.c session.c signals.c terminal.c tilde.c window.c indices.c +SRCS+= xmalloc.c nodemenu.c footnotes.c dribble.c variables.c gc.c man.c clib.c -CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\" -CFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H -CFLAGS+= -I${TXIDIR} -I${TXIDIR}/lib -I../libintl +CFLAGS+= -DHANDLE_MAN_PAGES -DNAMED_FUNCTIONS=1 +CFLAGS+= -DDEFAULT_INFOPATH=\"${INFODIR}:/usr/local/info:.\" +CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_TERMIOS_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 +CFLAGS+= -DHAVE_VARARGS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 +CFLAGS+= -DHAVE_ALLOCA=1 -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_MEMSET=1 -DHAVE_BZERO=1 +CFLAGS+= -DHAVE_STRCHR=1 -DHAVE_STRCASECMP=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 -DHAVE_STRERROR=1 +CFLAGS+= -DHAVE_SIGPROCMASK=1 -DHAVE_SIGSETMASK=1 -I${TXIDIR}/libtxi -DPADD= ${LIBTERMCAP} ${LIBTXI} ${LIBINTL} -LDADD= -ltermcap ${LIBTXI} ${LIBINTL} +DPADD= ${LIBTERMCAP} ${LIBTXI} +LDADD= -ltermcap ${LIBTXI} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile index 114baaab228fe..e233f5db190fc 100644 --- a/gnu/usr.bin/texinfo/install-info/Makefile +++ b/gnu/usr.bin/texinfo/install-info/Makefile @@ -1,12 +1,15 @@ -# $Id$ +# $Id: Makefile,v 1.6 1997/04/07 16:52:45 bde Exp $ PROG= install-info -CFLAGS+= -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" -CFLAGS+= -I${TXIDIR} -I${TXIDIR}/lib -I../libintl +CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_TERMIOS_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 +CFLAGS+= -DHAVE_VARARGS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_ALLOCA=1 +CFLAGS+= -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_MEMSET=1 -DHAVE_BZERO=1 -DHAVE_STRCHR=1 +CFLAGS+= -DHAVE_STRCASECMP=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 -DHAVE_STRERROR=1 -DHAVE_SIGPROCMASK=1 +CFLAGS+= -DHAVE_SIGSETMASK=1 -I${TXIDIR}/libtxi -DPADD= ${LIBTXI} ${LIBINTL} -lz -LDADD= ${LIBTXI} ${LIBINTL} -lz +DPADD= ${LIBTXI} +LDADD= ${LIBTXI} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/texinfo/libintl/Makefile b/gnu/usr.bin/texinfo/libintl/Makefile deleted file mode 100644 index 0bce892fccdd9..0000000000000 --- a/gnu/usr.bin/texinfo/libintl/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $Id$ - -LIB= intl -INTERNALLIB= true -INTERNALSTATICLIB= true - -CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" -CFLAGS+= -DGNULOCALEDIR=\"/usr/share/locale\" -CFLAGS+= -DLOCALE_ALIAS_PATH=\"/usr/share/locale:.\" -CFLAGS+= -I${TXIDIR} -I${TXIDIR}/lib -I${TXIDIR}/intl -I. - -SRCS= bindtextdom.c dcgettext.c dgettext.c gettext.c -SRCS+= finddomain.c loadmsgcat.c localealias.c textdomain.c -SRCS+= l10nflist.c explodename.c intl-compat.c libintl.h - -CLEANFILES+= libintl.h - -libintl.h: libgettext.h - @ln -sf ${.OODATE} ${.TARGET} - -.include <bsd.lib.mk> - -.PATH: ${TXIDIR}/intl diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile index 5e83853a11b16..73a371356129e 100644 --- a/gnu/usr.bin/texinfo/libtxi/Makefile +++ b/gnu/usr.bin/texinfo/libtxi/Makefile @@ -4,8 +4,8 @@ LIB= txi INTERNALLIB= true INTERNALSTATICLIB= true -SRCS= getopt.c getopt1.c xmalloc.c xstrdup.c +SRCS= getopt.c getopt1.c .include <bsd.lib.mk> -.PATH: ${TXIDIR}/lib +.PATH: ${TXIDIR}/libtxi diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile index 2037f4c090112..a5398940a71f2 100644 --- a/gnu/usr.bin/texinfo/makeinfo/Makefile +++ b/gnu/usr.bin/texinfo/makeinfo/Makefile @@ -1,15 +1,17 @@ -# $Id: Makefile,v 1.8 1999/01/14 20:00:46 markm Exp $ +# $Id$ PROG= makeinfo NOMAN= yes SRCS= makeinfo.c multi.c -CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" -CFLAGS+= -I${TXIDIR}/makeinfo -I${TXIDIR} -I${TXIDIR}/lib -I../libintl +CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_TERMIOS_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 +CFLAGS+= -DHAVE_VARARGS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_ALLOCA=1 +CFLAGS+= -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_MEMSET=1 -DHAVE_BZERO=1 -DHAVE_STRCHR=1 +CFLAGS+= -DHAVE_STRCASECMP=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 -DHAVE_STRERROR=1 -DHAVE_SIGPROCMASK=1 +CFLAGS+= -DHAVE_SIGSETMASK=1 -I${TXIDIR}/libtxi -DPADD= ${LIBTXI} ${LIBINTL} -LDADD= ${LIBTXI} ${LIBINTL} +DPADD= ${LIBTXI} +LDADD= ${LIBTXI} .include <bsd.prog.mk> |