<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c946275ae726b3671b3a94e9c7c0fdcaba0e9586">https://github.com/macports/macports-ports/commit/c946275ae726b3671b3a94e9c7c0fdcaba0e9586</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c946275 Use filespath
</span>c946275 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c946275ae726b3671b3a94e9c7c0fdcaba0e9586
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon May 14 21:49:03 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> Use filespath
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> rather than constructing it manually.
</span>---
databases/MyODBC/Portfile | 4 ++--
databases/unixODBC/Portfile | 2 +-
devel/mulle-xcode-settings/Portfile | 4 ++--
devel/mulle-xcode-to-cmake/Portfile | 4 ++--
devel/subversion-python27bindings/Portfile | 2 +-
games/boswars/Portfile | 4 ++--
games/rrgbis/Portfile | 4 ++--
lang/g95/Portfile | 2 +-
mail/postgrey/Portfile | 4 ++--
mail/qpopper/Portfile | 4 ++--
net/munin/Portfile | 2 +-
net/rsync-lart/Portfile | 2 +-
net/zabbix/Portfile | 6 +++---
net/zabbix2/Portfile | 4 ++--
python/py-backports/Portfile | 4 ++--
python/py-scikits-module/Portfile | 2 +-
python/py-smb/Portfile | 2 +-
python/py-spark/Portfile | 2 +-
ruby/rb-technorati-ruby/Portfile | 2 +-
science/SDRplay/Portfile | 2 +-
science/weka/Portfile | 2 +-
security/sancp/Portfile | 2 +-
sysutils/smart/Portfile | 2 +-
sysutils/yum-createrepo/Portfile | 2 +-
sysutils/yum-utils/Portfile | 2 +-
sysutils/yum/Portfile | 2 +-
textproc/iso8879/Portfile | 2 +-
textproc/relames/Portfile | 2 +-
www/abyss/Portfile | 4 ++--
www/webkit2-gtk/Portfile | 2 +-
x11/qt3/Portfile | 4 ++--
x11/xglobe/Portfile | 2 +-
xfce/xfce/Portfile | 2 +-
33 files changed, 46 insertions(+), 46 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/MyODBC/Portfile b/databases/MyODBC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f071f8..aa19371 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/MyODBC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/MyODBC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,13 +90,13 @@ post-destroot {
</span> }
# install example odbc.ini
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${portpath}/${filesdir}/odbc.ini \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${filespath}/odbc.ini \
</span> ${destroot}${prefix}/share/${name}/odbc.ini.dist
reinplace "s|/usr/local|${prefix}|g" \
${destroot}${prefix}/share/${name}/odbc.ini.dist
# install MyODBC templates
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach template [glob ${portpath}/${filesdir}/*.template] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach template [glob ${filespath}/*.template] {
</span> xinstall -m 0644 $template ${destroot}${prefix}/share/unixODBC
}
reinplace "s|__PREFIX__|${prefix}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/unixODBC/Portfile b/databases/unixODBC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f00602b..8964c9c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/unixODBC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/unixODBC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +68,7 @@ post-destroot {
</span> # TEMPLATES
xinstall -d -m 0755 ${destroot}${prefix}/share/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach template [glob ${portpath}/${filesdir}/*.template] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach template [glob ${filespath}/*.template] {
</span> xinstall -m 0644 $template ${destroot}${prefix}/share/${name}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mulle-xcode-settings/Portfile b/devel/mulle-xcode-settings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bcb8233..3771e46 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mulle-xcode-settings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mulle-xcode-settings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +25,8 @@ if {[vercmp $xcodeversion 4.2] < 0} {
</span> cmake.out_of_source yes
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${portpath}/${filesdir}/CMakeLists.txt ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${portpath}/${filesdir}/CMakeSourcesAndHeaders.txt ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/CMakeLists.txt ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/CMakeSourcesAndHeaders.txt ${worksrcpath}
</span> }
configure.cflags-append -DCURRENT_PROJECT_VERSION=\\"${version}\\"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mulle-xcode-to-cmake/Portfile b/devel/mulle-xcode-to-cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5993f4..f39252d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mulle-xcode-to-cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mulle-xcode-to-cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,8 +36,8 @@ if {[vercmp $xcodeversion 4.2] < 0} {
</span> cmake.out_of_source yes
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${portpath}/${filesdir}/CMakeLists.txt ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${portpath}/${filesdir}/CMakeSourcesAndHeaders.txt ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/CMakeLists.txt ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/CMakeSourcesAndHeaders.txt ${worksrcpath}
</span> }
configure.cflags-append -DCURRENT_PROJECT_VERSION=${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/subversion-python27bindings/Portfile b/devel/subversion-python27bindings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3697364..4223ff4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion-python27bindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion-python27bindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +96,7 @@ post-destroot {
</span> set PYTHON_PATH ${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7
xinstall -m 755 -d ${destroot}${PYTHON_PATH}/site-packages
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${portpath}/${filesdir}/svn-python.pth \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/svn-python.pth \
</span> ${destroot}${PYTHON_PATH}/site-packages
reinplace "s|@PREFIX@|${prefix}|g" \
${destroot}${PYTHON_PATH}/site-packages/svn-python.pth
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/boswars/Portfile b/games/boswars/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ab7d26..de9af5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/boswars/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/boswars/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ post-extract {
</span> }
pre-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${portpath}/${filesdir}/build_options.py ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${filespath}/build_options.py ${worksrcpath}
</span> }
patchfiles patch-SConstruct.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ destroot {
</span> # boswars files.
move ${worksrcpath}/build/boswars-release ${destroot}${prefix}/bin/boswars-bin
# Copy the helper script to ${prefix}/bin.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${portpath}/${filesdir}/boswars ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${filespath}/boswars ${destroot}${prefix}/bin
</span> # Set the correct path to the boswars files in the boswars helper script.
reinplace "s|__BOSWARS__|${share}|g" ${destroot}${prefix}/bin/boswars
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/rrgbis/Portfile b/games/rrgbis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 832762b..59ec818 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/rrgbis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/rrgbis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,12 +53,12 @@ build.target default
</span> destroot {
# Install the helper script which automatically sets the correct
# LD_LIBRARY_PATH variable and set the right ${prefix} path.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${portpath}/${filesdir}/rrgbis ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${filespath}/rrgbis ${destroot}${prefix}/bin
</span> reinplace "s|__PREFIX__|${prefix}|g" ${destroot}${prefix}/bin/rrgbis
# Install the helper setup script which creates ~/.rrgbis and the
# settings.dat file in it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${portpath}/${filesdir}/rrgbis-setup ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${filespath}/rrgbis-setup ${destroot}${prefix}/bin
</span> reinplace "s|__PREFIX__|${prefix}|g" ${destroot}${prefix}/bin/rrgbis-setup
# Install the real binary and rename it to rrgbis-bin.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/g95/Portfile b/lang/g95/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5908a66..6bf0b5c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/g95/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/g95/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,7 +125,7 @@ pre-configure {
</span> system "cd ${workpath}/gcc-${version_gcc}/${name}/gcc; \
ar d libbackend.a options.o; \
cd ${workpath}/gcc-${version_gcc}/gcc/; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch -p0 < ${portpath}/files/patch-gcc.c.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p0 < ${filespath}/patch-gcc.c.diff"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/postgrey/Portfile b/mail/postgrey/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 27be7db..70a9c8b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/postgrey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/postgrey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,9 +80,9 @@ destroot {
</span> ${worksrcpath}/Changes \
${worksrcpath}/COPYING \
${destroot}${prefix}/share/doc/postgrey
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -c ${portpath}/files/postgrey.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -c ${filespath}/postgrey.conf \
</span> ${destroot}${prefix}/etc/postgrey/postgrey.conf.sample
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -c ${portpath}/files/postgrey.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -c ${filespath}/postgrey.sh \
</span> ${destroot}${prefix}/share/postgrey
reinplace "s|__PREFIX|${prefix}|g" \
${destroot}${prefix}/share/postgrey/postgrey.sh
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/qpopper/Portfile b/mail/qpopper/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 787cacd..3f14d0d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/qpopper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/qpopper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ destroot.destdir prefix=${destroot}${prefix} \
</span>
pre-destroot {
xinstall -d ${destroot}${prefix}/etc/xinetd.d
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -o ${install.user} -m 755 -c ${portpath}/files/qpopper-dist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -o ${install.user} -m 755 -c ${filespath}/qpopper-dist \
</span> ${destroot}${prefix}/etc/xinetd.d/
reinplace "s|@@PREFIX@@|${prefix}|g" \
${destroot}${prefix}/etc/xinetd.d/qpopper-dist
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +72,7 @@ platform darwin {
</span>
pre-destroot {
xinstall -d ${destroot}${prefix}/Library/LaunchDaemons/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -o ${install.user} -m 755 -c ${portpath}/files/org.macports.mail.qpopper.plist-dist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -o ${install.user} -m 755 -c ${filespath}/org.macports.mail.qpopper.plist-dist \
</span> ${destroot}${prefix}/Library/LaunchDaemons/
reinplace "s|@@PREFIX@@|${prefix}|g" \
${destroot}${prefix}/Library/LaunchDaemons/org.macports.mail.qpopper.plist-dist
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/munin/Portfile b/net/munin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7eb9bac..5f53f9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/munin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/munin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,7 +132,7 @@ post-destroot {
</span> file rename ${destroot}${prefix}/etc/munin/munin.conf ${destroot}${prefix}/etc/munin/munin.conf.sample
# Create and symlink launchd item for munin-cron
xinstall -d ${destroot}${prefix}/etc/LaunchDaemons/org.macports.munin-cron
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${portpath}/files/org.macports.munin-cron.plist.in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/org.macports.munin-cron.plist.in \
</span> ${destroot}${prefix}/etc/LaunchDaemons/org.macports.munin-cron/org.macports.munin-cron.plist
reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/etc/LaunchDaemons/org.macports.munin-cron/org.macports.munin-cron.plist
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync-lart/Portfile b/net/rsync-lart/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4091c4b..0d3e0a5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/rsync-lart/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync-lart/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +65,7 @@ platform darwin 8 {
</span> # Copy Apple's copyfile.h for use on Mac OS X 10.4 and higher.
# See APPLE_LICENSE.txt for license and copying information.
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${portpath}/${filesdir}/copyfile.h ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/copyfile.h ${worksrcpath}
</span> }
configure.cppflags-append "-I${worksrcpath}"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix/Portfile b/net/zabbix/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6baec1b..ee212df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zabbix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,7 +119,7 @@ if { [variant_isset agent_only] } {
</span>
# Copy a startup script for the agent
xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${portpath}/${filesdir}/zabbix_agentd.init \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/zabbix_agentd.init \
</span> ${destroot}${prefix}/share/zabbix
reinplace "s|__PREFIX__|${prefix}|g" \
${destroot}${prefix}/share/zabbix/zabbix_agentd.init
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,13 +150,13 @@ if { [variant_isset agent_only] } {
</span> ${destroot}${prefix}/share/zabbix/frontends/
# Create a startup script for the server
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${portpath}/${filesdir}/zabbix_server.init \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/zabbix_server.init \
</span> ${destroot}${prefix}/share/zabbix
reinplace "s|__PREFIX__|${prefix}|g" \
${destroot}${prefix}/share/zabbix/zabbix_server.init
# Create a startup script for the agent
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${portpath}/${filesdir}/zabbix_agentd.init \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/zabbix_agentd.init \
</span> ${destroot}${prefix}/share/zabbix
reinplace "s|__PREFIX__|${prefix}|g" \
${destroot}${prefix}/share/zabbix/zabbix_agentd.init
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix2/Portfile b/net/zabbix2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4aa89a4..892ffc9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zabbix2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -245,7 +245,7 @@ post-destroot {
</span> # This script has a delay built into it (waiting for DB to start) so we
# don't use a simple startupitem.executable approach
if { ${MYSQL_MODE} == 1 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${portpath}/${filesdir}/zabbix_server.init.mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/zabbix_server.init.mysql \
</span> ${destroot}${prefix}/share/zabbix/zabbix_server.init
reinplace "s|__VER__|${ZDB}|g" \
${destroot}${prefix}/share/zabbix/zabbix_server.init
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -254,7 +254,7 @@ post-destroot {
</span> ${destroot}${prefix}/share/zabbix/zabbix_server.init
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${portpath}/${filesdir}/zabbix_server.init \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/zabbix_server.init \
</span> ${destroot}${prefix}/share/zabbix
}
reinplace "s|__PREFIX__|${prefix}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-backports/Portfile b/python/py-backports/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 91449f2..795bdaf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-backports/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-backports/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,9 @@ if {${name} ne ${subport}} {
</span> extract.mkdir yes
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${portpath}/${filesdir}/setup.py ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/setup.py ${worksrcpath}
</span> file mkdir ${worksrcpath}/backports
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${portpath}/${filesdir}/__init__.py ${worksrcpath}/backports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/__init__.py ${worksrcpath}/backports
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scikits-module/Portfile b/python/py-scikits-module/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 61e0c67..f215267 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scikits-module/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scikits-module/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ if {${name} ne ${subport}} {
</span> destroot {
set scikits_dir ${destroot}${python.pkgd}/scikits
file mkdir ${scikits_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${portpath}/${filesdir}/__init__.py ${scikits_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/__init__.py ${scikits_dir}
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-smb/Portfile b/python/py-smb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ec8847..b9ebd1a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-smb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-smb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ if {${name} ne ${subport}} {
</span> extract.post_args "| tar -xf - --exclude 'CVS'"
patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${portpath}/files/setup.py ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/setup.py ${worksrcpath}
</span> reinplace "s|VERSION|${version}|g" ${worksrcpath}/setup.py
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spark/Portfile b/python/py-spark/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b9c3686..8cf897e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spark/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spark/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ python.versions 27
</span> if {${name} ne ${subport}} {
patch {
file delete ${worksrcpath}/generic.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${portpath}/files/setup.py ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/setup.py ${worksrcpath}
</span> reinplace "s|PORTVERSION|${version}|g" ${worksrcpath}/setup.py
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-technorati-ruby/Portfile b/ruby/rb-technorati-ruby/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ca3572..114ebc5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ruby/rb-technorati-ruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ruby/rb-technorati-ruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ homepage http://www.pablotron.org/software/technorati-ruby/
</span> # Fix a bug in the code.
# Cf ${homepage}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${workpath} && patch -p1 < ${portpath}/${filesdir}/patch-technorati.rb"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${workpath} && patch -p1 < ${filespath}/patch-technorati.rb"
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/SDRplay/Portfile b/science/SDRplay/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a6d7cb..518c5f1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/SDRplay/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/SDRplay/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ build {
</span> # prepend license to header
global sdrplay_header
move ${sdrplay_dir}/${sdrplay_header} ${sdrplay_dir}/tmp.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${portpath}/${filesdir}/license.txt ${sdrplay_dir}/${sdrplay_header}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/license.txt ${sdrplay_dir}/${sdrplay_header}
</span> system -W ${sdrplay_dir} "cat ${sdrplay_dir}/tmp.h >> ${sdrplay_dir}/${sdrplay_header}"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/weka/Portfile b/science/weka/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c91c7eb..3fea0ab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/weka/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/weka/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ build.pre_args -Drelease='${version}'
</span>
post-extract {
system "cd ${worksrcpath} && jar xf ./weka-src.jar"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${portpath}/${filesdir}/weka_icon.icns ${worksrcpath}/src/main/java/weka/gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/weka_icon.icns ${worksrcpath}/src/main/java/weka/gui
</span> }
pre-build {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/sancp/Portfile b/security/sancp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bc10af2..e811271 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/sancp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/sancp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ post-destroot {
</span>
# Install startup script
xinstall -m 755 -d ${destroot}${prefix}/share/sancp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${portpath}/${filesdir}/sancp.init ${destroot}${prefix}/share/sancp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/sancp.init ${destroot}${prefix}/share/sancp
</span> reinplace "s|__PREFIX__|${prefix}|g" \
${destroot}${prefix}/share/sancp/sancp.init
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/smart/Portfile b/sysutils/smart/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 348aaeb..ed46ece 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/smart/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/smart/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ depends_lib path:lib/python2.7/site-packages/rpm/__init__.py:rpm port:python27
</span> patch {
foreach patch $patchfiles {
system "cd '${workpath}/${distname}' && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sed -e 's#@@PREFIX@@#${prefix}#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -e 's#@@PREFIX@@#${prefix}#g' '${filespath}/${patch}' | patch -p0"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/yum-createrepo/Portfile b/sysutils/yum-createrepo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d86ccd5..07baca1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/yum-createrepo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/yum-createrepo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ set python.bin ${prefix}/bin/python2.7
</span> patch {
foreach patch $patchfiles {
system "cd '${workpath}/${distname}' && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${python.bin}#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${python.bin}#g' '${filespath}/${patch}' | patch -p0"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/yum-utils/Portfile b/sysutils/yum-utils/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d03bb6..11cec85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/yum-utils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/yum-utils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ depends_lib port:python27 port:yum
</span> patch {
foreach patch $patchfiles {
system "cd '${workpath}/${distname}' && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${prefix}/bin/python2.7#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${prefix}/bin/python2.7#g' '${filespath}/${patch}' | patch -p0"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/yum/Portfile b/sysutils/yum/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 351c655..ab93d01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/yum/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/yum/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ set python.bin ""
</span> patch {
foreach patch $patchfiles {
system "cd '${workpath}/${distname}' && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${python.bin}#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${python.bin}#g' '${filespath}/${patch}' | patch -p0"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/iso8879/Portfile b/textproc/iso8879/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b6e5526..57881ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/iso8879/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/iso8879/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,6 @@ destroot.args prefix=${destroot}${prefix}
</span>
destroot {
xinstall -m 755 -d ${destroot}${install_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${portpath}/${filesdir}/catalog ${destroot}${install_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${filespath}/catalog ${destroot}${install_dir}
</span> xinstall -m 644 {*}[glob ${workpath}/ISO*] ${destroot}${install_dir}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/relames/Portfile b/textproc/relames/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8248652..966aea4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/relames/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/relames/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ destroot {
</span> set relames ${prefix}/share/java/relames
# install the relames script from files:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${portpath}/${filesdir}/relames ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${filespath}/relames ${destroot}${prefix}/bin
</span> # set the correct path to relames.jar in the relames script:
reinplace "s|@@RELAMES@@|${relames}/relames.jar|g" \
${destroot}${prefix}/bin/relames
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/abyss/Portfile b/www/abyss/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a039978..2a373ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/abyss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/abyss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,11 +34,11 @@ destroot {
</span> xinstall -o root -m 0644 -p "${worksrcpath}/conf/mime.types" \
"${destroot}${prefix}/share/abyss/conf/"
xinstall -d -o root -m 0755 "${destroot}${prefix}/share/abyss/htdocs/"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -o root -m 0644 "${portpath}/files/index.html" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -o root -m 0644 "${filespath}/index.html" \
</span> "${destroot}${prefix}/share/abyss/htdocs/"
xinstall -o root -m 755 -d "${destroot}${prefix}/etc/rc.d"
xinstall -o root -m 755 -c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "${portpath}/files/abyss.sh" "${destroot}${prefix}/etc/rc.d"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${filespath}/abyss.sh" "${destroot}${prefix}/etc/rc.d"
</span> reinplace "s|__PREFIX|${prefix}|g" \
"${destroot}${prefix}/etc/rc.d/abyss.sh"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/Portfile b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d7b7ebf..4e07297 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,7 +184,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span> # contents of snowmath.h should someday become part of gcc6 cmath
if { ${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.major} < 11 } {
configure.cxxflags-append -D_GLIBCXX_USE_C99_MATH_TR1=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -include ${portpath}/${filesdir}/snowmath.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -include ${filespath}/snowmath.h
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/qt3/Portfile b/x11/qt3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0c0f556..7b41317 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/qt3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/qt3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ patchfiles qt3-tiger.patch \
</span>
patch {
foreach p ${patchfiles} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && sed -e 's|@PREFIX@|${prefix}|g' < ${portpath}/${filesdir}/${p} | patch -p1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${worksrcpath} && sed -e 's|@PREFIX@|${prefix}|g' < ${filespath}/${p} | patch -p1"
</span> }
#system "perl -pi -e 's|cp \-P|/bin/cp \-RL|' ${worksrcpath}/qmake/Makefile.unix"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,7 +108,7 @@ patch {
</span>
post-patch {
foreach file {CompileScript.sh InstallScript.sh} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${portpath}/${filesdir}/${file} ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/${file} ${worksrcpath}
</span> reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
reinplace "s|%n|${name}|g" ${worksrcpath}/${file}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xglobe/Portfile b/x11/xglobe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c361cc7..e37df6d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xglobe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xglobe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ configure { reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Makefile
</span> destroot.args DESTDIR=${destroot}
destroot.destdir prefix=${destroot}${prefix}
post-destroot { system "install -c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${portpath}/files/xglobe-markers.opendarwin ${destroot}${prefix}/share/xglobe/" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${filespath}/xglobe-markers.opendarwin ${destroot}${prefix}/share/xglobe/" }
</span>
notes "xglobe starts in the X11 root window, so enable the full screen menu\
in Apple's X11 preferences menu and then use Command-Shift-A to\
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/xfce/Portfile b/xfce/xfce/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 43f0ffd..5a6b117 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/xfce/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/xfce/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +39,6 @@ supported_archs noarch
</span> build { }
destroot {
xinstall -d ${destroot}${prefix}/share/xfce4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${portpath}/${filesdir}/STARTME ${destroot}${prefix}/share/xfce4/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/STARTME ${destroot}${prefix}/share/xfce4/
</span> }
post-destroot { ui_msg "To start xfce put \"exec startxfce4\" in your .xinitrc" }
</pre><pre style='margin:0'>
</pre>