cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
62,038 Commits 1 Branch 0 Tags 554 MiB
2c0a53e285
Commit Graph

1252 Commits

Author SHA1 Message Date
espie
4649ae2bfa new update-or-install target needs to have dependent subpackages built as 
well.

Incidentally, this is also an issue with update: in some cases, the update
target wouldn't work (specifically, when dependencies had changed).
Fix it as well.

There might be a need to revisit the DEPENDS_TARGET stuff later, this is
a bit of a kludge...
 2008-07-26 12:23:43 +00:00
espie
6a61504833 INSTALL/DEINSTALL obsolete for multi-packages as well 2008-07-26 11:22:59 +00:00
espie
a44d1d9c1e _FMN is a terrible acronym 2008-07-26 11:16:04 +00:00
espie
e38014bf41 INSTALL/DEINSTALL are completely obsolete now (been deprecated for over 
a year)
 2008-07-26 11:14:07 +00:00
espie
d4209be428 new "convenience target": update-or-install (all) 
Basically, make update without the tests that prevent it from running when
stuff is not installed yet.
 2008-07-26 10:59:20 +00:00
sturm
28942b6f0b honour ftp_ and http_proxy for FETCH_PACKAGES 
ok espie
 2008-07-03 17:36:47 +00:00
espie
5b18fe959e ... works much better if I commit pkgpath.mk as well... 2008-07-03 17:00:38 +00:00
espie
8e680d768f make full-*-depends targets invocable at the subdir level, as requested 
by ajacoutot@
 2008-07-03 15:43:22 +00:00
fgsch
13bf7688dd fix fetching files from MASTER_SITE[0-9]. found earlier by me during 
a full port-lib-depends-check and later reported on ports
by Tim Donahue (tdonahue at vonsystems dot com). espie@ ok.
 2008-06-06 01:17:13 +00:00
fgsch
0ae2ac563d ignore ports marked as such on port-lib-depends-check. rearrange targets 
while im here. espie@ ok.
 2008-06-05 08:14:00 +00:00
fgsch
537c203d29 allow port-lib-depends-check to be recursive; espie@ ok. 2008-05-23 16:53:28 +00:00
espie
95097113a0 add a bit of glue so that mirror-maker will be able to use the same locks 
as the rest of the tree
 2008-05-18 11:22:14 +00:00
espie
64d146b5bf remove intermediate targets we're no longer needing 2008-05-18 10:05:21 +00:00
espie
b6f6bdaee7 compute a set of missing files to show a better message for FETCH_MANUALLY 
(got annoyed at java each time I had to figure out WHICH file got updated
and I had to fetch out of... the ten of them)
 2008-05-18 09:58:09 +00:00
espie
59ea16ab14 no reason for fetch-all not to be a recursive target 2008-05-17 11:02:22 +00:00
espie
eac6cf7b3c simplify computation of MAKESUMFILES: start with what's already been done, 
and just append to it.
 2008-05-15 10:09:29 +00:00
espie
456b53e76f hide ALLFILES and REALLY_ALLFILES, they have confusing names anyways 2008-05-15 09:57:03 +00:00
espie
377f320ea8 clean-up fetch/fetch-all framework 2008-05-15 09:51:17 +00:00
espie
7e5366d9fb no reason not to allow install-all as a subdir target, so... 
allow it!
 2008-05-13 14:52:44 +00:00
deanna
2b77239a61 Add X11BASE to SUBST_VARS 
ok espie@
 2008-05-12 14:45:48 +00:00
espie
6c2917a593 stylistic changes 2008-05-11 19:50:55 +00:00
espie
25bde73a04 forgot one 2008-05-11 19:50:42 +00:00
espie
63905f17d2 zap indirectors that are no longer needed 2008-05-11 19:44:12 +00:00
espie
5e19e9e080 slightly simpler hook loops: use :U just once, since it applies to 
every word. Also use :T to select the final word of the PKGPATH, so
that hooks work seamlessly for `non-core' modules, thus removing the
need for most modules to be core.
 2008-05-11 19:36:12 +00:00
espie
4a25b37ecc clean-up pre-install hook. 2008-05-11 12:05:51 +00:00
espie
5caea536bd put back a default definition of FAKE_FLAGS, for style, since this did not 
break anything.
 2008-05-11 11:19:19 +00:00
espie
321669c708 conform to other hook naming. 2008-05-11 11:12:09 +00:00
espie
b9752adc83 sanity check: one CATEGORY should match the PKGPATH. 
Surprisingly, this catches about 20 ports with their pants down.
 2008-05-08 22:35:51 +00:00
ajacoutot
690b31ffc5 - add ^LOCALBASE to SUBST_VARS; now that SUBST_CMD is here, this will 
become handy

ok espie@
 2008-05-06 19:20:16 +00:00
espie
7ede32a06c use a trap to remove the tmp file, thus helping making sure it does not 
stay around
 2008-05-04 12:58:03 +00:00
espie
58b1418be0 make the lock on distfile more useful. In case we got stuck in the 
SIMPLE_LOCK for a while, this means something else is fetching
the same distfile, so first check whether our target actually exists
before we try to fetch it all over again.
 2008-05-04 12:53:14 +00:00
espie
2c22929416 extend VAR_SUBST syntax slightly: a supplementary ^ at the beginning of 
the variable subst means the subst shouldn't occur anywhere, but only at
beginning of name... useful for backsubst of SYSCONFDIR, since etc is so
frequent. Extended to other variables such as PREFIX.

tweak make-plist to use OpenBSD::Subst.

*this means this only works with current, but you've had a week to update...*
 2008-04-12 13:04:21 +00:00
espie
3a17c26da8 add support for SUBST_CMD 2008-04-07 11:12:42 +00:00
pvalchev
ce69f8a036 'sh' now has shared libs; from brad 2008-03-29 01:58:33 +00:00
simon
c2eff19a79 run cpanreport with perl 2008-01-28 00:03:01 +00:00
simon
bf1bcd25c5 let `make regress' write test reports 
to use it set CPAN_REPORT=Yes, CPAN_REPORT_FROM to your email address
and CPAN_REPORT_DB to a directory (like PLIST_DB)

initially by steven@
feedback from steven@, msf@, rui@, espie@, merdely@, okan@

ok msf@
 2008-01-27 23:28:25 +00:00
espie
10fa94b01a insist on mkdir -p... now that FAKE_FLAGS is `fixed' this works. 
Tested thru a full bulk-build
 2008-01-18 20:58:15 +00:00
espie
bf85c6df5a make it possible to lock/unlock manually a given directory. 
This can be used to work on a port update while building other stuff
without risking the global build from interfering until the update is
finished.
 2008-01-12 14:12:43 +00:00
espie
9ca2e064cf do the same thing with REGRESS_FLAGS as FAKE_FLAGS 2008-01-04 18:38:51 +00:00
espie
17d70806a3 tweak FAKE_FLAGS semantics to saner defaults. 2008-01-04 17:48:33 +00:00
espie
e0c15c5448 scaffold for running make in parallel, to be documented soon. 2007-12-28 12:49:12 +00:00
espie
4cdccf971e add a PKGDB_LOCK that can be used by pkg_add to -F nolock in src/ build 
mode.
 2007-12-28 12:46:03 +00:00
jolan
72e58f4c30 support .tbz2, ok espie@ 2007-12-05 06:55:41 +00:00
merdely
32c84fc9c3 Create $PLIST_DB directory if defined. 
Fix a spacing nit.

ok espie@
 2007-12-01 14:44:47 +00:00
sturm
6438da2ade back out, this breaks PLIST_DB 2007-10-29 21:50:40 +00:00
sturm
09b5470166 unbreak, the regular expression never matched and $' was empty there 
ok espie@
 2007-10-29 20:00:53 +00:00
steven
19811ccb50 protect FLAVOR with :Q when passed to the shell, since it may contain 
whitespace.
 2007-09-30 15:07:40 +00:00
steven
bad04c5480 pass FLAVOR to update-plist. 
ok espie@
 2007-09-21 08:04:06 +00:00
steven
9cb9ca7c2e use :Q for BROKEN 
ok sturm@
 2007-09-21 06:58:21 +00:00
naddy
1715498931 quote shell meta characters when generating readmes; ok espie@ 2007-09-16 21:38:34 +00:00
espie
7a9f1afb15 add message that shows we exited a directory after an error, stops log there 
during rebuilds.
 2007-08-25 07:56:04 +00:00
espie
fb338f26c3 make mirror-maker sturdier: 
- pass an argument for the file into which we want to save the result, to
avoid getting it polluted with error messages (defaults to /dev/stdout for
debug).
- create the makefile fragment as a temp file and only copy it when complete.
- copy it in one chunk, so that one can read a partial mirror-maker file
and have it be usable.

This does allow for people to start a make mirror-maker in one shell, and
start fetching stuff right away, before mirror-maker is finished.

This also produces usable mirror-maker Makefiles even if the ports tree
contains bogus entries.
 2007-07-28 12:58:34 +00:00
espie
a52a0f1494 make sure ARCH gets defined also for individual port. 
Noticed by Stuart Henderson
 2007-07-09 13:32:56 +00:00
espie
43c841c254 avoid recomputing ARCH all the time. 2007-07-08 17:57:56 +00:00
simon
641ac136d2 let MODAPACHE_FINAL point to the correct location 
noticed by & ok steven@
 2007-06-30 15:27:29 +00:00
espie
33473a3fbb better, make it fetch file under DISTDIR 2007-06-30 14:48:04 +00:00
espie
b96d64afbf debug target for mirror-maker: allows one to check quickly whether a given port 
generates correct mirror-maker fragments.
 2007-06-30 14:43:49 +00:00
espie
3c826c4a33 rework the way subdirs are skipped so that they're skipped a the right 
location.
Allows stuff like make ... STARTDIR=x11/openmotif SKIPDIR=x11/openmotif
to work.
 2007-06-30 14:31:00 +00:00
espie
07262849b8 add support for FTP_KEEPALIVE. 
You need a somewhat current ftp(1) for this to work !!!
 2007-06-29 10:24:23 +00:00
espie
9eb5a6bae5 tweak getpkgpath to display a diagnostic, but not exit 1, in case of 
error.

Do the real erroring out through a fatal error in pkgpath.mk (and set
PKGPATH to something less confusing than an empty variable). This
solves PR 5510 for real.
 2007-06-28 21:05:47 +00:00
steven
eb5a2e2d25 log results of regression tests into a file. 
ok simon@
 2007-06-23 09:39:18 +00:00
simon
ac9f495cdd set MODAPACHE_ENABLE and MODAPACHE_MODULE conditional 
for apache modules with mixed interal/external names

ok espie@
 2007-06-22 19:07:33 +00:00
ajacoutot
e6e9840691 - set SHARED_ONLY 
ok simon@ espie@
 2007-06-21 07:37:58 +00:00
simon
8055ea218d adjust the comment according to changed subst_vars 
ok espie@
 2007-06-21 06:11:11 +00:00
espie
7d0d0ae02a don't substitute MODAPACHE_NAME, this is often too short and causes 
too much trouble
 2007-06-20 14:43:17 +00:00
espie
5e5ec2f584 fix name of installed file 2007-06-20 13:55:41 +00:00
espie
b869babbd8 glue to simplify installation/updates of apache modules 2007-06-20 12:23:17 +00:00
jakemsr
28e134ba9c pass $PORTSDIR to ${PORTSDIR}/infrastructure/package/check-lib-depends 
"Sure" espie@
 2007-06-18 23:04:02 +00:00
espie
343aff0c83 tweak FETCH_PACKAGES: do not fetch all multi-packages to satisfy a 
dependency, but only the ones actually required.
If we end up needing to rebuild them from source, then change back
to _internal-package-only, so that we benefit from the whole build
and get all packages again.
 2007-06-16 09:57:03 +00:00
espie
b257e4d40f put all phony targets inside a variable, so I can check quickly that those 
targets do still exist.
 2007-06-04 12:15:09 +00:00
espie
479b2ddcdc since we no longer have to tsort the output of _print-package-args, 
we can compute it first, and only start pkg_create if it didn't error
out.

This gets rid of the very verbose and confusing error messages
pkg_create meets when the ports tree cannot solve some dependencies.
 2007-06-03 22:30:25 +00:00
espie
7f62033c1e zap duplicate lines 2007-06-03 22:25:01 +00:00
espie
1196a0d7f3 reorganize to avoid repeating lists of targets: 
classify stuff that is used in bsd.port.subdir.mk, name them in pkgpath.mk,
and use them as .PHONY targets in both bsd.port.mk and bsd.port.subdir.mk.
 2007-06-03 12:51:59 +00:00
espie
b4a526a3bb tell make-plist about .saved-libs 2007-06-03 11:06:41 +00:00
espie
8aed1af7f0 Let lock save the BUILD_PKGPATH. 
Do port-lib-depends-check in two steps: first generate a list of
binary: lib1,lib2,lib3
in WRKINST/.saved_libs
then run check-lib-depends on it.

Speeds up tweaks to WANTLIB quite a lot, as we do not rescan every
binary all the time...
 2007-06-03 11:03:06 +00:00
espie
4fb932ea5d finish renaming check-newlib-depends -> check-lib-depends 2007-06-01 13:15:21 +00:00
espie
3eae0fe94a kill REQ script support, flag INSTALL/DEINSTALL as warnings. 
Remove obsolete _PKG_PREREQ cruft.
 2007-05-31 10:52:16 +00:00
espie
1a7def9f37 use the same rules to represent comments in describe that are used to 
build packages.
 2007-05-27 11:53:39 +00:00
espie
f693d15fb3 use the new features of pkg_create. A few packages may no longer build 
without a packagename bump, or because they have too long comments.

steven@ and I cleaned up most of them.

As a result, there's no longer any WRKPKG directory with their temporary
files.

We also use the `sort -u' feature of pkg_create for dependencies, so that
the command lines to pkg_create get simpler, which will allow for easier
error-checking later on.
 2007-05-25 13:07:41 +00:00
espie
9fd3895989 fix infinite recursion for p5-version like we already did for modbuild 
proper... nothing new under the sun.
 2007-05-22 20:57:25 +00:00
steven
f1aafbc927 add clean=plist to clean a port's registered plists. 
fine with bernd@, ok espie@
 2007-05-21 11:18:10 +00:00
sturm
7c066d7098 fix the recursive case for FETCH_PACKAGES by appending the PACKAGE_COOKIE 
to _TRIED_FETCHING, this broke in 1.774

ok bernd, espie
 2007-05-01 17:17:54 +00:00
espie
77b04141fd pedantic fix: typo without actual consequences. 2007-04-30 12:44:46 +00:00
espie
e55de40a3f handle exact matches on STARTDIR. 
allows `partial' STARTDIR, such as make describe STARTDIR=x11/kde
to work as expected.
 2007-04-28 10:19:41 +00:00
espie
2e20da7e2c make it work with >2 directories in PORTSDIR_PATH. 
From Mikolaj Kujars
 2007-04-17 15:22:46 +00:00
espie
e4dcfe629b avoid Makemaker going interactive, okay naddy@ 2007-04-08 16:16:06 +00:00
espie
7c076f597b port-lib-depends-check should ignore errors, because it's much less useful 
that way.
 2007-04-08 11:26:39 +00:00
espie
04b97b2f22 STARTDIR functionality: allows one to skip directly to a given directory 
and start from there.
 2007-04-07 09:55:13 +00:00
espie
97e872a96d sha256 by default 2007-04-05 18:32:26 +00:00
espie
064be6c9e4 revert order of tests, if CHECK_LIB_DEPENDS is active, do not register plist 
until we're satisfied.
 2007-04-03 13:32:45 +00:00
espie
23c2d177a9 allow people to run check-lib-depends automatically, grabbing the files 
from WRKINST and the packing-list from the just built package.
Reuse the register_plist pattern.
 2007-04-03 10:14:14 +00:00
espie
1cca659066 configure may not exist. found oud by steven@ 2007-04-02 10:43:39 +00:00
espie
f020e9e32b new target: port-lib-depends-check, can verify libraries directly from the 
fake area, without needing to build bogus packages first.
 2007-03-31 15:36:43 +00:00
espie
5bc25e411a display warnings if autoconf version differs. 2007-03-30 13:55:07 +00:00
espie
949afb38a5 like xenocara: REORDER_DEPENDENCIES has been tested enough, silence it 
by default.
 2007-03-30 13:44:50 +00:00
espie
c6897dc077 CHECKSUM_FILE never changes -> can be used directly 2007-03-30 13:41:44 +00:00
espie
634644d8e4 tweak the way mirror-maker emits stuff, so that the Makefile contains lines 
suitable for cksum -c.
 2007-03-28 15:45:03 +00:00
espie
fb9fcd5fbc use cksum -c so we can get `magic' base64/hex matching. 2007-03-28 13:21:43 +00:00
espie
bc0a71b1bb remove stupid hack that makes _print-packagename display README on 
subdirs. Confuse the hell out of broken dependencies, and is not
even needed.

fix typo.
 2007-03-19 21:32:35 +00:00
naddy
2c2c250df3 makesum: don't try to create distinfo if there are no distfiles; ok espie@ 2007-03-15 18:11:54 +00:00
espie
b5a3fca2a6 use _CKSUMFILES in clean=dist, and recurse if we notice there are 
SUPDISTFILES, so we get them as well.

This misbehavior noticed by Mikolaj Kucharski.

(the intention is obviously to regrab everything to verify whether
anything changed, and that includes SUPDISTFILES)
 2007-02-16 19:08:54 +00:00
espie
3b1db2b2c1 use cksum -a $$cipher instead of $$cipher to compute crypto hashes. 
Only functional change:
Add sha256 at the end of the list of supported ciphers, so that new
makesums will add the new cipher.

The rest is business as usual.
 2007-02-11 11:44:17 +00:00
espie
2c0953c14e minor tidbit: define FULLPKGPATH based on FULLPKGPATH${SUBPACKAGE} in 
the multi-packages case, as should be.

introduce _ALLPKGPATHS, and use it in show-required-by, so that
show-required-by works for multi-packages.

problem noticed by bernd@
 2007-02-06 20:04:01 +00:00
espie
50ea26a11c rely on new make feature, avoid old work-around (need a current make to 
work)
 2007-02-03 17:09:39 +00:00
espie
fa6fc8a2f7 sometimes (not very often), config.h.in files live in any directory 2007-02-03 17:08:59 +00:00
espie
a7cedd9db7 add the ability to cleanly delimit embedded plist info. 
will help unconfuse lib-depends-check and make-plist wrt error messages.
 2007-01-15 13:43:52 +00:00
bernd
c5e1d48b7a Fix typo. This unbreaks 'make update'. 2007-01-04 11:34:14 +00:00
espie
9f019509e8 prefer subpackage-dependent version of variables for substitutions. 
this lets the correct PREFIX be substituted in packages, among other things.

Problem discovered in php5-extensions
 2006-12-31 13:12:35 +00:00
espie
8b31dd60d8 use a simple perl script to compute initial pkgpaths... Cwd can replace 
pwd -P, and we select the longest prefix from PORTSDIR_PATH.

This lets mystuff-like dirs get stripped from PKGPATH correctly, as long
as PORTSDIR_PATH is set correctly.
 2006-12-26 15:00:24 +00:00
espie
5efd6b68e4 duplicate the print-plist targets, add a version -with-depends, which is 
slower, but shows dependency lines as well...

Also fix target evaluation to work like it does elsewhere
 2006-12-18 12:52:34 +00:00
espie
25c626b21e activate our pkg-config. 2006-12-16 11:53:46 +00:00
espie
b3ba10ebac repair pkg_mklocatedb from src 2006-12-11 15:52:14 +00:00
steven
e3820f5171 DEPPATHS per subpackage, ok espie 2006-12-11 14:01:03 +00:00
espie
c89eab44fc pass all subpackage information to make-plist. 
Adapt make-plist to use the same code as pkg_create to deduce fragment
names, remove some old special cases that should no longer matter.

Zap directories from dependencies in a way depending on the dependency.
Far from perfect yet, as directories should be registered multiple times
in packages that do not depend on each other, and could also be used to
figure out where to put new files...
 2006-12-11 13:36:06 +00:00
espie
9d1d088f4c missed a few = signs. 
Avoid writing anything when no libspecs.
 2006-12-11 11:05:43 +00:00
espie
5792254153 Add proper "Returning to build of..." to unconfuse the logger in the case 
of FORCE_UPDATE.   Also break out in case update fails (otherwise the old
installed package would be enough to continue building).

Sprinkle REPORT_PROBLEM to know more precisely what stuff is breaking.

replace some
if eval cmd; then
with
if (eval exec cmd); then

because if eval... seems to break early, even with the test guard, thus
giving a chance to REPORT_PROBLEM to do stuff instead of having to wait.

(Note: a trap would probably be simpler ?)
 2006-12-09 14:56:41 +00:00
espie
1afd447f95 wrap calls for _print-package-args to print reliable errors (better than: 
`some Makefile somewhere is broken ! find it')
 2006-12-08 10:19:08 +00:00
espie
a9bf5ac052 ending up with an empty SUBPACKAGE is an explicit error. 2006-12-05 19:23:42 +00:00
espie
26075e9de6 move TMPDIR to pkgpath.mk to allow its use from both bsd.port.mk and 
bsd.port.subdir.mk

Use absolute paths to build readmes files, based on READMES_TOP, which
can be (or not) PORTSDIR.

Generate category readmes in tmp directory as well.

minor clean-ups
 2006-12-02 11:27:46 +00:00
espie
b219b82d19 move the generated readme stuff to a temporary directory, much cleaner that way. 2006-12-02 11:08:49 +00:00
espie
6f8c254c9e fix READMES again 2006-12-02 10:27:40 +00:00
espie
8fb5e71cef clean-up spacing 2006-12-02 00:10:24 +00:00
espie
1259dc14cb let license-check recurse correctly, thus we are checking ALL licences, 
finally.

Remove work-around for undefined SUBPACKAGE stuff, since we're no longer
hardcoding it at the Makefile level, and thus the ERROR check works.
 2006-12-01 17:56:38 +00:00
espie
5f5c120220 use the pkg-config in /usr/local preferably, until we get a decent 
pkg-config in /usr/bin...
 2006-12-01 17:37:15 +00:00
espie
197d308a2f remove the last redirectors, regenerate readmes on the fly... 2006-12-01 17:33:16 +00:00
espie
0e7d3606d9 make it possible to override a FULLPKGPATH if you REALLY know what you're 
doing... DO NOT USE, unless you really know.
 2006-12-01 11:34:04 +00:00
espie
dfa3a77ddb fix describe 2006-11-30 23:08:07 +00:00
espie
a8356d9ae2 un-recursive dump-vars, remove vars that don't make a lot of sense now. 2006-11-29 09:42:08 +00:00
espie
c72f6e29fd hidden SUBPACKAGE in _register_plist: put it back into ${_PACKAGE_COOKIE${_S}} 2006-11-28 23:13:30 +00:00
espie
6d481f3f77 apply the same transformation to install/install-all 2006-11-28 20:40:55 +00:00
espie
cd97d2252c move a few things around inside one single MULTI_PACKAGES loop 2006-11-28 20:31:25 +00:00
espie
46484d5a90 fix a typo 
mv some PKG_ARGS where they belong, and s/SUBPACKAGE/_S
 2006-11-28 20:26:38 +00:00
espie
fe36feb551 remove a lot of redirectors, add a lot more loops, build stuff based 
on internal variables mostly.
 2006-11-28 20:20:25 +00:00
espie
fda8ee6238 let PKG_ARGS be SUBPACKAGE dependent, define them all 2006-11-28 19:59:15 +00:00
espie
4d572376b6 fix for xview 2006-11-28 19:13:47 +00:00
espie
0f300c1d5c big internal changes: if MULTI_PACKAGES is not defined, define it to '-', 
so that the `normal' cases is MULTI_PACKAGES, (with possibly one
special '-' subpackage).

Adjust a few tests accordingly so that people don't notice the '-'
SUBPACKAGE: mostly do not print some directory changes, adjust FULLPKGPATH,
and set up PLIST- templates correctly.
 2006-11-28 18:25:42 +00:00
espie
2e52dd7f15 display something when switching directories during updates 2006-11-28 18:17:57 +00:00
espie
fea2461c67 prepare to be able to have every subpackage present at once. 2006-11-28 16:28:56 +00:00
espie
1aa5f43449 explicitly duplicate stuff to SUBPACKAGE, often a nop, but make sure 
people get correct information.
 2006-11-28 16:24:00 +00:00
espie
b43469a3f4 unbreak xplanet for now 2006-11-27 20:29:50 +00:00
espie
8d1eecfc23 zap the last special case of PLIST, we do not use that either 2006-11-27 19:09:19 +00:00
espie
950e643e3b zap some older ways to define PLIST which we haven't used ever since 
pkg_add groks fragments.
 2006-11-27 17:30:18 +00:00
espie
2d838f4cc0 white space police 2006-11-27 16:08:05 +00:00
espie
926c904147 same formatting clean-up as bsd.port.mk 2006-11-27 15:38:01 +00:00
espie
6eb7a1f31c some white space and reformat (style) 
make sure every variable assignement is surrounded by spaces
 2006-11-27 15:28:40 +00:00
espie
3d6e1eba81 fix so that variable definitions work even in the presence of subpackage=c++ 2006-11-26 23:39:41 +00:00
espie
311d135465 minor tweaks: make internal _COMMENT and *_DEP3 depend on SUBPACKAGE, 
so that subdescribe looks cool...
 2006-11-26 20:02:28 +00:00
espie
251749b901 avoid recursion in subdescribe. 
make things simple in *-depends-list.

fix LIB_DEP3 (this one from steven)
 2006-11-26 19:46:16 +00:00
espie
7a44b164f2 repair describe 2006-11-26 19:12:20 +00:00
espie
4e9d8781c2 completely remove PACKAGING, it's no longer needed 2006-11-26 17:45:59 +00:00
espie
3fcf725ef8 all MULTI_PACKAGES are new, stop testing -main. 2006-11-26 17:36:07 +00:00
espie
598ff7edac add BASE_PKGPATH to SUBST_VARS 2006-11-25 19:47:53 +00:00
espie
33415a71e4 define BUILD_PKGPATH/BASE_PKGPATH, to document later 2006-11-25 18:31:23 +00:00
espie
c1a8fddfb8 add new define, CPAN_AUTHOR, to allow grabbing modules from the author's 
nickname.

occasionally used, a few modules don't have an explicit subdirectory,
and need to be grabbed by author nick.
 2006-11-25 13:14:40 +00:00
espie
4d71e0cedc repair update-plist 2006-11-24 16:49:37 +00:00
espie
d89691b16b let PLIST, DESCR, MESSAGE, UNMESSAGE be subpackage-dependent. 
careful: they do not get defined to a default value unless the `main'
variable is defined, because they get set later otherwise...

remove the .if defined(MULTI_PACKAGES) guards as they don't serve any purpose.

Simplify the PLIST tests to make them more uniform.

Move SED_PLIST to the list of obsolete variables instead of giving it special
treatment.
 2006-11-24 00:10:00 +00:00
kili
42eb3262c7 Fix dependency checks for automake. 
"go for it", espie@
 2006-11-23 16:31:46 +00:00
espie
93006f30a0 no need to generate an intermediate mtree.spec 2006-11-22 12:40:50 +00:00
espie
714428c327 filter out the current PKGPATH in fetch_makefile, prevents infinite 
recursion.
 2006-11-22 08:20:20 +00:00
bernd
60457f98c3 Disallow "nasm::devel/nasm" pkgspecs for BUILD, RUN and REGRESS_DEPENDS again. 
All _DEPENDS should be correct now.

'go for it' espie@
 2006-11-21 10:32:51 +00:00
steven
277615a529 enable config.x11.site if USE_X11 is set. 
ok espie@
 2006-11-20 23:18:25 +00:00
espie
6223466710 make sure the right version of autoconf/automake is installed. 
bug-report from jolan@
 2006-11-20 20:52:28 +00:00
espie
e0e5780e0e allows PREFIX and CATEGORIES to be subpackage dependent 2006-11-20 13:50:16 +00:00
espie
5cf40c9a72 re-allow BUILD_DEPENDS=nasm::devel/nasm temporarily. 
until this gets killed... we haven't used the front part of : for a very
long time now !
 2006-11-20 12:34:52 +00:00
espie
b7c78d5d16 typo 2006-11-20 12:04:40 +00:00
espie
15375beded fix NO_SHARED_LIBS case, found out by bernd@ 2006-11-20 11:15:39 +00:00
espie
32322a6cfa clone LIB_DEPENDS${SUBPACKAGE}/WANTLIB${SUBPACKAGE} as expected. 2006-11-20 11:11:38 +00:00
espie
cb87b66c0b let LIB_DEPENDS and WANTLIB depend on the SUBPACKAGE. 
Build a special list of _BUILDLIB_DEPENDS, so that separate subpackages
can depend on each other without making an infinite loop...
 2006-11-20 10:49:22 +00:00
espie
15be4f88b2 forgot one DEPRUNLIBS 2006-11-20 10:38:31 +00:00
espie
b46318f8f6 distinguish between _BUILDLIB_DEPENDS and LIB_DEPENDS, and _BUILDWANTLIB 
and WANTLIB.

Get the rules for the LIBSPECS_COOKIES out of the loop that dictates their
usage.

Introduce *DEP3 variables, to keep *-depends-list compatible with old stuff.

Use _BUILDLIB_DEPENDS and _BUILDWANTLIB everywhere this makes sense.
 2006-11-20 10:36:13 +00:00
espie
a0b5fa8262 simplify xxx-dir-depends: only rely on _BUILD_DEP/_RUN_DEP. 
Fold _ALWAYS_DEP.
 2006-11-20 09:59:11 +00:00
espie
076413b410 remove extra subpackage that crept in 2006-11-20 09:46:56 +00:00
sturm
50a78e8f73 add sh to NO_SHARED_ARCHS for now 2006-11-19 19:52:03 +00:00
espie
2238471bc2 rephrase dependency evaluation without $$dep. 
Also, more error checking, check specifically for which dependency targets
are allowed.
 2006-11-19 18:20:01 +00:00
espie
6d0da43bdc Now that all dependencies are evaluated in the same way, build the cookies 
in one single loop, based on _DEPLIST.

Extract dependencies off the loop.
 2006-11-19 18:07:38 +00:00
espie
eb86c17946 remove confusing FAKE=lib scaffolding that's not finished, and that won't 
work in that way in any case...
 2006-11-19 18:01:44 +00:00
espie
2b06f42b4a avoid redefining the same dependency cookie twice 2006-11-19 17:52:32 +00:00
espie
b7ae3ba7bb simplify dep cookies names. Since we no longer use the dep part, let 
it vanish completely.

Also, stop converting . to -, as it's useless and makes for less readable
names.
 2006-11-19 17:48:14 +00:00
espie
299af1fa5b also defaults to stem-* for build depends, thus simplifying code a bit... 2006-11-19 17:40:35 +00:00
espie
2d34234cec oops typo. make sure lib depends are done 2006-11-19 17:39:15 +00:00
espie
37bfbe6e97 start making a big distinction between lib depends evaluated at build time 
and at `run(packaging)' time.
 2006-11-19 16:39:41 +00:00
espie
c5bed01d12 also use RUN_DEPENDS${SUBPACKAGE} in the simple parts. 2006-11-19 12:37:55 +00:00
espie
13a468ef7b add an extra level of indirection for dependency lists: _xxx_DEPLIST. 
allows us to get rid of some NO_DEPENDS tests later, also allows for
RUN_DEPENDS to become indexed on SUBPACKAGE.

LIB_DEPENDS and WANTLIB are going to need more surgery, since they need
to be checked during build and packaging...
 2006-11-19 12:32:53 +00:00
espie
138ff85a86 rename more internal stuff to make it less visually confusing: 
_DEPlibs_COOKIE => _DEPWANTLIB_COOKIE
_DEPlibs_COOKIES => _DEPLIBSPECS_COOKIES
 2006-11-19 12:11:30 +00:00
espie
cde96256b8 rename some internal variables: _DEPlib_COOKIES -> _DEPLIB_COOKIES. 
simplify some
.if defined(A)
.  for i in $A
      ...
.  endfor
.endfor

into

.for i in $A
      ...
.  endfor
.endfor

since empty loops work just fine.
 2006-11-19 12:05:10 +00:00
espie
6c3789ee8b start of multi-packages simplification: if MULTI_PACKAGES contains -main, 
consider it to be the main package, and do some equal treatment for each
package.

(to do: add subpackage where needed to WANTLIB, RUN_DEPENDS, LIB_DEPENDS
and act on them accordingly).

Also define _DONE_FILES for _fetch-makefile to avoid blocking if it's
not invoked from a higher level target.
 2006-11-18 00:15:33 +00:00
espie
b500ceff5d allows one to short-circuit PKG_ARCH=* in the build process 
by setting NO_ARCH to MACHINE_ARCH/all
 2006-11-17 17:16:16 +00:00
espie
759b3af1dc index PKG_ARCH, PERMIT_PACKAGE_FTP, PERMIT_PACKAGE_CDROM on SUBPACKAGE name. 2006-11-13 14:14:57 +00:00
espie
1ef50b337c avoid ignoring ports while running a `describe' target. 
triggered by setting DESCRIBE_TARGET=Yes in bsd.port.subdir.mk
 2006-11-13 13:55:10 +00:00
espie
0b6d91b275 move PKG_ARCH after MODULES 2006-11-12 10:52:59 +00:00
espie
6a9f2056f7 more tweaks 2006-11-12 10:48:17 +00:00
espie
47a8fcf5fc tweaks so it works 2006-11-12 10:45:40 +00:00
espie
41a9dbf299 a small cpan module that takes care of most common things there 2006-11-12 10:29:15 +00:00
espie
0a20eb70a6 Top-level redirectors which recurse for multi-packages should display where 
they are. This does unconfuse pkg_mklocatedb
 2006-11-11 16:32:12 +00:00
espie
7564143ca2 shorten dependency names, so that regress and run can share. 
add print-plist-all, for better introspection (to be used by pkg_mklocatedb).
 2006-11-11 16:10:36 +00:00
espie
a2beb10ca4 zap uses of ${SH} 2006-11-09 08:29:47 +00:00
espie
6b60ddeb78 remove the dependency of make-plist on dependent packages: instead, go 
directly use `make print-plist' to find these lists in the ports tree.
 2006-11-09 08:16:22 +00:00
espie
adbf2219c0 have _internal-regress depend on the _BUILD_COOKIE, so that build is 
performed before regress dependencies.
 2006-11-05 20:20:28 +00:00
espie
7be15550f4 add regress-dir-depends/full-regress-depends, similar mechanism to 
run-depends, only the basic test changes.
 2006-11-05 15:46:51 +00:00
espie
19abee34c6 revert. called from bsd.port.subdir.mk as well, which doesn't define 
TMPDIR.
Noticed by steven@
 2006-11-03 23:19:42 +00:00