Commit graph

2887 commits

Author SHA1 Message Date
jschauma
1cce0bd065 Some licenses are pretty long, so use $PAGER instead of $CAT, if $PAGER
is set.
2004-01-28 20:29:46 +00:00
agc
c156ab5d49 Replace all occurrences of the "MAIL" definition with MAIL_CMD, since
some shells can set MAIL to be the mailbox of the user, and
environment variables will override assignments in make when using
conditional assignments.
2004-01-27 16:11:47 +00:00
jlam
e8eafe236e Abstract out the filter commmand used to list headers and libraries in
the package +CONTENTS file into a variable BUILDLINK_CONTENTS_FILTER.<pkg>.
2004-01-27 12:19:03 +00:00
jlam
2c5e5ce5d0 Move all of the stuff relating to _BLNK_ADD_TO.* into the same if.endif
block.
2004-01-27 08:42:13 +00:00
jlam
955f55be09 Add a missing "empty". Thanks seb! 2004-01-27 08:39:24 +00:00
jlam
5b7a8cf9b1 Also break up -R*:* into separate -R options. 2004-01-27 08:23:45 +00:00
jlam
2116fcb603 "fetch" is also a distinct build phase. 2004-01-27 02:36:59 +00:00
jlam
aab2374faf Restore changes in 1.57 that were backed out in 1.60. The _BLNK_ADD_TO.*
variables are no longer saved using MAKEFLAGS since the saved values aren't
correct for recursively invoked make targets that bsd.pkg.mk uses
internally for information-gathering, e.g. show-var, run-depends-list.
Instead of saving the values, we now just don't compute them during phases
of the build that don't care about the dependency information, e.g. when
not in extract, install, or package.
2004-01-27 02:32:56 +00:00
grant
d84262f580 add /usr/5bin for Solaris. 2004-01-26 22:32:30 +00:00
seb
1df8873c30 Revert changes in revision 1.57:
_BLNK_ADD_TO.* never get redefined for dependent packages (recursive
make invocation in install-depends target) causing an endless loop.
2004-01-26 22:19:16 +00:00
agc
1e90841f0d Add a new definition, _PRESERVE_WRKDIR, which defaults to "no". This
definition is not intended to be set by the user, and so has a leading
'_', and is undocumented.

If set to "yes", then a "make clean" of the package will not be done,
thereby preserving the working directory.  This is useful for
debugging problems in bulk builds.
2004-01-26 21:24:41 +00:00
heinz
4d478bb0cf Use $FIND with "-print". Noted by Georg Schwarz in PR pkg/24248 2004-01-26 21:10:31 +00:00
jlam
bde1c835c5 Purge one more instance of _NULL_SUFFIX. Fix by Marc Recht. 2004-01-25 19:23:20 +00:00
jlam
2d58c835eb Use -S instead of '-s ""' to check for package matches with a null suffix.
This option is available as of pkg_install>=20030918 which is required in
pkgsrc.  Noted by Klaus Heinz.
2004-01-25 18:44:31 +00:00
jlam
71c7ad7f16 pkgsrc requires PKGTOOLS_REQD>=20030918, so we don't need to conditionalize
passing "-S" to pkg_admin.
2004-01-25 18:42:53 +00:00
jlam
66b2e171eb The new standard for modifying BUILDLINK_DEPENDS.<pkg> is to append to the
value instead of overriding.  The reason is so that the most restrictive
<pkg> dependency will always be a part of the dependency list.
2004-01-25 16:46:21 +00:00
jlam
0129c7eedd Append to BUILDLINK_DEPENDS.<pkg> instead of overriding it so that the
most restrictive dependency is always part of the DEPENDS/BUILD_DEPENDS
list.
2004-01-25 16:17:37 +00:00
grant
d85f19a094 show-needs-update target: run ${MAKE}, not "make". 2004-01-25 16:12:40 +00:00
jlam
8e850d0459 Instead of directly manipulating DEPENDS, BUILD_DEPENDS, and RECOMMENDED,
create _BLNK_ADD_TO.<depmethod> for each of depencdency methods above from
the BUILDLINK_DEPEND.<pkg> and BUILDLINK_RECOMMENDED.<pkg> lists and save
the created values so they don't need to constantly be recomputed.
2004-01-25 13:26:43 +00:00
jlam
93ad14ffc4 Suppress duplicate dependencies in the DEPENDS and BUILD_DEPENDS list
added by buildlink3.mk files if the dependencies are _exactly_ the same.
2004-01-25 13:09:46 +00:00
jlam
0b36d85a83 Fix code that assumed that BUILDLINK_DEPENDS.<pkg> was a unique value by
modifying it to accept a list.
2004-01-25 12:43:24 +00:00
grant
57eb61a5d6 run GNU configure scripts with ${CONFIG_SHELL}, which defaults to
${SH} when GNU_CONFIGURE is defined.

fixes problems on Solaris and BSDI with some GNU configure scripts.
2004-01-25 10:36:15 +00:00
xtraeme
7c90204834 Removed XFree86-libs dependency if we are trying to use XFree86
packages from pkgsrc, it's not really needed with the latest change
to x11-links.
2004-01-25 07:47:00 +00:00
grant
677c8663d9 g/c USE_GMAKE. nothing uses it anymore. 2004-01-25 02:37:49 +00:00
xtraeme
c0f8903bb6 Added a new variable for XFree86 packages:
USE_PKGSRC_XFREE86

By default it is disabled, if you want to use XFree86 packages from
pkgsrc, please add "USE_PKGSRC_XFREE86=YES" in /etc/mk.conf.
2004-01-24 09:23:22 +00:00
jlam
018df25438 Move all of the code that sets USE_XPKGWEDGE from bsd.pkg.mk into
bsd.prefs.mk as it's needed in setting X11PREFIX to the correct value,
which is also done in bsd.prefs.mk.  This is the follow-through to the
temporary fix in previous revision (1.141) of bsd.prefs.mk.
2004-01-23 17:55:17 +00:00
jmmv
cd39cfd5a5 Add http://osdn.dl.sourceforge.net/sourceforge/ as a master site for
Sourceforge.
2004-01-23 17:04:55 +00:00
agc
d4ff22acec Temporary fix for xpkgwedge'd packages which were getting buildlinked
with a prefix of X11BASE, rather than LOCALBASE - check whether
USE_XPKGWEDGE is defined to {"YES", "yes"} as well as looking for the
existence of the xpkgwedge definition file when calculating the value
of X11PREFIX.
2004-01-23 16:49:47 +00:00
grant
c7be5308d1 sandboxed builds also need /usr/dt and /usr/ucblib on Solaris. 2004-01-22 13:08:32 +00:00
xtraeme
582b323b23 Add three additional mirrors to MASTER_SITE_SUSE. 2004-01-22 10:19:58 +00:00
grant
3764132f99 make date format string more portable. 2004-01-22 09:08:34 +00:00
jlam
dfe9bb1980 Most of this file only applies if we're in some phase after buildlink, so
enforce that using PHASES_AFTER_BUILDLINK.

Also, transform the physical path to ${WRKDIR} into the value ${WRKDIR} in
the wrapper scripts.  This allows ${WRKDIR} to be a path that traverses a
symlink.  In particular, it allows users to set WRKOBJDIR to point to a
symlink.
2004-01-21 18:18:13 +00:00
jlam
3306fc00c1 Introduce concept of the "phase" that we're in as we progress through
fetching, extracting, configuring, building, etc. of a package.  We
can check what phase we're in by examining the value of ${PKG_PHASE}
and comparing against PHASES_AFTER_<phase>, which list phases that
are "greater than or equal to" <phase>.

One useful example of how to use PKG_PHASE is:

.if !empty(PHASES_AFTER_EXTRACT:${PKG_PHASE})
#
# Some variable settings or targets here that rely on dependencies to
# already be installed, or ${WRKDIR} to be created, etc., as these are
# things that should have happened by the time "make extract" is
# completed.
#
.endif
2004-01-21 18:13:27 +00:00
jlam
ab10d9f748 Put more debugging information in .work.log: first output the command the
wrapper script will transform, then output the transformed command.
Prefix the original command with [*] and the transformed command with <.>
to ease scanning of .work.log.
2004-01-21 13:52:56 +00:00
jlam
85513cb202 Packages that use Kerberos are automatically categorized as restricted
packages.
2004-01-21 13:09:31 +00:00
jlam
4ea5e626c5 Add a new command "sub-rpath" that does the same thing as "rpath" but only
protects subdirectories of the named paths in rpath options to the linker.
Use sub-rpath to protect /usr/lib/* in rpath options to the linker.
2004-01-21 08:04:29 +00:00
jlam
008a41b7ec Rename 'submangle' to 'sub-mangle' 2004-01-21 07:54:50 +00:00
jlam
f50372de35 Allow -L/usr/lib/* as NetBSD-current actually has shared libraries there,
and we should allow these to pass untouched through the wrapper scripts.
2004-01-21 07:37:32 +00:00
snj
e0220ad330 s/it's/its/ 2004-01-20 22:15:21 +00:00
grant
b61400f8a3 add archivers/pax, net/tnftp, security/kth-krb4 and textproc/nbsed to
the packages to skip on non-NetBSD because they blow away
bootstrap-pkgsrc installed files.

only create ${PKG_DBDIR} if it doesn't already exist.
2004-01-20 12:44:30 +00:00
grant
002e1324e0 make this work on Solaris by using perl's internal grep(). it is
faster, and (f)grep can't handle very long word lists.
2004-01-20 12:37:08 +00:00
grant
15a0f7f8f5 reverse some "if ! command;" statements so this works with Solaris'
/bin/sh, which doesn't deal with !

bulk builds now work out-of-the-box on Solaris. woo :-)
2004-01-20 09:41:52 +00:00
grant
39935c10c4 missed a uname -p 2004-01-20 07:39:24 +00:00
grant
87c28cdc91 get and use the value of ${MACHINE_ARCH} instead of uname -p to
correctly reflect the pkgsrc arch.

(uname -p returns "unknown" on (my) Linux, which is not very helpful..)
2004-01-20 07:01:18 +00:00
grant
c0baecbda3 tiny whitespace tweak 2004-01-20 05:56:34 +00:00
grant
94317ffdac on Linux, use --bind arg to mount(8) and call 'MAKEDEV generic' to
make the device files, as this is what Linux systems seem to use...
2004-01-20 01:01:56 +00:00
jlam
eb35df0213 Fix PERL5_REQD=5.8 to mean that we want to install lang/perl58. Before,
we were expecting PERL5_REQD=5.8.0.
2004-01-19 23:47:41 +00:00
jlam
cebb84d3d5 Allow CONFIG_STATUS_OVERRIDE to override config.status scripts generated
by GNU configure scripts at CONFIGURE_POSTREQ time.  The new config.status
scripts merely return success.  This prevents newer Makefiles from
re-running the configure script with the wrong shell environment if we've
touched some GNU autotool-related files during the patch stage.

We might want to always do this, i.e. make this opt-out instead of opt-in.
However, we start with opt-in so that no existing packages can break.
2004-01-19 15:04:05 +00:00
jlam
69bbf64eeb Remove some extraneous commands and switch some targets to be conditionally
defined.
2004-01-19 14:54:26 +00:00
jlam
a011748fab * Create two new package-settable variables: BUILDLINK_PASSTHRU_DIRS is
an extra list of paths denoting entire directory trees that will be
  unchanged by the wrapper scripts in options passed to the toolchain.
  BUILDLINK_PASSTHRU_RPATHDIRS is the same as BUILDLINK_PASSTHRU_DIRS
  but the the listed paths are only unchanged if used in an rpath option.

* Garbage-collect _BLNK_BUILTIN_DIRS, which is superseded by
  _BLNK_PASSTHRU_DIRS.

* Ensure that the correct set of directories is passed to the linker
  for the runtime library search path in the pkgviews case.

* Allow -I/usr/include/* to be unchanged by the wrapper scripts.  This
  allows building LKMs in pkgsrc, which need -I/usr/include/sys, using
  the buildlink3 wrapper scripts.
2004-01-19 12:34:54 +00:00