Commit ae4dc2ba authored by bapt's avatar bapt
Browse files

Readd PORTSDIR for now we will only start removing them after 2016Q1 is branched

This gives more time for tools to get updated, available in packages etc before
bothering users
parent 6b669508
......@@ -10,20 +10,6 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
20151014:
AUTHOR: bapt@FreeBSD.org
Adding ${PORTSDIR} in dependency lines is no longer necessary meaning
RUN_DEPENDS= foo:${PORTSDIR}/bar/foo
can now be written
RUN_DEPENDS= foo:bar/foo
if the path after ':' is not absolute the framework will automatically
prepend ${PORTSDIR}/
20150928:
AUTHOR: amdmi3@FreeBSD.org
......
......@@ -28,10 +28,10 @@ ADAXX= gcc5
. endif
. if ${ada_ARGS:Mrun}
RUN_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux
RUN_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux
. endif
BUILD_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux
BUILD_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux
MAKE_ENV+= PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \
ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat
CONFIGURE_ENV+= PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \
......
......@@ -54,14 +54,14 @@
_INCLUDE_USES_AUTORECONF_MK= yes
_USES_POST+= autoreconf
BUILD_DEPENDS+= autoconf-2.69:devel/autoconf \
autoheader-2.69:devel/autoconf \
autoreconf-2.69:devel/autoconf \
aclocal-1.15:devel/automake \
automake-1.15:devel/automake
BUILD_DEPENDS+= autoconf-2.69:${PORTSDIR}/devel/autoconf \
autoheader-2.69:${PORTSDIR}/devel/autoconf \
autoreconf-2.69:${PORTSDIR}/devel/autoconf \
aclocal-1.15:${PORTSDIR}/devel/automake \
automake-1.15:${PORTSDIR}/devel/automake
.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
BUILD_DEPENDS+= libtoolize:devel/libtool
BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool
.endif
.endif
......
......@@ -11,7 +11,7 @@
.if !defined(_INCLUDE_USES_BISON_MK)
_INCLUDE_USES_BISON_MK= yes
_BISON_DEPENDS= bison:devel/bison
_BISON_DEPENDS= bison:${PORTSDIR}/devel/bison
.if empty(bison_ARGS)
bison_ARGS= build
......
......@@ -24,23 +24,23 @@ blaslapack_ARGS= ${_DEFAULT_BLASLAPACK}
LDFLAGS+= -L${LOCALBASE}/lib
.if ${blaslapack_ARGS} == atlas
LIB_DEPENDS+= libatlas.so:math/atlas
LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas
_BLASLIB= ptf77blas
LAPACKLIB= -lalapack -lptcblas
_ATLASLIB= atlas
ATLASLIB= -l${_ATLASLIB}
.elif ${blaslapack_ARGS} == gotoblas
LIB_DEPENDS+= libgoto2.so:math/gotoblas
LIB_DEPENDS+= liblapack.so:math/lapack
LIB_DEPENDS+= libgoto2.so:${PORTSDIR}/math/gotoblas
LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack
_BLASLIB= goto2p
LAPACKLIB= -lgoto2p
.elif ${blaslapack_ARGS} == netlib
LIB_DEPENDS+= libblas.so:math/blas
LIB_DEPENDS+= liblapack.so:math/lapack
LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas
LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack
_BLASLIB= blas
LAPACKLIB= -llapack
.elif ${blaslapack_ARGS} == openblas
LIB_DEPENDS+= libopenblas.so:math/openblas
LIB_DEPENDS+= libopenblas.so:${PORTSDIR}/math/openblas
_BLASLIB= openblasp
LAPACKLIB= -lopenblasp
.else
......
......@@ -48,10 +48,10 @@ IGNORE= Incorrect 'USES+= cmake:${cmake_ARGS}' usage: argument [${arg}] is not r
.endfor
CMAKE_BIN= ${LOCALBASE}/bin/cmake
BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake
BUILD_DEPENDS+= ${CMAKE_BIN}:${PORTSDIR}/devel/cmake
.if ${cmake_ARGS:Mrun}
RUN_DEPENDS+= ${CMAKE_BIN}:devel/cmake
RUN_DEPENDS+= ${CMAKE_BIN}:${PORTSDIR}/devel/cmake
.endif
.if defined(WITH_DEBUG)
......
......@@ -153,7 +153,7 @@ CC= clang
CXX= clang++
CHOSEN_COMPILER_TYPE= clang
.else
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang36:lang/clang36
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang36:${PORTSDIR}/lang/clang36
CPP= ${LOCALBASE}/bin/clang-cpp36
CC= ${LOCALBASE}/bin/clang36
CXX= ${LOCALBASE}/bin/clang++36
......@@ -179,7 +179,7 @@ CC= clang
CXX= clang++
CHOSEN_COMPILER_TYPE= clang
.else
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:lang/clang34
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
CPP= ${LOCALBASE}/bin/clang-cpp34
CC= ${LOCALBASE}/bin/clang34
CXX= ${LOCALBASE}/bin/clang++34
......
......@@ -28,8 +28,8 @@ MASTER_SITE_CRAN_ARCHIVE+= ${MASTER_SITE_CRAN:S,$,Archive/${PORTNAME}/,}
MASTER_SITES?= ${MASTER_SITE_CRAN} ${MASTER_SITE_CRAN_ARCHIVE}
BUILD_DEPENDS+= ${LOCALBASE}/bin/R:math/R
RUN_DEPENDS+= ${LOCALBASE}/bin/R:math/R
BUILD_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R
RUN_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R
PKGNAMEPREFIX?= R-cran-
......
......@@ -15,8 +15,8 @@ _INCLUDE_USES_DESKTOP_FILE_UTILS_MK= yes
IGNORE= USES=desktop-file-utils does not require args
.endif
BUILD_DEPENDS+= update-desktop-database:devel/desktop-file-utils
RUN_DEPENDS+= update-desktop-database:devel/desktop-file-utils
BUILD_DEPENDS+= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
RUN_DEPENDS+= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
PLIST_FILES+= "@desktop-file-utils"
.endif
......@@ -16,11 +16,11 @@ display_ARGS= install
.endif
.if !defined(DISPLAY)
BUILD_DEPENDS+= Xvfb:x11-servers/xorg-vfbserver \
${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:x11-fonts/xorg-fonts-miscbitmaps \
${LOCALBASE}/share/fonts/misc/fonts.alias:x11-fonts/font-alias \
${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
xkbcomp:x11/xkbcomp
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
${LOCALBASE}/share/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \
${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
xkbcomp:${PORTSDIR}/x11/xkbcomp
XVFBPORT!= port=0; while test -S /tmp/.X11-unix/X$${port} ; do port=$$(( port + 1 )) ; done ; ${ECHO_CMD} $$port
XVFBPIDFILE= /tmp/.xvfb-${XVFBPORT}.pid
......
......@@ -81,7 +81,7 @@ DIST_SUBDIR= drupal
NO_BUILD?= yes
WRKSRC?= ${WRKDIR}/${PORTNAME}
RUN_DEPENDS+= ${LOCALBASE}/${DRUPAL_BASE}/index.php:${DRUPAL_BASE}
RUN_DEPENDS+= ${LOCALBASE}/${DRUPAL_BASE}/index.php:${PORTSDIR}/${DRUPAL_BASE}
PLIST_SUB+= DRUPAL_MODDIR=${DRUPAL_MODDIR}
PLIST_FILES+= "@owner www" \
......
......@@ -58,11 +58,11 @@ MIX_EXTRA_APPS?=
MIX_EXTRA_DIRS?=
MIX_EXTRA_FILES?=
BUILD_DEPENDS+= elixir:lang/elixir
RUN_DEPENDS+= elixir:lang/elixir
BUILD_DEPENDS+= elixir:${PORTSDIR}/lang/elixir
RUN_DEPENDS+= elixir:${PORTSDIR}/lang/elixir
.for depend in ${MIX_BUILD_DEPS}
BUILD_DEPENDS+= ${depend:T}>=0:${depend}
BUILD_DEPENDS+= ${depend:T}>=0:${PORTSDIR}/${depend}
.endfor
.for depend in ${MIX_RUN_DEPS}
......
......@@ -38,23 +38,23 @@ ERL_DOCS?= README*
# VERSION is used in every Erlang pkg-plist
PLIST_SUB+= VERSION="${PORTVERSION}"
BUILD_DEPENDS+= erl:lang/erlang
RUN_DEPENDS+= erl:lang/erlang
BUILD_DEPENDS+= erl:${PORTSDIR}/lang/erlang
RUN_DEPENDS+= erl:${PORTSDIR}/lang/erlang
.if ${erlang_ARGS:Mrebar}
BUILD_DEPENDS+= rebar>=0:devel/rebar
BUILD_DEPENDS+= rebar>=0:${PORTSDIR}/devel/rebar
.endif
.if ${erlang_ARGS:Mrebar3}
BUILD_DEPENDS+= rebar3>=0:devel/rebar3
BUILD_DEPENDS+= rebar3>=0:${PORTSDIR}/devel/rebar3
.endif
.for depend in ${ERL_BUILD_DEPS}
BUILD_DEPENDS+= ${depend:T}>=0:${depend}
BUILD_DEPENDS+= ${depend:T}>=0:${PORTSDIR}/${depend}
.endfor
.for depend in ${ERL_RUN_DEPS}
RUN_DEPENDS+= ${depend:T}>=0:${depend}
RUN_DEPENDS+= ${depend:T}>=0:${PORTSDIR}/${depend}
.endfor
.if ${erlang_ARGS:Mrebar}
......
......@@ -19,7 +19,7 @@
_INCLUDE_USES_EXECINFO_MK= yes
.if !exists(/usr/lib/libexecinfo.so)
LIB_DEPENDS+= libexecinfo.so:devel/libexecinfo
LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
EXECINFO_CPPFLAGS= -I${LOCALBASE}/include
EXECINFO_LDFLAGS= -L${LOCALBASE}/lib
.endif
......
......@@ -10,7 +10,7 @@
.if !defined(_INCLUDE_USES_FAKEROOT_MK)
_INCLUDE_USES_FAKEROOT_MK= yes
BUILD_DEPENDS+= fakeroot:security/fakeroot
BUILD_DEPENDS+= fakeroot:${PORTSDIR}/security/fakeroot
.if ${UID} != 0
FAKEROOT?= fakeroot
.endif
......
......@@ -15,8 +15,8 @@
.if !defined(_INCLUDE_USES_FAM_MK)
_INCLUDE_USES_FAM_MK= yes
_fam_DEPENDS= libfam.so.0:devel/fam
_gamin_DEPENDS= libfam.so.0:devel/gamin
_fam_DEPENDS= libfam.so.0:${PORTSDIR}/devel/fam
_gamin_DEPENDS= libfam.so.0:${PORTSDIR}/devel/gamin
_FAM_SYSTEMS= fam gamin
_DEFAULT_FAM= gamin
......
......@@ -16,7 +16,7 @@ IGNORE= Incorrect 'USES+= fmake:${fmake_ARGS}' fmake takes no arguments
.if defined(.PARSEDIR)
FMAKE= ${LOCALBASE}/bin/fmake
BUILD_DEPENDS+= ${FMAKE}:devel/fmake
BUILD_DEPENDS+= ${FMAKE}:${PORTSDIR}/devel/fmake
CONFIGURE_ENV+= MAKE=${FMAKE}
MAKE_CMD= ${FMAKE}
.endif
......
......@@ -51,11 +51,11 @@ IGNORE= USES=fonts - invalid ARGS (${fonts_ARGS})
.endif
.if !empty(fonts_ARGS:Mfc) || !empty(fonts_ARGS:Mfcfontsdir)
RUN_DEPENDS+= fc-cache:x11-fonts/fontconfig
RUN_DEPENDS+= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
.endif
.if !empty(fonts_ARGS:Mfontsdir) || !empty(fonts_ARGS:Mfcfontsdir)
RUN_DEPENDS+= mkfontdir:x11-fonts/mkfontdir \
mkfontscale:x11-fonts/mkfontscale
RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
.endif
FONTNAME?= ${PORTNAME}
......
......@@ -19,11 +19,11 @@ fortran_ARGS= gcc
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
_GCC_VER= ${GCC_DEFAULT:S/.//}
.if ${GCC_DEFAULT} == ${LANG_GCC_IS}
BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc
RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc
BUILD_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
.else
BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
BUILD_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER}
RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER}
.endif
USE_BINUTILS= yes
F77= gfortran${_GCC_VER}
......@@ -33,8 +33,8 @@ FCFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
-L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin
.elif ${fortran_ARGS} == ifort
BUILD_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc
RUN_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc
BUILD_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
RUN_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
F77= ${LOCALBASE}/intel_fc_80/bin/ifort
FC= ${LOCALBASE}/intel_fc_80/bin/ifort
.else
......
......@@ -15,9 +15,9 @@ _INCLUDE_USES_FUSE_MK= yes
IGNORE= USES=fuse does not require args
.endif
LIB_DEPENDS+= libfuse.so:sysutils/fusefs-libs
LIB_DEPENDS+= libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
.if !exists(/sbin/mount_fusefs)
RUN_DEPENDS+= mount_fusefs:sysutils/fusefs-kmod
RUN_DEPENDS+= mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
.endif
.endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment