cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression that has been introduced in r524227

Browse Source 
Revert part of the patch that introduced the --try-broken option, it
caused problems in combination with -m.

Submitted by:	Rudolf Cejka (cejkar at fit.vutbr.cz)
Approved by:	antoine (implicit)
This commit is contained in:
Stefan Eßer 2020-02-13 08:34:02 +00:00
parent f5318f3bf3
commit e1260a7ab8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=526008
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/portmaster/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= portmaster
PORTVERSION= 3.19
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= ports-mgmt
MAINTAINER= se@FreeBSD.org

9
ports-mgmt/portmaster/files/patch-portmaster
View File

@ -221,14 +221,7 @@
--*) echo "Illegal option $var" ; echo ''
echo "===>>> Try $progname --help"; exit 1 ;;
*) newopts="$newopts $var" ;;
@@ -722,13 +753,13 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop:r:stvwx:y' CO
h) usage 0 ;;
i) INTERACTIVE_UPDATE=iopt; ARGS="-i $ARGS" ;;
l) LIST=lopt ;;
- m) export PM_MAKE_ARGS=$OPTARG # For 'make checksum'
+ m) export PM_MAKE_ARGS="$PM_MAKE_ARGS $OPTARG" # For 'make checksum'
ARGS="-m $PM_MAKE_ARGS $ARGS" ;;
n) NO_ACTION=nopt; ARGS="-n $ARGS" ;;
@@ -728,7 +759,7 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop:r:stvwx:y' CO
o) REPLACE_ORIGIN=oopt ;; # -o should take a parameter and $OPTARG should be assigned here
p) fail 'The -p option has been deprecated' ;;
r) PM_URB=ropt