<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/0e09a2228fd5f39e426a0d6a785fc14a8264a2b7">https://github.com/macports/macports-base/commit/0e09a2228fd5f39e426a0d6a785fc14a8264a2b7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0e09a2228fd5f39e426a0d6a785fc14a8264a2b7
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed May 9 14:38:57 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> Remove ${DESTDIR} from INSTALLDIR
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Instead, prepend ${DESTDIR} everywhere ${INSTALLDIR} is used.
</span>---
doc/Makefile.in | 26 +++++++++++++-------------
src/darwintracelib1.0/Makefile.in | 6 +++---
src/machista1.0/Makefile.in | 2 +-
src/macports1.0/Makefile.in | 10 +++++-----
src/mpcommon1.0/Makefile.in | 8 ++++----
src/package1.0/Makefile.in | 8 ++++----
src/pextlib1.0/Makefile.in | 2 +-
src/port/Makefile.in | 18 +++++++++---------
src/port1.0/Makefile.in | 10 +++++-----
src/registry2.0/Makefile.in | 12 ++++++------
10 files changed, 51 insertions(+), 51 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/Makefile.in b/doc/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index ec04d6c..5e4aba2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +106,7 @@ MANXML= ${MANTXT:.txt=.xml}
</span> MANHTML= ${MANTXT:.txt=.html} ${MANSOELIM:.soelim=.html}
CONF= archive_sites.conf macports.conf pubkeys.conf sources.conf variants.conf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR= ${DESTDIR}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLDIR= ${prefix}
</span> TOPSRCDIR= ..
ifneq ($(MAKECMDGOALS),distclean)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,16 +183,16 @@ man: ${MAN} ${MAN:%=%.gz}
</span> endif
install: all
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${INSTALLDIR}"
</span> $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${mpconfigdir}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- < prefix.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- < base.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ < prefix.mtree $(MTREE) -U -e -p "${DESTDIR}${INSTALLDIR}" > /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ < base.mtree $(MTREE) -U -e -p "${DESTDIR}${INSTALLDIR}" > /dev/null
</span> ifneq (,$(findstring darwin,@build_os@))
ifneq (8,@OS_MAJOR@)
# Tiger's chmod doesn't accept -h
# mtree with umask 0077 doesn't get the permissions of the symlink right
<span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod -h 755 "${INSTALLDIR}/man"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod -h 755 "${DESTDIR}${INSTALLDIR}/man"
</span> endif
endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,15 +205,15 @@ endif
</span> done
# delete old uncompressed man pages if they exist
<span style='display:block; white-space:pre;background:#ffe0e0;'>- for m in ${MAN1}; do rm -f "${INSTALLDIR}/share/man/man1/$$m" ; done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for m in ${MAN5}; do rm -f "${INSTALLDIR}/share/man/man5/$$m" ; done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for m in ${MAN7}; do rm -f "${INSTALLDIR}/share/man/man7/$$m" ; done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for m in ${MAN1}; do rm -f "${DESTDIR}${INSTALLDIR}/share/man/man1/$$m" ; done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for m in ${MAN5}; do rm -f "${DESTDIR}${INSTALLDIR}/share/man/man5/$$m" ; done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for m in ${MAN7}; do rm -f "${DESTDIR}${INSTALLDIR}/share/man/man7/$$m" ; done
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/share/macports/install"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 base.mtree "${INSTALLDIR}/share/macports/install/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 prefix.mtree "${INSTALLDIR}/share/macports/install/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 macosx.mtree "${INSTALLDIR}/share/macports/install/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${INSTALLDIR}/share/macports/install"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 base.mtree "${DESTDIR}${INSTALLDIR}/share/macports/install/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 prefix.mtree "${DESTDIR}${INSTALLDIR}/share/macports/install/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 macosx.mtree "${DESTDIR}${INSTALLDIR}/share/macports/install/"
</span>
for page in ${MAN1} ${MAN5} ${MAN7}; do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$${page}.gz" "${INSTALLDIR}/share/man/man$$(echo $$page | sed -e 's/.*\.//')"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$${page}.gz" "${DESTDIR}${INSTALLDIR}/share/man/man$$(echo $$page | sed -e 's/.*\.//')"; \
</span> done
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/darwintracelib1.0/Makefile.in b/src/darwintracelib1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index a030e17..5f5515f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/darwintracelib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/darwintracelib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ CPPFLAGS+= -I$(srcdir)/../compat
</span> LIBS+= $(COMPAT_OBJS)
SHLIB_NAME = darwintrace$(SHLIB_SUFFIX)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR = $(DESTDIR)$(TCL_PACKAGE_PATH)/darwintrace1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLDIR = $(TCL_PACKAGE_PATH)/darwintrace1.0
</span>
# Yes, we know having $ signs in identifiers is not a very good idea; in the
# case of darwintrace we still need them, though.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,8 +70,8 @@ distclean:: clean
</span> rm -f Makefile
install:: all
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -d -o "$(DSTUSR)" -g "$(DSTGRP)" -m "$(DSTMODE)" "$(INSTALLDIR)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "$(DSTUSR)" -g "$(DSTGRP)" -m 444 "$(SHLIB_NAME)" "$(INSTALLDIR)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -o "$(DSTUSR)" -g "$(DSTGRP)" -m "$(DSTMODE)" "$(DESTDIR)$(INSTALLDIR)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "$(DSTUSR)" -g "$(DSTGRP)" -m 444 "$(SHLIB_NAME)" "$(DESTDIR)$(INSTALLDIR)"
</span>
test::
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/Makefile.in b/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fe46a0..825fde2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ include ../../Mk/macports.autoconf.mk
</span>
OBJS= libmachista.o hashmap.o machista_wrap.o
SHLIB_NAME= machista${SHLIB_SUFFIX}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/machista1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLDIR= ${TCL_PACKAGE_PATH}/machista1.0
</span>
SWIG = @SWIG@
SWIG_FLAGS = -tcl8 -pkgversion 1.0 -namespace
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/Makefile.in b/src/macports1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 4fc9cf7..dae3b58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ SRCS= macports.tcl macports_dlist.tcl macports_util.tcl \
</span> OBJS= macports.o get_systemconfiguration_proxies.o sysctl.o
SHLIB_NAME= MacPorts${SHLIB_SUFFIX}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/macports1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLDIR= ${TCL_PACKAGE_PATH}/macports1.0
</span> OLDINSTALLDIR= ${datadir}/macports/Tcl
ifeq (@HAVE_FRAMEWORK_COREFOUNDATION@,yes)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,15 +32,15 @@ install:: all
</span>
@# Remove the previously installed link if it still exists. Without this,
@# creating the directory will fail.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -L "${INSTALLDIR}"; then rm -rf "${INSTALLDIR}"; fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -L "${DESTDIR}${INSTALLDIR}"; then rm -rf "${DESTDIR}${INSTALLDIR}"; fi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${INSTALLDIR}"
</span>
$(SILENT) set -x; for file in ${SRCS}; do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}/$$file"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${DESTDIR}${INSTALLDIR}/$$file"; \
</span> done
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${DESTDIR}${INSTALLDIR}"
</span>
include $(srcdir)/../../Mk/macports.tea.mk
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/mpcommon1.0/Makefile.in b/src/mpcommon1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 571fe24..305745b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/mpcommon1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/mpcommon1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ include ../../Mk/macports.autoconf.mk
</span>
SRCS = mpcommon.tcl signalcatch.tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/mpcommon1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLDIR= ${TCL_PACKAGE_PATH}/mpcommon1.0
</span>
all:: pkgIndex.tcl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,10 +19,10 @@ distclean:: clean
</span> rm -f Makefile
install:: all
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${INSTALLDIR}"
</span> $(SILENT) set -x; for file in ${SRCS}; do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}/$$file"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${DESTDIR}${INSTALLDIR}/$$file"; \
</span> done
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${DESTDIR}${INSTALLDIR}"
</span>
test:: ;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/Makefile.in b/src/package1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ae2503..b784e4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@ VPATH = @srcdir@
</span>
include ../../Mk/macports.autoconf.mk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/package1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLDIR= ${TCL_PACKAGE_PATH}/package1.0
</span>
SRCS= package.tcl portdmg.tcl portmdmg.tcl portmpkg.tcl portpkg.tcl \
portunarchive.tcl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +25,8 @@ test::
</span> $(TCLSH) $(srcdir)/../tests/test.tcl -nocolor
install:: all
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${INSTALLDIR}"
</span> $(SILENT)set -x; for file in ${SRCS}; do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${DESTDIR}${INSTALLDIR}"; \
</span> done
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${DESTDIR}${INSTALLDIR}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/Makefile.in b/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c84f59..f2b7fea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@ CPPFLAGS+= -I$(srcdir)/../compat
</span> LIBS+= $(COMPAT_OBJS)
SHLIB_NAME= Pextlib${SHLIB_SUFFIX}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/pextlib1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLDIR= ${TCL_PACKAGE_PATH}/pextlib1.0
</span>
include $(srcdir)/../../Mk/macports.tea.mk
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/Makefile.in b/src/port/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index d9a70bf..2ec8ad4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@ VPATH = @srcdir@
</span>
include ../../Mk/macports.autoconf.mk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR= ${DESTDIR}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLDIR= ${prefix}
</span> TOPSRCDIR= ../..
SCRIPTS= portmirror portindex port
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +23,8 @@ port: port.tcl ../../Mk/macports.autoconf.mk
</span> ${edit} $(srcdir)/port.tcl > $@
mkdirs:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- < ../../doc/prefix.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- < ../../doc/base.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ < ../../doc/prefix.mtree $(MTREE) -U -d -e -p "${DESTDIR}${INSTALLDIR}" > /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ < ../../doc/base.mtree $(MTREE) -U -d -e -p "${DESTDIR}${INSTALLDIR}" > /dev/null
</span>
clean:
rm -f ${SCRIPTS}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,13 +35,13 @@ distclean: clean
</span> rm -f Makefile
install: all mkdirs
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/bin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/var/macports"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 555 port portindex portmirror "${INSTALLDIR}/bin/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "${INSTALLDIR}/bin" && $(LN_S) -f port portf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "${INSTALLDIR}/bin" && $(LN_S) -f "${TCLSH}" port-tclsh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${INSTALLDIR}/bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${INSTALLDIR}/var/macports"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 555 port portindex portmirror "${DESTDIR}${INSTALLDIR}/bin/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "${DESTDIR}${INSTALLDIR}/bin" && $(LN_S) -f port portf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "${DESTDIR}${INSTALLDIR}/bin" && $(LN_S) -f "${TCLSH}" port-tclsh
</span> ifneq (,$(findstring darwin,@build_os@))
ifneq (8,@OS_MAJOR@)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod -h 555 "${INSTALLDIR}/bin/portf" "${INSTALLDIR}/bin/port-tclsh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod -h 555 "${DESTDIR}${INSTALLDIR}/bin/portf" "${DESTDIR}${INSTALLDIR}/bin/port-tclsh"
</span> endif
endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/Makefile.in b/src/port1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index f32392f..eb5cd42 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@ VPATH = @srcdir@
</span>
include ../../Mk/macports.autoconf.mk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/port1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLDIR= ${TCL_PACKAGE_PATH}/port1.0
</span>
SRCS_AUTOCONF= port_autoconf.tcl
SRCS= port.tcl portchecksum.tcl portconfigure.tcl portextract.tcl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,14 +31,14 @@ distclean:: clean
</span> rm -f Makefile
install:: all
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${INSTALLDIR}"
</span> $(SILENT)set -x; for file in ${SRCS}; do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${DESTDIR}${INSTALLDIR}"; \
</span> done
$(SILENT)set -x; for file in ${SRCS_AUTOCONF}; do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${DESTDIR}${INSTALLDIR}"; \
</span> done
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${DESTDIR}${INSTALLDIR}"
</span>
test::
$(TCLSH) $(srcdir)/../tests/test.tcl -nocolor
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/Makefile.in b/src/registry2.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 66967f7..461cdcb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ OBJS = registry.o util.o \
</span> portgroup.o portgroupobj.o
SHLIB_NAME= registry${SHLIB_SUFFIX}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/registry2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALLDIR= ${TCL_PACKAGE_PATH}/registry2.0
</span>
include $(srcdir)/../../Mk/macports.tea.mk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,12 +39,12 @@ distclean:: clean
</span> rm -f Makefile
install:: all $(SHLIB_NAME)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "${SHLIB_NAME}" "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "${SHLIB_NAME}" "${DESTDIR}${INSTALLDIR}"
</span> $(SILENT) set -x; for file in ${SRCS}; do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}/$$file"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${DESTDIR}${INSTALLDIR}/$$file"; \
</span> done
$(SILENT) set -x; for file in ${SRCS_AUTOCONF}; do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}/$$file"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${DESTDIR}${INSTALLDIR}/$$file"; \
</span> done
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${DESTDIR}${INSTALLDIR}"
</span></pre><pre style='margin:0'>
</pre>