Commit Graph

574 Commits

Author SHA1 Message Date
John Birrell
5ec0ebbb0d FreeBSD's make knows about the MACHINE, but not the MACHINE_ARCH unless
it is built with this defined (which it isn't by default). This change
to sys.mk treats the absence of MACHINE_ARCH as i386 on the assumption
that it will be appropriately defined (as something else) on any other
architecture. When building FreeBSD's make with NetBSD tools, both
MACHINE and MACHINE_ARCH are correctly set (e.g. when bootstrapping
FreeBSD's make on NetBSD/mvme68k, MACHINE=mvme68k and
MACHINE_ARCH=m68k). This isn't really needed for the alpha which
has both defined as 'alpha', but I thought it was worth getting the
distinction between a MACHINE and a MACHINE_ARCH correct now.

Now, shouldn't PC98 have MACHINE=pc98 and MACHINE_ARCH=i386 ??!!
1998-01-21 01:03:51 +00:00
John Birrell
5bd65ce6ad Choose the default binary format based on machine type.
Alpha is elf, not aout.
1998-01-13 06:00:56 +00:00
Steve Price
5ea3b08056 Add a couple of ?='s missed in the previous commit.
Noticed by:	Paul Allenby <pallenby@zibbi.mikom.csi.co.za>
1998-01-04 00:00:21 +00:00
Wolfram Schneider
c7d591d647 Add new variables:
LIBCOMPATDIR 	[/usr/lib/compat]
	LIBDATADIR 	[/usr/libdata]
	INCLUDEDIR 	[/usr/include]
	LIBEXECDIR 	[/usr/libexec]
1998-01-03 19:07:30 +00:00
Wolfram Schneider
32bebd8d26 Undo rev 1.11, the cd is null since NOOBJ is set.
444 -> ${SHAREMODE}
1998-01-03 14:04:55 +00:00
Satoshi Asami
68ce8f76e8 About one month worth of bsd.port.mk improvements.
(1) Allow multiple checksums of same file.
Submitted by:	hoek

(2) Add "deinstall" target as an alias to "pkg_delete $(make package-name)"
    (well, something like that, see diff for details).

(3) Add new port variable USE_AUTOCONF.   It appends BUILD_DEPENDS to
    devel/autoconf and runs autoconf before configure.
Submitted by:	ohashi@mickey.ai.kyutech.ac.jp (Takeshi Ohashi)

(4) Clarify USE_X11 and USE_IMAKE usage.

(5) Add new user-overridable variable MASTER_SITE_KDE.
Submitted by:	vanilla

(6) Add support for "Latest" package links.
Idea by:	Terry Lambert

(7) Try to catch obsolete tcl/tk installations that could cause problems.
Annoyed by various bogus commits by:	you-know-who
1998-01-02 10:37:14 +00:00
Jordan K. Hubbard
935f96e769 DISTRIBUTION is bin (we'll make the info dist another way). 1997-12-26 00:19:23 +00:00
Bruce Evans
939d5a3dd8 Only remove ${CLEANFILES} in the default clean rule. In particular,
don't remove a.out explicitly.  a.out should only be generated for
libraries and is removed in the non-default rule in bsd.lib.mk.

Removed undocumented cleanfiles target.  It was the same as the
default clean target except it didn't descend into subdirs.  It was
different from special clean targets in other ways.  This feature
hasn't been missed for more important targets.

Removed unused default cleandepend target.  bsd.dep.mk has a better
version which is always used.

Use a better rule for checkdpadd in the BINFORMAT=aout case.  This
mainly checks that ld -f is working correctly.  The old rule is
still available via `make BINFORMAT=foo checkdpadd' and should be
used to check for regressions under 2.2 where ld -f is not available.
1997-12-19 18:48:45 +00:00
Bruce Evans
c6d8090e2c Oops, the previous patch was botched. 1997-12-18 12:56:52 +00:00
Bruce Evans
f0adc726c5 Oops, rm -f can't handle empty lists. 1997-12-17 15:35:09 +00:00
Bruce Evans
c0849ac85c Oops, rm -f can't handle empty lists. 1997-12-17 15:18:53 +00:00
Bruce Evans
4e9229ba67 Don't clean files that we don't create.
Fixed style of empty test.

Include <bsd.libnames.mk> if `checkdpadd' is being made, so that it can
:e checked until it goes away.
1997-12-17 13:40:00 +00:00
Bruce Evans
e3ace70e1e Normally don't include <bsd.libnames.mk>. Include it in the !aout case
(as in bsd.prog.mk).  Include it if `checkdpadd' is being made, so that
it can be checked until it goes away.

Don't clean files that we don't create.

Fixed style of empty test.
1997-12-17 13:36:44 +00:00
Bruce Evans
079512d1a2 Removed gross dir file bootstrap rule again. It would break building
when there is no /usr/src/share/info if it were actually used.

Added comments to explain duplicated tex commands.

Use substitution in IFILENS to simplify some things.

Removed /g from many substitutions.  It is bogus for anchored matches.

Don't echo nothing.

Don't add things that wouldn't be built with the current options to
CLEANFILES (except for some cases involving tex).
Reviewed by:	wosch
1997-12-16 18:29:48 +00:00
Wolfgang Helbig
e525599ef1 Add libcalendar 1997-12-15 20:30:38 +00:00
Wolfram Schneider
b31409f379 Optimize rm(1) usage. 1997-12-14 15:38:47 +00:00
Wolfram Schneider
261d7bf1f1 Add LIBZ 1997-12-09 20:17:49 +00:00
Satoshi Asami
c9f6c74d48 Define MASTER_SITE_SUBDIR and PATCH_SITE_SUBDIR to default to "." so
we won't have double-slashes.

Add support for new port variable MANUAL_PACKAGE_BUILD.  If this is
defined as well as the user variable PACKAGE_BUILDING, the port will
be ignored.  This is used to mark ports that can be built normally
except on a machine that has a lot of conflicting ports (i.e., our
package building machine).
1997-11-20 05:33:56 +00:00
Satoshi Asami
6f6617ad09 Add new target "checksubdirs". It will warn about any subdirectories that
are not in the SUBDIR list.  It also knows about the "standard" directories
that are to be ignored ("CVS", "distfiles", etc.).
1997-11-20 05:31:44 +00:00
Wolfram Schneider
2504f8dc98 target(__target) -> target(${__target})
PR: bin/4736
Submitted by: Martin Kammerhofer <dada@sbox.tu-graz.ac.at>

Index: bsd.subdir.mk
===================================================================
RCS file: /usr/cvs/src/share/mk/bsd.subdir.mk,v
retrieving revision 1.18
diff -u -r1.18 bsd.subdir.mk
--- bsd.subdir.mk	1997/06/21 15:40:34	1.18
+++ bsd.subdir.mk	1997/11/09 18:04:33
@@ -59,7 +59,7 @@

 .for __target in all checkdpadd clean cleandir depend lint \
 		 maninstall obj objlink
-.if !target(__target)
+.if !target(${__target})
 ${__target}: _SUBDIRUSE
 .endif
 .endfor
1997-11-15 13:09:52 +00:00
Mark Murray
18fed7b641 Upgrade perl to perl5.004_04 1997-11-12 10:25:17 +00:00
Wolfram Schneider
5e1b557ef4 target(__target) -> target(${__target})
PR: bin/4736
Submitted by: Martin Kammerhofer <dada@sbox.tu-graz.ac.at>
1997-11-10 00:35:25 +00:00
Wolfram Schneider
70e244f8f6 Remove the comments hat just list the nested includes.
The lists don't provide significantly more information than
grep '\.include', and grep gives lists that are actually correct.
Submitted by: Bruce
1997-11-09 15:03:15 +00:00
Wolfram Schneider
6d840e43a4 target(__target) -> target(${__target})
PR: bin/4736
Submitted by: Martin Kammerhofer <dada@sbox.tu-graz.ac.at>
1997-11-09 14:37:40 +00:00
Bill Fenner
ca8fdeef9e Convert <, > and & into &lt;, &gt; and &amp; in port names, COMMENT and
DESCR files when building README.html .
Don't use control characters in sed statement.

Problems reported by "Chris G. Demetriou" <cgd@pa.dec.com> in NetBSD PR
pkg/4341.
1997-11-06 02:20:27 +00:00
Wolfram Schneider
81e5344479 Inlucde ../Makefile.inc if exists. This make it easier to
build the Unix Seventh Edition Manual volumes 2.
1997-11-02 18:50:53 +00:00
Wolfram Schneider
534ac553a1 Undo rev 1.33 and 1.34: Build the HTML files in .CURDIR and
not in .OBJDIR so the hyper links will work again.
1997-11-01 19:45:02 +00:00
Bruce Evans
7ffe3d1c5d Oops, comment lines can't be indented either. 1997-10-21 10:39:27 +00:00
Bruce Evans
1bfc282680 Oops, comment lines can't be continued. 1997-10-21 10:36:07 +00:00
Bruce Evans
6e47de28bb Added -Wuninitialized to CWARNFLAGS. Warnings about uninitialialized
variables were lost when we removed -W, and 23 new ones including at
least one serious one have crept in for LINT.

Restored -Winline to CFLAGS.  This gives only 3 old warnings and 1 new
for LINT.
1997-10-21 06:53:24 +00:00
Wolfram Schneider
938d2a75bd Support output format html.
Add make variables INFO2HTML, TEX, DVIPS, DVIPS2ASCII.
1997-10-12 18:54:34 +00:00
Wolfram Schneider
3f3e72d5f9 Do not use an intermediate file. The intermediate filename will go
into the info output which may breaks other programs (e.g. info2html).
1997-10-11 17:30:18 +00:00
Wolfram Schneider
8d20e51f0a Bugfix for rev 1.41:
makeinfo does not understand the tex command \input
1997-10-09 18:14:18 +00:00
Satoshi Asami
f210c44ab8 Install ${PKGDIR}/MESSAGE as /var/db/pkg/${PKGNAME}/+DISPLAY if it exists.
Reviewed by:	kiri
1997-10-08 05:04:48 +00:00
Jordan K. Hubbard
97fe7f477f Changes to support full make parallelism (-j<n>) in the world
target.
Reviewed by:	<many different folks>
Submitted by:	Nickolay N. Dudorov" <nnd@nnd.itfs.nsk.su>
1997-10-05 09:40:24 +00:00
Wolfram Schneider
7c31952e23 Delete redundant entries.
Run tex twice due cross references.
Cleanup many tex generated files in `make clean'
Format latin1 output in 80 characters column (was ~110 characters).
1997-10-04 13:00:56 +00:00
Wolfram Schneider
4e8f5527a1 Support output formats dvi, ps, latin1. 1997-10-01 21:35:14 +00:00
Peter Wemm
e782d0b55d Restore the BINFORMAT?= in sys.mk, or it's painfully difficult to use
.if in Makefiles.  bsd.prog.mk and bsd.lib.mk do not depend on it however.

Allow overriding of the -soname arg when building the lib*crypt.so* libs
since libdescrypt.so and libscrupt.so both need a -soname of libcrypt.so
so that the symlink is obeyed at runtime rather than at compile time.
1997-09-05 11:45:15 +00:00
Peter Wemm
3ec75cc6df Change the BINFORMAT definitions so that they do not depend on sys.mk,
since 2.1.x make(1) apparently does not have the -m switch to set both
the the bsd.*.mk and sys.mk location, and this breaks 'make world' from a
2.1.x system.
1997-09-05 09:09:56 +00:00
Peter Wemm
8c05a446bf A first cut at some rules for building elf shared libs. Of particular
note, using "-Wl,-f" to generate a library objects list doesn't work
anymore since the hack to ld hasn't been incorporated into binutils-2.8.
(and the -f switch is used for something else already)

This is disabled by default, don't panic! :-)
1997-08-30 23:23:18 +00:00
Bruce Evans
662773e296 Fixed cleandepend target. Subdirectories weren't handled unless SRCS
was defined.
1997-08-26 16:54:33 +00:00
Satoshi Asami
2722459822 Add "distclean" to list of targets to descend into subdirs for. 1997-08-22 11:16:15 +00:00
Satoshi Asami
45d47e069f (1) Be nicer about mtree file missing. (Actually, just suggest where
you can get one from.)

(2) Use "reinstall" as DEPENDS_TARGET if target is "reinstall".  In
    particular, this will make it possible to do a "make reinstall" on
    several NFS clients and have them install all dependencies
    correctly.
Tested by:	davidn
1997-08-20 03:44:14 +00:00
Satoshi Asami
2799473b0c Merge buildworld/installworld patch to Makefile from RELENG_2_2. Patch
a couple *.mk files to enable -current world building on really old
machines (e.g., 2.1.5).

Reviewed by:	too many many people to list here, special thanks to bde
1997-08-05 03:49:49 +00:00
Satoshi Asami
e89ac5b08b Do not set the application variable LDDESTDIR. Note that it is still honored
in a few places (in bsd.lib.mk and bsd.prog.mk); this merely fixed part of
the brokenness by not setting it here.

This fixes building of secure telnetd when DESTDIR is defined.
(Otherwise, it will try to link libtelnet from ${DESTDIR}/usr/lib.)

Reviewed by:	bde, jkh
1997-07-31 06:12:04 +00:00
Bruce Evans
5d08f31126 Don't use !empty() on the potentially unset variable MANBUILDCAT. Using
it broke "everything" unless MANBUILDCAT was set.
1997-07-25 11:17:12 +00:00
Bruce Evans
87d75709bb Removed a stray `.if' that broke everything. 1997-07-25 10:43:55 +00:00
Paul Traina
5191ded867 Allow optional building of preformatted manual pages.
Reviewed by:	wosch
1997-07-24 18:39:46 +00:00
Bruce Evans
2e9b23b0ba Added ${KMOD} to CLEANFILES. ${KMOD} gets created if you run `make load'. 1997-07-21 16:04:41 +00:00
Mark Murray
5a93a1d726 Changes for perl-5.004_01 1997-07-17 17:47:36 +00:00