svn commit: r457645 - in head/ports-mgmt/portmaster: . files

[Stefan Esser]

Author: se
Date: Sat Dec 30 22:14:58 2017
New Revision: 457645
URL: https://svnweb.freebsd.org/changeset/ports/457645

Log:
  ----------------------------------------------------------------------------
  Fix spelling of OPTIONS_FILE.
  
  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	Sat Dec 30 22:00:03 2017	(r457644)
+++ head/ports-mgmt/portmaster/Makefile	Sat Dec 30 22:14:58 2017	(r457645)
@@ -2,7 +2,7 @@
 
 PORTNAME=	portmaster
 PORTVERSION=	3.18
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	se at FreeBSD.org

Modified: head/ports-mgmt/portmaster/files/patch-portmaster
==============================================================================
--- head/ports-mgmt/portmaster/files/patch-portmaster	Sat Dec 30 22:00:03 2017	(r457644)
+++ head/ports-mgmt/portmaster/files/patch-portmaster	Sat Dec 30 22:14:58 2017	(r457645)
@@ -1,4 +1,4 @@
---- portmaster.orig	2017-12-29 22:11:06 UTC
+--- portmaster.orig	2017-12-21 09:02:44 UTC
 +++ portmaster
 @@ -113,13 +113,13 @@ kill_bad_children () {
  		[ "$pid" -gt 25 ] || continue
@@ -36,6 +36,15 @@
  			fi
  
  			cd ${1}/${portdir%/*}
+@@ -1665,7 +1664,7 @@ find_dl_distfiles () {
+ 	else
+ 		# Old method, for now
+ 		if pm_cd $pd/$1; then
+-			dist_list=`pm_make_b -V OPTIONSFILE`
++			dist_list=`pm_make_b -V OPTIONS_FILE`
+ 			dist_list="${dist_list%options}distfiles"
+ 		else
+ 			# The port might have moved, etc.; so take a stab at it,
 @@ -1803,6 +1802,7 @@ set_distfiles_and_subdir () {
  }