Skip to content

Commit

Permalink
Use filespath
Browse files Browse the repository at this point in the history
rather than constructing it manually.
  • Loading branch information
ryandesign authored and pmetzger committed May 17, 2018
1 parent 520abea commit c946275
Show file tree
Hide file tree
Showing 33 changed files with 46 additions and 46 deletions.
4 changes: 2 additions & 2 deletions databases/MyODBC/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ post-destroot {
}

# install example odbc.ini
xinstall -m 0644 ${portpath}/${filesdir}/odbc.ini \
xinstall -m 0644 ${filespath}/odbc.ini \
${destroot}${prefix}/share/${name}/odbc.ini.dist
reinplace "s|/usr/local|${prefix}|g" \
${destroot}${prefix}/share/${name}/odbc.ini.dist

# install MyODBC templates
foreach template [glob ${portpath}/${filesdir}/*.template] {
foreach template [glob ${filespath}/*.template] {
xinstall -m 0644 $template ${destroot}${prefix}/share/unixODBC
}
reinplace "s|__PREFIX__|${prefix}|g" \
Expand Down
2 changes: 1 addition & 1 deletion databases/unixODBC/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ post-destroot {
# TEMPLATES
xinstall -d -m 0755 ${destroot}${prefix}/share/${name}

foreach template [glob ${portpath}/${filesdir}/*.template] {
foreach template [glob ${filespath}/*.template] {
xinstall -m 0644 $template ${destroot}${prefix}/share/${name}
}

Expand Down
4 changes: 2 additions & 2 deletions devel/mulle-xcode-settings/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ if {[vercmp $xcodeversion 4.2] < 0} {
cmake.out_of_source yes

pre-configure {
copy ${portpath}/${filesdir}/CMakeLists.txt ${worksrcpath}
copy ${portpath}/${filesdir}/CMakeSourcesAndHeaders.txt ${worksrcpath}
copy ${filespath}/CMakeLists.txt ${worksrcpath}
copy ${filespath}/CMakeSourcesAndHeaders.txt ${worksrcpath}
}

configure.cflags-append -DCURRENT_PROJECT_VERSION=\\"${version}\\"
Expand Down
4 changes: 2 additions & 2 deletions devel/mulle-xcode-to-cmake/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ if {[vercmp $xcodeversion 4.2] < 0} {
cmake.out_of_source yes

pre-configure {
copy ${portpath}/${filesdir}/CMakeLists.txt ${worksrcpath}
copy ${portpath}/${filesdir}/CMakeSourcesAndHeaders.txt ${worksrcpath}
copy ${filespath}/CMakeLists.txt ${worksrcpath}
copy ${filespath}/CMakeSourcesAndHeaders.txt ${worksrcpath}
}

configure.cflags-append -DCURRENT_PROJECT_VERSION=${version}
Expand Down
2 changes: 1 addition & 1 deletion devel/subversion-python27bindings/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ post-destroot {
set PYTHON_PATH ${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7

xinstall -m 755 -d ${destroot}${PYTHON_PATH}/site-packages
xinstall -m 755 ${portpath}/${filesdir}/svn-python.pth \
xinstall -m 755 ${filespath}/svn-python.pth \
${destroot}${PYTHON_PATH}/site-packages
reinplace "s|@PREFIX@|${prefix}|g" \
${destroot}${PYTHON_PATH}/site-packages/svn-python.pth
Expand Down
4 changes: 2 additions & 2 deletions games/boswars/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ post-extract {
}

pre-patch {
xinstall ${portpath}/${filesdir}/build_options.py ${worksrcpath}
xinstall ${filespath}/build_options.py ${worksrcpath}
}

patchfiles patch-SConstruct.diff \
Expand All @@ -89,7 +89,7 @@ destroot {
# boswars files.
move ${worksrcpath}/build/boswars-release ${destroot}${prefix}/bin/boswars-bin
# Copy the helper script to ${prefix}/bin.
xinstall ${portpath}/${filesdir}/boswars ${destroot}${prefix}/bin
xinstall ${filespath}/boswars ${destroot}${prefix}/bin
# Set the correct path to the boswars files in the boswars helper script.
reinplace "s|__BOSWARS__|${share}|g" ${destroot}${prefix}/bin/boswars

Expand Down
4 changes: 2 additions & 2 deletions games/rrgbis/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ build.target default
destroot {
# Install the helper script which automatically sets the correct
# LD_LIBRARY_PATH variable and set the right ${prefix} path.
xinstall ${portpath}/${filesdir}/rrgbis ${destroot}${prefix}/bin
xinstall ${filespath}/rrgbis ${destroot}${prefix}/bin
reinplace "s|__PREFIX__|${prefix}|g" ${destroot}${prefix}/bin/rrgbis

# Install the helper setup script which creates ~/.rrgbis and the
# settings.dat file in it.
xinstall ${portpath}/${filesdir}/rrgbis-setup ${destroot}${prefix}/bin
xinstall ${filespath}/rrgbis-setup ${destroot}${prefix}/bin
reinplace "s|__PREFIX__|${prefix}|g" ${destroot}${prefix}/bin/rrgbis-setup

# Install the real binary and rename it to rrgbis-bin.
Expand Down
2 changes: 1 addition & 1 deletion lang/g95/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ pre-configure {
system "cd ${workpath}/gcc-${version_gcc}/${name}/gcc; \
ar d libbackend.a options.o; \
cd ${workpath}/gcc-${version_gcc}/gcc/; \
patch -p0 < ${portpath}/files/patch-gcc.c.diff"
patch -p0 < ${filespath}/patch-gcc.c.diff"
}
}

Expand Down
4 changes: 2 additions & 2 deletions mail/postgrey/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ destroot {
${worksrcpath}/Changes \
${worksrcpath}/COPYING \
${destroot}${prefix}/share/doc/postgrey
xinstall -m 644 -c ${portpath}/files/postgrey.conf \
xinstall -m 644 -c ${filespath}/postgrey.conf \
${destroot}${prefix}/etc/postgrey/postgrey.conf.sample
xinstall -m 755 -c ${portpath}/files/postgrey.sh \
xinstall -m 755 -c ${filespath}/postgrey.sh \
${destroot}${prefix}/share/postgrey
reinplace "s|__PREFIX|${prefix}|g" \
${destroot}${prefix}/share/postgrey/postgrey.sh
Expand Down
4 changes: 2 additions & 2 deletions mail/qpopper/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ destroot.destdir prefix=${destroot}${prefix} \

pre-destroot {
xinstall -d ${destroot}${prefix}/etc/xinetd.d
xinstall -o ${install.user} -m 755 -c ${portpath}/files/qpopper-dist \
xinstall -o ${install.user} -m 755 -c ${filespath}/qpopper-dist \
${destroot}${prefix}/etc/xinetd.d/
reinplace "s|@@PREFIX@@|${prefix}|g" \
${destroot}${prefix}/etc/xinetd.d/qpopper-dist
Expand All @@ -72,7 +72,7 @@ platform darwin {

pre-destroot {
xinstall -d ${destroot}${prefix}/Library/LaunchDaemons/
xinstall -o ${install.user} -m 755 -c ${portpath}/files/org.macports.mail.qpopper.plist-dist \
xinstall -o ${install.user} -m 755 -c ${filespath}/org.macports.mail.qpopper.plist-dist \
${destroot}${prefix}/Library/LaunchDaemons/
reinplace "s|@@PREFIX@@|${prefix}|g" \
${destroot}${prefix}/Library/LaunchDaemons/org.macports.mail.qpopper.plist-dist
Expand Down
2 changes: 1 addition & 1 deletion net/munin/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ post-destroot {
file rename ${destroot}${prefix}/etc/munin/munin.conf ${destroot}${prefix}/etc/munin/munin.conf.sample
# Create and symlink launchd item for munin-cron
xinstall -d ${destroot}${prefix}/etc/LaunchDaemons/org.macports.munin-cron
file copy ${portpath}/files/org.macports.munin-cron.plist.in \
file copy ${filespath}/org.macports.munin-cron.plist.in \
${destroot}${prefix}/etc/LaunchDaemons/org.macports.munin-cron/org.macports.munin-cron.plist
reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/etc/LaunchDaemons/org.macports.munin-cron/org.macports.munin-cron.plist

Expand Down
2 changes: 1 addition & 1 deletion net/rsync-lart/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ platform darwin 8 {
# Copy Apple's copyfile.h for use on Mac OS X 10.4 and higher.
# See APPLE_LICENSE.txt for license and copying information.
post-patch {
file copy ${portpath}/${filesdir}/copyfile.h ${worksrcpath}
file copy ${filespath}/copyfile.h ${worksrcpath}
}
configure.cppflags-append "-I${worksrcpath}"
}
Expand Down
6 changes: 3 additions & 3 deletions net/zabbix/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ if { [variant_isset agent_only] } {

# Copy a startup script for the agent
xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix
xinstall -m 755 ${portpath}/${filesdir}/zabbix_agentd.init \
xinstall -m 755 ${filespath}/zabbix_agentd.init \
${destroot}${prefix}/share/zabbix
reinplace "s|__PREFIX__|${prefix}|g" \
${destroot}${prefix}/share/zabbix/zabbix_agentd.init
Expand Down Expand Up @@ -150,13 +150,13 @@ if { [variant_isset agent_only] } {
${destroot}${prefix}/share/zabbix/frontends/

# Create a startup script for the server
xinstall -m 755 ${portpath}/${filesdir}/zabbix_server.init \
xinstall -m 755 ${filespath}/zabbix_server.init \
${destroot}${prefix}/share/zabbix
reinplace "s|__PREFIX__|${prefix}|g" \
${destroot}${prefix}/share/zabbix/zabbix_server.init

# Create a startup script for the agent
xinstall -m 755 ${portpath}/${filesdir}/zabbix_agentd.init \
xinstall -m 755 ${filespath}/zabbix_agentd.init \
${destroot}${prefix}/share/zabbix
reinplace "s|__PREFIX__|${prefix}|g" \
${destroot}${prefix}/share/zabbix/zabbix_agentd.init
Expand Down
4 changes: 2 additions & 2 deletions net/zabbix2/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ post-destroot {
# This script has a delay built into it (waiting for DB to start) so we
# don't use a simple startupitem.executable approach
if { ${MYSQL_MODE} == 1 } {
xinstall -m 755 ${portpath}/${filesdir}/zabbix_server.init.mysql \
xinstall -m 755 ${filespath}/zabbix_server.init.mysql \
${destroot}${prefix}/share/zabbix/zabbix_server.init
reinplace "s|__VER__|${ZDB}|g" \
${destroot}${prefix}/share/zabbix/zabbix_server.init
Expand All @@ -254,7 +254,7 @@ post-destroot {
${destroot}${prefix}/share/zabbix/zabbix_server.init
}
} else {
xinstall -m 755 ${portpath}/${filesdir}/zabbix_server.init \
xinstall -m 755 ${filespath}/zabbix_server.init \
${destroot}${prefix}/share/zabbix
}
reinplace "s|__PREFIX__|${prefix}|g" \
Expand Down
4 changes: 2 additions & 2 deletions python/py-backports/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ if {${name} ne ${subport}} {
extract.mkdir yes

post-extract {
file copy ${portpath}/${filesdir}/setup.py ${worksrcpath}
file copy ${filespath}/setup.py ${worksrcpath}
file mkdir ${worksrcpath}/backports
file copy ${portpath}/${filesdir}/__init__.py ${worksrcpath}/backports
file copy ${filespath}/__init__.py ${worksrcpath}/backports
}
}

Expand Down
2 changes: 1 addition & 1 deletion python/py-scikits-module/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if {${name} ne ${subport}} {
destroot {
set scikits_dir ${destroot}${python.pkgd}/scikits
file mkdir ${scikits_dir}
file copy ${portpath}/${filesdir}/__init__.py ${scikits_dir}
file copy ${filespath}/__init__.py ${scikits_dir}
}
}

Expand Down
2 changes: 1 addition & 1 deletion python/py-smb/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if {${name} ne ${subport}} {
extract.post_args "| tar -xf - --exclude 'CVS'"

patch {
file copy ${portpath}/files/setup.py ${worksrcpath}
file copy ${filespath}/setup.py ${worksrcpath}
reinplace "s|VERSION|${version}|g" ${worksrcpath}/setup.py
}

Expand Down
2 changes: 1 addition & 1 deletion python/py-spark/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ python.versions 27
if {${name} ne ${subport}} {
patch {
file delete ${worksrcpath}/generic.py
file copy ${portpath}/files/setup.py ${worksrcpath}
file copy ${filespath}/setup.py ${worksrcpath}
reinplace "s|PORTVERSION|${version}|g" ${worksrcpath}/setup.py
}

Expand Down
2 changes: 1 addition & 1 deletion ruby/rb-technorati-ruby/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ homepage http://www.pablotron.org/software/technorati-ruby/
# Fix a bug in the code.
# Cf ${homepage}
post-destroot {
system "cd ${workpath} && patch -p1 < ${portpath}/${filesdir}/patch-technorati.rb"
system "cd ${workpath} && patch -p1 < ${filespath}/patch-technorati.rb"
}

livecheck.type regex
Expand Down
2 changes: 1 addition & 1 deletion science/SDRplay/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ build {
# prepend license to header
global sdrplay_header
move ${sdrplay_dir}/${sdrplay_header} ${sdrplay_dir}/tmp.h
copy ${portpath}/${filesdir}/license.txt ${sdrplay_dir}/${sdrplay_header}
copy ${filespath}/license.txt ${sdrplay_dir}/${sdrplay_header}
system -W ${sdrplay_dir} "cat ${sdrplay_dir}/tmp.h >> ${sdrplay_dir}/${sdrplay_header}"

}
Expand Down
2 changes: 1 addition & 1 deletion science/weka/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ build.pre_args -Drelease='${version}'

post-extract {
system "cd ${worksrcpath} && jar xf ./weka-src.jar"
file copy ${portpath}/${filesdir}/weka_icon.icns ${worksrcpath}/src/main/java/weka/gui
file copy ${filespath}/weka_icon.icns ${worksrcpath}/src/main/java/weka/gui
}

pre-build {
Expand Down
2 changes: 1 addition & 1 deletion security/sancp/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ post-destroot {

# Install startup script
xinstall -m 755 -d ${destroot}${prefix}/share/sancp
xinstall -m 755 ${portpath}/${filesdir}/sancp.init ${destroot}${prefix}/share/sancp
xinstall -m 755 ${filespath}/sancp.init ${destroot}${prefix}/share/sancp
reinplace "s|__PREFIX__|${prefix}|g" \
${destroot}${prefix}/share/sancp/sancp.init
}
Expand Down
2 changes: 1 addition & 1 deletion sysutils/smart/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ depends_lib path:lib/python2.7/site-packages/rpm/__init__.py:rpm port:python27
patch {
foreach patch $patchfiles {
system "cd '${workpath}/${distname}' && \
sed -e 's#@@PREFIX@@#${prefix}#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
sed -e 's#@@PREFIX@@#${prefix}#g' '${filespath}/${patch}' | patch -p0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion sysutils/yum-createrepo/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ set python.bin ${prefix}/bin/python2.7
patch {
foreach patch $patchfiles {
system "cd '${workpath}/${distname}' && \
sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${python.bin}#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${python.bin}#g' '${filespath}/${patch}' | patch -p0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion sysutils/yum-utils/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ depends_lib port:python27 port:yum
patch {
foreach patch $patchfiles {
system "cd '${workpath}/${distname}' && \
sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${prefix}/bin/python2.7#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${prefix}/bin/python2.7#g' '${filespath}/${patch}' | patch -p0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion sysutils/yum/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ set python.bin ""
patch {
foreach patch $patchfiles {
system "cd '${workpath}/${distname}' && \
sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${python.bin}#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${python.bin}#g' '${filespath}/${patch}' | patch -p0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion textproc/iso8879/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ destroot.args prefix=${destroot}${prefix}

destroot {
xinstall -m 755 -d ${destroot}${install_dir}
xinstall -m 644 ${portpath}/${filesdir}/catalog ${destroot}${install_dir}
xinstall -m 644 ${filespath}/catalog ${destroot}${install_dir}
xinstall -m 644 {*}[glob ${workpath}/ISO*] ${destroot}${install_dir}
}
2 changes: 1 addition & 1 deletion textproc/relames/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ destroot {
set relames ${prefix}/share/java/relames

# install the relames script from files:
xinstall ${portpath}/${filesdir}/relames ${destroot}${prefix}/bin
xinstall ${filespath}/relames ${destroot}${prefix}/bin
# set the correct path to relames.jar in the relames script:
reinplace "s|@@RELAMES@@|${relames}/relames.jar|g" \
${destroot}${prefix}/bin/relames
Expand Down
4 changes: 2 additions & 2 deletions www/abyss/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ destroot {
xinstall -o root -m 0644 -p "${worksrcpath}/conf/mime.types" \
"${destroot}${prefix}/share/abyss/conf/"
xinstall -d -o root -m 0755 "${destroot}${prefix}/share/abyss/htdocs/"
xinstall -o root -m 0644 "${portpath}/files/index.html" \
xinstall -o root -m 0644 "${filespath}/index.html" \
"${destroot}${prefix}/share/abyss/htdocs/"
xinstall -o root -m 755 -d "${destroot}${prefix}/etc/rc.d"
xinstall -o root -m 755 -c \
"${portpath}/files/abyss.sh" "${destroot}${prefix}/etc/rc.d"
"${filespath}/abyss.sh" "${destroot}${prefix}/etc/rc.d"
reinplace "s|__PREFIX|${prefix}|g" \
"${destroot}${prefix}/etc/rc.d/abyss.sh"
}
Expand Down
2 changes: 1 addition & 1 deletion www/webkit2-gtk/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 13} {
# contents of snowmath.h should someday become part of gcc6 cmath
if { ${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.major} < 11 } {
configure.cxxflags-append -D_GLIBCXX_USE_C99_MATH_TR1=1
configure.cxxflags-append -include ${portpath}/${filesdir}/snowmath.h
configure.cxxflags-append -include ${filespath}/snowmath.h
}
}

Expand Down
4 changes: 2 additions & 2 deletions x11/qt3/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ patchfiles qt3-tiger.patch \

patch {
foreach p ${patchfiles} {
system "cd ${worksrcpath} && sed -e 's|@PREFIX@|${prefix}|g' < ${portpath}/${filesdir}/${p} | patch -p1"
system "cd ${worksrcpath} && sed -e 's|@PREFIX@|${prefix}|g' < ${filespath}/${p} | patch -p1"
}
#system "perl -pi -e 's|cp \-P|/bin/cp \-RL|' ${worksrcpath}/qmake/Makefile.unix"

Expand Down Expand Up @@ -108,7 +108,7 @@ patch {

post-patch {
foreach file {CompileScript.sh InstallScript.sh} {
copy ${portpath}/${filesdir}/${file} ${worksrcpath}
copy ${filespath}/${file} ${worksrcpath}
reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
reinplace "s|%n|${name}|g" ${worksrcpath}/${file}
Expand Down
2 changes: 1 addition & 1 deletion x11/xglobe/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ configure { reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Makefile
destroot.args DESTDIR=${destroot}
destroot.destdir prefix=${destroot}${prefix}
post-destroot { system "install -c \
${portpath}/files/xglobe-markers.opendarwin ${destroot}${prefix}/share/xglobe/" }
${filespath}/xglobe-markers.opendarwin ${destroot}${prefix}/share/xglobe/" }

notes "xglobe starts in the X11 root window, so enable the full screen menu\
in Apple's X11 preferences menu and then use Command-Shift-A to\
Expand Down
2 changes: 1 addition & 1 deletion xfce/xfce/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ supported_archs noarch
build { }
destroot {
xinstall -d ${destroot}${prefix}/share/xfce4
file copy ${portpath}/${filesdir}/STARTME ${destroot}${prefix}/share/xfce4/
file copy ${filespath}/STARTME ${destroot}${prefix}/share/xfce4/
}
post-destroot { ui_msg "To start xfce put \"exec startxfce4\" in your .xinitrc" }

0 comments on commit c946275

Please sign in to comment.