Commit Graph

215 Commits

Author SHA1 Message Date
espie
f0d10863c0 Dependency tweaks.
- put .if defined(XXX) && !defined(YYY) on the same line: less indentation,
more readability.
- set found to true/false directly (builtin).

ALWAYS check that a dependency directory does exist and is a directory.
Catch up typos more quickly, since they will be evident *even if the
dependency is already satisfied*.

Make this only a warning, not a hard error, as we still want to cater
to users with a partially checked out tree...
2000-02-02 00:15:07 +00:00
espie
9fbdb62b2b Undefined PATCH_SITES equivalent to MASTER_SITES,
PATCH_SITESn equivalent to MASTER_SITESn.

Start phasing out PATCH_SITES.
2000-02-01 14:39:20 +00:00
kjell
d61239cad1 missing / in a sunsite. ok espie 2000-01-31 00:12:13 +00:00
espie
01ffa0afd0 Add intermediate `distpatch' target.
This is done in a tricky way, so as not to disturb the usual sequence
of targets. Namely, you still have
fetch, extract, patch, configure, build, install, package,
but patch does invoke a subtarget distpatch when needed,
and you can
fetch, extract, distpatch, patch, configure, build, install, package
for the same results.

Mostly useful for porters: provide an intermediate point to work on
patches, and make it easy to override distpatch/OpenBSD patches separately.
2000-01-30 15:19:40 +00:00
espie
e7e66ce2ba oops 2000-01-27 20:45:44 +00:00
espie
c7c4af8749 Missed a few phony targets. 2000-01-27 20:16:14 +00:00
brad
4cb3c59fb8 sync with recently removed network.conf 2000-01-27 15:48:53 +00:00
espie
12c5417949 Having this in the repository was a bad idea... 2000-01-27 15:36:00 +00:00
espie
1526900c51 Use db/network.conf only if it exists, defaults to the template otherwise. 2000-01-27 15:32:15 +00:00
espie
064d4ddad3 Repairs 2000-01-27 15:28:08 +00:00
brad
a177e38fec update comment to match reality after recent removal of support for using
pre-*/post-* scripts
2000-01-27 00:09:44 +00:00
espie
4ca9faf7c8 Kill _PORT_USE macro.
This trims down the number of sub-makes the port system runs quite a bit,
and makes some other fun stuff possible.

THIS KILLS THE pre-*/post-* SCRIPT STUFF
The functionality is unneeded, as it can be done with normal
pre-*/post-* targets, but it must be kept in mind when porting
Free/NetBSD ports.
2000-01-26 23:11:08 +00:00
espie
0c4dc05e18 Work-around for a whole set of bugs in 2.6...
some ftp servers give weird dates, like Dec 14 1909...
and then make gets confused, as make 2.6 is broken with respect to negative
dates.

So we touch the file whenever make gets confused and it already exists.
This avoids fetching & re-fetching files with negative dates, while keeping
timestamps for correct files...
2000-01-26 21:15:05 +00:00
espie
1415b158f2 make handles indented tests nicely.
So, we indent each test/loop level two spaces to let the structure
of bsd.port.mk be more visible.

Large indentations show that something blatantly unobvious/obfuscated is
going on.

Design decision made after consulting with brad@.
We agree it's much clearer that way.
2000-01-13 17:40:20 +00:00
espie
7b052eb98b MANNPREFIX and CATNPREFIX are no special cases.
.for lang in ${MANLANG} cannot be folded yet, as make still uses a very
primitive .for parser (should use an efficient variant of brk_string...)
2000-01-06 21:53:27 +00:00
brad
efcb8ae111 automagically -> automatically 2000-01-01 15:43:34 +00:00
brad
19431e3806 - update MASTER_SITE_AFTERSTEP and MASTER_SITE_WINDOWMAKER
- fix one URL for MASTER_SITE_XCONTRIB; from FreeBSD's bsd.port.mk
2000-01-01 15:41:33 +00:00
brad
4b3b3202b8 Substitute ftp.cdrom.com for ftp.funet.fi in MASTER_SITE_SUNSITE, which no
longer seems to be a full mirror anymore; from FreeBSD's bsd.port.mk
2000-01-01 15:17:52 +00:00
espie
821242006f Clean do-fetch target: it can depend on the files it's trying to fetch.
Plays some make trickery to get all details correct.
Numerous benefits:
- make automatically handles badly fetched files,
- possible extension to special-case *each* file fetch,
- can be easily parallelized.

Similar rules for fetch-list soon coming.

Also simplify CDROM handling while we're at it, no need for 10 knobs
when one suffices.
1999-12-24 00:27:58 +00:00
espie
ffdd2ed285 Wrap MASTER_SITESn/PATCH_SITESn into a .for loop.
Don't bother computing MASTER_SITESn/PATCH_SITESn if they're not
set in the first place...
1999-12-21 21:43:37 +00:00
espie
0d89aad7ef Deprecate DO_NADA 1999-12-20 19:02:37 +00:00
espie
089030e769 Clean up _PORT_USE, so that it does not depend on what's being made.
fetch can depend on real-fetch directly, since it does not involve
cookies.
1999-12-20 00:07:17 +00:00
espie
469acd4ed9 Changes tests of IGNORE/NO_IGNORE so that
`main' targets (checksum, fetch, extract...) are always defined.

This removes the possibility of erroneously overriding them.

Dependency fix:
- move the NO_xxx test to the _xxx_COOKIE target, so that each cookie
is built at exactly one point in the Makefile.
- separate phony targets from the real thing:
`top' dummy targets (e.g., build)  depend on the corresponding cookie,
cookies depend on each others and each cookie does trigger the real targett
(unless NO_xxx) before creating the cookie.

This does repair parallel makes, which were completely broken.

Might induce problems into odd-balls ports, but I couldn't get anyone to
comment on this patch after a week on ports@ and tech@.

Maybe, if something breaks, I'll finally get some comments...
1999-12-19 23:48:36 +00:00
espie
f0ac2fb53b Use IFS to parse PATH instead of ludicrous echo $PATH|tr 1999-12-11 16:14:20 +00:00
espie
88c2b83d49 Make cookie names internal to bsd.port.mk
Don't allow the user to override these. It's a major can of worms anyway.
1999-12-08 17:11:09 +00:00
espie
c4a330bf2b Pass YACC to configure script.
Ensure reproducability of builds for autoconf ports: those would tend
to use bison by default otherwise.
1999-12-08 17:00:15 +00:00
espie
09dcbf4eb0 Kill a few extraneous for loops. 1999-12-03 17:37:33 +00:00
espie
7e4de2c7c4 Streamline checksum verification, remove awk use. 1999-12-03 17:30:47 +00:00
espie
1770d2d1b6 Simplify cipher usage slightly 1999-12-03 17:20:02 +00:00
brad
79b5f71811 fix typo with recent ${AWK} -> awk change, needed a space added in 1999-12-03 16:54:42 +00:00
espie
5e4ddb8ec0 Introduce _MAKE_COOKIE, rename CIPHERS to _CIPHERS (and change it).
Deprecate a whole slew of unneeded variables.
1999-12-03 14:57:12 +00:00
espie
88d4502064 Kill USE_EGCC/USE_EGXX, since 2.6 includes both as standard compilers. 1999-12-03 14:24:38 +00:00
ian
6ad4086728 Less verbose. 1999-12-01 22:39:44 +00:00
ian
32d5d70d09 Have delete-package-link function correctly even if ${PACKAGES} is itself
a symlink (ok espie).
1999-12-01 22:35:54 +00:00
espie
12d7c97fc6 Use _ALWAYS_DEP & friends pervasively.
Rename SORT_DEPENDS to _SORT_DEPENDS, nothing but us does need it anyway.
1999-12-01 13:36:50 +00:00
espie
3374f661ba Prefer sh builtins to a dubious `optimization' 1999-11-29 23:14:03 +00:00
espie
ba2e23f4fb Vi commodity fix: default sw=4 to the same as ts while we're at it. 1999-11-28 14:14:58 +00:00
espie
409c763512 Kill opsys cruft. 1999-11-28 14:12:24 +00:00
espie
a4e97990a9 Uniformize: everything else uses :L. 1999-11-27 13:17:13 +00:00
espie
3431057fa4 Oops. 1999-11-24 01:18:57 +00:00
espie
5643e9ca49 Typo
Surprising nobody saw it before...
1999-11-24 00:56:52 +00:00
espie
498376f7a5 Kill some extra shells that are not needed.
Note that

if ! (cmd1 && cmd2) then
cmd
fi

can be replaced with

if cmd1 && cmd2 then :
else
cmd
fi
1999-11-23 15:06:14 +00:00
espie
5642444dae Use echo directly, except where ECHO_MSG makes sense.
Clean up error conditions somewhat.
1999-11-22 23:44:01 +00:00
espie
e0f299c92c Robust subdir substitution.
dugsong@ agrees that @ is a better choice.
1999-11-22 20:40:53 +00:00
espie
aaa04faba2 Simplify make fetch-list by using _ALWAYS_DEP and friends.
Remove some extraneous subshells.
Remove unwanted variables.
1999-11-22 20:37:04 +00:00
espie
5e1ecf9a5e Simplify CATPAGES 1999-11-22 20:34:14 +00:00
espie
dc7126a53b Typo 1999-11-21 16:18:30 +00:00
espie
5f45a616e7 Revert unwanted commit... 1999-11-20 17:56:57 +00:00
espie
211653ece7 Blast DEPENDS_TMP .USE macro out of existence.
The problem with .USE macros is that they should be constant...
If they do depend on the target being made, they will invariably use
.if make(TARGET) tests.   But this is a bad idea, as then `TARGET' can't
be used as a true dependency, since it's not being made then...
So instead, one would have to remember to fork another make TARGET to
ensure the .USE macro is executed correctly... This is slow, and
error-prone.
1999-11-20 17:54:09 +00:00
espie
dd10aadc45 Fix recursive dependency computation. 1999-11-15 18:37:58 +00:00