Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Feb 2020 08:34:02 +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: r526008 - in head/ports-mgmt/portmaster: . files
Message-ID:  <202002130834.01D8Y25x060863@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: se
Date: Thu Feb 13 08:34:02 2020
New Revision: 526008
URL: https://svnweb.freebsd.org/changeset/ports/526008

Log:
  Fix regression that has been introduced in r524227
  
  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)

Modified:
  head/ports-mgmt/portmaster/Makefile
  head/ports-mgmt/portmaster/files/patch-portmaster

Modified: head/ports-mgmt/portmaster/Makefile
==============================================================================
--- head/ports-mgmt/portmaster/Makefile	Thu Feb 13 04:14:05 2020	(r526007)
+++ head/ports-mgmt/portmaster/Makefile	Thu Feb 13 08:34:02 2020	(r526008)
@@ -2,7 +2,7 @@
 
 PORTNAME=	portmaster
 PORTVERSION=	3.19
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	se@FreeBSD.org

Modified: head/ports-mgmt/portmaster/files/patch-portmaster
==============================================================================
--- head/ports-mgmt/portmaster/files/patch-portmaster	Thu Feb 13 04:14:05 2020	(r526007)
+++ head/ports-mgmt/portmaster/files/patch-portmaster	Thu Feb 13 08:34:02 2020	(r526008)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002130834.01D8Y25x060863>