Commit Graph

242 Commits

Author SHA1 Message Date
turan
f8ee58bf77 cleanup. espie@ 2000-02-12 20:03:00 +00:00
turan
d3d79d5efd "lic1,lic2" -> "lic1 lic2" espie@ 2000-02-12 19:43:44 +00:00
espie
6aea87cf34 Warning message to stderr, to not interfere with other stuff. 2000-02-12 13:52:04 +00:00
turan
dc8ee597ce more doc 2000-02-12 09:24:30 +00:00
turan
1d168e9d66 cleanup 2000-02-12 08:08:58 +00:00
turan
c92e1e4f21 license framework minus checksums 2000-02-12 06:02:04 +00:00
espie
898da22d5e Remove NO_WRKDIR... The xview ports need a rewrite.
Document NO_WRKDIR as being a bad idea.
2000-02-12 01:00:28 +00:00
espie
c6da62630a Oops, left `build' line visible. 2000-02-12 00:49:17 +00:00
espie
b3ed337056 Change MAKE_FLAGS to remove the -f.
Actually reading the Makefiles proved that about one third of them was
confused about this already...
2000-02-12 00:43:57 +00:00
espie
91dd43bca4 Remove deprecated variables. 2000-02-11 01:11:00 +00:00
espie
2b44b9412b Remove WRKSRC work-around 2000-02-11 00:40:09 +00:00
espie
78bdb819c7 Bye, bye NO_WRKSUBDIR 2000-02-10 23:46:42 +00:00
espie
018d14a85f Repair package building.
Thanks to martin@ for reminding me...
2000-02-09 20:09:05 +00:00
espie
8b20f37bef and of course, nobody spotted the obvious typo in the patch I gave on
ports...
2000-02-09 00:54:33 +00:00
espie
7c8bf5098c Temporary work-around for ports that define WRKSRC manually... 2000-02-09 00:42:39 +00:00
espie
26704f504e Use DIRMODE to install dirs, avoid collisions with mtree
(keep a duplicate of DIRMODE until 2.7)
2000-02-09 00:26:32 +00:00
espie
9ecf27ba4f Introduce WRKDIST: place where stuff unpacks.
May be different from where source lives.
And from where build happens.

NO_WRKSUBDIR=Yes is equivalent to WRKDIST=${WRKDIR}, and not
particularly smaller, deprecated it.

Remove CLEANDISTORIG, use patch -b instead.
Note that DISTORIG ends in .orig to let rm *.orig still work...
2000-02-09 00:23:26 +00:00
espie
aa931bcd50 Kill ALL_HOOK, it's deprecated and unused. 2000-02-06 18:35:24 +00:00
espie
e971455139 Compute CKSUMFILES in a better way, to avoid duplicates.
Simplifies SUPDISTFILES choice: put everything that might ever be fetched
there, don't worry about duplicates.
2000-02-04 20:33:42 +00:00
espie
c24ad602d8 Defining ALLFILES in every case is much better... 2000-02-04 12:55:33 +00:00
espie
8538981335 Finish cleansing PATCH_SITES out. 2000-02-04 11:15:16 +00:00
espie
956abc1070 Remove the real-* targets, do things directly at the cookie level.
More submakes die.

Remove NO_WRKDIR `feature'

Fix `make clean' to do the right thing even if WRKOBJDIR is not defined
at that point.

It's doubtful package-noinstall is useful, but I left it in for now, with
slightly altered semantics.
2000-02-04 11:09:33 +00:00
espie
4df22da508 Don't let real target depend on phony, unless we want the real target to
be rebuilt each and every time...
2000-02-04 00:51:53 +00:00
espie
d7feb40951 Buglet fix: there's absolutely no reason not to run checksum, or
dependencies, if NO_EXTRACT or NO_PACKAGE has been defined ?

Might break some ports that don't explicitly ask not to run those steps.
Good thing.
2000-02-03 22:03:00 +00:00
espie
e150702129 ...twice 2000-02-02 18:33:42 +00:00
espie
158908fdce I am a moron 2000-02-02 18:20:28 +00:00
espie
e5ce6f9944 Cosmetic patch: don't append DIST_SUBDIR if it's not defined.
Set vim filetype, as vi doesn't care.
2000-02-02 15:28:17 +00:00
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