Date: Fri, 25 Aug 2006 12:56:23 -0700 (PDT) From: Andrew Pantyukhin <infofarmer@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/102514: [patch] bsd.port.mk: "set $var" ==> "set -- $var" Message-ID: <44ef55e7.246e3210.5049.ffff987b@mx.gmail.com> Resent-Message-ID: <200608252000.k7PK0arI034619@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102514 >Category: ports >Synopsis: [patch] bsd.port.mk: "set $var" ==> "set -- $var" >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Aug 25 20:00:36 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Andrew Pantyukhin >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD sat64.net17 6.1-STABLE FreeBSD 6.1-STABLE #22: Sat Aug 5 22:19:18 MSD 2006 sat@sat64.net17:/usr/obj/usr/src/sys/SATCUR32 i386 >Description: sh(1) recommends using "set -- <new args>" instead of just, "set <new args>", but of course marcus, kris, and clement chose to avoid wasting 3 bytes in each case ;-) >How-To-Repeat: Try defining empty MLINKS - and look what happens at install >Fix: http://people.freebsd.org/~sat/diffs/bpm.set.diff --- bpm.set.diff begins here --- Index: bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.540 diff -u -r1.540 bsd.port.mk --- bsd.port.mk 14 Aug 2006 13:24:18 -0000 1.540 +++ bsd.port.mk 25 Aug 2006 19:46:18 -0000 @@ -5551,7 +5551,7 @@ @_manpages='${_MANPAGES:S/'/'\''/g}' && [ "$${_manpages}" != "" ] && ( eval ${GZIP_CMD} $${_manpages} ) || ${TRUE} .endif .if defined(_MLINKS) - @set ${_MLINKS}; \ + @set -- ${_MLINKS}; \ while :; do \ [ $$# -eq 0 ] && break || ${TRUE}; \ ${RM} -f $${2%.gz}; ${RM} -f $$2.gz; \ @@ -5681,7 +5681,7 @@ -@if [ -e ${_OPTIONSFILE} ]; then \ . ${_OPTIONSFILE}; \ fi; \ - set ${OPTIONS} XXX; \ + set -- ${OPTIONS} XXX; \ while [ $$# -gt 3 ]; do \ OPTIONSLIST="$${OPTIONSLIST} $$1"; \ defaultval=$$3; \ @@ -5761,7 +5761,7 @@ -@if [ -e ${_OPTIONSFILE} ]; then \ . ${_OPTIONSFILE}; \ fi; \ - set ${OPTIONS} XXX; \ + set -- ${OPTIONS} XXX; \ while [ $$# -gt 3 ]; do \ defaultval=$$3; \ withvar=WITH_$$1; \ @@ -5894,7 +5894,7 @@ check-desktop-entries: .if defined(DESKTOP_ENTRIES) - @set ${DESKTOP_ENTRIES} XXX; \ + @set -- ${DESKTOP_ENTRIES} XXX; \ if [ `${EXPR} \( $$# - 1 \) % 6` -ne 0 ]; then \ ${ECHO_MSG} "${PKGNAME}: Makefile error: the DESKTOP_ENTRIES list must contain one or more groups of 6 elements"; \ exit 1; \ @@ -5952,7 +5952,7 @@ .if defined(DESKTOP_ENTRIES) @(${MKDIR} "${DESKTOPDIR}" 2> /dev/null) || \ (${ECHO_MSG} "===> Cannot create ${DESKTOPDIR}, check permissions"; exit 1) - @set ${DESKTOP_ENTRIES} XXX; \ + @set -- ${DESKTOP_ENTRIES} XXX; \ if [ -z "${_DESKTOPDIR_REL}" ]; then \ ${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST}; \ fi; \ --- bpm.set.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?44ef55e7.246e3210.5049.ffff987b>