diff options
| author | dougb <dougb@FreeBSD.org> | 2009-12-31 11:52:19 +0800 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2009-12-31 11:52:19 +0800 |
| commit | b13de9496a1785305648a2c8d3cddb1f72c1ed9a (patch) | |
| tree | c3e76daff93ad9bd05bdb8efa90a48b20900f9c8 | |
| parent | b1e9abf06793d126e6e23f08ab8d991383daecda (diff) | |
| download | freebsd-ports-gnome-b13de9496a1785305648a2c8d3cddb1f72c1ed9a.tar.gz freebsd-ports-gnome-b13de9496a1785305648a2c8d3cddb1f72c1ed9a.tar.zst freebsd-ports-gnome-b13de9496a1785305648a2c8d3cddb1f72c1ed9a.zip | |
Two minor bug fixes:
====================
1. We only want to set PM_BUILD_ONLY_LIST=pm_bol in the command line
parser if we are the parent port. Otherwise proper build dep detection
will not occur.
2. Versions of pkg_add in FreeBSD older than 6.4-RELEASE will not have
the proper options available, so warn the user if they try to use
package-related code.[1]
Reported by: Miroslav Lachman <000.fbsd@quip.cz>[1]
| -rw-r--r-- | ports-mgmt/portmaster/files/portmaster.sh.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ports-mgmt/portmaster/files/portmaster.sh.in b/ports-mgmt/portmaster/files/portmaster.sh.in index abbe6115a93d..2fe2c33ab3ed 100644 --- a/ports-mgmt/portmaster/files/portmaster.sh.in +++ b/ports-mgmt/portmaster/files/portmaster.sh.in @@ -449,9 +449,15 @@ for var in "$@" ; do esac done -if [ -n "$PM_PACKAGES_BUILD" -o -n "$PM_DEL_BUILD_ONLY" ]; then - PM_BUILD_ONLY_LIST=pm_bol - export PM_BUILD_ONLY_LIST +if [ "$$" -eq "$PM_PARENT_PID" ]; then + if [ -n "$PM_PACKAGES_BUILD" -o -n "$PM_DEL_BUILD_ONLY" ]; then + PM_BUILD_ONLY_LIST=pm_bol + export PM_BUILD_ONLY_LIST + fi + if [ -n "$PM_PACKAGES" -o -n "$PM_PACKAGES_BUILD" ]; then + [ `/sbin/sysctl -n kern.osreldate 2>/dev/null` -lt 600400 ] && + fail Package installation support requires FreeBSD 6.4 or newer + fi fi set -- $newopts |