svn commit: r411569 - head/Mk
Tijl Coosemans
tijl at FreeBSD.org
Mon Mar 21 14:34:07 UTC 2016
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}
More information about the svn-ports-head
mailing list