PERFORCE change 167389 for review

[Alejandro Pulver]

http://perforce.freebsd.org/chv.cgi?CH=167389

Change 167389 by alepulver at 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