From owner-p4-projects@FreeBSD.ORG Sat Aug 15 23:43:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A44CD106568E; Sat, 15 Aug 2009 23:43:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69123106568D for ; Sat, 15 Aug 2009 23:43:47 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3EF0E8FC3D for ; Sat, 15 Aug 2009 23:43:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7FNhloe045782 for ; Sat, 15 Aug 2009 23:43:47 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7FNhlmV045780 for perforce@freebsd.org; Sat, 15 Aug 2009 23:43:47 GMT (envelope-from alepulver@freebsd.org) Date: Sat, 15 Aug 2009 23:43:47 GMT Message-Id: <200908152343.n7FNhlmV045780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alepulver@freebsd.org using -f From: Alejandro Pulver To: Perforce Change Reviews Cc: Subject: PERFORCE change 167389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Aug 2009 23:43:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=167389 Change 167389 by alepulver@alepulver_deimos on 2009/08/15 23:43:26 - Increase width when displaying licenses in "dialog". - Add more information to "dual" and "multi" dialogs. Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#11 edit Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#11 (text+ko) ==== @@ -599,7 +599,7 @@ case $${result} in \ accept) break ;; \ reject) exit 1;; \ - view) ${DIALOG} --textbox "${_LICENSE_FILE}" 21 70 ;; \ + view) ${DIALOG} --textbox "${_LICENSE_FILE}" 21 75 ;; \ esac; \ done @@ -608,7 +608,7 @@ . for lic in ${_LICENSE_TO_ASK} @${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA} . endfor - @menu_cmd="${DIALOG} --menu \"License for ${PKGNAME}\" 21 70 15"; \ + @menu_cmd="${DIALOG} --hline \"This port requires you to accept at least one license\" --menu \"License for ${PKGNAME} (dual)\" 21 70 15"; \ tmpfile=$$(mktemp -t portlicenses); \ for lic in ${_LICENSE_TO_ASK}; do \ menu_cmd="$${menu_cmd} VIEW_$${lic} \"View the license $${lic}\" USE_$${lic} \"Accept the license $${lic}\""; \ @@ -621,7 +621,7 @@ REJECT) exit 1;; \ VIEW_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^VIEW_//'); \ file=$$(${GREP} "^$${name}:" ${_LICENSE_ASK_DATA} | ${CUT} -d : -f 2); \ - ${DIALOG} --textbox "$${file}" 21 70 ;; \ + ${DIALOG} --textbox "$${file}" 21 75 ;; \ USE_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^USE_//'); \ ${ECHO_CMD} $${name} > ${_LICENSE_COOKIE}; \ break ;; \ @@ -633,7 +633,7 @@ . for lic in ${_LICENSE_TO_ASK} @${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA} . endfor - @menu_cmd="${DIALOG} --menu \"License for ${PKGNAME}\" 21 70 15"; \ + @menu_cmd="${DIALOG} --hline \"This port requires you to accept all mentioned licenses\" --menu \"License for ${PKGNAME} (multi)\" 21 70 15"; \ tmpfile=$$(mktemp -t portlicenses); \ for lic in ${_LICENSE_TO_ASK}; do \ menu_cmd="$${menu_cmd} VIEW_$${lic} \"View the license $${lic}\""; \ @@ -647,7 +647,7 @@ REJECT) exit 1 ;; \ VIEW_*) name=$$(${ECHO_CMD} $${result} | ${SED} -e 's/^VIEW_//'); \ file=$$(${GREP} "^$${name}:" ${_LICENSE_ASK_DATA} | ${CUT} -d : -f 2); \ - ${DIALOG} --textbox "$${file}" 21 70 ;; \ + ${DIALOG} --textbox "$${file}" 21 75 ;; \ esac; \ done . endif