<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e7c4bde2d47ed42f5d565657e749d713ca96b0ca">https://github.com/macports/macports-ports/commit/e7c4bde2d47ed42f5d565657e749d713ca96b0ca</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 e7c4bde multiple ports: quoting
</span>e7c4bde is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e7c4bde2d47ed42f5d565657e749d713ca96b0ca
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat May 19 02:35:28 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> multiple ports: quoting
</span>---
aqua/osx2x/Portfile | 4 ++--
audio/libsdl_sound-framework/Portfile | 6 +++---
audio/libsdl_sound/Portfile | 4 ++--
devel/gecko-sharp2/Portfile | 4 ++--
devel/lua-numlua/Portfile | 6 +++---
devel/sid/Portfile | 2 +-
devel/tig/Portfile | 2 +-
editors/cedet/Portfile | 10 +++++-----
games/bluemoon/Portfile | 6 +++---
games/bs/Portfile | 2 +-
games/wumpus/Portfile | 2 +-
gnome/gnome-audio/Portfile | 2 +-
gnome/gnome-sharp2/Portfile | 6 +++---
graphics/InsightToolkit/Portfile | 6 +++---
graphics/InsightToolkit312/Portfile | 6 +++---
graphics/InsightToolkit314/Portfile | 6 +++---
graphics/field3d/Portfile | 2 +-
graphics/giblib/Portfile | 2 +-
graphics/jgraph/Portfile | 8 ++++----
graphics/pngpp/Portfile | 2 +-
java/zeroc-ice35-java/Portfile | 2 +-
lang/guile18/Portfile | 6 +++---
math/petsc/Portfile | 2 +-
math/slepc/Portfile | 2 +-
net/cvsync/Portfile | 6 +++---
net/openssh/Portfile | 2 +-
net/yersinia/Portfile | 2 +-
office/todotxt/Portfile | 2 +-
python/py-libxml2/Portfile | 2 +-
python/py-zeroc-ice35/Portfile | 2 +-
science/fastlink/Portfile | 4 ++--
science/gqrx/Portfile | 2 +-
science/gwyddion/Portfile | 2 +-
shells/luash/Portfile | 4 ++--
sysutils/yum/Portfile | 2 +-
textproc/dumpasn1/Portfile | 2 +-
textproc/hunspell-de/Portfile | 2 +-
textproc/hunspell-en/Portfile | 2 +-
textproc/pdfjam/Portfile | 2 +-
x11/XFree86/Portfile | 6 +++---
x11/gtk-sharp2/Portfile | 10 +++++-----
x11/herbstluftwm/Portfile | 2 +-
42 files changed, 78 insertions(+), 78 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/osx2x/Portfile b/aqua/osx2x/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ac8c4c..98f85d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/osx2x/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/osx2x/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,8 +39,8 @@ patchfiles patch-osx2x.xcodeproj.diff \
</span> patch-offbyone.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@X11_PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|@PREFIX@|${prefix}| ${worksrcpath}/osx2x.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|@X11_PREFIX@|${prefix}| ${worksrcpath}/osx2x.xcodeproj/project.pbxproj
</span> }
depends_lib port:xorg-libXtst \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libsdl_sound-framework/Portfile b/audio/libsdl_sound-framework/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f325505..982fd78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libsdl_sound-framework/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libsdl_sound-framework/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ depends_lib port:libsdl-framework \
</span> port:libmikmod
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "tar xzf $worksrcpath/PBProjects.tar.gz -C $worksrcpath"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "tar xzf ${worksrcpath}/PBProjects.tar.gz -C ${worksrcpath}"
</span> }
patchfiles patch-project.pbxproj.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ patchfiles patch-project.pbxproj.diff
</span> post-patch {
set pbxproj ${worksrcpath}/${xcode.project}/project.pbxproj
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@PREFIX@|$prefix|g ${pbxproj}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|@PREFIX@|${prefix}|g ${pbxproj}
</span> reinplace -E "/(MACOSX_DEPLOYMENT_TARGET|GCC_VERSION|SDKROOT)_ppc =/d" ${pbxproj}
reinplace "s|~/Library/Frameworks|./build/Frameworks|g" ${pbxproj}
reinplace "s|\$(HOME)/Library/Frameworks|${frameworks_dir}|g" ${pbxproj}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ xcode.target Framework
</span>
xcode.build.settings FRAMEWORK_SEARCH_PATHS=${frameworks_dir} \
INSTALL_PATH=${frameworks_dir} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY_SEARCH_PATHS=$prefix/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_SEARCH_PATHS=${prefix}/lib
</span>
xcode.destroot.type framework
xcode.destroot.settings {*}${xcode.build.settings}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libsdl_sound/Portfile b/audio/libsdl_sound/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 25a931b..8308119 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libsdl_sound/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libsdl_sound/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,8 @@ configure.args --disable-sdltest \
</span> --disable-mikmod
configure.cppflags-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -I$prefix/include/smpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I$prefix/include/SDL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include/smpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include/SDL
</span>
use_parallel_build yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gecko-sharp2/Portfile b/devel/gecko-sharp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0c2950..679f8ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gecko-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gecko-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +44,8 @@ post-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/libgtk-x11-2\\.0\\.0\\.dylib/[glob -tail -path $prefix/lib/ libgtk-*-2.0.0.dylib]/" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $worksrcpath/gtkmozembed/gecko-sharp.dll.config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/libgtk-x11-2\\.0\\.0\\.dylib/[glob -tail -path ${prefix}/lib/ libgtk-*-2.0.0.dylib]/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/gtkmozembed/gecko-sharp.dll.config
</span> }
use_parallel_build yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/lua-numlua/Portfile b/devel/lua-numlua/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 818d502..2d3907a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/lua-numlua/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/lua-numlua/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,17 +38,17 @@ post-extract {
</span> xinstall -m 644 ${filespath}/Makefile ${worksrcpath} }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W $worksrcpath "s|%%PREFIX%%|${prefix}|" Makefile }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|%%PREFIX%%|${prefix}|" Makefile }
</span>
build.args-append CC=${configure.cc} \
CPP=${configure.cpp} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=$prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix} \
</span> CFLAGS="${configure.cflags} [get_canonical_archflags]" \
CPPFLAGS=${configure.cppflags} \
LDFLAGS=${configure.ldflags} \
DEPLOYMENT_TARGET=${macosx_deployment_target}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append PREFIX=$prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args-append PREFIX=${prefix}
</span>
pre-destroot {
destroot.args-append LUA_VERSION=[string range [lindex [lindex [registry_active lua] 0] 1] 0 2]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/sid/Portfile b/devel/sid/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 016bef9..13404ab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/sid/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/sid/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,4 +24,4 @@ checksums md5 2b2efdcb72d60a2387eba35fe5a6bac4 \
</span> depends_lib port:libxslt port:docbook-xsl-nons port:docbook-xml
use_configure no
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args PREFIX=$destroot$prefix _MANDIR=$destroot$prefix/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args PREFIX=${destroot}${prefix} _MANDIR=${destroot}${prefix}/share/man
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tig/Portfile b/devel/tig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a00604d..5ec0ea7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ pre-configure {
</span> }
build.target-append doc-man doc-html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# for some reason, the XML tools fail to find and use $prefix/etc/catalog,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# for some reason, the XML tools fail to find and use ${prefix}/etc/catalog,
</span> # where these paths are configured
build.target-append XMLTO=\"${prefix}/bin/xmlto \
--searchpath ${prefix}/share/xml/docbook/4.5/ \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/cedet/Portfile b/editors/cedet/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19591aa..12aa4a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/cedet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/cedet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ use_configure no
</span> use_parallel_build no
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set lispdir $prefix/share/emacs/site-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lispdir ${prefix}/share/emacs/site-lisp
</span>
set packages {
common
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,19 +48,19 @@ destroot {
</span> global destroot worksrcpath
upvar lispdir lispdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d $destroot$lispdir/$package_dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -directory $worksrcpath/$package_dir *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${lispdir}/${package_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -directory ${worksrcpath}/${package_dir} *] {
</span> if {[file isdirectory $f]} {
set p [file tail $f]
if {$p ne "." && $p ne ".."} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot_package $package_dir/$p
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot_package ${package_dir}/$p
</span> }
} else {
set ext [file extension $f]
if {$ext eq ".el" || $ext eq ".elc"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 $f $destroot$lispdir/$package_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 $f ${destroot}${lispdir}/${package_dir}
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/bluemoon/Portfile b/games/bluemoon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c025e6..550aea4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/bluemoon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/bluemoon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +38,9 @@ checksums md5 49fba3643c689970939267fc821fedcf \
</span> sha256 52aec7ba74d0e811f46de44c30252877b612d780bc531e872357375b54083006
patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|/usr|$prefix|g $worksrcpath/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|cp bluemoon |cp bluemoon \$\{DESTDIR\}|" $worksrcpath/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|cp bluemoon.6 |cp bluemoon.6 \$\{DESTDIR\}|" $worksrcpath/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|/usr|${prefix}|g ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|cp bluemoon |cp bluemoon \$\{DESTDIR\}|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|cp bluemoon.6 |cp bluemoon.6 \$\{DESTDIR\}|" ${worksrcpath}/Makefile
</span> }
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/bs/Portfile b/games/bs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2813685..90e84ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/bs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/bs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ checksums rmd160 951a7d5c09c566bfd9d230ab61fa220fb81e91fa \
</span> sha256 1f8c1541fd13f481ff96df26d668658a7465da064801ae22ee584bd50f3a3107
patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|/usr|$prefix| $worksrcpath/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|/usr|${prefix}| ${worksrcpath}/Makefile
</span> }
use_configure no
build.target ${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/wumpus/Portfile b/games/wumpus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 070bf06..57985dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/wumpus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/wumpus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +16,6 @@ platforms darwin
</span> master_sites sunsite:games/strategy
checksums md5 7dbc447a3607ae2f08057c73986e9499
patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|/usr|$destroot$prefix|g $worksrcpath/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|/usr|${destroot}${prefix}|g ${worksrcpath}/Makefile
</span> }
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-audio/Portfile b/gnome/gnome-audio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e02706..3b96619 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-audio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-audio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +30,6 @@ use_configure no
</span>
build {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args datadir=$prefix/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args datadir=${prefix}/share
</span>
livecheck.type gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-sharp2/Portfile b/gnome/gnome-sharp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fcbc9cc..308acfa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,12 +50,12 @@ post-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/libgtk-x11-2\\.0\\.0\\.dylib/[glob -tail -path $prefix/lib/ libgtk-*-2.0.0.dylib]/" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $worksrcpath/gnome/gnome-sharp.dll.config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/libgtk-x11-2\\.0\\.0\\.dylib/[glob -tail -path ${prefix}/lib/ libgtk-*-2.0.0.dylib]/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/gnome/gnome-sharp.dll.config
</span>
# http://mono.1490590.n4.nabble.com/gnome-sharp-compilation-error-td3848979.html
reinplace "/^EXTRA_TARGETS/s/TestXfer.exe//" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $worksrcpath/sample/gnomevfs/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/sample/gnomevfs/Makefile
</span> }
variant x11 {}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/InsightToolkit/Portfile b/graphics/InsightToolkit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e243105..a2f634a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/InsightToolkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/InsightToolkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -203,8 +203,8 @@ variant doc description "provide doxygen documentation in ${itkDocPath}" {
</span> file copy ${worksrcpath}/Copyright ${destroot}${itkDocPath}/
file copy ${worksrcpath}/Copyright.txt ${destroot}${itkDocPath}/
file copy ${worksrcpath}/README.html ${destroot}${itkDocPath}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create a symlink to the $prefix path (not the destroot path); use the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # system to do this because the $prefix path doesn't exist yet and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create a symlink to the ${prefix} path (not the destroot path); use the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # system to do this because the ${prefix} path doesn't exist yet and the
</span> # tcl ln command fails, whereas this system command will allow it.
system "ln -Fns ${itkDocPath} ${destroot}${itkDocPathLink}"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -315,7 +315,7 @@ variant brainweb description "provide ITK BrainWeb data in ${itkDataPath}" {
</span> # CMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF. After the build, at the destroot
# phase, all the installation candidates (which excludes the examples and
# testing binaries) have their rpath settings reset to the INSTALL_RPATH (which
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# should point to $prefix..., not the $destroot location).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# should point to ${prefix}..., not the ${destroot} location).
</span>
variant shared description "build shared libraries" {
configure.args-delete \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/InsightToolkit312/Portfile b/graphics/InsightToolkit312/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f8031d..a60192a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/InsightToolkit312/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/InsightToolkit312/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,8 +179,8 @@ variant doc description "provide doxygen documentation in ${itkDocPath}" {
</span> file copy ${worksrcpath}/Copyright ${destroot}${itkDocPath}/
file copy ${worksrcpath}/Copyright.txt ${destroot}${itkDocPath}/
file copy ${worksrcpath}/README.html ${destroot}${itkDocPath}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create a symlink to the $prefix path (not the destroot path); use the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # system to do this because the $prefix path doesn't exist yet and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create a symlink to the ${prefix} path (not the destroot path); use the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # system to do this because the ${prefix} path doesn't exist yet and the
</span> # tcl ln command fails, whereas this system command will allow it.
system "ln -Fns ${itkDocPath} ${destroot}${itkDocPathLink}"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -291,7 +291,7 @@ variant brainweb description "provide ITK BrainWeb data in ${itkDataPath}" {
</span> # CMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF. After the build, at the destroot
# phase, all the installation candidates (which excludes the examples and
# testing binaries) have their rpath settings reset to the INSTALL_RPATH (which
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# should point to $prefix..., not the $destroot location).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# should point to ${prefix}..., not the ${destroot} location).
</span>
variant shared description "build shared libraries" {
configure.args-delete \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/InsightToolkit314/Portfile b/graphics/InsightToolkit314/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce232b4..fcba2d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/InsightToolkit314/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/InsightToolkit314/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,8 +186,8 @@ variant doc description "provide doxygen documentation in ${itkDocPath}" {
</span> file copy ${worksrcpath}/Copyright ${destroot}${itkDocPath}/
file copy ${worksrcpath}/Copyright.txt ${destroot}${itkDocPath}/
file copy ${worksrcpath}/README.html ${destroot}${itkDocPath}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create a symlink to the $prefix path (not the destroot path); use the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # system to do this because the $prefix path doesn't exist yet and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create a symlink to the ${prefix} path (not the destroot path); use the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # system to do this because the ${prefix} path doesn't exist yet and the
</span> # tcl ln command fails, whereas this system command will allow it.
system "ln -Fns ${itkDocPath} ${destroot}${itkDocPathLink}"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,7 +307,7 @@ variant brainweb description "provide ITK BrainWeb data in ${itkDataPath}" {
</span> # CMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF. After the build, at the destroot
# phase, all the installation candidates (which excludes the examples and
# testing binaries) have their rpath settings reset to the INSTALL_RPATH (which
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# should point to $prefix..., not the $destroot location).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# should point to ${prefix}..., not the ${destroot} location).
</span>
variant shared description "build shared libraries" {
configure.args-delete \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/field3d/Portfile b/graphics/field3d/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f64a03c..0848bab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/field3d/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/field3d/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ post-patch {
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd $prefix/bin/scons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${prefix}/bin/scons
</span> build.target
build.args verbose=1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/giblib/Portfile b/graphics/giblib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f7c9b9..9b0a75d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/giblib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/giblib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ patchfiles patch-automake-1.13.diff
</span> use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# install docs to $prefix/share/doc instead of $prefix/doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# install docs to ${prefix}/share/doc instead of ${prefix}/doc
</span> destroot.args docsdir=${prefix}/share/doc/${name}
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/jgraph/Portfile b/graphics/jgraph/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef02de8..3011211 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/jgraph/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/jgraph/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,13 +65,13 @@ post-extract {
</span> use_configure no
use_test no
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}$prefix/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/bin
</span> xinstall -m 755 ${worksrcpath}/jgraph ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}$prefix/share/man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}$prefix/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/man/man1
</span> xinstall -m 644 ${worksrcpath}/jgraph.1 \
${destroot}${prefix}/share/man/man1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}$prefix/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
</span> xinstall -m 644 ${worksrcpath}/README \
${destroot}${prefix}/share/doc/${name}
xinstall -m 755 -d ${destroot}${prefix}/share/examples/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pngpp/Portfile b/graphics/pngpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3becf0f..ad17060 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pngpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/pngpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,5 +24,5 @@ depends_lib port:libpng
</span>
use_configure no
build {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env PREFIX=$destroot$prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env PREFIX=${destroot}${prefix}
</span> destroot.target install-headers
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/zeroc-ice35-java/Portfile b/java/zeroc-ice35-java/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f33d984..df97fd7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/zeroc-ice35-java/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/zeroc-ice35-java/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ post-patch {
</span> # Prevent core dumps from mixing Mac OS X's libstdc++.6.dylib
# on older operating systems, e.g. 10.5.8, with MacPorts'
# libstdc++.6.dylib from newer libgcc's, e.g. 4.8.1, through
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the use of DYLD_LIBRARY_PATH being set to $prefix, use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the use of DYLD_LIBRARY_PATH being set to ${prefix}, use
</span> # DYLD_FALLBACK_LIBRARY_PATH instead. This also have the ant
# slice task set DYLD_FALLBACK_LIBRARY_PATH instead of DYLD_LIBRARY_PATH.
system "find ${worksrcpath} -type f -print0 | xargs -0 grep -Z -l DYLD_LIBRARY_PATH | xargs -0 perl -w -p -i -e 's/DYLD_LIBRARY_PATH/DYLD_FALLBACK_LIBRARY_PATH/g'"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/guile18/Portfile b/lang/guile18/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71a7839..6d4e9ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/guile18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/guile18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,10 +55,10 @@ depends_lib port:readline \
</span>
# guile-using applications may need to set DYLD_LIBRARY_PATH to the
# guile library path so they can be loaded at runtime. They should not
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# use $prefix/lib because this includes other MacPorts libraries that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use ${prefix}/lib because this includes other MacPorts libraries that
</span> # they may not wish to load instead. Accordingly, we install guile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libraries into $prefix/lib/$libsubdir For compatibility, we symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# everything back into $prefix/lib.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libraries into ${prefix}/lib/$libsubdir For compatibility, we symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# everything back into ${prefix}/lib.
</span> # See https://trac.macports.org/ticket/52494
set libsubdir guile18
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/petsc/Portfile b/math/petsc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 885853d..dd8795f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/petsc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/petsc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@ subport petsc-devel {
</span> }
notes "Add the following line to your .bash_profile if you plan to use\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- the PETSC makefile rules in $prefix/lib/petsc/conf: \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the PETSC makefile rules in ${prefix}/lib/petsc/conf: \n\
</span> \texport PETSC_DIR=${prefix}/lib/${name}"
configure.args --prefix=${prefix}/lib/${name} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/slepc/Portfile b/math/slepc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dfcf511..c61d39c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/slepc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/slepc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ long_description SLEPc is a software library for the solution of large \
</span> computing a partial SVD of a large, sparse, rectangular matrix.
notes "Add the following lines to your .bash_profile if you plan to\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use the PETSC/SLEPC makefile rules in $prefix/lib/petsc/conf:\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use the PETSC/SLEPC makefile rules in ${prefix}/lib/petsc/conf:\n\
</span> \texport PETSC_DIR=${prefix}/lib/petsc\n\
\texport SLEPC_DIR=${prefix}/lib/slepc"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/cvsync/Portfile b/net/cvsync/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e77962f..b6266d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/cvsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/cvsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ patchfiles patch-common__updater_list.c \
</span> patch-mk__network.mk
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|/var/run|$prefix/var/run| \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $worksrcpath/cvsyncd/cvsyncd.1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $worksrcpath/cvsyncd/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|/var/run|${prefix}/var/run| \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cvsyncd/cvsyncd.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cvsyncd/main.c
</span> }
configure.cmd make
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/Portfile b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15f7adc..52976a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,7 @@ if {${name} eq ${subport}} {
</span> # - patch-*-apple-sandbox-named-external.diff
# Use Apple's sandbox_init(3) in addition to standard privilege separation.
# This requires a sandbox profile (which we provide) and the sandbox_init(3)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # call before the chroot(2) to privsep-path ($prefix/var/empty), or it will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # call before the chroot(2) to privsep-path (${prefix}/var/empty), or it will
</span> # fail to load the sandbox description and libsandbox.1.dylib.
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/yersinia/Portfile b/net/yersinia/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 77c06fb..e0976a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/yersinia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/yersinia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ depends_lib port:ncurses \
</span> port:libnet11
configure.args --disable-gtk \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pcap-includes=$prefix/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pcap-includes=${prefix}/include
</span>
variant gtk {
depends_lib-append port:gtk2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/todotxt/Portfile b/office/todotxt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 53005fc..07a3d02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/todotxt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/todotxt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ post-destroot {
</span> }
patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # default cfg will try to write in $prefix/bin, since this isn't obvious from the config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # default cfg will try to write in ${prefix}/bin, since this isn't obvious from the config
</span> # file we help the user avoiding this
reinplace "s|TODO_DIR=`dirname \"\$0\"`|TODO_DIR=\"\$HOME\"/.todo|" ${worksrcpath}/todo.cfg
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-libxml2/Portfile b/python/py-libxml2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d486d1d..10aab30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ if {${name} ne ${subport}} {
</span> worksrcdir ${worksrcdir}/python
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|$prefix|" ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/setup.py
</span> }
# Note: the latter patch is adapted from Fedora,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-zeroc-ice35/Portfile b/python/py-zeroc-ice35/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 54effab..e398c53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-zeroc-ice35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-zeroc-ice35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@ if {${name} ne ${subport}} {
</span> # Prevent core dumps from mixing Mac OS X's libstdc++.6.dylib
# on older operating systems, e.g. 10.5.8, with MacPorts'
# libstdc++.6.dylib from newer libgcc's, e.g. 4.8.1, through
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the use of DYLD_LIBRARY_PATH being set to $prefix, use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the use of DYLD_LIBRARY_PATH being set to ${prefix}, use
</span> # DYLD_FALLBACK_LIBRARY_PATH instead.
system "find ${worksrcpath} -type f -print0 | xargs -0 grep -Z -l DYLD_LIBRARY_PATH | xargs -0 perl -w -p -i -e 's/DYLD_LIBRARY_PATH/DYLD_FALLBACK_LIBRARY_PATH/g'"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/fastlink/Portfile b/science/fastlink/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b27dc22..c8cc1ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/fastlink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/fastlink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,6 @@ build.args CC=${configure.cc} \
</span> destroot {
xinstall -m 755 -W ${worksrcpath} lodscore ilink linkmap mlink unknown ${destroot}${prefix}/bin
xinstall -m 755 -d ${destroot}${prefix}/share/doc/fastlink
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 444 {*}[glob ${workpath}/fastlink/README.*] ${destroot}$prefix/share/doc/fastlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 444 {*}[glob ${workpath}/fastlink/*.ps] ${destroot}$prefix/share/doc/fastlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 444 {*}[glob ${workpath}/fastlink/README.*] ${destroot}${prefix}/share/doc/fastlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 444 {*}[glob ${workpath}/fastlink/*.ps] ${destroot}${prefix}/share/doc/fastlink
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gqrx/Portfile b/science/gqrx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b85ba4a..8ee7da4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gqrx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gqrx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +105,7 @@ post-configure {
</span> post-destroot {
# link the executable back to $qt_bins_dir, and, if $qt_dir is
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # not $prefix, back to $prefix/bin too.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # not ${prefix}, back to ${prefix}/bin too.
</span>
xinstall -m 755 -d ${destroot}${qt_bins_dir}
ln -s ${qt_apps_dir}/Gqrx.app/Contents/MacOS/Gqrx \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gwyddion/Portfile b/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c8fd925..cc4f7b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ variant quartz description { Build gwyddion with quartz gl support } {
</span> }
variant pygwy description { Build gwyddion with python support } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "For console python support you have to set DYLD_FALLBACK_LIBRARY_PATH to $prefix/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "For console python support you have to set DYLD_FALLBACK_LIBRARY_PATH to ${prefix}/lib"
</span> set python.prefix ${frameworks_dir}/Python.framework/Versions/2.7
configure.pkg_config_path ${python.prefix}/lib/pkgconfig
depends_lib-append port:py-pygtk \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/luash/Portfile b/shells/luash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6689646..90aab00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/luash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/luash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ pre-build {
</span> destroot.destdir PREFIX=${destroot}${prefix}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${destroot}$prefix/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} COPYING README ${destroot}$prefix/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} COPYING README ${destroot}${prefix}/share/doc/${name}
</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 ab93d01..aab73c7 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;'>@@ -58,7 +58,7 @@ post-destroot {
</span> xinstall -d -m 755 ${destroot}${prefix}/var/cache/yum/release/headers
xinstall -d -m 755 ${destroot}${prefix}/var/cache/yum/release/packages
copy -force ${filespath}/yum.conf ${destroot}${prefix}/etc/yum/yum.conf
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|$prefix|g" ${destroot}${prefix}/etc/yum/yum.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${prefix}|g" ${destroot}${prefix}/etc/yum/yum.conf
</span> reinplace "s|@@PLATFORM@@|${os.platform}|g" ${destroot}${prefix}/etc/yum/yum.conf
destroot.keepdirs ${destroot}${prefix}/etc/yum/repos.d \
${destroot}${prefix}/var/cache/yum/release/headers \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/dumpasn1/Portfile b/textproc/dumpasn1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c9c5d2..12c0e6c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/dumpasn1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/dumpasn1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ patchfiles bug348856.patch \
</span> bug840771.patch
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/etc/dumpasn1/|$prefix/etc/|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/etc/dumpasn1/|${prefix}/etc/|g" \
</span> "${worksrcpath}/dumpasn1.c"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/hunspell-de/Portfile b/textproc/hunspell-de/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 42c4dad..a4281ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/hunspell-de/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/hunspell-de/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ depends_build port:ispell
</span>
depends_lib port:hunspell
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set installdir "$destroot$prefix/share/hunspell/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set installdir "${destroot}${prefix}/share/hunspell/"
</span>
pre-destroot {
xinstall -d -m 755 $installdir
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/hunspell-en/Portfile b/textproc/hunspell-en/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a853b80..ca9710d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/hunspell-en/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/hunspell-en/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ build.cmd ./make-hunspell-dict
</span> build.target -all
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set installdir "$destroot$prefix/share/hunspell/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set installdir "${destroot}${prefix}/share/hunspell/"
</span>
pre-destroot {
xinstall -d -m 755 $installdir
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/pdfjam/Portfile b/textproc/pdfjam/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ed7283..87c8cd8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/pdfjam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/pdfjam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,7 @@ pre-activate {
</span> # texlive-bin-extra used to contain pdfjam, but doesn't
# anymore. If the old version is installed, deactivate it to avoid
# a conflict.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists $prefix/bin/pdfjam]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/bin/pdfjam]
</span> && ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
&& [vercmp [lindex $vers 1] 19536] < 0} {
registry_deactivate_composite texlive-bin-extra "" [list ports_nodepcheck 1]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/XFree86/Portfile b/x11/XFree86/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4bfb9f2..ec6206d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/XFree86/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/XFree86/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +88,7 @@ platform macosx {
</span> If you really want to use XFree86 instead,
please move it aside first :
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo mv $prefix ${prefix}.apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo mv ${prefix} ${prefix}.apple
</span> "
} else {
return -code error "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +99,7 @@ platform macosx {
</span> If you really want to use XFree86 instead,
please move it aside first :
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo mv $prefix ${prefix}.apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo mv ${prefix} ${prefix}.apple
</span> "
}
} elseif { [file exists ${prefix}/include/X11/X.h] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +114,7 @@ platform macosx {
</span> If you really want to use XFree86 instead,
please move it aside first :
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo mv $prefix ${prefix}.apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo mv ${prefix} ${prefix}.apple
</span> "
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-sharp2/Portfile b/x11/gtk-sharp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f81a530..805e3d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,12 +55,12 @@ post-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/libgtk-x11-2\\.0\\.0\\.dylib/[glob -tail -path $prefix/lib/ libgtk-*-2.0.0.dylib]/" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $worksrcpath/gtk/gtk-sharp.dll.config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/libgtk-x11-2\\.0\\.0\\.dylib/[glob -tail -path ${prefix}/lib/ libgtk-*-2.0.0.dylib]/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/gtk/gtk-sharp.dll.config
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/libgdk-x11-2\\.0\\.0\\.dylib/[glob -tail -path $prefix/lib/ libgdk-*-2.0.0.dylib]/" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $worksrcpath/gdk/gdk-sharp.dll.config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $worksrcpath/gtkdotnet/gtk-dotnet.dll.config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/libgdk-x11-2\\.0\\.0\\.dylib/[glob -tail -path ${prefix}/lib/ libgdk-*-2.0.0.dylib]/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/gdk/gdk-sharp.dll.config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/gtkdotnet/gtk-dotnet.dll.config
</span> }
use_parallel_build no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/herbstluftwm/Portfile b/x11/herbstluftwm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dc88af4..96d5d4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/herbstluftwm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/herbstluftwm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ variant universal {}
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append PKG_CONFIG_PATH=$prefix/lib/pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PKG_CONFIG_PATH=${prefix}/lib/pkgconfig \
</span> CFLAGS="${configure.cflags} [get_canonical_archflags]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags]"
</pre><pre style='margin:0'>
</pre>