Date: Sun, 26 Jan 2020 20:12:08 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524230 - in head/ports-mgmt/portmaster: . files Message-ID: <202001262012.00QKC86a014883@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Sun Jan 26 20:12:08 2020 New Revision: 524230 URL: https://svnweb.freebsd.org/changeset/ports/524230 Log: Make the pre-build "make clean" use SU_CMD if appropriate. Additionally document that PORTSDIR can be passed in the environment. PR: 228439 Approved by: antoine (implicit) Modified: head/ports-mgmt/portmaster/Makefile head/ports-mgmt/portmaster/files/patch-files_portmaster.8 head/ports-mgmt/portmaster/files/patch-portmaster Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Sun Jan 26 19:53:44 2020 (r524229) +++ head/ports-mgmt/portmaster/Makefile Sun Jan 26 20:12:08 2020 (r524230) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org Modified: head/ports-mgmt/portmaster/files/patch-files_portmaster.8 ============================================================================== --- head/ports-mgmt/portmaster/files/patch-files_portmaster.8 Sun Jan 26 19:53:44 2020 (r524229) +++ head/ports-mgmt/portmaster/files/patch-files_portmaster.8 Sun Jan 26 20:12:08 2020 (r524230) @@ -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) Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Sun Jan 26 19:53:44 2020 (r524229) +++ head/ports-mgmt/portmaster/files/patch-portmaster Sun Jan 26 20:12:08 2020 (r524230) @@ -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!)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001262012.00QKC86a014883>