[71533] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Wed Sep 15 13:26:16 PDT 2010
Revision: 71533
http://trac.macports.org/changeset/71533
Author: ryandesign at macports.org
Date: 2010-09-15 13:26:12 -0700 (Wed, 15 Sep 2010)
Log Message:
-----------
In the interest that all portfiles exemplify correct portfile writing techniques, remove slash before ${prefix} which is not needed because ${prefix} already begins with a slash
Modified Paths:
--------------
trunk/dports/archivers/gnutar/Portfile
trunk/dports/audio/id3v2/Portfile
trunk/dports/benchmarks/bonnie/Portfile
trunk/dports/cross/arm-aout-binutils/Portfile
trunk/dports/cross/arm-aout-gcc/Portfile
trunk/dports/cross/arm-elf-gcc/Portfile
trunk/dports/cross/arm-elf-gcc3/Portfile
trunk/dports/cross/arm-none-linux-gnueabi-binutils/Portfile
trunk/dports/cross/arm-none-linux-gnueabi-gcc/Portfile
trunk/dports/cross/arm-rtems-binutils/Portfile
trunk/dports/cross/arm-rtems-gcc/Portfile
trunk/dports/cross/avr-gcc/Portfile
trunk/dports/cross/avr-gdb/Portfile
trunk/dports/cross/i386-elf-binutils/Portfile
trunk/dports/cross/i386-elf-gcc/Portfile
trunk/dports/cross/i386-mingw32-gcc/Portfile
trunk/dports/cross/i386-mingw32-runtime/Portfile
trunk/dports/cross/i386-mingw32-w32api/Portfile
trunk/dports/cross/i386-rtems-binutils/Portfile
trunk/dports/cross/i386-rtems-gcc/Portfile
trunk/dports/cross/i960-rtems-binutils/Portfile
trunk/dports/cross/i960-rtems-gcc/Portfile
trunk/dports/cross/m68k-elf-binutils/Portfile
trunk/dports/cross/m68k-elf-gcc/Portfile
trunk/dports/cross/m68k-rtems-binutils/Portfile
trunk/dports/cross/m68k-rtems-gcc/Portfile
trunk/dports/cross/mips-elf-binutils/Portfile
trunk/dports/cross/mips-elf-gcc/Portfile
trunk/dports/cross/mips-rtems-binutils/Portfile
trunk/dports/cross/mips-rtems-gcc/Portfile
trunk/dports/cross/powerpc-rtems-binutils/Portfile
trunk/dports/cross/powerpc-rtems-gcc/Portfile
trunk/dports/cross/sh-rtems-binutils/Portfile
trunk/dports/cross/sh-rtems-gcc/Portfile
trunk/dports/cross/sparc-rtems-binutils/Portfile
trunk/dports/cross/sparc-rtems-gcc/Portfile
trunk/dports/databases/couchdb/Portfile
trunk/dports/databases/spatialite/Portfile
trunk/dports/databases/spatialite-devel/Portfile
trunk/dports/databases/tokyocabinet-java/Portfile
trunk/dports/devel/GitX/Portfile
trunk/dports/devel/caml-ansicolor/Portfile
trunk/dports/devel/caml-getopt/Portfile
trunk/dports/devel/caml-inifiles/Portfile
trunk/dports/devel/caml-lwt/Portfile
trunk/dports/devel/caml-ounit/Portfile
trunk/dports/devel/cryptokit/Portfile
trunk/dports/devel/ftjam/Portfile
trunk/dports/devel/gnat-booch95/Portfile
trunk/dports/devel/ht/Portfile
trunk/dports/devel/jam/Portfile
trunk/dports/devel/mercurial/Portfile
trunk/dports/devel/ott/Portfile
trunk/dports/devel/subversion-javahlbindings/Portfile
trunk/dports/devel/subversion-python24bindings/Portfile
trunk/dports/devel/subversion-python25bindings/Portfile
trunk/dports/devel/subversion-python26bindings/Portfile
trunk/dports/devel/tailor/Portfile
trunk/dports/editors/TeXmacs/Portfile
trunk/dports/editors/vim-app/Portfile
trunk/dports/games/crafty/Portfile
trunk/dports/games/duke3d/Portfile
trunk/dports/gnome/glom/Portfile
trunk/dports/graphics/qwtplot3d/Portfile
trunk/dports/graphics/shapelib/Portfile
trunk/dports/graphics/vtk-devel/Portfile
trunk/dports/graphics/wxLua/Portfile
trunk/dports/lang/ccl/Portfile
trunk/dports/lang/fsharp/Portfile
trunk/dports/lang/ghc-devel/Portfile
trunk/dports/lang/gprolog/Portfile
trunk/dports/lang/sbcl/Portfile
trunk/dports/mail/alpine/Portfile
trunk/dports/mail/eudora2unix/Portfile
trunk/dports/mail/qpopper/Portfile
trunk/dports/mail/vpopmail/Portfile
trunk/dports/math/DSDP/Portfile
trunk/dports/net/ASFRecorder/Portfile
trunk/dports/net/asterisk/Portfile
trunk/dports/net/asterisknow/Portfile
trunk/dports/net/blackbag/Portfile
trunk/dports/net/ldapvi/Portfile
trunk/dports/net/ntop/Portfile
trunk/dports/net/openvpn2/Portfile
trunk/dports/net/trafshow/Portfile
trunk/dports/print/cups-pdf/Portfile
trunk/dports/python/py-elementtree/Portfile
trunk/dports/python/py-gnuplot/Portfile
trunk/dports/python/py-pastescript/Portfile
trunk/dports/python/py-pylons/Portfile
trunk/dports/python/py-supervisor/Portfile
trunk/dports/python/py-twisted/Portfile
trunk/dports/python/py25-elementtree/Portfile
trunk/dports/python/py25-gnuplot/Portfile
trunk/dports/python/py25-logilab-astng/Portfile
trunk/dports/python/py25-logilab-constraint/Portfile
trunk/dports/python/py25-pastescript/Portfile
trunk/dports/python/py25-pylons/Portfile
trunk/dports/python/py25-twisted/Portfile
trunk/dports/python/py26-elementtree/Portfile
trunk/dports/python/py26-gnuplot/Portfile
trunk/dports/science/geoexpress-sdk/Portfile
trunk/dports/science/geos2/Portfile
trunk/dports/science/gromacs-double/Portfile
trunk/dports/security/cracklib-words/Portfile
trunk/dports/security/metasploit2/Portfile
trunk/dports/security/metasploit3/Portfile
trunk/dports/security/rsyncrypto/Portfile
trunk/dports/sysutils/apt/Portfile
trunk/dports/sysutils/sysvbanner/Portfile
trunk/dports/tex/BibTool/Portfile
trunk/dports/tex/gtamacfonts/Portfile
trunk/dports/tex/texlive-basic/Portfile
trunk/dports/textproc/chmdump/Portfile
trunk/dports/textproc/docbook-dsssl/Portfile
trunk/dports/textproc/hunspell-dict-de_DE/Portfile
trunk/dports/textproc/lookup/Portfile
trunk/dports/textproc/naturaldocs/Portfile
trunk/dports/textproc/pdftohtml/Portfile
trunk/dports/textproc/remind/Portfile
trunk/dports/www/drupal5/Portfile
trunk/dports/www/drupal6/Portfile
trunk/dports/x11/kochi-substitute/Portfile
trunk/dports/x11/mikachanfont/Portfile
trunk/dports/x11/sazanami-font/Portfile
trunk/dports/x11/xping/Portfile
Modified: trunk/dports/archivers/gnutar/Portfile
===================================================================
--- trunk/dports/archivers/gnutar/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/archivers/gnutar/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -40,7 +40,7 @@
file rename ${destroot}${prefix}/share/info/tar.info-1 ${destroot}${prefix}/share/info/gnutar.info-1
file rename ${destroot}${prefix}/share/info/tar.info-2 ${destroot}${prefix}/share/info/gnutar.info-2
- xinstall -m 755 -d ${destroot}/${prefix}/libexec/gnubin
+ xinstall -m 755 -d ${destroot}${prefix}/libexec/gnubin
ln -sf ${prefix}/bin/gnutar ${destroot}${prefix}/libexec/gnubin/tar
}
Modified: trunk/dports/audio/id3v2/Portfile
===================================================================
--- trunk/dports/audio/id3v2/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/audio/id3v2/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -28,6 +28,6 @@
build.env CXX=${configure.cxx}
destroot {
- xinstall -m 755 ${worksrcpath}/id3v2 ${destroot}/${prefix}/bin/
- xinstall -m 644 ${worksrcpath}/id3v2.1 ${destroot}/${prefix}/share/man/man1/
+ xinstall -m 755 ${worksrcpath}/id3v2 ${destroot}${prefix}/bin/
+ xinstall -m 644 ${worksrcpath}/id3v2.1 ${destroot}${prefix}/share/man/man1/
}
Modified: trunk/dports/benchmarks/bonnie/Portfile
===================================================================
--- trunk/dports/benchmarks/bonnie/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/benchmarks/bonnie/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -24,8 +24,8 @@
build.target bsd
destroot {
- file mkdir "${destroot}/${prefix}/bin"
- file mkdir "${destroot}/${prefix}/share/man/man1"
- xinstall -m 755 ${workpath}/${name}/Bonnie ${destroot}/${prefix}/bin
- xinstall -m 644 ${workpath}/${name}/bonnie.1 ${destroot}/${prefix}/share/man/man1
+ file mkdir "${destroot}${prefix}/bin"
+ file mkdir "${destroot}${prefix}/share/man/man1"
+ xinstall -m 755 ${workpath}/${name}/Bonnie ${destroot}${prefix}/bin
+ xinstall -m 644 ${workpath}/${name}/bonnie.1 ${destroot}${prefix}/share/man/man1
}
Modified: trunk/dports/cross/arm-aout-binutils/Portfile
===================================================================
--- trunk/dports/cross/arm-aout-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/arm-aout-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -122,7 +122,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/arm-aout-gcc/Portfile
===================================================================
--- trunk/dports/cross/arm-aout-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/arm-aout-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -69,7 +69,7 @@
--with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${version}/
build.dir ${workpath}/build
destroot.args \
- --with-gxx-include-dir=${destroot}/${prefix}/${crossgcc-target}/include/c++/${version}/
+ --with-gxx-include-dir=${destroot}${prefix}/${crossgcc-target}/include/c++/${version}/
# Since we don't build gcc and binutils at the same time, gcc's Makefile will try to transform
# program names as gcc's name (add -${version} with ${version} being the version of gcc).
@@ -177,35 +177,35 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
- file rename "${destroot}/${prefix}/share/man/man1/cpp.1" \
- "${destroot}/${prefix}/share/man/man1/${crossgcc-target}-cpp.1"
- file rename "${destroot}/${prefix}/share/man/man1/gcjh.1" \
- "${destroot}/${prefix}/share/man/man1/${crossgcc-target}-gcjh.1"
- file rename "${destroot}/${prefix}/share/man/man1/gcov.1" \
- "${destroot}/${prefix}/share/man/man1/${crossgcc-target}-gcov.1"
- file rename "${destroot}/${prefix}/share/man/man1/jcf-dump.1" \
- "${destroot}/${prefix}/share/man/man1/${crossgcc-target}-jcf-dump.1"
- file rename "${destroot}/${prefix}/share/man/man1/jv-scan.1" \
- "${destroot}/${prefix}/share/man/man1/${crossgcc-target}-jv-scan.1"
+ file rename "${destroot}${prefix}/share/man/man1/cpp.1" \
+ "${destroot}${prefix}/share/man/man1/${crossgcc-target}-cpp.1"
+ file rename "${destroot}${prefix}/share/man/man1/gcjh.1" \
+ "${destroot}${prefix}/share/man/man1/${crossgcc-target}-gcjh.1"
+ file rename "${destroot}${prefix}/share/man/man1/gcov.1" \
+ "${destroot}${prefix}/share/man/man1/${crossgcc-target}-gcov.1"
+ file rename "${destroot}${prefix}/share/man/man1/jcf-dump.1" \
+ "${destroot}${prefix}/share/man/man1/${crossgcc-target}-jcf-dump.1"
+ file rename "${destroot}${prefix}/share/man/man1/jv-scan.1" \
+ "${destroot}${prefix}/share/man/man1/${crossgcc-target}-jv-scan.1"
}
livecheck.type regex
Modified: trunk/dports/cross/arm-elf-gcc/Portfile
===================================================================
--- trunk/dports/cross/arm-elf-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/arm-elf-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -276,8 +276,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -290,10 +290,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -302,22 +302,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -332,7 +332,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/arm-elf-gcc3/Portfile
===================================================================
--- trunk/dports/cross/arm-elf-gcc3/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/arm-elf-gcc3/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -204,8 +204,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -218,10 +218,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -230,22 +230,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -260,7 +260,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/arm-none-linux-gnueabi-binutils/Portfile
===================================================================
--- trunk/dports/cross/arm-none-linux-gnueabi-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/arm-none-linux-gnueabi-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -126,7 +126,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/arm-none-linux-gnueabi-gcc/Portfile
===================================================================
--- trunk/dports/cross/arm-none-linux-gnueabi-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/arm-none-linux-gnueabi-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -197,8 +197,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -211,10 +211,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -223,22 +223,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -253,5 +253,5 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
Modified: trunk/dports/cross/arm-rtems-binutils/Portfile
===================================================================
--- trunk/dports/cross/arm-rtems-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/arm-rtems-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -140,7 +140,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/arm-rtems-gcc/Portfile
===================================================================
--- trunk/dports/cross/arm-rtems-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/arm-rtems-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -213,8 +213,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -227,10 +227,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -239,22 +239,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -269,7 +269,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/avr-gcc/Portfile
===================================================================
--- trunk/dports/cross/avr-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/avr-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -188,8 +188,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -202,10 +202,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -214,22 +214,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -244,7 +244,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/avr-gdb/Portfile
===================================================================
--- trunk/dports/cross/avr-gdb/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/avr-gdb/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -30,5 +30,5 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
Modified: trunk/dports/cross/i386-elf-binutils/Portfile
===================================================================
--- trunk/dports/cross/i386-elf-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/i386-elf-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -135,7 +135,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/i386-elf-gcc/Portfile
===================================================================
--- trunk/dports/cross/i386-elf-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/i386-elf-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -198,8 +198,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -212,10 +212,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -224,22 +224,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -254,7 +254,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/i386-mingw32-gcc/Portfile
===================================================================
--- trunk/dports/cross/i386-mingw32-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/i386-mingw32-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -173,24 +173,24 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# There is no need for documentation on installing gcc
# given that this port just installed gcc.
- file delete "${destroot}/${prefix}/share/info/gccinstall.info"
+ file delete "${destroot}${prefix}/share/info/gccinstall.info"
}
Modified: trunk/dports/cross/i386-mingw32-runtime/Portfile
===================================================================
--- trunk/dports/cross/i386-mingw32-runtime/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/i386-mingw32-runtime/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -33,8 +33,8 @@
destroot.violate_mtree yes
destroot {
- file mkdir ${destpath}/${prefix}/${crossgcc-target}
+ file mkdir ${destpath}${prefix}/${crossgcc-target}
foreach dir {include lib doc share} {
- file copy -force ${worksrcpath}/$dir ${destpath}/${prefix}/${crossgcc-target}
+ file copy -force ${worksrcpath}/$dir ${destpath}${prefix}/${crossgcc-target}
}
}
Modified: trunk/dports/cross/i386-mingw32-w32api/Portfile
===================================================================
--- trunk/dports/cross/i386-mingw32-w32api/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/i386-mingw32-w32api/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -33,7 +33,7 @@
destroot.violate_mtree yes
destroot {
- file mkdir ${destpath}/${prefix}/${crossgcc-target}
- file copy -force ${worksrcpath}/include ${destpath}/${prefix}/${crossgcc-target}
- file copy -force ${worksrcpath}/lib ${destpath}/${prefix}/${crossgcc-target}
+ file mkdir ${destpath}${prefix}/${crossgcc-target}
+ file copy -force ${worksrcpath}/include ${destpath}${prefix}/${crossgcc-target}
+ file copy -force ${worksrcpath}/lib ${destpath}${prefix}/${crossgcc-target}
}
Modified: trunk/dports/cross/i386-rtems-binutils/Portfile
===================================================================
--- trunk/dports/cross/i386-rtems-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/i386-rtems-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -141,7 +141,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/i386-rtems-gcc/Portfile
===================================================================
--- trunk/dports/cross/i386-rtems-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/i386-rtems-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -214,8 +214,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -228,10 +228,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -240,22 +240,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -270,7 +270,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/i960-rtems-binutils/Portfile
===================================================================
--- trunk/dports/cross/i960-rtems-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/i960-rtems-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -122,7 +122,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
# This target has been abandonned upstream.
Modified: trunk/dports/cross/i960-rtems-gcc/Portfile
===================================================================
--- trunk/dports/cross/i960-rtems-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/i960-rtems-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -71,7 +71,7 @@
--with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${version}/
build.dir ${workpath}/build
destroot.args \
- --with-gxx-include-dir=${destroot}/${prefix}/${crossgcc-target}/include/c++/${version}/
+ --with-gxx-include-dir=${destroot}${prefix}/${crossgcc-target}/include/c++/${version}/
# Since we don't build gcc and binutils at the same time, gcc's Makefile will try to transform
# program names as gcc's name (add -${version} with ${version} being the version of gcc).
@@ -180,23 +180,23 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
- file rename "${destroot}/${prefix}/share/man/man1/cpp.1" \
- "${destroot}/${prefix}/share/man/man1/${crossgcc-target}-cpp.1"
- file rename "${destroot}/${prefix}/share/man/man1/gcov.1" \
- "${destroot}/${prefix}/share/man/man1/${crossgcc-target}-gcov.1"
+ file rename "${destroot}${prefix}/share/man/man1/cpp.1" \
+ "${destroot}${prefix}/share/man/man1/${crossgcc-target}-cpp.1"
+ file rename "${destroot}${prefix}/share/man/man1/gcov.1" \
+ "${destroot}${prefix}/share/man/man1/${crossgcc-target}-gcov.1"
}
# This target has been abandonned upstream.
Modified: trunk/dports/cross/m68k-elf-binutils/Portfile
===================================================================
--- trunk/dports/cross/m68k-elf-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/m68k-elf-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -122,7 +122,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/m68k-elf-gcc/Portfile
===================================================================
--- trunk/dports/cross/m68k-elf-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/m68k-elf-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -202,8 +202,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -216,10 +216,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -228,22 +228,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -258,7 +258,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/m68k-rtems-binutils/Portfile
===================================================================
--- trunk/dports/cross/m68k-rtems-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/m68k-rtems-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -141,7 +141,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/m68k-rtems-gcc/Portfile
===================================================================
--- trunk/dports/cross/m68k-rtems-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/m68k-rtems-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -214,8 +214,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -228,10 +228,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -240,22 +240,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -270,7 +270,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/mips-elf-binutils/Portfile
===================================================================
--- trunk/dports/cross/mips-elf-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/mips-elf-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -122,7 +122,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/mips-elf-gcc/Portfile
===================================================================
--- trunk/dports/cross/mips-elf-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/mips-elf-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -201,8 +201,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -215,10 +215,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -227,22 +227,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -257,7 +257,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/mips-rtems-binutils/Portfile
===================================================================
--- trunk/dports/cross/mips-rtems-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/mips-rtems-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -141,7 +141,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/mips-rtems-gcc/Portfile
===================================================================
--- trunk/dports/cross/mips-rtems-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/mips-rtems-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -214,8 +214,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -228,10 +228,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -240,22 +240,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -270,7 +270,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/powerpc-rtems-binutils/Portfile
===================================================================
--- trunk/dports/cross/powerpc-rtems-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/powerpc-rtems-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -141,7 +141,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/powerpc-rtems-gcc/Portfile
===================================================================
--- trunk/dports/cross/powerpc-rtems-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/powerpc-rtems-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -213,8 +213,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -227,10 +227,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -239,22 +239,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -269,7 +269,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/sh-rtems-binutils/Portfile
===================================================================
--- trunk/dports/cross/sh-rtems-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/sh-rtems-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -140,7 +140,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/sh-rtems-gcc/Portfile
===================================================================
--- trunk/dports/cross/sh-rtems-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/sh-rtems-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -213,8 +213,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -227,10 +227,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -239,22 +239,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -269,7 +269,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/cross/sparc-rtems-binutils/Portfile
===================================================================
--- trunk/dports/cross/sparc-rtems-binutils/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/sparc-rtems-binutils/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -140,7 +140,7 @@
post-destroot {
# Installing (host) libiberty was a mistake.
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
}
livecheck.type freshmeat
Modified: trunk/dports/cross/sparc-rtems-gcc/Portfile
===================================================================
--- trunk/dports/cross/sparc-rtems-gcc/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/cross/sparc-rtems-gcc/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -213,8 +213,8 @@
pre-destroot {
# gcc needs the cross directory structure to be present
# in order to fill it during installation.
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}/${prefix}/${crossgcc-target}/lib"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
@@ -227,10 +227,10 @@
proc crossgcc::rename_man_page { section manpage } {
global crossgcc-target destroot prefix
- set manpage_path "${destroot}/${prefix}/share/man/man${section}/${manpage}.${section}"
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
if { [ file exists ${manpage_path} ] } {
file rename ${manpage_path} \
- "${destroot}/${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
}
}
@@ -239,22 +239,22 @@
# (it's easier for maintainability purposes to fix things here)
# aliases for locales (should be on the system)
- file delete "${destroot}/${prefix}/share/locale/locale.alias"
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
# FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}/${prefix}/share/man/man7"
+ file delete -force "${destroot}${prefix}/share/man/man7"
# (host) libiberty
- file delete "${destroot}/${prefix}/lib/libiberty.a"
+ file delete "${destroot}${prefix}/lib/libiberty.a"
# aliases for charsets (should already be there)
- file delete "${destroot}/${prefix}/lib/charset.alias"
+ file delete "${destroot}${prefix}/lib/charset.alias"
# Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}/${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}/${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}/${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}/${prefix}/share/man/man1/gij.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
# For some reason, some man pages are not prefixed while they should have been
# (to avoid conflicting).
@@ -269,7 +269,7 @@
# $(target_noncanonical)-gcc-$(version)
# and hence the driver isn't installed.
xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}/${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
livecheck.type regex
Modified: trunk/dports/databases/couchdb/Portfile
===================================================================
--- trunk/dports/databases/couchdb/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/databases/couchdb/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -54,8 +54,8 @@
set plist org.apache.couchdb.plist
system "cd ${destroot}/Library/LaunchDaemons && ln -sf ${prefix}/Library/LaunchDaemons/${plist}"
# the following patches can be removed after next version
- reinplace "s;`/opt/local/bin/icu-config --invoke`;;" ${destroot}/${prefix}/bin/couchdb
- reinplace "s;^.*DYLD_LIBRARY_PATH.*$;;g" ${destroot}/${prefix}/Library/LaunchDaemons/org.apache.couchdb.plist
+ reinplace "s;`/opt/local/bin/icu-config --invoke`;;" ${destroot}${prefix}/bin/couchdb
+ reinplace "s;^.*DYLD_LIBRARY_PATH.*$;;g" ${destroot}${prefix}/Library/LaunchDaemons/org.apache.couchdb.plist
}
post-activate {
Modified: trunk/dports/databases/spatialite/Portfile
===================================================================
--- trunk/dports/databases/spatialite/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/databases/spatialite/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -44,7 +44,7 @@
post-destroot {
# Set up the init SQL
- set sharedir ${destroot}/${prefix}/share/spatialite
+ set sharedir ${destroot}${prefix}/share/spatialite
file mkdir ${sharedir}
system "gzip -cd ${distpath}/init_spatialite.sql.gz > ${sharedir}/init_spatialite.sql"
}
\ No newline at end of file
Modified: trunk/dports/databases/spatialite-devel/Portfile
===================================================================
--- trunk/dports/databases/spatialite-devel/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/databases/spatialite-devel/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -48,10 +48,10 @@
post-destroot {
# Set up the init SQL
- set sharedir ${destroot}/${prefix}/share/spatialite
+ set sharedir ${destroot}${prefix}/share/spatialite
file mkdir ${sharedir}
system "gzip -cd ${distpath}/init_spatialite.sql.gz > ${sharedir}/init_spatialite.sql"
# Create a template database
- system "${destroot}/${prefix}/bin/spatialite ${sharedir}/spatialite.db < ${sharedir}/init_spatialite.sql"
+ system "${destroot}${prefix}/bin/spatialite ${sharedir}/spatialite.db < ${sharedir}/init_spatialite.sql"
}
Modified: trunk/dports/databases/tokyocabinet-java/Portfile
===================================================================
--- trunk/dports/databases/tokyocabinet-java/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/databases/tokyocabinet-java/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -41,5 +41,5 @@
set dest ${javadir}/${jarfile}
xinstall -m 0755 -d ${javadir}
- file rename ${destroot}/${prefix}/lib/${jarfile} ${dest}
+ file rename ${destroot}${prefix}/lib/${jarfile} ${dest}
}
Modified: trunk/dports/devel/GitX/Portfile
===================================================================
--- trunk/dports/devel/GitX/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/GitX/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -45,8 +45,8 @@
}
post-destroot {
- file mkdir ${destroot}/${prefix}/bin
- file rename ${destroot}/${applications_dir}/gitx ${destroot}/${prefix}/bin/gitx
+ file mkdir ${destroot}${prefix}/bin
+ file rename ${destroot}/${applications_dir}/gitx ${destroot}${prefix}/bin/gitx
}
livecheck.url http://gitx.frim.nl/release_history.html
Modified: trunk/dports/devel/caml-ansicolor/Portfile
===================================================================
--- trunk/dports/devel/caml-ansicolor/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/caml-ansicolor/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -39,5 +39,5 @@
post-destroot {
xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
eval xinstall -m 644 [glob ${worksrcpath}/ANSITerminal.html/*.html] \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/devel/caml-getopt/Portfile
===================================================================
--- trunk/dports/devel/caml-getopt/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/caml-getopt/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -36,11 +36,11 @@
pre-destroot {
set ocaml_site_path [exec ocamlfind printconf destdir]
xinstall -m 755 -d ${destroot}/${ocaml_site_path} \
- ${destroot}/${prefix}/share/doc/ \
- ${destroot}/${prefix}/share/examples/${name}
- file copy ${worksrcpath}/doc ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/ \
+ ${destroot}${prefix}/share/examples/${name}
+ file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} COPYING Changes README \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 ${worksrcpath}/sample.ml \
${destroot}${prefix}/share/examples/${name}
}
Modified: trunk/dports/devel/caml-inifiles/Portfile
===================================================================
--- trunk/dports/devel/caml-inifiles/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/caml-inifiles/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -29,8 +29,8 @@
destroot {
set ocaml_site_path [exec ocamlfind printconf destdir]
xinstall -m 755 -d ${destroot}/${ocaml_site_path} \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
system "cd ${worksrcpath} && OCAMLFIND_INSTFLAGS=\"-destdir ${destroot}/${ocaml_site_path}\" make install "
- xinstall -m 644 -W ${worksrcpath} COPYING ${destroot}/${prefix}/share/doc/${name}/
+ xinstall -m 644 -W ${worksrcpath} COPYING ${destroot}${prefix}/share/doc/${name}/
}
Modified: trunk/dports/devel/caml-lwt/Portfile
===================================================================
--- trunk/dports/devel/caml-lwt/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/caml-lwt/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -37,5 +37,5 @@
post-destroot {
xinstall -d -755 ${destroot}${prefix}/share/doc/${name}
eval xinstall -m 644 [glob ${worksrcpath}/_build/lwt.docdir/*] \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/devel/caml-ounit/Portfile
===================================================================
--- trunk/dports/devel/caml-ounit/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/caml-ounit/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -42,7 +42,7 @@
post-destroot {
xinstall -d -755 ${destroot}${prefix}/share/doc/${name}
eval xinstall -m 644 [glob ${worksrcpath}/doc/*.html] \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
use_configure no
Modified: trunk/dports/devel/cryptokit/Portfile
===================================================================
--- trunk/dports/devel/cryptokit/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/cryptokit/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -39,5 +39,5 @@
system "mv ${instdir}/cryptokit/stublibs/*.so ${instdir}/stublibs/"
xinstall -d -755 ${destroot}${prefix}/share/doc/${name}
eval xinstall -m 644 [glob ${worksrcpath}/doc/*] \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/devel/ftjam/Portfile
===================================================================
--- trunk/dports/devel/ftjam/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/ftjam/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -22,10 +22,10 @@
destroot {
system "install -m 755 ${worksrcpath}/bin.*/jam ${destroot}${prefix}/bin/"
system "install -m 755 ${worksrcpath}/bin.*/mkjambase ${destroot}${prefix}/bin/"
- xinstall -d -m 755 ${destroot}/${prefix}/share/doc/${name}/
- xinstall -m 644 ${worksrcpath}/Jam.html ${destroot}/${prefix}/share/doc/${name}/
- xinstall -m 644 ${worksrcpath}/Jambase.html ${destroot}/${prefix}/share/doc/${name}/
- xinstall -m 644 ${worksrcpath}/Jamfile.html ${destroot}/${prefix}/share/doc/${name}/
+ xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}/
+ xinstall -m 644 ${worksrcpath}/Jam.html ${destroot}${prefix}/share/doc/${name}/
+ xinstall -m 644 ${worksrcpath}/Jambase.html ${destroot}${prefix}/share/doc/${name}/
+ xinstall -m 644 ${worksrcpath}/Jamfile.html ${destroot}${prefix}/share/doc/${name}/
}
livecheck.type regex
Modified: trunk/dports/devel/gnat-booch95/Portfile
===================================================================
--- trunk/dports/devel/gnat-booch95/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/gnat-booch95/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -39,24 +39,24 @@
}
destroot {
- xinstall -m 775 -d ${destroot}/${prefix}/lib/booch
- xinstall -m 775 -d ${destroot}/${prefix}/include/booch/src
- xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT
- xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release
- xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/obj
- xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/lib
- xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug
- xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/obj
- xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/lib
+ xinstall -m 775 -d ${destroot}${prefix}/lib/booch
+ xinstall -m 775 -d ${destroot}${prefix}/include/booch/src
+ xinstall -m 775 -d ${destroot}${prefix}/include/booch/GNAT
+ xinstall -m 775 -d ${destroot}${prefix}/include/booch/GNAT/Darwin-i686-Release
+ xinstall -m 775 -d ${destroot}${prefix}/include/booch/GNAT/Darwin-i686-Release/obj
+ xinstall -m 775 -d ${destroot}${prefix}/include/booch/GNAT/Darwin-i686-Release/lib
+ xinstall -m 775 -d ${destroot}${prefix}/include/booch/GNAT/Darwin-i686-Debug
+ xinstall -m 775 -d ${destroot}${prefix}/include/booch/GNAT/Darwin-i686-Debug/obj
+ xinstall -m 775 -d ${destroot}${prefix}/include/booch/GNAT/Darwin-i686-Debug/lib
- eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/lib/*] ${destroot}/${prefix}/lib/booch
- eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/src/*] ${destroot}/${prefix}/include/booch/src
- eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Makefile] ${destroot}/${prefix}/include/booch/GNAT
- eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/booch_95.gpr] ${destroot}/${prefix}/include/booch/GNAT
- eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/obj/*] ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/obj
- eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/lib/*] ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/lib
- eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Debug/obj/*] ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/obj
- eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Debug/lib/*] ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/lib
+ eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/lib/*] ${destroot}${prefix}/lib/booch
+ eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/src/*] ${destroot}${prefix}/include/booch/src
+ eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Makefile] ${destroot}${prefix}/include/booch/GNAT
+ eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/booch_95.gpr] ${destroot}${prefix}/include/booch/GNAT
+ eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/obj/*] ${destroot}${prefix}/include/booch/GNAT/Darwin-i686-Release/obj
+ eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/lib/*] ${destroot}${prefix}/include/booch/GNAT/Darwin-i686-Release/lib
+ eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Debug/obj/*] ${destroot}${prefix}/include/booch/GNAT/Darwin-i686-Debug/obj
+ eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Debug/lib/*] ${destroot}${prefix}/include/booch/GNAT/Darwin-i686-Debug/lib
}
# vim: set nowrap tabstop=8 shiftwidth=4 softtabstop=4 noexpandtab :
Modified: trunk/dports/devel/ht/Portfile
===================================================================
--- trunk/dports/devel/ht/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/ht/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -21,5 +21,5 @@
rmd160 8c88e0ad0162977c55c6a6d97e23141815559811
post-destroot {
- file rename ${destroot}/${prefix}/bin/ht ${destroot}/${prefix}/bin/hte
+ file rename ${destroot}${prefix}/bin/ht ${destroot}${prefix}/bin/hte
}
Modified: trunk/dports/devel/jam/Portfile
===================================================================
--- trunk/dports/devel/jam/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/jam/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -42,10 +42,10 @@
file mkdir ${destroot}${prefix}/share/doc/${name}
system "install -m 755 ${worksrcpath}/bin.*/jam ${destroot}${prefix}/bin/"
system "install -m 755 ${worksrcpath}/bin.*/mkjambase ${destroot}${prefix}/bin/"
- xinstall -d -m 755 ${destroot}/${prefix}/share/doc/${name}/
- xinstall -m 644 ${worksrcpath}/Jam.html ${destroot}/${prefix}/share/doc/${name}/
- xinstall -m 644 ${worksrcpath}/Jambase.html ${destroot}/${prefix}/share/doc/${name}/
- xinstall -m 644 ${worksrcpath}/Jamfile.html ${destroot}/${prefix}/share/doc/${name}/
+ xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}/
+ xinstall -m 644 ${worksrcpath}/Jam.html ${destroot}${prefix}/share/doc/${name}/
+ xinstall -m 644 ${worksrcpath}/Jambase.html ${destroot}${prefix}/share/doc/${name}/
+ xinstall -m 644 ${worksrcpath}/Jamfile.html ${destroot}${prefix}/share/doc/${name}/
}
# Metrowerks compiler.
@@ -63,9 +63,9 @@
file mkdir ${destroot}${prefix}/share/doc/${name}
system "install -m 755 ${worksrcpath}/bin.*/g/jam ${destroot}${prefix}/bin/"
system "install -m 755 ${worksrcpath}/bin.*/g/mkjambase ${destroot}${prefix}/bin/"
- xinstall -d -m 755 ${destroot}/${prefix}/share/doc/${name}/
- xinstall -m 644 ${worksrcpath}/Jambase.html ${destroot}/${prefix}/share/doc/${name}/
- xinstall -m 644 ${worksrcpath}/Jamfile.html ${destroot}/${prefix}/share/doc/${name}/
+ xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}/
+ xinstall -m 644 ${worksrcpath}/Jambase.html ${destroot}${prefix}/share/doc/${name}/
+ xinstall -m 644 ${worksrcpath}/Jamfile.html ${destroot}${prefix}/share/doc/${name}/
}
}
Modified: trunk/dports/devel/mercurial/Portfile
===================================================================
--- trunk/dports/devel/mercurial/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/mercurial/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -33,13 +33,13 @@
post-destroot {
# install html docs
xinstall -m 644 -W ${worksrcpath}/doc hg.1.html hgrc.5.html hgignore.5.html \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
# install man pages
xinstall -m 444 -W ${worksrcpath}/doc hg.1 \
- ${destroot}/${prefix}/share/man/man1
+ ${destroot}${prefix}/share/man/man1
xinstall -m 444 -W ${worksrcpath}/doc hgrc.5 hgignore.5 \
- ${destroot}/${prefix}/share/man/man5
+ ${destroot}${prefix}/share/man/man5
# install contrib
xinstall -d -m 755 ${destroot}${prefix}/share/${name}
Modified: trunk/dports/devel/ott/Portfile
===================================================================
--- trunk/dports/devel/ott/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/ott/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -33,7 +33,7 @@
build.target world-opt
destroot {
- xinstall -m 755 -d ${destroot}/${prefix}/bin
+ xinstall -m 755 -d ${destroot}${prefix}/bin
xinstall -m 755 -W ${worksrcpath} bin/ott \
- ${destroot}/${prefix}/bin/ott
+ ${destroot}${prefix}/bin/ott
}
Modified: trunk/dports/devel/subversion-javahlbindings/Portfile
===================================================================
--- trunk/dports/devel/subversion-javahlbindings/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/subversion-javahlbindings/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -88,7 +88,7 @@
file mkdir ${destroot}/Library/Java/Extensions
system "ln -sf ${prefix}/lib/libsvnjavahl-1.dylib ${destroot}/Library/Java/Extensions/libsvnjavahl.jnilib"
file mkdir ${destroot}${prefix}/share/java
- system "ln -sf ${prefix}/lib/svn-javahl/svn-javahl.jar ${destroot}/${prefix}/share/java/svn-javahl.jar"
+ system "ln -sf ${prefix}/lib/svn-javahl/svn-javahl.jar ${destroot}${prefix}/share/java/svn-javahl.jar"
}
# 10.3 says -> CarbonCore/MacTypes.h: No such file or directory
Modified: trunk/dports/devel/subversion-python24bindings/Portfile
===================================================================
--- trunk/dports/devel/subversion-python24bindings/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/subversion-python24bindings/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -97,8 +97,8 @@
reinplace "s|@PREFIX@|${prefix}|g" \
${destroot}${PYTHON_PATH}/site-packages/svn-python.pth
- file rename "${destroot}/${prefix}/lib/svn-python" \
- "${destroot}/${prefix}/lib/svn-python2.4"
+ file rename "${destroot}${prefix}/lib/svn-python" \
+ "${destroot}${prefix}/lib/svn-python2.4"
}
# 10.3 says -> CarbonCore/MacTypes.h: No such file or directory
Modified: trunk/dports/devel/subversion-python25bindings/Portfile
===================================================================
--- trunk/dports/devel/subversion-python25bindings/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/subversion-python25bindings/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -97,6 +97,6 @@
reinplace "s|@PREFIX@|${prefix}|g" \
${destroot}${PYTHON_PATH}/site-packages/svn-python.pth
- file rename "${destroot}/${prefix}/lib/svn-python" \
- "${destroot}/${prefix}/lib/svn-python2.5"
+ file rename "${destroot}${prefix}/lib/svn-python" \
+ "${destroot}${prefix}/lib/svn-python2.5"
}
Modified: trunk/dports/devel/subversion-python26bindings/Portfile
===================================================================
--- trunk/dports/devel/subversion-python26bindings/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/subversion-python26bindings/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -97,8 +97,8 @@
reinplace "s|@PREFIX@|${prefix}|g" \
${destroot}${PYTHON_PATH}/site-packages/svn-python.pth
- file rename "${destroot}/${prefix}/lib/svn-python" \
- "${destroot}/${prefix}/lib/svn-python2.6"
+ file rename "${destroot}${prefix}/lib/svn-python" \
+ "${destroot}${prefix}/lib/svn-python2.6"
}
# 10.3 says -> CarbonCore/MacTypes.h: No such file or directory
Modified: trunk/dports/devel/tailor/Portfile
===================================================================
--- trunk/dports/devel/tailor/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/devel/tailor/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -24,5 +24,5 @@
post-destroot {
# install docs
xinstall -m 644 -W ${worksrcpath} README.rst README.html \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/editors/TeXmacs/Portfile
===================================================================
--- trunk/dports/editors/TeXmacs/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/editors/TeXmacs/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -74,7 +74,7 @@
# TeXmacs is ignorant of "make all", so we just "make" with no target:
build.target { }
-post-destroot { file mkdir ${destroot}/${prefix}/share/${name}
+post-destroot { file mkdir ${destroot}${prefix}/share/${name}
system "chown -R root:admin ${destroot}${prefix}/share/${name}"
file rename ${destroot}${prefix}/share/${name}/plugins/cadabra \
Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/editors/vim-app/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -120,8 +120,8 @@
file attributes ${f} -permissions 0644
}
# install launchscript
- xinstall -m 755 ${filespath}/gvim.sh ${destroot}/${prefix}/bin/gvim
- reinplace "s|@APPPATH@|${applications_dir}|g" ${destroot}/${prefix}/bin/gvim
+ xinstall -m 755 ${filespath}/gvim.sh ${destroot}${prefix}/bin/gvim
+ reinplace "s|@APPPATH@|${applications_dir}|g" ${destroot}${prefix}/bin/gvim
# allow for Vim.App to open .nfo, .vim, .latex, .tex, .diff files
system "patch -d ${destroot}${applications_dir}/Vim.app/Contents/ -p0 < ${filespath}/patch-Info.plist.diff"
Modified: trunk/dports/games/crafty/Portfile
===================================================================
--- trunk/dports/games/crafty/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/games/crafty/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -65,23 +65,23 @@
destroot {
# copy the executable
- xinstall -m 755 -d ${destroot}/${prefix}/bin
- file copy ${worksrcpath}/${name} ${destroot}/${prefix}/bin/
+ xinstall -m 755 -d ${destroot}${prefix}/bin
+ file copy ${worksrcpath}/${name} ${destroot}${prefix}/bin/
# copy the book files
- xinstall -m 755 -d ${destroot}/${prefix}/share/${name}
+ xinstall -m 755 -d ${destroot}${prefix}/share/${name}
file copy ${distpath}/${dist_book1} \
${distpath}/${dist_book2} \
${distpath}/${dist_book3} \
- ${destroot}/${prefix}/share/${name}/
+ ${destroot}${prefix}/share/${name}/
# copy the docs
- xinstall -m 755 -d ${destroot}/${prefix}/share/doc/${name}
+ xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
file copy ${distpath}/${dist_ascii} \
${distpath}/${dist_ps} \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
# copy the manpage, renaming the extension
file copy ${distpath}/${dist_man} \
- ${destroot}/${prefix}/share/man/man1/${name}.1
+ ${destroot}${prefix}/share/man/man1/${name}.1
}
Modified: trunk/dports/games/duke3d/Portfile
===================================================================
--- trunk/dports/games/duke3d/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/games/duke3d/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -24,8 +24,8 @@
build.args macosx=true
destroot {
- xinstall -m 755 -d ${destroot}/${prefix}/bin
- file copy ${worksrcpath}/${name} ${destroot}/${prefix}/bin/
+ xinstall -m 755 -d ${destroot}${prefix}/bin
+ file copy ${worksrcpath}/${name} ${destroot}${prefix}/bin/
}
livecheck.type none
Modified: trunk/dports/gnome/glom/Portfile
===================================================================
--- trunk/dports/gnome/glom/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/gnome/glom/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -37,7 +37,7 @@
build.args MSGFMT="${prefix}/bin/msgfmt" GMSGFMT="${prefix}/bin/msgfmt"
post-destroot {
- file delete "${destpath}/${prefix}/share/mime/globs"
- file delete "${destpath}/${prefix}/share/mime/magic"
- file delete "${destpath}/${prefix}/share/mime/XMLnamespaces"
+ file delete "${destpath}${prefix}/share/mime/globs"
+ file delete "${destpath}${prefix}/share/mime/magic"
+ file delete "${destpath}${prefix}/share/mime/XMLnamespaces"
}
Modified: trunk/dports/graphics/qwtplot3d/Portfile
===================================================================
--- trunk/dports/graphics/qwtplot3d/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/graphics/qwtplot3d/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -96,11 +96,11 @@
}
destroot {
- xinstall -m 0644 ${worksrcpath}/lib/lib${name}.${version}.dylib ${destroot}/${prefix}/lib
- system "cd ${destroot}/${prefix}/lib && ln -s lib${name}.${version}.dylib lib${name}.0.2.dylib"
- system "cd ${destroot}/${prefix}/lib && ln -s lib${name}.${version}.dylib lib${name}.0.dylib"
- system "cd ${destroot}/${prefix}/lib && ln -s lib${name}.${version}.dylib lib${name}.dylib"
- xinstall -m 755 -d ${destroot}/${prefix}/include/${name}
- eval xinstall -m 0644 [glob ${worksrcpath}/include/*] ${destroot}/${prefix}/include/${name}
- system "install_name_tool -id ${prefix}/lib/lib${name}.${version}.dylib ${destroot}/${prefix}/lib/lib${name}.${version}.dylib"
+ xinstall -m 0644 ${worksrcpath}/lib/lib${name}.${version}.dylib ${destroot}${prefix}/lib
+ system "cd ${destroot}${prefix}/lib && ln -s lib${name}.${version}.dylib lib${name}.0.2.dylib"
+ system "cd ${destroot}${prefix}/lib && ln -s lib${name}.${version}.dylib lib${name}.0.dylib"
+ system "cd ${destroot}${prefix}/lib && ln -s lib${name}.${version}.dylib lib${name}.dylib"
+ xinstall -m 755 -d ${destroot}${prefix}/include/${name}
+ eval xinstall -m 0644 [glob ${worksrcpath}/include/*] ${destroot}${prefix}/include/${name}
+ system "install_name_tool -id ${prefix}/lib/lib${name}.${version}.dylib ${destroot}${prefix}/lib/lib${name}.${version}.dylib"
}
Modified: trunk/dports/graphics/shapelib/Portfile
===================================================================
--- trunk/dports/graphics/shapelib/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/graphics/shapelib/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -39,6 +39,6 @@
xinstall -m 644 -c -W ${worksrcpath} \
libshp.${version}.dylib ${destroot}${prefix}/lib
system "ln -sf libshp.${version}.dylib \
- ${destroot}/${prefix}/lib/libshp.${libver}.dylib"
+ ${destroot}${prefix}/lib/libshp.${libver}.dylib"
system "ln -sf libshp.${version}.dylib \
- ${destroot}/${prefix}/lib/libshp.dylib" }
+ ${destroot}${prefix}/lib/libshp.dylib" }
Modified: trunk/dports/graphics/vtk-devel/Portfile
===================================================================
--- trunk/dports/graphics/vtk-devel/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/graphics/vtk-devel/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -331,7 +331,7 @@
rmd160 d6372984b74ede33713501219fecd6768edcfad3
post-destroot {
xinstall -d -o root -g admin -m 0755 ${destroot}/${vtkDocPath}
- xinstall -d -o root -g admin -m 0755 ${destroot}/${prefix}/share/doc
+ xinstall -d -o root -g admin -m 0755 ${destroot}${prefix}/share/doc
# Add the doxygen documentation
system "gnutar -C ${destroot}/${vtkDocPath} -zxf ${distpath}/${vtkDocFile}"
# Add basic documentation
@@ -341,7 +341,7 @@
# Create a symlink to the $prefix path (not the destroot path); use the
# system to do this because the $prefix path doesn't exist yet and the
# tcl ln command fails, whereas this system command will allow it.
- system "ln -s ${vtkDocPath} ${destroot}/${prefix}/share/doc/${distname}"
+ system "ln -s ${vtkDocPath} ${destroot}${prefix}/share/doc/${distname}"
}
# A doxygen dependency would add a lot of complexity to vtk, so
# just use a download instead of building the docs. Otherwise:
Modified: trunk/dports/graphics/wxLua/Portfile
===================================================================
--- trunk/dports/graphics/wxLua/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/graphics/wxLua/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -79,9 +79,9 @@
xinstall -m 0755 "${filespath}/wxluaedit.sh" "${destroot}${prefix}/bin/wxluaedit"
# remove some stuff that is unused with wxMac port
- delete "${destroot}/${prefix}/share/applications/wxlua.desktop"
- delete "${destroot}/${prefix}/share/mime/packages/wxlua.xml"
- delete "${destroot}/${prefix}/share/pixmaps/wxlualogo.xpm"
+ delete "${destroot}${prefix}/share/applications/wxlua.desktop"
+ delete "${destroot}${prefix}/share/mime/packages/wxlua.xml"
+ delete "${destroot}${prefix}/share/pixmaps/wxlualogo.xpm"
}
}
Modified: trunk/dports/lang/ccl/Portfile
===================================================================
--- trunk/dports/lang/ccl/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/lang/ccl/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -64,14 +64,14 @@
set prefixpath \\\"[regsub -all / [strsed ${prefix}/share/asdf-install {g/^\///}] "\\\" \\\""]\\\"
destroot {
- file mkdir ${destroot}/${prefix}/share/${name}/${shortversion}
- system "cd ${worksrcpath} && tar cf - . | ( cd ${destroot}/${prefix}/share/${name}/${shortversion} && tar xf -)"
+ file mkdir ${destroot}${prefix}/share/${name}/${shortversion}
+ system "cd ${worksrcpath} && tar cf - . | ( cd ${destroot}${prefix}/share/${name}/${shortversion} && tar xf -)"
reinplace "s|/usr/local/src/ccl|${prefix}/share/${name}/${shortversion}|" \
${workpath}/ccl/scripts/${ccl_script}
system "chmod +x ${workpath}/ccl/scripts/${ccl_script}"
- file copy ${workpath}/ccl/scripts/${ccl_script} ${destroot}/${prefix}/bin
+ file copy ${workpath}/ccl/scripts/${ccl_script} ${destroot}${prefix}/bin
reinplace "s|\"usr\" \"local\" \"asdf-install\")))))|${prefixpath})))))|" \
- ${destroot}/${prefix}/share/${name}/${shortversion}/tools/asdf-install/installer.lisp
+ ${destroot}${prefix}/share/${name}/${shortversion}/tools/asdf-install/installer.lisp
}
post-activate {
Modified: trunk/dports/lang/fsharp/Portfile
===================================================================
--- trunk/dports/lang/fsharp/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/lang/fsharp/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -30,7 +30,7 @@
use_configure no
post-patch {
- reinplace "s|gacutil -i|gacutil -i -root ${destroot}/${prefix}/lib/|g" ${worksrcpath}/install-mono.sh
+ reinplace "s|gacutil -i|gacutil -i -root ${destroot}${prefix}/lib/|g" ${worksrcpath}/install-mono.sh
reinplace "s|^echo.*||g" ${worksrcpath}/install-mono.sh
}
@@ -52,7 +52,7 @@
continue
}
- set destfile [file join "${destroot}/${prefix}/bin/" [file tail [file rootname $binary]]]
+ set destfile [file join "${destroot}${prefix}/bin/" [file tail [file rootname $binary]]]
set linkdest [file join ${sharedir}/bin/ [file tail $binary]]
# Write the launcher script
Modified: trunk/dports/lang/ghc-devel/Portfile
===================================================================
--- trunk/dports/lang/ghc-devel/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/lang/ghc-devel/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -73,7 +73,7 @@
# the versions that are officially supported.
#bugs GHC does not support DESTDIR. Instead, we install \
-# everything into ${destroot}/${prefix}, and then fix up \
+# everything into ${destroot}${prefix}, and then fix up \
# the five scripts which actually have the installation \
# path hard coded.
@@ -100,8 +100,8 @@
configure.env DYLD_FALLBACK_LIBRARY_PATH=${prefix}/lib
configure.cflags-append "-I${prefix}/include"
-configure.args --prefix=${destroot}/${prefix} \
- --mandir=${destroot}/${prefix}/share/man/ \
+configure.args --prefix=${destroot}${prefix} \
+ --mandir=${destroot}${prefix}/share/man/ \
--with-readline-includes=${prefix}/include \
--with-readline-libraries=${prefix}/lib \
--with-gmp-includes=${prefix}/include \
@@ -122,26 +122,26 @@
set ghc-pkg_script [ glob ${destroot}${prefix}/bin/ghc-pkg-${version}.* ]
foreach script_name [concat ${ghc_script} ${ghci_script} ${ghc-pkg_script} ] {
- reinplace s|${destroot}/${prefix}|${prefix}|g ${destroot}${prefix}/bin/${script_name}
+ reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/${script_name}
}
foreach script_name { ghcprof hsc2hs-ghc } {
- reinplace s|${destroot}/${prefix}|${prefix}|g ${destroot}${prefix}/bin/${script_name}
+ reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/${script_name}
}
reinplace "s|\\\$@\"\}|\\\$@\"\} -L${prefix}/lib -I${prefix}/include |" ${destroot}${prefix}/bin/ghc
set ghc_libdir [ glob ${destroot}${prefix}/bin/ghc-${version}.* ]
- reinplace s|${destroot}/${prefix}|${prefix}|g ${destroot}${prefix}/lib/${ghc_libdir}/package.conf
+ reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/lib/${ghc_libdir}/package.conf
- file delete ${destroot}/${prefix}/bin/ghc
- file delete ${destroot}/${prefix}/bin/ghci
- file delete ${destroot}/${prefix}/bin/ghc-pkg
+ file delete ${destroot}${prefix}/bin/ghc
+ file delete ${destroot}${prefix}/bin/ghci
+ file delete ${destroot}${prefix}/bin/ghc-pkg
set ghc_date [ lindex [ split ${ghc_libdir} "." ] 2 ]
foreach bin_name { ghcprof hasktags hp2ps hsc2hs-ghc runghc } {
- file rename ${destroot}/${prefix}/bin/${bin_name} ${destroot}${prefix}/bin/${bin_name}-${version}.${ghc_date}
+ file rename ${destroot}${prefix}/bin/${bin_name} ${destroot}${prefix}/bin/${bin_name}-${version}.${ghc_date}
}
system "cd ${destroot}${prefix}/lib/${ghc_libdir} && ranlib *.a"
Modified: trunk/dports/lang/gprolog/Portfile
===================================================================
--- trunk/dports/lang/gprolog/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/lang/gprolog/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -31,7 +31,7 @@
worksrcdir ${name}-${version}/src
configure.args \
- --prefix=${destroot}/${prefix} \
+ --prefix=${destroot}${prefix} \
--with-install-dir=${prefix}/lib/${name}-${version} \
--with-examples-dir=${prefix}/share/${name}-${version} \
--with-doc-dir=${prefix}/share/${name}-${version}
Modified: trunk/dports/lang/sbcl/Portfile
===================================================================
--- trunk/dports/lang/sbcl/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/lang/sbcl/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -113,7 +113,7 @@
test.cmd sh
test.target run-tests.sh
-destroot { system "cd ${worksrcpath}; INSTALL_ROOT=${destroot}/${prefix} sh ${worksrcpath}/install.sh"
+destroot { system "cd ${worksrcpath}; INSTALL_ROOT=${destroot}${prefix} sh ${worksrcpath}/install.sh"
}
livecheck.url http://sourceforge.net/api/file/index/project-id/1373/rss?path=%2F${name}
Modified: trunk/dports/mail/alpine/Portfile
===================================================================
--- trunk/dports/mail/alpine/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/mail/alpine/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -55,7 +55,7 @@
--with-debug-level=0
build.args \
- SPECIALS="GSSLIB=/${prefix}/lib SSLDIR=${prefix}"
+ SPECIALS="GSSLIB=${prefix}/lib SSLDIR=${prefix}"
variant without_krb5 description {Disable Kerberos5 support} {
depends_lib-delete port:cyrus-sasl2
Modified: trunk/dports/mail/eudora2unix/Portfile
===================================================================
--- trunk/dports/mail/eudora2unix/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/mail/eudora2unix/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -23,10 +23,10 @@
build {}
destroot {
- xinstall -d -m 755 ${destroot}/${prefix}/share/doc/${name}/
- xinstall -m 644 ${worksrcpath}/index.html ${destroot}/${prefix}/share/doc/${name}/
- xinstall -m 644 ${worksrcpath}/details.html ${destroot}/${prefix}/share/doc/${name}/
- xinstall -m 755 ${worksrcpath}/Eudora2Mbox.py ${destroot}/${prefix}/bin/
- xinstall -m 755 ${worksrcpath}/Eudora2Unix.py ${destroot}/${prefix}/bin/
- xinstall -m 755 ${worksrcpath}/EudoraTOC.py ${destroot}/${prefix}/bin/
+ xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}/
+ xinstall -m 644 ${worksrcpath}/index.html ${destroot}${prefix}/share/doc/${name}/
+ xinstall -m 644 ${worksrcpath}/details.html ${destroot}${prefix}/share/doc/${name}/
+ xinstall -m 755 ${worksrcpath}/Eudora2Mbox.py ${destroot}${prefix}/bin/
+ xinstall -m 755 ${worksrcpath}/Eudora2Unix.py ${destroot}${prefix}/bin/
+ xinstall -m 755 ${worksrcpath}/EudoraTOC.py ${destroot}${prefix}/bin/
}
Modified: trunk/dports/mail/qpopper/Portfile
===================================================================
--- trunk/dports/mail/qpopper/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/mail/qpopper/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -22,7 +22,7 @@
patchfiles patch-Makefile.in patch-popper-Makefile.in
configure.args --mandir=${prefix}/share/man \
--without-pam
-destroot.destdir prefix=${destroot}/${prefix} mandir=${destroot}/${prefix}/share/man
+destroot.destdir prefix=${destroot}${prefix} mandir=${destroot}${prefix}/share/man
post-patch {
reinplace "s|@@INSTALL.USER@@|${install.user}|g" \
Modified: trunk/dports/mail/vpopmail/Portfile
===================================================================
--- trunk/dports/mail/vpopmail/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/mail/vpopmail/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -103,7 +103,7 @@
xinstall -m 644 -W ${worksrcpath} README.roamingusers ${destroot}${prefix}/var/${name}/doc
}
if {[variant_isset mysql5]} {
- file rename ${destroot}/${prefix}/var/${name}/etc/vpopmail.mysql ${destroot}/${prefix}/var/${name}/etc/vpopmail.mysql.sample
+ file rename ${destroot}${prefix}/var/${name}/etc/vpopmail.mysql ${destroot}${prefix}/var/${name}/etc/vpopmail.mysql.sample
xinstall -m 644 -W ${worksrcpath} README.mysql ${destroot}${prefix}/var/${name}/doc
}
if {[variant_isset maildrop]} {
Modified: trunk/dports/math/DSDP/Portfile
===================================================================
--- trunk/dports/math/DSDP/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/math/DSDP/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -36,11 +36,11 @@
}
destroot {
- xinstall ${worksrcpath}/lib/libdsdp.a ${destroot}/${prefix}/lib
- eval xinstall [glob ${worksrcpath}/include/*] ${destroot}/${prefix}/include
- xinstall ${worksrcpath}/bin/dsdp5 ${destroot}/${prefix}/bin
- xinstall ${worksrcpath}/bin/maxcut ${destroot}/${prefix}/bin
- xinstall ${worksrcpath}/bin/theta ${destroot}/${prefix}/bin
+ xinstall ${worksrcpath}/lib/libdsdp.a ${destroot}${prefix}/lib
+ eval xinstall [glob ${worksrcpath}/include/*] ${destroot}${prefix}/include
+ xinstall ${worksrcpath}/bin/dsdp5 ${destroot}${prefix}/bin
+ xinstall ${worksrcpath}/bin/maxcut ${destroot}${prefix}/bin
+ xinstall ${worksrcpath}/bin/theta ${destroot}${prefix}/bin
if {[variant_isset octave]} {
if {[catch {set msite [exec ${prefix}/bin/octave-config --m-site-dir]}]} {
Modified: trunk/dports/net/ASFRecorder/Portfile
===================================================================
--- trunk/dports/net/ASFRecorder/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/net/ASFRecorder/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -22,4 +22,4 @@
build { system "cc -o ${workpath}/${name}/source/${name} \
${workpath}/${name}/source/asfrecorder.c"}
destroot { xinstall -m 755 ${workpath}/${name}/source/ASFRecorder \
- ${destroot}/${prefix}/bin }
+ ${destroot}${prefix}/bin }
Modified: trunk/dports/net/asterisk/Portfile
===================================================================
--- trunk/dports/net/asterisk/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/net/asterisk/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -48,7 +48,7 @@
}
post-destroot {
- system "rsync -a $worksrcpath/configs/*.sample ${destroot}/${prefix}/etc/asterisk"
- file mkdir "${destroot}/${prefix}/var/run"
- file mkdir "${destroot}/${prefix}/var/log/asterisk"
+ system "rsync -a $worksrcpath/configs/*.sample ${destroot}${prefix}/etc/asterisk"
+ file mkdir "${destroot}${prefix}/var/run"
+ file mkdir "${destroot}${prefix}/var/log/asterisk"
}
Modified: trunk/dports/net/asterisknow/Portfile
===================================================================
--- trunk/dports/net/asterisknow/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/net/asterisknow/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -23,8 +23,8 @@
depends_run port:asterisk
post-destroot {
- file mkdir ${destroot}/${prefix}/var/lib/asterisk/gui_backups
- file mkdir ${destroot}/${prefix}/var/lib/asterisk/static-http/private/bkps
+ file mkdir ${destroot}${prefix}/var/lib/asterisk/gui_backups
+ file mkdir ${destroot}${prefix}/var/lib/asterisk/static-http/private/bkps
}
post-patch {
Modified: trunk/dports/net/blackbag/Portfile
===================================================================
--- trunk/dports/net/blackbag/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/net/blackbag/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -33,10 +33,10 @@
patchfiles patch-bkb.diff
post-patch {
- reinplace "s|/usr/local|\$\(DESTDIR\)/${prefix}|g" ${worksrcpath}/Makefile
+ reinplace "s|/usr/local|\$\(DESTDIR\)${prefix}|g" ${worksrcpath}/Makefile
reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/bkb
reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/sub.c
- reinplace "s|/usr/local|\$\(DESTDIR\)/${prefix}|g" ${worksrcpath}/asn/Makefile
+ reinplace "s|/usr/local|\$\(DESTDIR\)${prefix}|g" ${worksrcpath}/asn/Makefile
reinplace "s|/usr/local/bin|${prefix}/bin/blackbag|g" ${worksrcpath}/asn/asn
reinplace "s|shift|#shift|g" ${worksrcpath}/asn/asn
reinplace "s|-I../third-party/libevent-1.0b||g" ${worksrcpath}/Makefile
Modified: trunk/dports/net/ldapvi/Portfile
===================================================================
--- trunk/dports/net/ldapvi/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/net/ldapvi/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -27,7 +27,7 @@
configure.cppflags-append "-L${prefix}/lib"
-destroot.destdir prefix=${destroot}/${prefix}
+destroot.destdir prefix=${destroot}${prefix}
patchfiles GNUmakefile-paths.patch \
configure-in.patch
Modified: trunk/dports/net/ntop/Portfile
===================================================================
--- trunk/dports/net/ntop/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/net/ntop/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -47,8 +47,8 @@
}
post-destroot {
- xinstall -m 755 -o nobody -d ${destroot}/${prefix}/var/ntop \
- ${destroot}/${prefix}/var/ntop/rrd
+ xinstall -m 755 -o nobody -d ${destroot}${prefix}/var/ntop \
+ ${destroot}${prefix}/var/ntop/rrd
system "cd ${destroot}${prefix}/var/ntop && \
touch addressQueue.db dnsCache.db macPrefix.db \
ntop_pw.db prefsCache.db rrd/.turd"
Modified: trunk/dports/net/openvpn2/Portfile
===================================================================
--- trunk/dports/net/openvpn2/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/net/openvpn2/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -33,7 +33,7 @@
--program-suffix=2
post-destroot {
- set docdir ${destroot}/${prefix}/share/doc/${name}
+ set docdir ${destroot}${prefix}/share/doc/${name}
xinstall -m 755 -d ${docdir}
foreach dir "easy-rsa sample-config-files sample-scripts \
contrib sample-keys" {
Modified: trunk/dports/net/trafshow/Portfile
===================================================================
--- trunk/dports/net/trafshow/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/net/trafshow/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -41,6 +41,6 @@
reinplace "s;%%PREFIX%%;${prefix};g" ${worksrcpath}/trafshow.c
reinplace "s;%%PREFIX%%;${prefix};g" ${worksrcpath}/trafshow.1 }
-destroot { xinstall -W ${worksrcpath} -m 755 -s -c trafshow ${destroot}/${prefix}/bin
- xinstall -W ${worksrcpath} -m 755 -s -c trafshow.1 ${destroot}/${prefix}/share/man/man1
- xinstall -W ${worksrcpath} -b -m 755 -s -c .trafshow ${destroot}/${prefix}/etc/trafshow.default }
+destroot { xinstall -W ${worksrcpath} -m 755 -s -c trafshow ${destroot}${prefix}/bin
+ xinstall -W ${worksrcpath} -m 755 -s -c trafshow.1 ${destroot}${prefix}/share/man/man1
+ xinstall -W ${worksrcpath} -b -m 755 -s -c .trafshow ${destroot}${prefix}/etc/trafshow.default }
Modified: trunk/dports/print/cups-pdf/Portfile
===================================================================
--- trunk/dports/print/cups-pdf/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/print/cups-pdf/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -65,8 +65,8 @@
destroot {
xinstall -m 755 -d ${destroot}${prefix}/libexec/cups/backend \
- ${destroot}/${prefix}/etc/cups ${destroot}${prefix}/share/cups/model \
- ${destroot}/${prefix}/share/doc/${name} \
+ ${destroot}${prefix}/etc/cups ${destroot}${prefix}/share/cups/model \
+ ${destroot}${prefix}/share/doc/${name} \
${destroot}${prefix}/var/spool/cups-pdf \
${destroot}${prefix}/var/log/cups
xinstall -m 700 ${worksrcpath}/src/cups-pdf \
Modified: trunk/dports/python/py-elementtree/Portfile
===================================================================
--- trunk/dports/python/py-elementtree/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py-elementtree/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -36,7 +36,7 @@
xinstall -m 644 -W ${worksrcpath}/samples simple-ns.xml simple.xml \
${destroot}${prefix}/share/doc/${name}/examples
eval file copy [glob ${worksrcpath}/docs/*] \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
livecheck.type regex
Modified: trunk/dports/python/py-gnuplot/Portfile
===================================================================
--- trunk/dports/python/py-gnuplot/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py-gnuplot/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -28,8 +28,8 @@
xinstall -m 644 -W ${worksrcpath} \
ANNOUNCE.txt CREDITS.txt FAQ.txt Gnuplot.html \
LICENSE.txt NEWS.txt README.txt TODO.txt \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
file copy ${worksrcpath}/doc \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/python/py-pastescript/Portfile
===================================================================
--- trunk/dports/python/py-pastescript/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py-pastescript/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -29,5 +29,5 @@
}
# Dependencies are the packaging system's job, for crying out loud.
# Cheetah doesn't use setuptools.
- reinplace s|^Cheetah.*||g $destroot/$prefix/lib/python2.4/site-packages/PasteScript-${version}-py2.4.egg-info/requires.txt
+ reinplace s|^Cheetah.*||g $destroot$prefix/lib/python2.4/site-packages/PasteScript-${version}-py2.4.egg-info/requires.txt
}
Modified: trunk/dports/python/py-pylons/Portfile
===================================================================
--- trunk/dports/python/py-pylons/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py-pylons/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -44,7 +44,7 @@
post-destroot {
# Dependencies are the packaging system's job, for crying out loud.
# Cheetah doesn't use setuptools.
- reinplace s|^Cheetah.*||g $destroot/$prefix/lib/python2.4/site-packages/Pylons-${version}-py2.4.egg-info/requires.txt
+ reinplace s|^Cheetah.*||g $destroot$prefix/lib/python2.4/site-packages/Pylons-${version}-py2.4.egg-info/requires.txt
# Neither does FormEncode
- reinplace s|^FormEncode.*||g $destroot/$prefix/lib/python2.4/site-packages/Pylons-${version}-py2.4.egg-info/requires.txt
+ reinplace s|^FormEncode.*||g $destroot$prefix/lib/python2.4/site-packages/Pylons-${version}-py2.4.egg-info/requires.txt
}
Modified: trunk/dports/python/py-supervisor/Portfile
===================================================================
--- trunk/dports/python/py-supervisor/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py-supervisor/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -22,6 +22,6 @@
checksums md5 e6533646e83aede64d2855c0f11f964c
post-destroot {
- file delete -force ${destroot}/${prefix}/doc
+ file delete -force ${destroot}${prefix}/doc
xinstall -m 644 -W ${worksrcpath} README.txt CHANGES.txt COPYRIGHT.txt LICENSES.txt TODO.txt UPGRADING.txt sample.conf ${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/python/py-twisted/Portfile
===================================================================
--- trunk/dports/python/py-twisted/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py-twisted/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -28,7 +28,7 @@
build {}
post-destroot {
- foreach f [glob -directory ${destroot}/${prefix}/bin *] {
+ foreach f [glob -directory ${destroot}${prefix}/bin *] {
move $f ${destroot}${prefix}/bin/[file tail $f]2.4
}
}
Modified: trunk/dports/python/py25-elementtree/Portfile
===================================================================
--- trunk/dports/python/py25-elementtree/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py25-elementtree/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -30,7 +30,7 @@
xinstall -m 644 -W ${worksrcpath}/samples simple-ns.xml simple.xml \
${destroot}${prefix}/share/doc/${name}/examples
eval file copy [glob ${worksrcpath}/docs/*] \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
livecheck.type regex
Modified: trunk/dports/python/py25-gnuplot/Portfile
===================================================================
--- trunk/dports/python/py25-gnuplot/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py25-gnuplot/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -28,8 +28,8 @@
xinstall -m 644 -W ${worksrcpath} \
ANNOUNCE.txt CREDITS.txt FAQ.txt Gnuplot.html \
LICENSE.txt NEWS.txt README.txt TODO.txt \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
file copy ${worksrcpath}/doc \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/python/py25-logilab-astng/Portfile
===================================================================
--- trunk/dports/python/py25-logilab-astng/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py25-logilab-astng/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -33,5 +33,5 @@
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} ChangeLog README \
${destroot}${prefix}/share/doc/${name}
- file delete ${destroot}/${prefix}/lib/python2.5/site-packages/logilab/__init__.py
+ file delete ${destroot}${prefix}/lib/python2.5/site-packages/logilab/__init__.py
}
Modified: trunk/dports/python/py25-logilab-constraint/Portfile
===================================================================
--- trunk/dports/python/py25-logilab-constraint/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py25-logilab-constraint/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -33,5 +33,5 @@
money.py money2.py queens.py queens2.py queens3.py rooks.py sudoku.py \
${destroot}${prefix}/share/doc/${name}/examples
- file delete ${destroot}/${prefix}/lib/python2.5/site-packages/logilab/__init__.py
+ file delete ${destroot}${prefix}/lib/python2.5/site-packages/logilab/__init__.py
}
Modified: trunk/dports/python/py25-pastescript/Portfile
===================================================================
--- trunk/dports/python/py25-pastescript/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py25-pastescript/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -29,5 +29,5 @@
}
# Dependencies are the packaging system's job, for crying out loud.
# Cheetah doesn't use setuptools.
- reinplace s|^Cheetah.*||g $destroot/$prefix/lib/python2.5/site-packages/PasteScript-${version}-py2.5.egg-info/requires.txt
+ reinplace s|^Cheetah.*||g $destroot$prefix/lib/python2.5/site-packages/PasteScript-${version}-py2.5.egg-info/requires.txt
}
Modified: trunk/dports/python/py25-pylons/Portfile
===================================================================
--- trunk/dports/python/py25-pylons/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py25-pylons/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -47,7 +47,7 @@
delete ${destroot}${prefix}/lib/python2.5/site-packages/tests
# Dependencies are the packaging system's job, for crying out loud.
# Cheetah doesn't use setuptools.
- reinplace s|^Cheetah.*||g $destroot/$prefix/lib/python2.5/site-packages/Pylons-${version}-py2.5.egg-info/requires.txt
+ reinplace s|^Cheetah.*||g $destroot$prefix/lib/python2.5/site-packages/Pylons-${version}-py2.5.egg-info/requires.txt
# Neither does FormEncode
- reinplace s|^FormEncode.*||g $destroot/$prefix/lib/python2.5/site-packages/Pylons-${version}-py2.5.egg-info/requires.txt
+ reinplace s|^FormEncode.*||g $destroot$prefix/lib/python2.5/site-packages/Pylons-${version}-py2.5.egg-info/requires.txt
}
Modified: trunk/dports/python/py25-twisted/Portfile
===================================================================
--- trunk/dports/python/py25-twisted/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py25-twisted/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -27,7 +27,7 @@
depends_lib-append port:py25-zopeinterface
post-destroot {
- foreach f [glob -directory ${destroot}/${prefix}/bin *] {
+ foreach f [glob -directory ${destroot}${prefix}/bin *] {
move $f ${destroot}${prefix}/bin/[file tail $f]2.5
}
Modified: trunk/dports/python/py26-elementtree/Portfile
===================================================================
--- trunk/dports/python/py26-elementtree/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py26-elementtree/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -28,7 +28,7 @@
post-destroot {
xinstall -m 644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
eval file copy [glob ${worksrcpath}/docs/*] \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
xinstall -m 755 -d ${destroot}${prefix}/share/examples/${name}
eval xinstall -m 644 [glob ${worksrcpath}/samples/*] \
${destroot}${prefix}/share/examples/${name}
Modified: trunk/dports/python/py26-gnuplot/Portfile
===================================================================
--- trunk/dports/python/py26-gnuplot/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/python/py26-gnuplot/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -29,8 +29,8 @@
xinstall -m 644 -W ${worksrcpath} \
ANNOUNCE.txt CREDITS.txt FAQ.txt Gnuplot.html \
LICENSE.txt NEWS.txt README.txt TODO.txt \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
file copy ${worksrcpath}/doc \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/science/geoexpress-sdk/Portfile
===================================================================
--- trunk/dports/science/geoexpress-sdk/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/science/geoexpress-sdk/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -35,7 +35,7 @@
build {}
destroot {
- file copy ${worksrcpath} ${destroot}/${prefix}/share/Geo_DSDK
- system "ln -s ${prefix}/share/Geo_DSDK/bin/mrsiddecode ${destroot}/${prefix}/bin"
- system "ln -s ${prefix}/share/Geo_DSDK/bin/mrsidinfo ${destroot}/${prefix}/bin"
+ file copy ${worksrcpath} ${destroot}${prefix}/share/Geo_DSDK
+ system "ln -s ${prefix}/share/Geo_DSDK/bin/mrsiddecode ${destroot}${prefix}/bin"
+ system "ln -s ${prefix}/share/Geo_DSDK/bin/mrsidinfo ${destroot}${prefix}/bin"
}
Modified: trunk/dports/science/geos2/Portfile
===================================================================
--- trunk/dports/science/geos2/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/science/geos2/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -39,11 +39,11 @@
post-destroot {
# Compatibility links
- system "cd ${destroot}/${prefix}/lib && ln -s geos2/libgeos.dylib libgeos2.dylib"
- system "cd ${destroot}/${prefix}/lib && ln -s geos2/libgeos_c.dylib libgeos2_c.dylib"
+ system "cd ${destroot}${prefix}/lib && ln -s geos2/libgeos.dylib libgeos2.dylib"
+ system "cd ${destroot}${prefix}/lib && ln -s geos2/libgeos_c.dylib libgeos2_c.dylib"
- system "cd ${destroot}/${prefix}/include && ln -s geos2/geos.h geos2.h"
- system "cd ${destroot}/${prefix}/include && ln -s geos2/geos_c.h geos2_c.h"
+ system "cd ${destroot}${prefix}/include && ln -s geos2/geos.h geos2.h"
+ system "cd ${destroot}${prefix}/include && ln -s geos2/geos_c.h geos2_c.h"
}
livecheck.type none
Modified: trunk/dports/science/gromacs-double/Portfile
===================================================================
--- trunk/dports/science/gromacs-double/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/science/gromacs-double/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -78,7 +78,7 @@
post-destroot {
# All the required files are provided by the single-precision 'gromacs' port. Delete everything that's not required.
- system "find \"${destroot}/${prefix}\" -depth 1 -not -name lib -print0 | xargs -0 rm -rf"
- system "find \"${destroot}/${prefix}\" -type f -not -iname '*_d' -a -not -name '*_d.*' -print0 | xargs -0 rm -rf"
- system "mv \"${destroot}/${prefix}/lib/gromacs-double\" \"${destroot}/${prefix}/lib/gromacs\""
+ system "find \"${destroot}${prefix}\" -depth 1 -not -name lib -print0 | xargs -0 rm -rf"
+ system "find \"${destroot}${prefix}\" -type f -not -iname '*_d' -a -not -name '*_d.*' -print0 | xargs -0 rm -rf"
+ system "mv \"${destroot}${prefix}/lib/gromacs-double\" \"${destroot}${prefix}/lib/gromacs\""
}
Modified: trunk/dports/security/cracklib-words/Portfile
===================================================================
--- trunk/dports/security/cracklib-words/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/security/cracklib-words/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -38,7 +38,7 @@
destroot {
xinstall -d ${destroot}${prefix}/share/cracklib
- xinstall -m 644 ${worksrcpath}/${name} ${destroot}/${prefix}/share/cracklib
+ xinstall -m 644 ${worksrcpath}/${name} ${destroot}${prefix}/share/cracklib
}
livecheck.distname ${name}
Modified: trunk/dports/security/metasploit2/Portfile
===================================================================
--- trunk/dports/security/metasploit2/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/security/metasploit2/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -40,16 +40,16 @@
}
destroot {
set metasploitTargetDir "libexec/metasploit2"
- xinstall -d -m 755 ${destroot}/${prefix}/${metasploitTargetDir}
+ xinstall -d -m 755 ${destroot}${prefix}/${metasploitTargetDir}
foreach file [glob -directory ${workpath}/${worksrcdir} *] {
- file copy ${file} ${destroot}/${prefix}/${metasploitTargetDir}
+ file copy ${file} ${destroot}${prefix}/${metasploitTargetDir}
}
- foreach file [glob -directory ${destroot}/${prefix}/${metasploitTargetDir} msf*] {
+ foreach file [glob -directory ${destroot}${prefix}/${metasploitTargetDir} msf*] {
set useFile [file tail ${file}]
## 'file link' doesn't play nice, it doesn't (seem) to want to do relative paths...
## file link -symbolic ${useFile} ../${metasploitTargetDir}/${useFile}
## so use 'system "ln -s ..."' instead.
- system "cd ${destroot}/${prefix}/sbin && /bin/ln -s ../${metasploitTargetDir}/${useFile} ${useFile}"
+ system "cd ${destroot}${prefix}/sbin && /bin/ln -s ../${metasploitTargetDir}/${useFile} ${useFile}"
}
}
Modified: trunk/dports/security/metasploit3/Portfile
===================================================================
--- trunk/dports/security/metasploit3/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/security/metasploit3/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -54,16 +54,16 @@
}
destroot {
set metasploitTargetDir "libexec/metasploit3"
- xinstall -d -m 755 ${destroot}/${prefix}/${metasploitTargetDir}
+ xinstall -d -m 755 ${destroot}${prefix}/${metasploitTargetDir}
foreach file [glob -directory ${workpath}/${worksrcdir} *] {
- file copy ${file} ${destroot}/${prefix}/${metasploitTargetDir}
+ file copy ${file} ${destroot}${prefix}/${metasploitTargetDir}
}
- foreach file [glob -directory ${destroot}/${prefix}/${metasploitTargetDir} msf*] {
+ foreach file [glob -directory ${destroot}${prefix}/${metasploitTargetDir} msf*] {
set useFile [file tail ${file}]
## 'file link' doesn't play nice, it doesn't (seem) to want to do relative paths...
## file link -symbolic ${useFile} ../${metasploitTargetDir}/${useFile}
## so use 'system "ln -s ..."' instead.
- system "cd ${destroot}/${prefix}/sbin && /bin/ln -s ../${metasploitTargetDir}/${useFile} ${useFile}"
+ system "cd ${destroot}${prefix}/sbin && /bin/ln -s ../${metasploitTargetDir}/${useFile} ${useFile}"
}
}
Modified: trunk/dports/security/rsyncrypto/Portfile
===================================================================
--- trunk/dports/security/rsyncrypto/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/security/rsyncrypto/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -31,5 +31,5 @@
configure.cppflags-append -D__unix__
-destroot.destdir prefix=${destroot}/${prefix} \
+destroot.destdir prefix=${destroot}${prefix} \
mandir=${destroot}${prefix}/share/man
Modified: trunk/dports/sysutils/apt/Portfile
===================================================================
--- trunk/dports/sysutils/apt/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/sysutils/apt/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -48,8 +48,8 @@
destroot.keepdirs ${varapt} \
${varapt}/cache/archives/partial \
${varapt}/state/lists/partial \
- ${destroot}/${prefix}/etc/apt \
- ${destroot}/${prefix}/etc/apt/apt.conf.d
+ ${destroot}${prefix}/etc/apt \
+ ${destroot}${prefix}/etc/apt/apt.conf.d
### Operating System Variants ###
platform darwin {
@@ -200,10 +200,10 @@
${mandest}/man5/
# Install configuration files
- set confdest ${destroot}/${prefix}/etc/apt/apt.conf.d
+ set confdest ${destroot}${prefix}/etc/apt/apt.conf.d
file mkdir ${confdest}
- xinstall -m 644 ${filespath}/sources.list ${destroot}/${prefix}/etc/apt/sources.list
- xinstall -m 644 ${worksrcpath}/build/docs/examples/apt.conf ${destroot}/${prefix}/etc/apt/apt.conf
+ xinstall -m 644 ${filespath}/sources.list ${destroot}${prefix}/etc/apt/sources.list
+ xinstall -m 644 ${worksrcpath}/build/docs/examples/apt.conf ${destroot}${prefix}/etc/apt/apt.conf
# Create var directoriesa
file mkdir ${destroot}${prefix}/var/db/apt/cache/archives/partial
Modified: trunk/dports/sysutils/sysvbanner/Portfile
===================================================================
--- trunk/dports/sysutils/sysvbanner/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/sysutils/sysvbanner/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -30,7 +30,7 @@
build.target banner
destroot {
- xinstall -W ${worksrcpath} -m 755 banner ${destroot}/${prefix}/bin/${name}
+ xinstall -W ${worksrcpath} -m 755 banner ${destroot}${prefix}/bin/${name}
xinstall -W ${worksrcpath} -m 644 banner.1 \
- ${destroot}/${prefix}/share/man/man1/${name}.1
+ ${destroot}${prefix}/share/man/man1/${name}.1
}
Modified: trunk/dports/tex/BibTool/Portfile
===================================================================
--- trunk/dports/tex/BibTool/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/tex/BibTool/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -23,6 +23,6 @@
checksums md5 20ebb18ea55e5f64b67f5b8edaa0d6fa
-destroot.destdir BINDIR=${destroot}/${prefix}/bin LIBDIR=${destroot}/${prefix}/lib/${name}
+destroot.destdir BINDIR=${destroot}${prefix}/bin LIBDIR=${destroot}${prefix}/lib/${name}
depends_lib bin:tex:texlive
Modified: trunk/dports/tex/gtamacfonts/Portfile
===================================================================
--- trunk/dports/tex/gtamacfonts/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/tex/gtamacfonts/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -65,8 +65,8 @@
}
destroot {
- file mkdir ${destroot}/${prefix}/share/texmf-dist
- system "mv ${workpath}/{doc,fonts,tex} ${destroot}/${prefix}/share/texmf-dist"
+ file mkdir ${destroot}${prefix}/share/texmf-dist
+ system "mv ${workpath}/{doc,fonts,tex} ${destroot}${prefix}/share/texmf-dist"
}
post-activate {
Modified: trunk/dports/tex/texlive-basic/Portfile
===================================================================
--- trunk/dports/tex/texlive-basic/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/tex/texlive-basic/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -97,7 +97,7 @@
texmf/tex/generic/config/language.def
post-destroot {
- delete ${destroot}/${prefix}/bin/mf
+ delete ${destroot}${prefix}/bin/mf
}
pre-activate {
Modified: trunk/dports/textproc/chmdump/Portfile
===================================================================
--- trunk/dports/textproc/chmdump/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/textproc/chmdump/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -29,5 +29,5 @@
}
destroot {
- xinstall -m 555 ${worksrcpath}/${name} ${destroot}/${prefix}/bin
+ xinstall -m 555 ${worksrcpath}/${name} ${destroot}${prefix}/bin
}
Modified: trunk/dports/textproc/docbook-dsssl/Portfile
===================================================================
--- trunk/dports/textproc/docbook-dsssl/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/textproc/docbook-dsssl/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -18,23 +18,23 @@
destroot {
# Docs
- xinstall -m 755 -d ${destroot}/${prefix}/${instdir} \
- ${destroot}/${prefix}/share/doc/${name} \
- ${destroot}/${prefix}/share/${name}
+ xinstall -m 755 -d ${destroot}${prefix}/${instdir} \
+ ${destroot}${prefix}/share/doc/${name} \
+ ${destroot}${prefix}/share/${name}
# bin
xinstall -m 644 -W ${worksrcpath} bin/collateindex.pl \
- ${destroot}/${prefix}/bin
+ ${destroot}${prefix}/bin
# man
xinstall -m 644 -W ${worksrcpath} bin/collateindex.pl.1 \
- ${destroot}/${prefix}/share/man/man1
+ ${destroot}${prefix}/share/man/man1
# everything else
xinstall -m 644 -W ${worksrcpath} BUGS ChangeLog README \
RELEASE-NOTES.html RELEASE-NOTES.xml RELEASE-NOTES.txt VERSION WhatsNew \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
foreach dirname $dirs_to_install {
- file copy ${worksrcpath}/${dirname} ${destroot}/${prefix}/${instdir}
+ file copy ${worksrcpath}/${dirname} ${destroot}${prefix}/${instdir}
}
}
Modified: trunk/dports/textproc/hunspell-dict-de_DE/Portfile
===================================================================
--- trunk/dports/textproc/hunspell-dict-de_DE/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/textproc/hunspell-dict-de_DE/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -23,7 +23,7 @@
use_zip yes
-set installdir "$destroot/$prefix/share/hunspell/"
+set installdir "$destroot$prefix/share/hunspell/"
set worksrcdir "."
use_configure no
Modified: trunk/dports/textproc/lookup/Portfile
===================================================================
--- trunk/dports/textproc/lookup/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/textproc/lookup/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -43,10 +43,10 @@
#test.target check
post-destroot {
- xinstall -d -m 755 ${destroot}/${prefix}/share/doc/${name}
+ xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
set docs {AUTHORS COPYING ChangeLog NEWS README README.org VERSION}
foreach f ${docs} {
- xinstall -m 644 ${worksrcpath}/${f} ${destroot}/${prefix}/share/doc/${name}
+ xinstall -m 644 ${worksrcpath}/${f} ${destroot}${prefix}/share/doc/${name}
}
delete ${destroot}${dir_info}/dir
@@ -95,7 +95,7 @@
system "cd ${worksrcpath}/texi && ptex lookup.texi && texindex lookup.?? && ptex lookup.texi && dvipdfmx lookup.dvi"
}
post-destroot {
- xinstall -m 644 ${worksrcpath}/texi/lookup.pdf ${destroot}/${prefix}/share/doc/${name}
+ xinstall -m 644 ${worksrcpath}/texi/lookup.pdf ${destroot}${prefix}/share/doc/${name}
}
}
Modified: trunk/dports/textproc/naturaldocs/Portfile
===================================================================
--- trunk/dports/textproc/naturaldocs/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/textproc/naturaldocs/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -39,6 +39,6 @@
build {}
destroot {
- file copy ${worksrcpath} ${destroot}/${prefix}/lib/
- ln -sf ${prefix}/lib/NaturalDocs-${version}/NaturalDocs ${destroot}/${prefix}/bin/
+ file copy ${worksrcpath} ${destroot}${prefix}/lib/
+ ln -sf ${prefix}/lib/NaturalDocs-${version}/NaturalDocs ${destroot}${prefix}/bin/
}
Modified: trunk/dports/textproc/pdftohtml/Portfile
===================================================================
--- trunk/dports/textproc/pdftohtml/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/textproc/pdftohtml/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -23,7 +23,7 @@
build.args
destroot {
- xinstall -m 755 ${worksrcpath}/src/${name} ${destroot}/${prefix}/bin/
+ xinstall -m 755 ${worksrcpath}/src/${name} ${destroot}${prefix}/bin/
}
livecheck.version 0.40
Modified: trunk/dports/textproc/remind/Portfile
===================================================================
--- trunk/dports/textproc/remind/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/textproc/remind/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -27,6 +27,6 @@
destroot.destdir prefix=${destroot}${prefix}
post-destroot {
- xinstall -m 755 -d ${destroot}/${prefix}/share/${name}/
- file copy ${worksrcpath}/examples ${destroot}/${prefix}/share/${name}/
+ xinstall -m 755 -d ${destroot}${prefix}/share/${name}/
+ file copy ${worksrcpath}/examples ${destroot}${prefix}/share/${name}/
}
Modified: trunk/dports/www/drupal5/Portfile
===================================================================
--- trunk/dports/www/drupal5/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/www/drupal5/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -73,7 +73,7 @@
use_configure no
build {}
-set docroot ${destroot}/${prefix}/www/data
+set docroot ${destroot}${prefix}/www/data
destroot {
xinstall -d -m 0755 ${docroot}/drupal5
Modified: trunk/dports/www/drupal6/Portfile
===================================================================
--- trunk/dports/www/drupal6/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/www/drupal6/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -73,7 +73,7 @@
use_configure no
build {}
-set docroot ${destroot}/${prefix}/www/data
+set docroot ${destroot}${prefix}/www/data
destroot {
xinstall -d -m 0755 ${docroot}/drupal6
Modified: trunk/dports/x11/kochi-substitute/Portfile
===================================================================
--- trunk/dports/x11/kochi-substitute/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/x11/kochi-substitute/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -22,13 +22,13 @@
destroot {
set fontsdir ${destroot}${prefix}/share/fonts/${name}
- xinstall -m 755 -d ${fontsdir} ${destroot}/${prefix}/share/doc/
+ xinstall -m 755 -d ${fontsdir} ${destroot}${prefix}/share/doc/
xinstall -m 644 ${worksrcpath}/kochi-mincho-subst.ttf ${fontsdir}
xinstall -m 644 ${worksrcpath}/kochi-gothic-subst.ttf ${fontsdir}
#mkfontscale && mkfontdir
system "mkfontscale ${fontsdir} && mkfontdir ${fontsdir}"
#docs
- file copy ${worksrcpath}/docs ${destroot}/${prefix}/share/doc/${name}
+ file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} COPYING README.ja Changelog \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/x11/mikachanfont/Portfile
===================================================================
--- trunk/dports/x11/mikachanfont/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/x11/mikachanfont/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -26,12 +26,12 @@
use_configure no
build {}
destroot {
- set fontsdir ${destroot}/${prefix}/share/fonts/${name}
- xinstall -d -m 755 ${fontsdir} ${destroot}/${prefix}/share/doc/${name}
+ set fontsdir ${destroot}${prefix}/share/fonts/${name}
+ xinstall -d -m 755 ${fontsdir} ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 ${worksrcpath}/fonts/mikachan.ttf ${fontsdir}
#mkfontscale && mkfontdir
system "mkfontscale ${fontsdir} && mkfontdir ${fontsdir}"
#docs
xinstall -m 644 -W ${worksrcpath} COPYRIGHT ChangeLog README.ja \
- COPYRIGHT.ja README ${destroot}/${prefix}/share/doc/${name}
+ COPYRIGHT.ja README ${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/x11/sazanami-font/Portfile
===================================================================
--- trunk/dports/x11/sazanami-font/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/x11/sazanami-font/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -21,13 +21,13 @@
build {}
destroot {
set fontsdir ${destroot}${prefix}/share/fonts/sazanami
- xinstall -d -m 755 ${destroot}/${prefix}/share/doc/ ${fontsdir}
+ xinstall -d -m 755 ${destroot}${prefix}/share/doc/ ${fontsdir}
xinstall -m 644 ${worksrcpath}/sazanami-mincho.ttf ${fontsdir}
xinstall -m 644 ${worksrcpath}/sazanami-gothic.ttf ${fontsdir}
#mkfontscale && mkfontdir
system "mkfontscale ${fontsdir} && mkfontdir ${fontsdir}"
#docs
- file copy ${worksrcpath}/doc ${destroot}/${prefix}/share/doc/${name}
+ file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 ${worksrcpath}/README \
- ${destroot}/${prefix}/share/doc/${name}
+ ${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/x11/xping/Portfile
===================================================================
--- trunk/dports/x11/xping/Portfile 2010-09-15 20:12:20 UTC (rev 71532)
+++ trunk/dports/x11/xping/Portfile 2010-09-15 20:26:12 UTC (rev 71533)
@@ -21,4 +21,4 @@
build { system "cd ${worksrcpath} && cc ${distfiles} -Wall -I${prefix}/include -L${prefix}/lib -lX11 -o xping" }
-destroot { system "install -m 755 ${worksrcpath}/xping ${destroot}/${prefix}/bin/" }
+destroot { system "install -m 755 ${worksrcpath}/xping ${destroot}${prefix}/bin/" }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100915/5bf877c0/attachment-0001.html>
More information about the macports-changes
mailing list