diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2020-01-26 20:12:08 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2020-01-26 20:12:08 +0000 |
| commit | aed8c82ed52d549646ddaf5308ee2a48517adef2 (patch) | |
| tree | 417f7da030a15ebc6ad61d7bc2893b4fad9ee437 | |
| parent | 6a096452b59cc6546302becf70e5a54926b02f51 (diff) | |
| download | ports-aed8c82ed52d549646ddaf5308ee2a48517adef2.tar.gz ports-aed8c82ed52d549646ddaf5308ee2a48517adef2.zip | |
Notes
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-files_portmaster.8 | 8 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 9 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index aaaedf5abc15..577f33beb5ab 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org diff --git a/ports-mgmt/portmaster/files/patch-files_portmaster.8 b/ports-mgmt/portmaster/files/patch-files_portmaster.8 index a88c8c882555..d3c2cd6b5671 100644 --- a/ports-mgmt/portmaster/files/patch-files_portmaster.8 +++ b/ports-mgmt/portmaster/files/patch-files_portmaster.8 @@ -50,3 +50,11 @@ .It Fl o Ar <new port dir in /usr/ports> <installed port> replace the installed port with a port from a different origin .It [-R] Fl r Ar name/glob of port directory in /var/db/pkg +@@ -603,6 +613,7 @@ variable must be set to a directory where the + superuser has write permissions. + Other useful variables include: + .Bd -literal ++PORTSDIR (default /usr/ports) + MASTER_SITE_INDEX (default http://www.FreeBSD.org/ports/) + FETCHINDEX (default fetch -am -o) + INDEXDIR (default $PORTSDIR, or $TMPDIR for --index-only) diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index 6652c021f797..8efb10784ee5 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -815,6 +815,15 @@ \<) # Could happen if ports tree is out of date use_package=up_old_tree pm_v "===>>> Available package ($latest_pv)" +@@ -3603,7 +3644,7 @@ if [ -z "$use_package" ]; then + + pm_cd_pd $portdir + export_flavor $(flavor_part $portdir) +- [ -z "$DONT_PRE_CLEAN" ] && { pm_make clean NOCLEANDEPENDS=ncd || ++ [ -z "$DONT_PRE_CLEAN" ] && { pm_make_s clean NOCLEANDEPENDS=ncd || + fail 'make clean failed'; } + + fl_read=`echo ${TMPDIR}/f-${PM_PARENT_PID}-fetchlog-${portdir#*/}.*` @@ -3632,19 +3673,27 @@ if [ -z "$use_package" ]; then # Return flavor for named pkg (must be executed in port directory!) |