Date: Mon, 23 Jan 2012 15:35:53 +0400 From: Jan Beich <jbeich@tormail.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/164403: [patch] Mk/bsd.licenses.mk: bring back --hline Message-ID: <1RpIDn-000Hz0-QH@internal.tormail.net> Resent-Message-ID: <201201231140.q0NBe3Ax015742@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 164403
>Category: ports
>Synopsis: [patch] Mk/bsd.licenses.mk: bring back --hline
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 23 11:40:03 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jan Beich
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
tested all this time
>Description:
As noted in ports/154121 followup the workaround is no longer necessary
since last libdialog update in /stable/9@r224014 (2011-07-14).
>How-To-Repeat:
>Fix:
--- hline.diff begins here ---
Index: Mk/bsd.licenses.mk
===================================================================
RCS file: /a/.csup/ports/Mk/bsd.licenses.mk,v
retrieving revision 1.9
diff -u -p -r1.9 bsd.licenses.mk
--- Mk/bsd.licenses.mk 9 Jan 2012 15:31:27 -0000 1.9
+++ Mk/bsd.licenses.mk 10 Jan 2012 15:41:05 -0000
@@ -613,7 +613,7 @@ ${_LICENSE_COOKIE}:
. for lic in ${_LICENSE_TO_ASK}
@${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA}
. endfor
- @menu_cmd="${DIALOG} --title \"This port requires you to accept at least one license\" --menu \"License for ${PKGNAME} (dual)\" 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"; \
trap '${RM} -f $$tmpfile' EXIT INT TERM; \
tmpfile=$$(mktemp -t portlicenses); \
for lic in ${_LICENSE_TO_ASK}; do \
@@ -639,7 +639,7 @@ ${_LICENSE_COOKIE}:
. for lic in ${_LICENSE_TO_ASK}
@${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA}
. endfor
- @menu_cmd="${DIALOG} --title \"This port requires you to accept all mentioned licenses\" --menu \"License for ${PKGNAME} (multi)\" 21 70 15"; \
+ @menu_cmd="${DIALOG} --hline \"This port requires you to accept all mentioned licenses\" --menu \"License for ${PKGNAME} (multi)\" 21 70 15"; \
trap '${RM} -f $$tmpfile' EXIT INT TERM; \
tmpfile=$$(mktemp -t portlicenses); \
for lic in ${_LICENSE_TO_ASK}; do \
--- hline.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1RpIDn-000Hz0-QH>