From owner-svn-ports-head@freebsd.org  Mon Mar 21 14:34:07 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 215B7AD8015;
 Mon, 21 Mar 2016 14:34:07 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E6AB3906;
 Mon, 21 Mar 2016 14:34:06 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2LEY6Ib099388;
 Mon, 21 Mar 2016 14:34:06 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2LEY6lT099387;
 Mon, 21 Mar 2016 14:34:06 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201603211434.u2LEY6lT099387@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Mon, 21 Mar 2016 14:34:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r411569 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Mar 2016 14:34:07 -0000

Author: tijl
Date: Mon Mar 21 14:34:05 2016
New Revision: 411569
URL: https://svnweb.freebsd.org/changeset/ports/411569

Log:
  Replace the license dialog menu and "View license" screen with one --yesno
  dialog.  This also folds long lines.
  
  PR:		208180
  Approved by:	portmgr (mat)

Modified:
  head/Mk/bsd.licenses.mk

Modified: head/Mk/bsd.licenses.mk
==============================================================================
--- head/Mk/bsd.licenses.mk	Mon Mar 21 14:33:34 2016	(r411568)
+++ head/Mk/bsd.licenses.mk	Mon Mar 21 14:34:05 2016	(r411569)
@@ -611,17 +611,9 @@ ${_LICENSE_COOKIE}:
 .	if !defined(NO_LICENSES_DIALOGS)
 # Dialog interface
 .		if ${_LICENSE_COMB} == "single"
-	@trap '${RM} -f $$tmpfile' EXIT INT TERM; \
-	tmpfile=$$(mktemp -t portlicenses); \
-	while true; do \
-		${DIALOG} --menu "License for ${PKGNAME} (${_LICENSE})" 21 70 15 accept "Accept license" reject "Reject license" view "View license" 2>"$${tmpfile}"; \
-		result=`${CAT} $${tmpfile}`; \
-		case $${result} in \
-		accept) break ;; \
-		reject) exit 1;; \
-		view)   ${DIALOG} --textbox "${_LICENSE_FILE}" 21 75 ;; \
-		esac; \
-	done
+	@${DIALOG} --title "License for ${PKGNAME} (${_LICENSE})" \
+		--yes-label Accept --no-label Reject --yesno \
+		"$$(${CAT} ${_LICENSE_FILE})" 21 76
 
 .		elif ${_LICENSE_COMB} == "dual"
 	@${RM} -f ${_LICENSE_ASK_DATA}