cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,167 Commits 1 Branch 0 Tags 554 MiB
216154a457
Commit Graph

1699 Commits

Author SHA1 Message Date
steven
e3820f5171 DEPPATHS per subpackage, ok espie 2006-12-11 14:01:03 +00:00
espie
468c67ec44 zap extra parse_args. 2006-12-11 13:51:14 +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
sturm
0bcaa0f861 reduce the amount of direct dependencies by pointing out those which 
are pulled in as indirect dependencies

ok espie@
 2006-12-10 17:34:41 +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
jakob
52fb94beac add user for net/flow-tools 2006-12-07 17:11: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
6d7703e824 move a large cpan mirror near the top, this one tends to have old stuff 
the others forgot.
 2006-11-28 23:43:54 +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
msf
9f48f41db6 +_siproxd 2006-11-27 11:18:21 +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
msf
297a01402e +_perdition 2006-11-25 11:01:19 +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
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