Commit Graph

1598 Commits

Author SHA1 Message Date
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
espie
e7bba25064 avoid weird error if we run this without patches 2006-11-21 11:18:34 +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
cc62c9b52c a few small additions, which were tested but not in tree yet 2006-11-20 23:21:38 +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
9d9d40e8e6 kludge make-plist to work with new multi packages 2006-11-20 13:56:37 +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
3d0bde7b9b zap duplicate specs 2006-11-20 12:13:43 +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
steven
666f31d371 forgot to comment one 2006-11-12 12:57:28 +00:00
steven
f27e97d635 remove/comment freetype and Xaw related items for now;
suggestion from espie
2006-11-12 12:17:33 +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
steven
5cc8db10f7 some more 2006-11-11 22:57:41 +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
steven
d637fde153 start at a config site file for X11 stuff, to be enabled later 2006-11-11 15:10:22 +00:00
steven
4b7f617b1b take out X11 related stuff, to be included in new file 2006-11-11 15:01:19 +00:00
espie
ea00df0a25 allows grabbing the packing-list from the ports tree.
suggestion from bernd
2006-11-11 13:11:45 +00:00
espie
321aced247 rename function for future change.
avoid re-reading the same plist for getting the same info (which doesn't
work anyways, so this avoids looking up a package for nothing).
let depwalk stash the pkgpath away for future use.
2006-11-11 12:44:26 +00:00
steven
d3786bb3e7 add more functions, headers, and errno values (tested in a bulk build)
okay espie@
2006-11-10 17:29:38 +00:00