Commit Graph

585 Commits

Author SHA1 Message Date
espie
41127009fa Fix _COMMENT and add SUDO for those few unfaked ports that are left. 2001-05-05 20:20:59 +00:00
espie
afc9760354 generate trimmed list using the Makefile. Ensure the same method is
used to remove comments, and (more importantly) pick up default
canonical package names, useful for ordering and removing duplicates.
2001-04-22 16:16:42 +00:00
espie
d677374763 TRUST_PACKAGES: use actual installed packages to check dependencies
and avoid calling pkg_add.
Solve some of art's problems.
2001-04-20 16:25:24 +00:00
espie
33d58011b9 Solve two simple problems:
- allow Makefile to distinguish packaging steps, since SUBPACKAGE can now
be set for various reasons.
- EXTRA_LIBDIRS for architectures without shared libraries.
2001-04-20 15:06:19 +00:00
espie
27a4fede8b REPORT_PROBLEM for non-existent dirs. 2001-04-20 15:00:04 +00:00
espie
e45a669ca1 typo. thanks Anil. 2001-04-19 22:15:05 +00:00
wilfried
75291818aa update WindowMaker sites 2001-04-19 16:51:36 +00:00
espie
c88f9d01b0 The script I use to build/verify plists. 2001-04-19 16:47:34 +00:00
espie
bd26c4b573 MOTIFLIB, not MOTIF_LIB
Use FULLPKGPATH for describe
2001-04-19 01:56:53 +00:00
brad
05d97a9773 consistency nit, add missing braces. 2001-04-18 15:00:53 +00:00
espie
701a95b5b2 Misc. small tweaks.
- let USE_MOTIF be sensible: any, openmotif, lesstif.
any triggers a lesstif flavor.
- show=name as a shortcut.
- package-dir-depends to check that packages are okay.

- error message for non-existent dirs.
2001-04-18 14:43:55 +00:00
espie
8a4e5086b5 Add SUBPACKAGE to INSTALL_COOKIE so that stuff such as
SUBPACKAGE=-thingy make install
works sanely.
2001-04-17 21:40:36 +00:00
espie
f7db65c8f4 Use same code as bsd.port.mk 2001-04-17 16:48:07 +00:00
espie
d646d4880c - Fix FULLPKGPATH again. I missed it in naddy's buggy bug-fix.
- save subdir into package, that's what is useful, since the name is
already there.
- check that SUBPACKAGE is a member of MULTI_PACKAGES.
Make make SUBDIR=misc/fileutils,-ls  work without error.
2001-04-17 16:45:14 +00:00
naddy
7f46795af3 Handle multiple flavors in package paths. ok espie@ 2001-04-16 21:40:04 +00:00
espie
2447f9b4db Updated version, that is much better at handling pkgspecs correctly 2001-04-15 17:44:29 +00:00
espie
8ae73df6f3 Add NO_SHARED_ARCHS, useful with NOT_FOR_ARCHS 2001-04-14 16:49:53 +00:00
espie
0c5f135c58 Flesh out MAINTAINER and PERMIT_xxx 2001-04-13 15:52:16 +00:00
espie
9dbd067f7d Proper quoting in build depends too. Discovered by avsm@.
Slightly more intricate, because we can't quote each value
indiscriminately, simplest way is to move the for loop from shell to make.
2001-04-12 20:35:59 +00:00
espie
39a760c88e aesthetical tweaks.
Oh, and uninstall doesn't need to remove the package cookies, obviously.
2001-04-11 16:06:07 +00:00
espie
35158dc67b define NEW_DEPENDS as yes. More consistent with the rest of the file. 2001-04-11 15:55:34 +00:00
espie
71f290aa08 protect dependencies from shell expansion.
Noticed by avsm@
2001-04-09 23:16:50 +00:00
espie
1215dcfa7d This script can be used to check that all ports are linked in master
Makefiles.
2001-04-08 17:01:31 +00:00
espie
6bac4e3df0 Turn NEW_DEPENDS on 2001-04-08 16:56:22 +00:00
espie
a930aa16bf FULLPKGPATH is PKGPATH plus flavor/multipackage modifiers.
Use it where we can, including WRKOBJDIR `real' names.

NOTE: if you are using WRKOBJDIR, *all* flavored builds directories
will change  names, from work-no_x11 to work,no_x11
2001-04-08 16:55:17 +00:00
espie
907db990a1 ...without breaking things 2001-04-08 16:50:13 +00:00
espie
ea034965e1 Store PERMIT_PACKAGE_* in PLIST. 2001-04-08 16:49:26 +00:00
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
espie
07876a6c8e Run pkg_create under ${SUDO} and fix the owner afterwards when needed.
The cleaner fix would be to create the package to stdout under SUDO
and redirect it, but that junk (pkg_create) is actively fighting that.

God, I've got to rewrite it and retire that crap.
2001-02-10 13:50:13 +00:00
espie
74d58c4e80 Fix DEF_UMASK check, should take ${SUDO} into account.
This ought to please naddy and avsm...
2001-02-10 13:47:54 +00:00
miod
18f01cdf24 Don't mention LICENCE_TYPE anymore 2001-02-03 01:14:52 +00:00
brad
2e026856d5 - indent
- sync MASTER_SITE_{SOURCEFORGE,GNOME,CPAN,TEX_CTAN,KDE,AFTERSTEP} with
FreeBSD's bsd.sites.mk
2001-01-18 15:48:04 +00:00
espie
02d5954552 move variables that only belong in old-install.mk to old-install.mk
Kill old work-arounds that are no longer needed since 2.8 came out.
2001-01-18 14:58:16 +00:00
beck
afe664aea0 Grotty little script to webify packages, written by Ryan Walker
<walkerr@ssimicro.com>. Committed here so espie's beavers can play with it :)
2001-01-16 20:51:48 +00:00
brad
386156aa3c eliminate NO_CDROM and make the use of :U/:L consistent. Ok'd by espie@ 2001-01-08 22:34:51 +00:00
espie
cd8425b805 Always make TRUEPREFIX/DESTDIR available 2001-01-08 22:10:36 +00:00
espie
fc2ad74c6f Less comments, see bsd.port.mk(5) 2001-01-08 22:09:24 +00:00
brad
5ec011f6df bye bye MIRROR_DISTFILE 2001-01-05 16:58:08 +00:00
kevlo
75ec7f3727 Add FLAVOR skeleton.
ok espie@
2001-01-04 01:30:37 +00:00
espie
45af2405c8 indentation 2000-12-23 12:27:17 +00:00
espie
c754691700 take the old non-fake code out of line, for greater clarity (and since
it's so seldom used now).

Remove a few targets that are not really needed (mirror-distfiles, use
mirror-maker instead).

More changes to fake to come, once they've been properly tested.
2000-12-23 12:25:57 +00:00
espie
7f2c930088 Handle cases like lgrind 2000-12-19 15:10:37 +00:00
espie
79e5ed78ab Tell user to add directory to rc.conf here, instead of doing that in
every port that needs it.
2000-12-16 23:25:36 +00:00
espie
78564b0e02 link-categories/unlink-categories target:
populate ports tree with symlinks.
2000-12-16 15:49:12 +00:00
espie
12dc728de6 Enforce directory check in dependencies, so that link-category can come
alive (since ports can now be symlinked, porters need some strong check
so that they don't create bogus dependencies).
2000-12-16 15:47:35 +00:00
espie
7a7b37f54b Remove compatibility scaffolding for EXTRACT_CMD, EXTRACT_BEFORE_ARGS,
EXTRACT_AFTER_ARGS
2000-12-16 15:44:35 +00:00
angelos
064ccd87c2 Bogus newline, I wonder why noone noticed this before... 2000-12-15 08:05:45 +00:00
espie
ec30af29cd Fix build of README.html (use PKGPATH) 2000-12-14 13:13:53 +00:00
espie
bf4b1ad7bb Add extraction support for shell archives (.sh, .shar, .shar.gz...) 2000-12-14 13:08:59 +00:00
espie
1a7956cf52 A script I use to remove old distfiles on my machine. It actually
produces another script, as this usually needs to be hand-tweaked for
various reasons.

(Documentation to come up, probably in mirroring-distfiles)
2000-12-06 11:55:11 +00:00
espie
046b0ff608 Remove documentation that is now in bsd.port.mk(5) 2000-12-01 16:31:11 +00:00