Changeset 122044
- Timestamp:
- Jul 13, 2014, 1:19:37 PM (10 years ago)
- Location:
- trunk/base
- Files:
-
- 9 edited
-
Makefile.in (modified) (3 diffs)
-
doc/Makefile.in (modified) (3 diffs)
-
src/darwintracelib1.0/Makefile.in (modified) (1 diff)
-
src/macports1.0/Makefile.in (modified) (1 diff)
-
src/package1.0/Makefile.in (modified) (1 diff)
-
src/port/Makefile.in (modified) (1 diff)
-
src/port1.0/Makefile.in (modified) (1 diff)
-
src/programs/daemondo/Makefile.in (modified) (1 diff)
-
src/registry2.0/Makefile.in (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/base/Makefile.in
r119709 r122044 37 37 install:: 38 38 [ ! -f "$(DESTDIR)${sysconfdir}/macports/mp_version" ] || rm -vf "$(DESTDIR)${sysconfdir}/macports/mp_version" 39 $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE}"$(DESTDIR)${datadir}/macports/"40 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP}-m 444 setupenv.bash "$(DESTDIR)${datadir}/macports/"41 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP}-m 444 $(srcdir)/macports-pubkey.pem "$(DESTDIR)${datadir}/macports/"39 $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "$(DESTDIR)${datadir}/macports/" 40 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 setupenv.bash "$(DESTDIR)${datadir}/macports/" 41 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 $(srcdir)/macports-pubkey.pem "$(DESTDIR)${datadir}/macports/" 42 42 # Only run these scripts when not building in a destroot 43 43 ifeq ($(DESTDIR),) 44 44 # create run user if it doesn't exist 45 45 @if test -n "${DSCL}" -a -n "${DSEDITGROUP}" ; then \ 46 if ! ${DSCL} -q . -read /Groups/${RUNUSR}> /dev/null 2>&1 ; then \46 if ! ${DSCL} -q . -read "/Groups/${RUNUSR}" > /dev/null 2>&1 ; then \ 47 47 if test `id -u` -eq 0; then \ 48 48 echo "Creating group \"${RUNUSR}\"" ; \ 49 ${DSEDITGROUP} -q -o create ${RUNUSR}; \49 ${DSEDITGROUP} -q -o create "${RUNUSR}" ; \ 50 50 else \ 51 51 echo "Not creating group \"${RUNUSR}\" (not root)" ; \ 52 52 fi ; \ 53 53 fi ; \ 54 if ! ${DSCL} -q . -list /Users/${RUNUSR}> /dev/null 2>&1 ; then \54 if ! ${DSCL} -q . -list "/Users/${RUNUSR}" > /dev/null 2>&1 ; then \ 55 55 if test `id -u` -eq 0; then \ 56 56 echo "Creating user \"${RUNUSR}\"" ; \ … … 59 59 let "NEXTUID=NEXTUID+1"; \ 60 60 done; \ 61 ${DSCL} -q . -create /Users/${RUNUSR}UniqueID $$NEXTUID ; \61 ${DSCL} -q . -create "/Users/${RUNUSR}" UniqueID $$NEXTUID ; \ 62 62 \ 63 ${DSCL} -q . -delete /Users/${RUNUSR}AuthenticationAuthority ; \64 ${DSCL} -q . -delete /Users/${RUNUSR}PasswordPolicyOptions ; \65 ${DSCL} -q . -delete /Users/${RUNUSR}dsAttrTypeNative:KerberosKeys ; \66 ${DSCL} -q . -delete /Users/${RUNUSR}dsAttrTypeNative:ShadowHashData ; \63 ${DSCL} -q . -delete "/Users/${RUNUSR}" AuthenticationAuthority ; \ 64 ${DSCL} -q . -delete "/Users/${RUNUSR}" PasswordPolicyOptions ; \ 65 ${DSCL} -q . -delete "/Users/${RUNUSR}" dsAttrTypeNative:KerberosKeys ; \ 66 ${DSCL} -q . -delete "/Users/${RUNUSR}" dsAttrTypeNative:ShadowHashData ; \ 67 67 \ 68 ${DSCL} -q . -create /Users/${RUNUSR}RealName MacPorts ; \69 ${DSCL} -q . -create /Users/${RUNUSR}Password \* ; \70 ${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $$(${DSCL} -q . -read /Groups/${RUNUSR}PrimaryGroupID | /usr/bin/awk '{print $$2}') ; \71 ${DSCL} -q . -create /Users/${RUNUSR}NFSHomeDirectory "${localstatedir}/macports/home" ; \72 ${DSCL} -q . -create /Users/${RUNUSR}UserShell /usr/bin/false ; \68 ${DSCL} -q . -create "/Users/${RUNUSR}" RealName MacPorts ; \ 69 ${DSCL} -q . -create "/Users/${RUNUSR}" Password \* ; \ 70 ${DSCL} -q . -create "/Users/${RUNUSR}" PrimaryGroupID $$(${DSCL} -q . -read "/Groups/${RUNUSR}" PrimaryGroupID | /usr/bin/awk '{print $$2}') ; \ 71 ${DSCL} -q . -create "/Users/${RUNUSR}" NFSHomeDirectory "${localstatedir}/macports/home" ; \ 72 ${DSCL} -q . -create "/Users/${RUNUSR}" UserShell /usr/bin/false ; \ 73 73 else \ 74 74 echo "Not creating user \"${RUNUSR}\" (not root)" ; \ 75 75 fi ; \ 76 76 fi ; \ 77 if test "$$(${DSCL} -q . -read /Users/${RUNUSR}NFSHomeDirectory)" = "NFSHomeDirectory: /var/empty" ; then \77 if test "$$(${DSCL} -q . -read "/Users/${RUNUSR}" NFSHomeDirectory)" = "NFSHomeDirectory: /var/empty" ; then \ 78 78 if test `id -u` -eq 0; then \ 79 79 echo "Updating home directory location for user \"${RUNUSR}\"" ; \ 80 ${DSCL} -q . -create /Users/${RUNUSR}NFSHomeDirectory "${localstatedir}/macports/home" ; \80 ${DSCL} -q . -create "/Users/${RUNUSR}" NFSHomeDirectory "${localstatedir}/macports/home" ; \ 81 81 else \ 82 82 echo "Not updating home directory location for user \"${RUNUSR}\" (not root)" ; \ … … 84 84 fi ; \ 85 85 if test `sw_vers -productVersion | /usr/bin/awk -F . '{print $$2}'` -eq 4 -a `id -u` -eq 0; then \ 86 GID=`${DSCL} -q . -read /Groups/${RUNUSR}PrimaryGroupID | /usr/bin/awk '{print $$2}'` ; \87 if test "`${DSCL} -q . -read /Users/${RUNUSR}PrimaryGroupID 2>/dev/null | /usr/bin/awk '{print $$2}'`" != "$$GID"; then \86 GID=`${DSCL} -q . -read "/Groups/${RUNUSR}" PrimaryGroupID | /usr/bin/awk '{print $$2}'` ; \ 87 if test "`${DSCL} -q . -read "/Users/${RUNUSR}" PrimaryGroupID 2>/dev/null | /usr/bin/awk '{print $$2}'`" != "$$GID"; then \ 88 88 echo "Fixing PrimaryGroupID for user \"${RUNUSR}\"" ; \ 89 ${DSCL} -q . -create /Users/${RUNUSR}PrimaryGroupID $$GID ; \90 ${DSCL} -q . -create /Users/${RUNUSR}RealName MacPorts ; \89 ${DSCL} -q . -create "/Users/${RUNUSR}" PrimaryGroupID $$GID ; \ 90 ${DSCL} -q . -create "/Users/${RUNUSR}" RealName MacPorts ; \ 91 91 fi ; \ 92 92 fi ; \ -
trunk/base/doc/Makefile.in
r120142 r122044 34 34 35 35 install: all 36 $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE}"${INSTALLDIR}"37 $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE}"${DESTDIR}${mpconfigdir}"36 $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}" 37 $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${mpconfigdir}" 38 38 39 39 < prefix.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null … … 43 43 # Tiger's chmod doesn't accept -h 44 44 # mtree with umask 0077 doesn't get the permissions of the symlink right 45 chmod -h 755 ${INSTALLDIR}/man45 chmod -h 755 "${INSTALLDIR}/man" 46 46 endif 47 47 endif 48 48 49 49 for f in ${CONF}; do \ 50 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$f"${DESTDIR}${mpconfigdir}/$${f}.default"; \50 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$f" "${DESTDIR}${mpconfigdir}/$${f}.default"; \ 51 51 if test ! -e "${DESTDIR}${mpconfigdir}/$$f" ; then \ 52 52 set -x; \ 53 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 $$f"${DESTDIR}${mpconfigdir}"; \53 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 "$$f" "${DESTDIR}${mpconfigdir}"; \ 54 54 fi; \ 55 55 done … … 60 60 for m in ${MAN7}; do rm -f "${INSTALLDIR}/share/man/man7/$$m" ; done 61 61 62 $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE}"${INSTALLDIR}/share/macports/install"63 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP}-m 644 base.mtree "${INSTALLDIR}/share/macports/install/"64 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP}-m 644 prefix.mtree "${INSTALLDIR}/share/macports/install/"65 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP}-m 644 macosx.mtree "${INSTALLDIR}/share/macports/install/"66 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP}-m 444 port.1.gz "${INSTALLDIR}/share/man/man1"67 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP}-m 444 macports.conf.5.gz "${INSTALLDIR}/share/man/man5"68 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP}-m 444 portfile.7.gz "${INSTALLDIR}/share/man/man7"69 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP}-m 444 portstyle.7.gz "${INSTALLDIR}/share/man/man7"70 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP}-m 444 porthier.7.gz "${INSTALLDIR}/share/man/man7"71 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP}-m 444 portgroup.7.gz "${INSTALLDIR}/share/man/man7"62 $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/share/macports/install" 63 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 base.mtree "${INSTALLDIR}/share/macports/install/" 64 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 prefix.mtree "${INSTALLDIR}/share/macports/install/" 65 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 macosx.mtree "${INSTALLDIR}/share/macports/install/" 66 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 port.1.gz "${INSTALLDIR}/share/man/man1" 67 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 macports.conf.5.gz "${INSTALLDIR}/share/man/man5" 68 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 portfile.7.gz "${INSTALLDIR}/share/man/man7" 69 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 portstyle.7.gz "${INSTALLDIR}/share/man/man7" 70 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 porthier.7.gz "${INSTALLDIR}/share/man/man7" 71 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 portgroup.7.gz "${INSTALLDIR}/share/man/man7" -
trunk/base/src/darwintracelib1.0/Makefile.in
r118562 r122044 29 29 30 30 install:: all 31 $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}32 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}31 $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}" 32 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "${SHLIB_NAME}" "${INSTALLDIR}" 33 33 34 34 test:: -
trunk/base/src/macports1.0/Makefile.in
r118568 r122044 33 33 if test -L "${INSTALLDIR}"; then rm -rf "${INSTALLDIR}"; fi 34 34 35 $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}35 $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}" 36 36 37 37 $(SILENT) set -x; for file in ${SRCS}; do \ 38 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \38 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}/$$file"; \ 39 39 done 40 40 41 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}41 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}" 42 42 43 43 -
trunk/base/src/package1.0/Makefile.in
r118562 r122044 27 27 28 28 install:: all 29 $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}29 $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}" 30 30 $(SILENT)set -x; for file in ${SRCS}; do \ 31 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}; \31 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}"; \ 32 32 done 33 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}33 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}" -
trunk/base/src/port/Makefile.in
r119297 r122044 36 36 37 37 install: all mkdirs 38 $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/bin39 $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/var/macports40 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 555 port portindex portmirror ${INSTALLDIR}/bin/41 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/port-help.tcl ${INSTALLDIR}/var/macports/42 cd ${INSTALLDIR}/bin&& $(LN_S) -f port portf43 cd ${INSTALLDIR}/bin && $(LN_S) -f ${TCLSH}port-tclsh38 $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/bin" 39 $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/var/macports" 40 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 555 port portindex portmirror "${INSTALLDIR}/bin/" 41 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/port-help.tcl" "${INSTALLDIR}/var/macports/" 42 cd "${INSTALLDIR}/bin" && $(LN_S) -f port portf 43 cd "${INSTALLDIR}/bin" && $(LN_S) -f "${TCLSH}" port-tclsh 44 44 ifneq (,$(findstring darwin,@build_os@)) 45 45 ifneq (8,@OS_MAJOR@) 46 chmod -h 555 ${INSTALLDIR}/bin/portf ${INSTALLDIR}/bin/port-tclsh46 chmod -h 555 "${INSTALLDIR}/bin/portf" "${INSTALLDIR}/bin/port-tclsh" 47 47 endif 48 48 endif -
trunk/base/src/port1.0/Makefile.in
r118562 r122044 32 32 33 33 install:: all 34 $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}34 $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}" 35 35 $(SILENT)set -x; for file in ${SRCS}; do \ 36 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}; \36 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}"; \ 37 37 done 38 38 $(SILENT)set -x; for file in ${SRCS_AUTOCONF}; do \ 39 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \39 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}"; \ 40 40 done 41 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}41 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}" 42 42 43 43 test:: -
trunk/base/src/programs/daemondo/Makefile.in
r117619 r122044 36 36 37 37 install: daemondo 38 ${INSTALL} -o ${DSTUSR} -g ${DSTGRP} -m 555 ${PROGRAM} ${DESTDIR}${bindir}38 ${INSTALL} -o "${DSTUSR}" -g "${DSTGRP}" -m 555 "${PROGRAM}" "${DESTDIR}${bindir}" 39 39 40 40 test: -
trunk/base/src/registry2.0/Makefile.in
r120069 r122044 42 42 43 43 install:: all $(SHLIB_NAME) 44 $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}45 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}44 $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}" 45 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "${SHLIB_NAME}" "${INSTALLDIR}" 46 46 $(SILENT) set -x; for file in ${SRCS}; do \ 47 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}/$$file; \47 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}/$$file"; \ 48 48 done 49 49 $(SILENT) set -x; for file in ${SRCS_AUTOCONF}; do \ 50 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \50 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}/$$file"; \ 51 51 done 52 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}52 $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
Note: See TracChangeset
for help on using the changeset viewer.