<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[122044] trunk/base</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/122044">122044</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-07-13 06:19:37 -0700 (Sun, 13 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: Makefiles: Quote DSTUSR/DSTGRP/DSTMODE, INSTALLDIR and RUNUSR in an attempt to fix #43875</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseMakefilein">trunk/base/Makefile.in</a></li>
<li><a href="#trunkbasedocMakefilein">trunk/base/doc/Makefile.in</a></li>
<li><a href="#trunkbasesrcdarwintracelib10Makefilein">trunk/base/src/darwintracelib1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcmacports10Makefilein">trunk/base/src/macports1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcpackage10Makefilein">trunk/base/src/package1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcportMakefilein">trunk/base/src/port/Makefile.in</a></li>
<li><a href="#trunkbasesrcport10Makefilein">trunk/base/src/port1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcprogramsdaemondoMakefilein">trunk/base/src/programs/daemondo/Makefile.in</a></li>
<li><a href="#trunkbasesrcregistry20Makefilein">trunk/base/src/registry2.0/Makefile.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseMakefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/Makefile.in (122043 => 122044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/Makefile.in 2014-07-13 12:58:08 UTC (rev 122043)
+++ trunk/base/Makefile.in 2014-07-13 13:19:37 UTC (rev 122044)
</span><span class="lines">@@ -36,58 +36,58 @@
</span><span class="cx">
</span><span class="cx"> install::
</span><span class="cx"> [ ! -f "$(DESTDIR)${sysconfdir}/macports/mp_version" ] || rm -vf "$(DESTDIR)${sysconfdir}/macports/mp_version"
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "$(DESTDIR)${datadir}/macports/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 setupenv.bash "$(DESTDIR)${datadir}/macports/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/macports-pubkey.pem "$(DESTDIR)${datadir}/macports/"
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "$(DESTDIR)${datadir}/macports/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 setupenv.bash "$(DESTDIR)${datadir}/macports/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 $(srcdir)/macports-pubkey.pem "$(DESTDIR)${datadir}/macports/"
</ins><span class="cx"> # Only run these scripts when not building in a destroot
</span><span class="cx"> ifeq ($(DESTDIR),)
</span><span class="cx"> # create run user if it doesn't exist
</span><span class="cx"> @if test -n "${DSCL}" -a -n "${DSEDITGROUP}" ; then \
</span><del>- if ! ${DSCL} -q . -read /Groups/${RUNUSR} > /dev/null 2>&1 ; then \
</del><ins>+ if ! ${DSCL} -q . -read "/Groups/${RUNUSR}" > /dev/null 2>&1 ; then \
</ins><span class="cx"> if test `id -u` -eq 0; then \
</span><span class="cx"> echo "Creating group \"${RUNUSR}\"" ; \
</span><del>- ${DSEDITGROUP} -q -o create ${RUNUSR} ; \
</del><ins>+ ${DSEDITGROUP} -q -o create "${RUNUSR}" ; \
</ins><span class="cx"> else \
</span><span class="cx"> echo "Not creating group \"${RUNUSR}\" (not root)" ; \
</span><span class="cx"> fi ; \
</span><span class="cx"> fi ; \
</span><del>- if ! ${DSCL} -q . -list /Users/${RUNUSR} > /dev/null 2>&1 ; then \
</del><ins>+ if ! ${DSCL} -q . -list "/Users/${RUNUSR}" > /dev/null 2>&1 ; then \
</ins><span class="cx"> if test `id -u` -eq 0; then \
</span><span class="cx"> echo "Creating user \"${RUNUSR}\"" ; \
</span><span class="cx"> NEXTUID=501; \
</span><span class="cx"> while test -n "`${DSCL} -q /Search -search /Users UniqueID $$NEXTUID`"; do \
</span><span class="cx"> let "NEXTUID=NEXTUID+1"; \
</span><span class="cx"> done; \
</span><del>- ${DSCL} -q . -create /Users/${RUNUSR} UniqueID $$NEXTUID ; \
</del><ins>+ ${DSCL} -q . -create "/Users/${RUNUSR}" UniqueID $$NEXTUID ; \
</ins><span class="cx"> \
</span><del>- ${DSCL} -q . -delete /Users/${RUNUSR} AuthenticationAuthority ; \
- ${DSCL} -q . -delete /Users/${RUNUSR} PasswordPolicyOptions ; \
- ${DSCL} -q . -delete /Users/${RUNUSR} dsAttrTypeNative:KerberosKeys ; \
- ${DSCL} -q . -delete /Users/${RUNUSR} dsAttrTypeNative:ShadowHashData ; \
</del><ins>+ ${DSCL} -q . -delete "/Users/${RUNUSR}" AuthenticationAuthority ; \
+ ${DSCL} -q . -delete "/Users/${RUNUSR}" PasswordPolicyOptions ; \
+ ${DSCL} -q . -delete "/Users/${RUNUSR}" dsAttrTypeNative:KerberosKeys ; \
+ ${DSCL} -q . -delete "/Users/${RUNUSR}" dsAttrTypeNative:ShadowHashData ; \
</ins><span class="cx"> \
</span><del>- ${DSCL} -q . -create /Users/${RUNUSR} RealName MacPorts ; \
- ${DSCL} -q . -create /Users/${RUNUSR} Password \* ; \
- ${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $$(${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $$2}') ; \
- ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory "${localstatedir}/macports/home" ; \
- ${DSCL} -q . -create /Users/${RUNUSR} UserShell /usr/bin/false ; \
</del><ins>+ ${DSCL} -q . -create "/Users/${RUNUSR}" RealName MacPorts ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" Password \* ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" PrimaryGroupID $$(${DSCL} -q . -read "/Groups/${RUNUSR}" PrimaryGroupID | /usr/bin/awk '{print $$2}') ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" NFSHomeDirectory "${localstatedir}/macports/home" ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" UserShell /usr/bin/false ; \
</ins><span class="cx"> else \
</span><span class="cx"> echo "Not creating user \"${RUNUSR}\" (not root)" ; \
</span><span class="cx"> fi ; \
</span><span class="cx"> fi ; \
</span><del>- if test "$$(${DSCL} -q . -read /Users/${RUNUSR} NFSHomeDirectory)" = "NFSHomeDirectory: /var/empty" ; then \
</del><ins>+ if test "$$(${DSCL} -q . -read "/Users/${RUNUSR}" NFSHomeDirectory)" = "NFSHomeDirectory: /var/empty" ; then \
</ins><span class="cx"> if test `id -u` -eq 0; then \
</span><span class="cx"> echo "Updating home directory location for user \"${RUNUSR}\"" ; \
</span><del>- ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory "${localstatedir}/macports/home" ; \
</del><ins>+ ${DSCL} -q . -create "/Users/${RUNUSR}" NFSHomeDirectory "${localstatedir}/macports/home" ; \
</ins><span class="cx"> else \
</span><span class="cx"> echo "Not updating home directory location for user \"${RUNUSR}\" (not root)" ; \
</span><span class="cx"> fi ; \
</span><span class="cx"> fi ; \
</span><span class="cx"> if test `sw_vers -productVersion | /usr/bin/awk -F . '{print $$2}'` -eq 4 -a `id -u` -eq 0; then \
</span><del>- GID=`${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $$2}'` ; \
- if test "`${DSCL} -q . -read /Users/${RUNUSR} PrimaryGroupID 2>/dev/null | /usr/bin/awk '{print $$2}'`" != "$$GID"; then \
</del><ins>+ GID=`${DSCL} -q . -read "/Groups/${RUNUSR}" PrimaryGroupID | /usr/bin/awk '{print $$2}'` ; \
+ if test "`${DSCL} -q . -read "/Users/${RUNUSR}" PrimaryGroupID 2>/dev/null | /usr/bin/awk '{print $$2}'`" != "$$GID"; then \
</ins><span class="cx"> echo "Fixing PrimaryGroupID for user \"${RUNUSR}\"" ; \
</span><del>- ${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $$GID ; \
- ${DSCL} -q . -create /Users/${RUNUSR} RealName MacPorts ; \
</del><ins>+ ${DSCL} -q . -create "/Users/${RUNUSR}" PrimaryGroupID $$GID ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" RealName MacPorts ; \
</ins><span class="cx"> fi ; \
</span><span class="cx"> fi ; \
</span><span class="cx"> else \
</span></span></pre></div>
<a id="trunkbasedocMakefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/doc/Makefile.in (122043 => 122044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/doc/Makefile.in 2014-07-13 12:58:08 UTC (rev 122043)
+++ trunk/base/doc/Makefile.in 2014-07-13 13:19:37 UTC (rev 122044)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> gzip -c $^ > $@
</span><span class="cx">
</span><span class="cx"> install: all
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${INSTALLDIR}"
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${DESTDIR}${mpconfigdir}"
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${mpconfigdir}"
</ins><span class="cx">
</span><span class="cx"> < prefix.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
</span><span class="cx"> < base.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
</span><span class="lines">@@ -42,15 +42,15 @@
</span><span class="cx"> ifneq (8,@OS_MAJOR@)
</span><span class="cx"> # Tiger's chmod doesn't accept -h
</span><span class="cx"> # mtree with umask 0077 doesn't get the permissions of the symlink right
</span><del>- chmod -h 755 ${INSTALLDIR}/man
</del><ins>+ chmod -h 755 "${INSTALLDIR}/man"
</ins><span class="cx"> endif
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> for f in ${CONF}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$f "${DESTDIR}${mpconfigdir}/$${f}.default"; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$f" "${DESTDIR}${mpconfigdir}/$${f}.default"; \
</ins><span class="cx"> if test ! -e "${DESTDIR}${mpconfigdir}/$$f" ; then \
</span><span class="cx"> set -x; \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 $$f "${DESTDIR}${mpconfigdir}"; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 "$$f" "${DESTDIR}${mpconfigdir}"; \
</ins><span class="cx"> fi; \
</span><span class="cx"> done
</span><span class="cx">
</span><span class="lines">@@ -59,13 +59,13 @@
</span><span class="cx"> for m in ${MAN5}; do rm -f "${INSTALLDIR}/share/man/man5/$$m" ; done
</span><span class="cx"> for m in ${MAN7}; do rm -f "${INSTALLDIR}/share/man/man7/$$m" ; done
</span><span class="cx">
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${INSTALLDIR}/share/macports/install"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 base.mtree "${INSTALLDIR}/share/macports/install/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree "${INSTALLDIR}/share/macports/install/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree "${INSTALLDIR}/share/macports/install/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 port.1.gz "${INSTALLDIR}/share/man/man1"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 macports.conf.5.gz "${INSTALLDIR}/share/man/man5"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portfile.7.gz "${INSTALLDIR}/share/man/man7"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portstyle.7.gz "${INSTALLDIR}/share/man/man7"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 porthier.7.gz "${INSTALLDIR}/share/man/man7"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portgroup.7.gz "${INSTALLDIR}/share/man/man7"
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/share/macports/install"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 base.mtree "${INSTALLDIR}/share/macports/install/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 prefix.mtree "${INSTALLDIR}/share/macports/install/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 macosx.mtree "${INSTALLDIR}/share/macports/install/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 port.1.gz "${INSTALLDIR}/share/man/man1"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 macports.conf.5.gz "${INSTALLDIR}/share/man/man5"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 portfile.7.gz "${INSTALLDIR}/share/man/man7"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 portstyle.7.gz "${INSTALLDIR}/share/man/man7"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 porthier.7.gz "${INSTALLDIR}/share/man/man7"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 portgroup.7.gz "${INSTALLDIR}/share/man/man7"
</ins></span></pre></div>
<a id="trunkbasesrcdarwintracelib10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/Makefile.in (122043 => 122044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/Makefile.in 2014-07-13 12:58:08 UTC (rev 122043)
+++ trunk/base/src/darwintracelib1.0/Makefile.in 2014-07-13 13:19:37 UTC (rev 122044)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> rm -f Makefile
</span><span class="cx">
</span><span class="cx"> install:: all
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "${SHLIB_NAME}" "${INSTALLDIR}"
</ins><span class="cx">
</span><span class="cx"> test::
</span></span></pre></div>
<a id="trunkbasesrcmacports10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/Makefile.in (122043 => 122044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/Makefile.in 2014-07-13 12:58:08 UTC (rev 122043)
+++ trunk/base/src/macports1.0/Makefile.in 2014-07-13 13:19:37 UTC (rev 122044)
</span><span class="lines">@@ -32,13 +32,13 @@
</span><span class="cx"> @# creating the directory will fail.
</span><span class="cx"> if test -L "${INSTALLDIR}"; then rm -rf "${INSTALLDIR}"; fi
</span><span class="cx">
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</ins><span class="cx">
</span><span class="cx"> $(SILENT) set -x; for file in ${SRCS}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}/$$file"; \
</ins><span class="cx"> done
</span><span class="cx">
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> include $(srcdir)/../../Mk/macports.tea.mk
</span></span></pre></div>
<a id="trunkbasesrcpackage10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/Makefile.in (122043 => 122044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/Makefile.in 2014-07-13 12:58:08 UTC (rev 122043)
+++ trunk/base/src/package1.0/Makefile.in 2014-07-13 13:19:37 UTC (rev 122044)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> $(TCLSH) $(srcdir)/tests/test.tcl -nocolor
</span><span class="cx">
</span><span class="cx"> install:: all
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</ins><span class="cx"> $(SILENT)set -x; for file in ${SRCS}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}"; \
</ins><span class="cx"> done
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</ins></span></pre></div>
<a id="trunkbasesrcportMakefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/Makefile.in (122043 => 122044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/Makefile.in 2014-07-13 12:58:08 UTC (rev 122043)
+++ trunk/base/src/port/Makefile.in 2014-07-13 13:19:37 UTC (rev 122044)
</span><span class="lines">@@ -35,14 +35,14 @@
</span><span class="cx"> rm -f Makefile
</span><span class="cx">
</span><span class="cx"> install: all mkdirs
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/bin
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/var/macports
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 555 port portindex portmirror ${INSTALLDIR}/bin/
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/port-help.tcl ${INSTALLDIR}/var/macports/
- cd ${INSTALLDIR}/bin && $(LN_S) -f port portf
- cd ${INSTALLDIR}/bin && $(LN_S) -f ${TCLSH} port-tclsh
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/bin"
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/var/macports"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 555 port portindex portmirror "${INSTALLDIR}/bin/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/port-help.tcl" "${INSTALLDIR}/var/macports/"
+ cd "${INSTALLDIR}/bin" && $(LN_S) -f port portf
+ cd "${INSTALLDIR}/bin" && $(LN_S) -f "${TCLSH}" port-tclsh
</ins><span class="cx"> ifneq (,$(findstring darwin,@build_os@))
</span><span class="cx"> ifneq (8,@OS_MAJOR@)
</span><del>- chmod -h 555 ${INSTALLDIR}/bin/portf ${INSTALLDIR}/bin/port-tclsh
</del><ins>+ chmod -h 555 "${INSTALLDIR}/bin/portf" "${INSTALLDIR}/bin/port-tclsh"
</ins><span class="cx"> endif
</span><span class="cx"> endif
</span></span></pre></div>
<a id="trunkbasesrcport10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/Makefile.in (122043 => 122044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/Makefile.in 2014-07-13 12:58:08 UTC (rev 122043)
+++ trunk/base/src/port1.0/Makefile.in 2014-07-13 13:19:37 UTC (rev 122044)
</span><span class="lines">@@ -31,14 +31,14 @@
</span><span class="cx"> rm -f Makefile
</span><span class="cx">
</span><span class="cx"> install:: all
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</ins><span class="cx"> $(SILENT)set -x; for file in ${SRCS}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}"; \
</ins><span class="cx"> done
</span><span class="cx"> $(SILENT)set -x; for file in ${SRCS_AUTOCONF}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}"; \
</ins><span class="cx"> done
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</ins><span class="cx">
</span><span class="cx"> test::
</span><span class="cx"> $(TCLSH) $(srcdir)/tests/test.tcl -nocolor
</span></span></pre></div>
<a id="trunkbasesrcprogramsdaemondoMakefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/programs/daemondo/Makefile.in (122043 => 122044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/programs/daemondo/Makefile.in 2014-07-13 12:58:08 UTC (rev 122043)
+++ trunk/base/src/programs/daemondo/Makefile.in 2014-07-13 13:19:37 UTC (rev 122044)
</span><span class="lines">@@ -35,6 +35,6 @@
</span><span class="cx"> rm -f Makefile
</span><span class="cx">
</span><span class="cx"> install: daemondo
</span><del>- ${INSTALL} -o ${DSTUSR} -g ${DSTGRP} -m 555 ${PROGRAM} ${DESTDIR}${bindir}
</del><ins>+ ${INSTALL} -o "${DSTUSR}" -g "${DSTGRP}" -m 555 "${PROGRAM}" "${DESTDIR}${bindir}"
</ins><span class="cx">
</span><span class="cx"> test:
</span></span></pre></div>
<a id="trunkbasesrcregistry20Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/registry2.0/Makefile.in (122043 => 122044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/Makefile.in 2014-07-13 12:58:08 UTC (rev 122043)
+++ trunk/base/src/registry2.0/Makefile.in 2014-07-13 13:19:37 UTC (rev 122044)
</span><span class="lines">@@ -41,12 +41,12 @@
</span><span class="cx"> rm -f Makefile
</span><span class="cx">
</span><span class="cx"> install:: all $(SHLIB_NAME)
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "${SHLIB_NAME}" "${INSTALLDIR}"
</ins><span class="cx"> $(SILENT) set -x; for file in ${SRCS}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}/$$file; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}/$$file"; \
</ins><span class="cx"> done
</span><span class="cx"> $(SILENT) set -x; for file in ${SRCS_AUTOCONF}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}/$$file"; \
</ins><span class="cx"> done
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</ins></span></pre>
</div>
</div>
</body>
</html>