Commit Graph

508 Commits

Author SHA1 Message Date
espie
0a2c20e0ec Synch mtree with bsd.local.dist.
I shouldn't have to do this. This should have been spotted by the loser
who changed tcsh's Makefile. Brad should have noticed it no longer builds
and fixed this, along with mtree/BSD.local.dist...
2001-04-05 12:46:54 +00:00
espie
4d85ac4a33 reset IFS so that dir-depends will work correctly. 2001-04-04 09:55:34 +00:00
espie
3b0481a403 New Features for NEW_DEPENDS:
dir-depends: list of SUBDIRS this port depends on (with flavors, subpackages),
to use with tsort.
build-depends-list, run-depends-list: list of pkgspec:dir needed for this
port, no recursion. To use for INDEX.
2001-04-04 08:17:31 +00:00
espie
b1aa09605d I missed one package cookie 2001-04-04 08:03:59 +00:00
espie
a54dee276a derive _ALWAYS_DEP from _ALWAYS_DEP2 (and friends) so that pkgspec don't
interfere.
2001-04-02 21:08:49 +00:00
espie
5c979b3753 Compute `new dependencies' if NEW_DEPENDS is defined. 2001-04-02 11:50:25 +00:00
espie
6d478c82a8 Some comments 2001-04-02 11:45:11 +00:00
espie
8edb444009 Remove stuff that is often duplicate, and causes only bogus warnings. 2001-04-02 11:32:32 +00:00
espie
15f663ed60 revise the way package multi-builds are handled.
- move FLAVOR_EXT up so that WRK* are correct when they're needed for
dependencies.
- build a list of _PACKAGE_COOKIES, one for each subpackage.
- let package go through an indirection:
package: ${_PACKAGE_COOKIES}

_PACKAGE_COOKIE_${SUB}:
	SUBPACKAGE=${SUB} ${MAKE} _package

so that all packages are `flat', and subpackages can depend on each other
freely.
2001-04-02 10:35:51 +00:00
espie
c8d7665254 Add FLAVOR_EXT to the list of substituted variables (deprecate ${FLAVOR}
in packing lists).
2001-04-02 10:16:59 +00:00
espie
9336fc846c Identify identical $file and $file.orig. Report them, but don't generate
an empty patch (that is sure to throw make patch later).
2001-03-31 22:54:41 +00:00
espie
5ce94b79e1 Repair IGNORE. I forgot to move this around when the rest needed
rearranging. Found by naddy@.
2001-03-29 19:01:05 +00:00
espie
11ff28f808 Restore REPORT_PROBLEM functionality.
I don't see what the hell sh is doing erroring out in an eval in a test,
even under set -e.
2001-03-28 16:37:27 +00:00
espie
673de31adf typo 2001-03-28 15:07:05 +00:00
espie
acf0fc7a70 Distinguish between no flavor seen (default flavor) and empty flavor seen
(empty flavor).
2001-03-28 15:04:34 +00:00
espie
01e30c116d Due to the way make is working, flavors passed as `make FLAVOR=a'
don't work, as they propagate down subdirs.

Use `FLAVOR=a make' (sh) or `env FLAVOR=a make' (csh) instead.

Error out with a useful error message if old usage is encountered.
2001-03-28 15:01:01 +00:00
espie
062a4a9eb7 Missed one in back-porting my diff 2001-03-28 14:50:17 +00:00
espie
656c37a943 dir -> dir[,-multi][,-flavor...] notation for dependencies. Finally ! 2001-03-28 14:33:24 +00:00
espie
b793933200 Slight optimisation:
always define _ALWAYS_DEP, _BUILD_DEP, _RUN_DEP and test for emptiness
instead of definedness, so that the code is still optimized away when
dependency lists are defined, but empty.
2001-03-28 12:15:26 +00:00
espie
0d35a51ad3 Use error=true/false instead of error=0/1 (consistency) 2001-03-28 11:52:20 +00:00
espie
e941296cc0 Move dependency checking above targets, so that it can be changed to
generate cookies for each dependency.
2001-03-28 11:48:12 +00:00
espie
3ca1304f6a Trim documented parts. Give default values to NO_DEPENDS, NO_BUILD 2001-03-28 11:43:16 +00:00
espie
85dc6dca9c More regularity, use $@ to regenerate target cookies 2001-03-28 11:32:29 +00:00
espie
59c853bcdf ... and to the list of targets too, oops. 2001-03-28 11:28:31 +00:00
espie
87006647c2 Add rebuild target 2001-03-28 11:27:18 +00:00
espie
a6396841cb Handle parsing the flavor/multi-package part internally.
Use eval to simplify passing those to submakes.

Note that the preferred separator is ',', not ':'.
(Because ':' can't be used unambiguously in *_DEPENDS, whereas ',' can)
2001-03-28 11:19:33 +00:00
espie
cd2b7ae81b Move DUDS handling to makefile level 2001-03-28 10:55:52 +00:00
espie
87d90f5e43 Add NOT_FOR_ARCHS 2001-03-28 10:25:38 +00:00
espie
1ee9c9c4ea Repair setting of PKGNAME/FULLPKGNAME dependning on Flavor.
These should override a default setting of PKGNAME, since in that case,
PKGNAME only holds the name for the main package.
2001-03-25 20:35:35 +00:00
brad
26b155db25 add another dist site to MASTER_SITE_GNU;
--
From & run by: Shell Hung <i@shellhung.org>
2001-03-25 17:29:01 +00:00
espie
76d1089163 Adjust default conflict rules to match pkg_create. 2001-03-24 15:16:53 +00:00
espie
ce3e41c265 Warn for arch dependent names in PLIST.
No automatic correction, as this can be hard.
2001-03-24 12:14:38 +00:00
avsm
0c6c38b353 add Shell Hung's Asia-Pac mirror to the CPAN list; espie@ ok 2001-03-22 00:23:53 +00:00
espie
6438a9450e ... and don't forget to include FULLPKGNAME here either. 2001-03-22 00:23:15 +00:00
espie
59abb51a42 _FEXT -> FLAVOR_EXT, make this visible
FULLPKGNAME as a knob for ex ${PKGNAME}-${_FEXT}, so that python
and others can tweak it directly, without needing post bsd.port.mk
tweaks.
2001-03-22 00:22:36 +00:00
espie
e568d53c54 Consistency (Peter Fritchman) 2001-03-17 11:16:38 +00:00
espie
ac0cf6ba19 Add simpler COMMENT variable.
Document multi-packages names simply.
2001-03-16 15:34:13 +00:00
espie
e82e5409a7 Allow for COMMENT-foo= inside the Makefile.
NetBSD did this a while ago, this is a natural idea. It just took me
some time to figure out how to do that in a MULTI_PACKAGE context,
while maintaining compatibility with existing stuff.
2001-03-16 14:56:41 +00:00
espie
5130db70d1 Simplify MULTI_PACKAGES, allow for PKGNAME-foo=value 2001-03-16 14:54:40 +00:00
espie
e31ec85085 logger -> portslogger
to avoid conflict with logger(1)
2001-03-13 22:00:14 +00:00
kevlo
af07be0868 Rearrange 2001-03-08 03:31:43 +00:00
brad
3a62c15a38 - remove some old stuff that isn't used anymore.
- rearrange.
2001-03-08 02:55:32 +00:00
form
30d4d0aba2 Better handling of installed packages not in ports INDEX.
ok espie@
2001-03-07 03:41:10 +00:00
espie
a199bcb59a Create an intermediate mtree.spec that is used for fake installations.
Use of VAR_SUBSTS will solve a few nasty problems.
2001-03-06 18:59:38 +00:00
reinhard
e6b35f85cf MASTER_SITE_GNOME; ok espie@ 2001-03-05 16:49:46 +00:00
espie
8c07bce4dc Add `===> Checking files for pkgname' line to simplify automatic
recognition of various package builds.
2001-03-01 00:01:40 +00:00
espie
d8eecece63 Script to log specific ports build independently. Recognizes all
===> xxx for package
lines, so that it will redirect dependencies correctly. Use as
make 2>&1 | logger logdir
2001-03-01 00:00:26 +00:00
espie
6bc4c47f7f Rework the dependency framework.
* pull every dependency under the same rule, using specialized fragments.
* re-check after the dependency is expanded, unless earlyexit is true.
* explicitly recognize /nonexistent as a specific way to have always
triggered dependencies, use it to handle DEPENDS in a uniform way.
* parse dependencies fully. Note that we know have a pkg variable that will
be used.

Thanks to naddy@ for useful tweaks.

This is probably not quite perfect yet, stuff may break. Other stuff that
remain to be done:

- handle library dependencies better, so that lib.10 will match only
lib.10.x and not lib.100.
- handle default FLAVORS correctly. This involves not
passing FLAVOR='', but rearranging ${MAKE} ${_DEPEND_THRU} to remove
FLAVOR from the environment and from MAKEFLAGS (yucky).
2001-02-24 22:02:08 +00:00
wilfried
4dbdfa7f73 We want to test if the variable is defined,
not the value it may have.
2001-02-15 21:51:32 +00:00
wilfried
f13fccbaf2 set variable before we use it, ok espie@ 2001-02-13 12:09:07 +00:00