From owner-svn-ports-head@freebsd.org Wed Oct 14 16:49:41 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49343A136D9; Wed, 14 Oct 2015 16:49:41 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E62241D02; Wed, 14 Oct 2015 16:49:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9EGndhJ022462; Wed, 14 Oct 2015 16:49:39 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9EGnZm9022415; Wed, 14 Oct 2015 16:49:35 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201510141649.t9EGnZm9022415@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 14 Oct 2015 16:49:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399278 - in head: . Mk Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2015 16:49:41 -0000 Author: bapt Date: Wed Oct 14 16:49:35 2015 New Revision: 399278 URL: https://svnweb.freebsd.org/changeset/ports/399278 Log: Drop the necessity to add ${PORTSDIR} to dependency line Modify make describe to automatically prepend ${PORTSDIR} if the path for the port is not absolute Checked with poudriere, portmaster, portupgrade PR: 203685 Exp-run by: antoine Differential Revision: https://reviews.freebsd.org/D3866 Modified: head/CHANGES head/Mk/Uses/ada.mk head/Mk/Uses/autoreconf.mk head/Mk/Uses/bison.mk head/Mk/Uses/blaslapack.mk head/Mk/Uses/cmake.mk head/Mk/Uses/compiler.mk head/Mk/Uses/cran.mk head/Mk/Uses/desktop-file-utils.mk head/Mk/Uses/display.mk head/Mk/Uses/drupal.mk head/Mk/Uses/elixir.mk head/Mk/Uses/erlang.mk head/Mk/Uses/execinfo.mk head/Mk/Uses/fakeroot.mk head/Mk/Uses/fam.mk head/Mk/Uses/fmake.mk head/Mk/Uses/fonts.mk head/Mk/Uses/fortran.mk head/Mk/Uses/fuse.mk head/Mk/Uses/gecko.mk head/Mk/Uses/gettext-runtime.mk head/Mk/Uses/gettext-tools.mk head/Mk/Uses/ghostscript.mk head/Mk/Uses/gmake.mk head/Mk/Uses/gnustep.mk head/Mk/Uses/gperf.mk head/Mk/Uses/gssapi.mk head/Mk/Uses/horde.mk head/Mk/Uses/iconv.mk head/Mk/Uses/imake.mk head/Mk/Uses/jpeg.mk head/Mk/Uses/lha.mk head/Mk/Uses/libarchive.mk head/Mk/Uses/libedit.mk head/Mk/Uses/libtool.mk head/Mk/Uses/lua.mk head/Mk/Uses/makeinfo.mk head/Mk/Uses/makeself.mk head/Mk/Uses/mono.mk head/Mk/Uses/motif.mk head/Mk/Uses/ncurses.mk head/Mk/Uses/ninja.mk head/Mk/Uses/objc.mk head/Mk/Uses/openal.mk head/Mk/Uses/pear.mk head/Mk/Uses/perl5.mk head/Mk/Uses/pgsql.mk head/Mk/Uses/pkgconfig.mk head/Mk/Uses/pure.mk head/Mk/Uses/python.mk head/Mk/Uses/qmail.mk head/Mk/Uses/readline.mk head/Mk/Uses/scons.mk head/Mk/Uses/shared-mime-info.mk head/Mk/Uses/tcl.mk head/Mk/Uses/twisted.mk head/Mk/Uses/xfce.mk head/Mk/Uses/zip.mk head/Mk/Uses/zope.mk head/Mk/bsd.port.mk head/Mk/bsd.qt.mk head/Mk/bsd.ruby.mk head/Mk/bsd.sdl.mk head/Mk/bsd.tex.mk head/Mk/bsd.wx.mk head/Mk/bsd.xorg.mk Modified: head/CHANGES ============================================================================== --- head/CHANGES Wed Oct 14 16:47:15 2015 (r399277) +++ head/CHANGES Wed Oct 14 16:49:35 2015 (r399278) @@ -10,6 +10,20 @@ in the release notes and/or placed into 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 Modified: head/Mk/Uses/ada.mk ============================================================================== --- head/Mk/Uses/ada.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/ada.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -28,10 +28,10 @@ ADAXX= gcc5 . endif . if ${ada_ARGS:Mrun} -RUN_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux +RUN_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux . endif -BUILD_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux +BUILD_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada: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} \ Modified: head/Mk/Uses/autoreconf.mk ============================================================================== --- head/Mk/Uses/autoreconf.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/autoreconf.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -54,14 +54,14 @@ _INCLUDE_USES_AUTORECONF_MK= yes _USES_POST+= autoreconf -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 +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 .if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild) -BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool +BUILD_DEPENDS+= libtoolize:devel/libtool .endif .endif Modified: head/Mk/Uses/bison.mk ============================================================================== --- head/Mk/Uses/bison.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/bison.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -11,7 +11,7 @@ .if !defined(_INCLUDE_USES_BISON_MK) _INCLUDE_USES_BISON_MK= yes -_BISON_DEPENDS= bison:${PORTSDIR}/devel/bison +_BISON_DEPENDS= bison:devel/bison .if empty(bison_ARGS) bison_ARGS= build Modified: head/Mk/Uses/blaslapack.mk ============================================================================== --- head/Mk/Uses/blaslapack.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/blaslapack.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -24,23 +24,23 @@ blaslapack_ARGS= ${_DEFAULT_BLASLAPACK} LDFLAGS+= -L${LOCALBASE}/lib .if ${blaslapack_ARGS} == atlas -LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas +LIB_DEPENDS+= libatlas.so:math/atlas _BLASLIB= ptf77blas LAPACKLIB= -lalapack -lptcblas _ATLASLIB= atlas ATLASLIB= -l${_ATLASLIB} .elif ${blaslapack_ARGS} == gotoblas -LIB_DEPENDS+= libgoto2.so:${PORTSDIR}/math/gotoblas -LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack +LIB_DEPENDS+= libgoto2.so:math/gotoblas +LIB_DEPENDS+= liblapack.so:math/lapack _BLASLIB= goto2p LAPACKLIB= -lgoto2p .elif ${blaslapack_ARGS} == netlib -LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas -LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack +LIB_DEPENDS+= libblas.so:math/blas +LIB_DEPENDS+= liblapack.so:math/lapack _BLASLIB= blas LAPACKLIB= -llapack .elif ${blaslapack_ARGS} == openblas -LIB_DEPENDS+= libopenblas.so:${PORTSDIR}/math/openblas +LIB_DEPENDS+= libopenblas.so:math/openblas _BLASLIB= openblasp LAPACKLIB= -lopenblasp .else Modified: head/Mk/Uses/cmake.mk ============================================================================== --- head/Mk/Uses/cmake.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/cmake.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -48,10 +48,10 @@ IGNORE= Incorrect 'USES+= cmake:${cmake_ .endfor CMAKE_BIN= ${LOCALBASE}/bin/cmake -BUILD_DEPENDS+= ${CMAKE_BIN}:${PORTSDIR}/devel/cmake +BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake .if ${cmake_ARGS:Mrun} -RUN_DEPENDS+= ${CMAKE_BIN}:${PORTSDIR}/devel/cmake +RUN_DEPENDS+= ${CMAKE_BIN}:devel/cmake .endif .if defined(WITH_DEBUG) Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/compiler.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -153,7 +153,7 @@ CC= clang CXX= clang++ CHOSEN_COMPILER_TYPE= clang .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang36:${PORTSDIR}/lang/clang36 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang36: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:${PORTSDIR}/lang/clang34 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:lang/clang34 CPP= ${LOCALBASE}/bin/clang-cpp34 CC= ${LOCALBASE}/bin/clang34 CXX= ${LOCALBASE}/bin/clang++34 Modified: head/Mk/Uses/cran.mk ============================================================================== --- head/Mk/Uses/cran.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/cran.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -28,8 +28,8 @@ MASTER_SITE_CRAN_ARCHIVE+= ${MASTER_SITE MASTER_SITES?= ${MASTER_SITE_CRAN} ${MASTER_SITE_CRAN_ARCHIVE} -BUILD_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R -RUN_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R +BUILD_DEPENDS+= ${LOCALBASE}/bin/R:math/R +RUN_DEPENDS+= ${LOCALBASE}/bin/R:math/R PKGNAMEPREFIX?= R-cran- Modified: head/Mk/Uses/desktop-file-utils.mk ============================================================================== --- head/Mk/Uses/desktop-file-utils.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/desktop-file-utils.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -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:${PORTSDIR}/devel/desktop-file-utils -RUN_DEPENDS+= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils +BUILD_DEPENDS+= update-desktop-database:devel/desktop-file-utils +RUN_DEPENDS+= update-desktop-database:devel/desktop-file-utils PLIST_FILES+= "@desktop-file-utils" .endif Modified: head/Mk/Uses/display.mk ============================================================================== --- head/Mk/Uses/display.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/display.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -16,11 +16,11 @@ display_ARGS= install .endif .if !defined(DISPLAY) -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 +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 XVFBPORT!= port=0; while test -S /tmp/.X11-unix/X$${port} ; do port=$$(( port + 1 )) ; done ; ${ECHO_CMD} $$port XVFBPIDFILE= /tmp/.xvfb-${XVFBPORT}.pid Modified: head/Mk/Uses/drupal.mk ============================================================================== --- head/Mk/Uses/drupal.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/drupal.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -81,7 +81,7 @@ DIST_SUBDIR= drupal NO_BUILD?= yes WRKSRC?= ${WRKDIR}/${PORTNAME} -RUN_DEPENDS+= ${LOCALBASE}/${DRUPAL_BASE}/index.php:${PORTSDIR}/${DRUPAL_BASE} +RUN_DEPENDS+= ${LOCALBASE}/${DRUPAL_BASE}/index.php:${DRUPAL_BASE} PLIST_SUB+= DRUPAL_MODDIR=${DRUPAL_MODDIR} PLIST_FILES+= "@owner www" \ Modified: head/Mk/Uses/elixir.mk ============================================================================== --- head/Mk/Uses/elixir.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/elixir.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -58,11 +58,11 @@ MIX_EXTRA_APPS?= MIX_EXTRA_DIRS?= MIX_EXTRA_FILES?= -BUILD_DEPENDS+= elixir:${PORTSDIR}/lang/elixir -RUN_DEPENDS+= elixir:${PORTSDIR}/lang/elixir +BUILD_DEPENDS+= elixir:lang/elixir +RUN_DEPENDS+= elixir:lang/elixir .for depend in ${MIX_BUILD_DEPS} -BUILD_DEPENDS+= ${depend:T}>=0:${PORTSDIR}/${depend} +BUILD_DEPENDS+= ${depend:T}>=0:${depend} .endfor .for depend in ${MIX_RUN_DEPS} Modified: head/Mk/Uses/erlang.mk ============================================================================== --- head/Mk/Uses/erlang.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/erlang.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -38,23 +38,23 @@ ERL_DOCS?= README* # VERSION is used in every Erlang pkg-plist PLIST_SUB+= VERSION="${PORTVERSION}" -BUILD_DEPENDS+= erl:${PORTSDIR}/lang/erlang -RUN_DEPENDS+= erl:${PORTSDIR}/lang/erlang +BUILD_DEPENDS+= erl:lang/erlang +RUN_DEPENDS+= erl:lang/erlang .if ${erlang_ARGS:Mrebar} -BUILD_DEPENDS+= rebar>=0:${PORTSDIR}/devel/rebar +BUILD_DEPENDS+= rebar>=0:devel/rebar .endif .if ${erlang_ARGS:Mrebar3} -BUILD_DEPENDS+= rebar3>=0:${PORTSDIR}/devel/rebar3 +BUILD_DEPENDS+= rebar3>=0:devel/rebar3 .endif .for depend in ${ERL_BUILD_DEPS} -BUILD_DEPENDS+= ${depend:T}>=0:${PORTSDIR}/${depend} +BUILD_DEPENDS+= ${depend:T}>=0:${depend} .endfor .for depend in ${ERL_RUN_DEPS} -RUN_DEPENDS+= ${depend:T}>=0:${PORTSDIR}/${depend} +RUN_DEPENDS+= ${depend:T}>=0:${depend} .endfor .if ${erlang_ARGS:Mrebar} Modified: head/Mk/Uses/execinfo.mk ============================================================================== --- head/Mk/Uses/execinfo.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/execinfo.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -19,7 +19,7 @@ _INCLUDE_USES_EXECINFO_MK= yes .if !exists(/usr/lib/libexecinfo.so) -LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo +LIB_DEPENDS+= libexecinfo.so:devel/libexecinfo EXECINFO_CPPFLAGS= -I${LOCALBASE}/include EXECINFO_LDFLAGS= -L${LOCALBASE}/lib .endif Modified: head/Mk/Uses/fakeroot.mk ============================================================================== --- head/Mk/Uses/fakeroot.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/fakeroot.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -10,7 +10,7 @@ .if !defined(_INCLUDE_USES_FAKEROOT_MK) _INCLUDE_USES_FAKEROOT_MK= yes -BUILD_DEPENDS+= fakeroot:${PORTSDIR}/security/fakeroot +BUILD_DEPENDS+= fakeroot:security/fakeroot .if ${UID} != 0 FAKEROOT?= fakeroot .endif Modified: head/Mk/Uses/fam.mk ============================================================================== --- head/Mk/Uses/fam.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/fam.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -15,8 +15,8 @@ .if !defined(_INCLUDE_USES_FAM_MK) _INCLUDE_USES_FAM_MK= yes -_fam_DEPENDS= libfam.so.0:${PORTSDIR}/devel/fam -_gamin_DEPENDS= libfam.so.0:${PORTSDIR}/devel/gamin +_fam_DEPENDS= libfam.so.0:devel/fam +_gamin_DEPENDS= libfam.so.0:devel/gamin _FAM_SYSTEMS= fam gamin _DEFAULT_FAM= gamin Modified: head/Mk/Uses/fmake.mk ============================================================================== --- head/Mk/Uses/fmake.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/fmake.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -16,7 +16,7 @@ IGNORE= Incorrect 'USES+= fmake:${fmake_ .if defined(.PARSEDIR) FMAKE= ${LOCALBASE}/bin/fmake -BUILD_DEPENDS+= ${FMAKE}:${PORTSDIR}/devel/fmake +BUILD_DEPENDS+= ${FMAKE}:devel/fmake CONFIGURE_ENV+= MAKE=${FMAKE} MAKE_CMD= ${FMAKE} .endif Modified: head/Mk/Uses/fonts.mk ============================================================================== --- head/Mk/Uses/fonts.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/fonts.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -51,11 +51,11 @@ IGNORE= USES=fonts - invalid ARGS (${fon .endif .if !empty(fonts_ARGS:Mfc) || !empty(fonts_ARGS:Mfcfontsdir) -RUN_DEPENDS+= fc-cache:${PORTSDIR}/x11-fonts/fontconfig +RUN_DEPENDS+= fc-cache:x11-fonts/fontconfig .endif .if !empty(fonts_ARGS:Mfontsdir) || !empty(fonts_ARGS:Mfcfontsdir) -RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +RUN_DEPENDS+= mkfontdir:x11-fonts/mkfontdir \ + mkfontscale:x11-fonts/mkfontscale .endif FONTNAME?= ${PORTNAME} Modified: head/Mk/Uses/fortran.mk ============================================================================== --- head/Mk/Uses/fortran.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/fortran.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -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}:${PORTSDIR}/lang/gcc -RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc +BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc +RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc .else -BUILD_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER} -RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER} +BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} +RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} .endif USE_BINUTILS= yes F77= gfortran${_GCC_VER} @@ -33,8 +33,8 @@ FCFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gc 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:${PORTSDIR}/lang/ifc -RUN_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc +BUILD_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc +RUN_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc F77= ${LOCALBASE}/intel_fc_80/bin/ifort FC= ${LOCALBASE}/intel_fc_80/bin/ifort .else Modified: head/Mk/Uses/fuse.mk ============================================================================== --- head/Mk/Uses/fuse.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/fuse.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -15,9 +15,9 @@ _INCLUDE_USES_FUSE_MK= yes IGNORE= USES=fuse does not require args .endif -LIB_DEPENDS+= libfuse.so:${PORTSDIR}/sysutils/fusefs-libs +LIB_DEPENDS+= libfuse.so:sysutils/fusefs-libs .if !exists(/sbin/mount_fusefs) -RUN_DEPENDS+= mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod +RUN_DEPENDS+= mount_fusefs:sysutils/fusefs-kmod .endif .endif Modified: head/Mk/Uses/gecko.mk ============================================================================== --- head/Mk/Uses/gecko.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/gecko.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -31,8 +31,8 @@ GECKO_CONFING?= ${LOCALBASE}/bin/${GECKO XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` -BUILD_DEPENDS+= libxul>=38:${PORTSDIR}/www/libxul -RUN_DEPENDS+= libxul>=38:${PORTSDIR}/www/libxul +BUILD_DEPENDS+= libxul>=38:www/libxul +RUN_DEPENDS+= libxul>=38:www/libxul .elif ${gecko_ARGS:Mfirefox} @@ -41,8 +41,8 @@ _GECKO_VERSIONS= 38 41 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions -38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -41_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr +41_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null @@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE .endif # Dependence lines for different Seamonkey versions -33_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey +33_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey .elif ${gecko_ARGS:Mthunderbird} @@ -75,7 +75,7 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE .endif # Dependence lines for different Thunderbird versions -38_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird +38_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:mail/thunderbird .else IGNORE= Unknown type of gecko dependency you may specify either libxul, firefox, seamonkey or thunderbird Modified: head/Mk/Uses/gettext-runtime.mk ============================================================================== --- head/Mk/Uses/gettext-runtime.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/gettext-runtime.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -16,13 +16,13 @@ gettext-runtime_ARGS= lib .endif .if ${gettext-runtime_ARGS:Mlib} -LIB_DEPENDS+= libintl.so:${PORTSDIR}/devel/gettext-runtime +LIB_DEPENDS+= libintl.so:devel/gettext-runtime .endif .if ${gettext-runtime_ARGS:Mbuild} -BUILD_DEPENDS+= gettext:${PORTSDIR}/devel/gettext-runtime +BUILD_DEPENDS+= gettext:devel/gettext-runtime .endif .if ${gettext-runtime_ARGS:Mrun} -RUN_DEPENDS+= gettext:${PORTSDIR}/devel/gettext-runtime +RUN_DEPENDS+= gettext:devel/gettext-runtime .endif .endif Modified: head/Mk/Uses/gettext-tools.mk ============================================================================== --- head/Mk/Uses/gettext-tools.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/gettext-tools.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -16,10 +16,10 @@ gettext-tools_ARGS= build .endif .if ${gettext-tools_ARGS:Mbuild} -BUILD_DEPENDS+= msgfmt:${PORTSDIR}/devel/gettext-tools +BUILD_DEPENDS+= msgfmt:devel/gettext-tools .endif .if ${gettext-tools_ARGS:Mrun} -RUN_DEPENDS+= msgfmt:${PORTSDIR}/devel/gettext-tools +RUN_DEPENDS+= msgfmt:devel/gettext-tools .endif .endif Modified: head/Mk/Uses/ghostscript.mk ============================================================================== --- head/Mk/Uses/ghostscript.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/ghostscript.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -101,9 +101,9 @@ _GS_X11_PORT= ghostscript${_GS_SELECTED} .for type in BUILD RUN .if defined(_GS_${type}_DEP) -${type}_DEPENDS+= ${_GS_PORT}>=${_GS_VERSION_MINOR}:${PORTSDIR}/print/${_GS_PORT} +${type}_DEPENDS+= ${_GS_PORT}>=${_GS_VERSION_MINOR}:print/${_GS_PORT} .if ${_GS_ARGS:Mx11} -${type}_DEPENDS+= ${_GS_X11_PORT}>=${_GS_VERSION_MINOR}:${PORTSDIR}/print/${_GS_X11_PORT} +${type}_DEPENDS+= ${_GS_X11_PORT}>=${_GS_VERSION_MINOR}:print/${_GS_X11_PORT} .endif .endif .endfor Modified: head/Mk/Uses/gmake.mk ============================================================================== --- head/Mk/Uses/gmake.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/gmake.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -22,7 +22,7 @@ IGNORE= Incorrect 'USES+= gmake:${gmake_ _GMAKE_EXT= -lite .endif -BUILD_DEPENDS+= gmake${_GMAKE_EXT}:${PORTSDIR}/devel/gmake${_GMAKE_EXT} +BUILD_DEPENDS+= gmake${_GMAKE_EXT}:devel/gmake${_GMAKE_EXT} CONFIGURE_ENV+= MAKE=gmake${_GMAKE_EXT} MAKE_CMD= gmake${_GMAKE_EXT} Modified: head/Mk/Uses/gnustep.mk ============================================================================== --- head/Mk/Uses/gnustep.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/gnustep.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -42,7 +42,7 @@ MAKE_ENV+= ADDITIONAL_${a}="${ADDITIONAL MAKE_ARGS+=messages=yes MAKEFILE= GNUmakefile -#MAKE_ENV+= GNUSTEP_CONFIG_FILE=${PORTSDIR}/devel/gnustep-make/files/GNUstep.conf +#MAKE_ENV+= GNUSTEP_CONFIG_FILE=devel/gnustep-make/files/GNUstep.conf GNU_CONFIGURE_PREFIX= ${GNUSTEP_PREFIX} .if ${MACHINE_ARCH} == "i386" @@ -58,7 +58,7 @@ PLIST_SUB+= MAJORLIBVERSION=${DEFAULT_LI .if defined(USE_GNUSTEP) . if ${USE_GNUSTEP:Mbase} -LIB_DEPENDS+= libgnustep-base.so:${PORTSDIR}/lang/gnustep-base +LIB_DEPENDS+= libgnustep-base.so:lang/gnustep-base . endif . if ${USE_GNUSTEP:Mbuild} @@ -69,17 +69,17 @@ MAKE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFI # conflicts. MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM CONFIGURE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" -BUILD_DEPENDS+= gnustep-make>0:${PORTSDIR}/devel/gnustep-make +BUILD_DEPENDS+= gnustep-make>0:devel/gnustep-make .include "${USESDIR}/objc.mk" . endif . if ${USE_GNUSTEP:Mgui} -LIB_DEPENDS+= libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui +LIB_DEPENDS+= libgnustep-gui.so:x11-toolkits/gnustep-gui . endif . if ${USE_GNUSTEP:Mback} -BUILD_DEPENDS+= gnustep-back>0:${PORTSDIR}/x11-toolkits/gnustep-back -RUN_DEPENDS+= gnustep-back>0:${PORTSDIR}/x11-toolkits/gnustep-back +BUILD_DEPENDS+= gnustep-back>0:x11-toolkits/gnustep-back +RUN_DEPENDS+= gnustep-back>0:x11-toolkits/gnustep-back . endif .endif Modified: head/Mk/Uses/gperf.mk ============================================================================== --- head/Mk/Uses/gperf.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/gperf.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -11,7 +11,7 @@ _INCLUDE_USES_GPERF_MK= yes .if !exists(/usr/bin/gperf) -BUILD_DEPENDS+= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf +BUILD_DEPENDS+= ${LOCALBASE}/bin/gperf:devel/gperf GPERF= ${LOCALBASE}/bin/gperf .else _GPERF_VERSION!= /usr/bin/gperf --version | head -1 || true @@ -22,7 +22,7 @@ _GPERF_MAJ_VERSION= 0 .endif .if ${_GPERF_MAJ_VERSION} < 3 -BUILD_DEPENDS+= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf +BUILD_DEPENDS+= ${LOCALBASE}/bin/gperf:devel/gperf GPERF= ${LOCALBASE}/bin/gperf .else GPERF= /usr/bin/gperf Modified: head/Mk/Uses/gssapi.mk ============================================================================== --- head/Mk/Uses/gssapi.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/gssapi.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -75,8 +75,8 @@ .if !defined(_INCLUDE_USES_GSSAPI_MK) _INCLUDE_USES_GSSAPI_MK= yes -_HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:${PORTSDIR}/security/heimdal -_MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:${PORTSDIR}/security/krb5 +_HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:security/heimdal +_MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:security/krb5 _HEADERS= sys/types.h sys/stat.h stdint.h .undef _FIXUP_KRB5CONFIG Modified: head/Mk/Uses/horde.mk ============================================================================== --- head/Mk/Uses/horde.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/horde.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -11,8 +11,8 @@ _INCLUDE_USES_HORDE_MK= yes MASTER_SITES?= http://pear.horde.org/get/ -BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:${PORTSDIR}/devel/pear-channel-horde -RUN_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:${PORTSDIR}/devel/pear-channel-horde +BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde +RUN_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde PKGNAMEPREFIX?= pear- HORDE_DIR?= www/horde @@ -24,118 +24,118 @@ CPE_VENDOR?= horde DIST_SUBDIR= Horde PEAR_CHANNEL= horde -horde-Horde_ActiveSync-DEPEND= ${PEARDIR}/Horde/ActiveSync.php:${PORTSDIR}/comms/pear-Horde_ActiveSync -horde-Horde_Alarm-DEPEND= ${PEARDIR}/Horde/Alarm.php:${PORTSDIR}/devel/pear-Horde_Alarm -horde-Horde_Auth-DEPEND= ${PEARDIR}/Horde/Auth.php:${PORTSDIR}/security/pear-Horde_Auth -horde-Horde_Autoloader-DEPEND= ${PEARDIR}/Horde/Autoloader.php:${PORTSDIR}/devel/pear-Horde_Autoloader -horde-Horde_Autoloader_Cache-DEPEND= ${PEARDIR}/Horde/Autoloader/Cache.php:${PORTSDIR}/devel/pear-Horde_Autoloader_Cache -horde-Horde_Argv-DEPEND= ${PEARDIR}/Horde/Argv/Parser.php:${PORTSDIR}/devel/pear-Horde_Argv -horde-Horde_Browser-DEPEND= ${PEARDIR}/Horde/Browser.php:${PORTSDIR}/www/pear-Horde_Browser -horde-Horde_Cache-DEPEND= ${PEARDIR}/Horde/Cache.php:${PORTSDIR}/devel/pear-Horde_Cache -horde-Horde_Cli-DEPEND= ${PEARDIR}/Horde/Cli.php:${PORTSDIR}/devel/pear-Horde_Cli -horde-Horde_Compress-DEPEND= ${PEARDIR}/Horde/Compress.php:${PORTSDIR}/archivers/pear-Horde_Compress -horde-Horde_Compress_Fast-DEPEND= ${PEARDIR}/Horde/Compress/Fast.php:${PORTSDIR}/archivers/pear-Horde_Compress_Fast -horde-Horde_Constraint-DEPEND= ${PEARDIR}/Horde/Constraint.php:${PORTSDIR}/devel/pear-Horde_Constraint -horde-Horde_Controller-DEPEND= ${PEARDIR}/Horde/Controller.php:${PORTSDIR}/devel/pear-Horde_Controller -horde-Horde_Core-DEPEND= ${PEARDIR}/Horde.php:${PORTSDIR}/devel/pear-Horde_Core -horde-Horde_Crypt-DEPEND= ${PEARDIR}/Horde/Crypt.php:${PORTSDIR}/security/pear-Horde_Crypt -horde-Horde_Crypt_Blowfish-DEPEND= ${PEARDIR}/Horde/Crypt/Blowfish.php:${PORTSDIR}/security/pear-Horde_Crypt_Blowfish -horde-Horde_CssMinify-DEPEND= ${PEARDIR}/Horde/CssMinify.php:${PORTSDIR}/textproc/pear-Horde_CssMinify -horde-Horde_Css_Parser-DEPEND= ${PEARDIR}/Horde/Css/Parser.php:${PORTSDIR}/www/pear-Horde_Css_Parser -horde-Horde_Data-DEPEND= ${PEARDIR}/Horde/Data.php:${PORTSDIR}/devel/pear-Horde_Data -horde-Horde_Date-DEPEND= ${PEARDIR}/Horde/Date.php:${PORTSDIR}/devel/pear-Horde_Date -horde-Horde_Date_Parser-DEPEND= ${PEARDIR}/Horde/Date/Parser.php:${PORTSDIR}/devel/pear-Horde_Date_Parser -horde-Horde_Dav-DEPEND= ${PEARDIR}/Horde/Dav/Client.php:${PORTSDIR}/www/pear-Horde_Dav -horde-Horde_Db-DEPEND= ${PEARDIR}/Horde/Db.php:${PORTSDIR}/databases/pear-Horde_Db -horde-Horde_Editor-DEPEND= ${PEARDIR}/Horde/Editor.php:${PORTSDIR}/www/pear-Horde_Editor -horde-Horde_Exception-DEPEND= ${PEARDIR}/Horde/Exception.php:${PORTSDIR}/devel/pear-Horde_Exception -horde-Horde_Feed-DEPEND= ${PEARDIR}/Horde/Feed.php:${PORTSDIR}/www/pear-Horde_Feed -horde-Horde_Form-DEPEND= ${PEARDIR}/Horde/Form.php:${PORTSDIR}/www/pear-Horde_Form -horde-Horde_Group-DEPEND= ${PEARDIR}/Horde/Group/Base.php:${PORTSDIR}/security/pear-Horde_Group -horde-Horde_HashTable-DEPEND= ${PEARDIR}/Horde/HashTable/Base.php:${PORTSDIR}/databases/pear-Horde_HashTable -horde-Horde_History-DEPEND= ${PEARDIR}/Horde/History.php:${PORTSDIR}/devel/pear-Horde_History -horde-Horde_Http-DEPEND= ${PEARDIR}/Horde/Http.php:${PORTSDIR}/www/pear-Horde_Http -horde-Horde_Icalendar-DEPEND= ${PEARDIR}/Horde/Icalendar.php:${PORTSDIR}/devel/pear-Horde_Icalendar -horde-Horde_Idna-DEPEND= ${PEARDIR}/Horde/Idna.php:${PORTSDIR}/dns/pear-Horde_Idna -horde-Horde_Image-DEPEND= ${PEARDIR}/Horde/Image.php:${PORTSDIR}/graphics/pear-Horde_Image -horde-Horde_Imap_Client-DEPEND= ${PEARDIR}/Horde/Imap/Client.php:${PORTSDIR}/mail/pear-Horde_Imap_Client -horde-Horde_Imsp-DEPEND= ${PEARDIR}/Horde/Imsp.php:${PORTSDIR}/databases/pear-Horde_Imsp -horde-Horde_Itip-DEPEND= ${PEARDIR}/Horde/Itip.php:${PORTSDIR}/devel/pear-Horde_Itip -horde-Horde_Injector-DEPEND= ${PEARDIR}/Horde/Injector.php:${PORTSDIR}/devel/pear-Horde_Injector -horde-Horde_JavascriptMinify-DEPEND= ${PEARDIR}/Horde/JavascriptMinify.php:${PORTSDIR}/textproc/pear-Horde_JavascriptMinify -horde-Horde_Kolab_Format-DEPEND= ${PEARDIR}/Horde/Kolab/Format.php:${PORTSDIR}/textproc/pear-Horde_Kolab_Format -horde-Horde_Kolab_Server-DEPEND= ${PEARDIR}/Horde/Kolab/Server/Factory.php:${PORTSDIR}/net/pear-Horde_Kolab_Server -horde-Horde_Kolab_Session-DEPEND= ${PEARDIR}/Horde/Kolab/Session.php:${PORTSDIR}/net/pear-Horde_Kolab_Session -horde-Horde_Kolab_Storage-DEPEND= ${PEARDIR}/Horde/Kolab/Storage.php:${PORTSDIR}/mail/pear-Horde_Kolab_Storage -horde-Horde_Ldap-DEPEND= ${PEARDIR}/Horde/Ldap.php:${PORTSDIR}/net/pear-Horde_Ldap -horde-Horde_ListHeaders-DEPEND= ${PEARDIR}/Horde/ListHeaders.php:${PORTSDIR}/mail/pear-Horde_ListHeaders -horde-Horde_Lock-DEPEND= ${PEARDIR}/Horde/Lock.php:${PORTSDIR}/devel/pear-Horde_Lock -horde-Horde_Log-DEPEND= ${PEARDIR}/Horde/Log.php:${PORTSDIR}/sysutils/pear-Horde_Log -horde-Horde_LoginTasks-DEPEND= ${PEARDIR}/Horde/LoginTasks.php:${PORTSDIR}/devel/pear-Horde_LoginTasks -horde-Horde_Mail-DEPEND= ${PEARDIR}/Horde/Mail/Transport.php:${PORTSDIR}/mail/pear-Horde_Mail -horde-Horde_Mail_Autoconfig-DEPEND= ${PEARDIR}/Horde/Mail/Autoconfig.php:${PORTSDIR}/mail/pear-Horde_Mail_Autoconfig -horde-Horde_Mapi-DEPEND= ${PEARDIR}/Horde/Mapi.php:${PORTSDIR}/mail/pear-Horde_Mapi -horde-Horde_Memcache-DEPEND= ${PEARDIR}/Horde/Memcache.php:${PORTSDIR}/databases/pear-Horde_Memcache -horde-Horde_Mime-DEPEND= ${PEARDIR}/Horde/Mime.php:${PORTSDIR}/mail/pear-Horde_Mime -horde-Horde_Mime_Viewer-DEPEND= ${PEARDIR}/Horde/Mime/Viewer.php:${PORTSDIR}/mail/pear-Horde_Mime_Viewer -horde-Horde_Mongo-DEPEND= ${PEARDIR}/Horde/Mongo/Client.php:${PORTSDIR}/databases/pear-Horde_Mongo -horde-Horde_Nls-DEPEND= ${PEARDIR}/Horde/Nls.php:${PORTSDIR}/devel/pear-Horde_Nls -horde-Horde_Notification-DEPEND= ${PEARDIR}/Horde/Notification.php:${PORTSDIR}/devel/pear-Horde_Notification -horde-Horde_Oauth-DEPEND= ${PEARDIR}/Horde/Oauth/Consumer.php:${PORTSDIR}/security/pear-Horde_Oauth -horde-Horde_Pack-DEPEND= ${PEARDIR}/Horde/Pack.php:${PORTSDIR}/archivers/pear-Horde_Pack -horde-Horde_Pdf-DEPEND= ${PEARDIR}/Horde/Pdf/Writer.php:${PORTSDIR}/textproc/pear-Horde_Pdf -horde-Horde_Perms-DEPEND= ${PEARDIR}/Horde/Perms.php:${PORTSDIR}/security/pear-Horde_Perms -horde-Horde_Prefs-DEPEND= ${PEARDIR}/Horde/Prefs.php:${PORTSDIR}/devel/pear-Horde_Prefs -horde-Horde_Queue-DEPEND= ${PEARDIR}/Horde/Queue/Runner.php:${PORTSDIR}/devel/pear-Horde_Queue -horde-Horde_Rdo-DEPEND= ${PEARDIR}/Horde/Rdo.php:${PORTSDIR}/devel/pear-Horde_Rdo -horde-Horde_Role-DEPEND= ${PEARDIR}/PEAR/Installer/Role/Horde/Role.php:${PORTSDIR}/devel/pear-Horde_Role -horde-Horde_Rpc-DEPEND= ${PEARDIR}/Horde/Rpc.php:${PORTSDIR}/net/pear-Horde_Rpc -horde-Horde_Routes-DEPEND= ${PEARDIR}/Horde/Routes/Route.php:${PORTSDIR}/www/pear-Horde_Routes -horde-Horde_Secret-DEPEND= ${PEARDIR}/Horde/Secret.php:${PORTSDIR}/security/pear-Horde_Secret -horde-Horde_Serialize-DEPEND= ${PEARDIR}/Horde/Serialize.php:${PORTSDIR}/devel/pear-Horde_Serialize -horde-Horde_SessionHandler-DEPEND= ${PEARDIR}/Horde/SessionHandler.php:${PORTSDIR}/www/pear-Horde_SessionHandler -horde-Horde_Scheduler-DEPEND= ${PEARDIR}/Horde/Scheduler.php:${PORTSDIR}/devel/pear-Horde_Scheduler -horde-Horde_Scribe-DEPEND= ${PEARDIR}/Horde/Scribe.php:${PORTSDIR}/net/pear-Horde_Scribe -horde-Horde_Share-DEPEND= ${PEARDIR}/Horde/Share/Base.php:${PORTSDIR}/security/pear-Horde_Share -horde-Horde_Smtp-DEPEND= ${PEARDIR}/Horde/Smtp.php:${PORTSDIR}/mail/pear-Horde_Smtp -horde-Horde_Socket_Client-DEPEND= ${PEARDIR}/Horde/Socket/Client.php:${PORTSDIR}/net/pear-Horde_Socket_Client -horde-Horde_SpellChecker-DEPEND= ${PEARDIR}/Horde/SpellChecker.php:${PORTSDIR}/textproc/pear-Horde_SpellChecker -horde-Horde_Stream-DEPEND= ${PEARDIR}/Horde/Stream.php:${PORTSDIR}/devel/pear-Horde_Stream -horde-Horde_Stream_Filter-DEPEND= ${PEARDIR}/Horde/Stream/Filter/Crc32.php:${PORTSDIR}/devel/pear-Horde_Stream_Filter -horde-Horde_Stream_Wrapper-DEPEND= ${PEARDIR}/Horde/Stream/Wrapper/StringStream.php:${PORTSDIR}/devel/pear-Horde_Stream_Wrapper -horde-Horde_Service_Facebook-DEPEND= ${PEARDIR}/Horde/Service/Facebook.php:${PORTSDIR}/www/pear-Horde_Service_Facebook -horde-Horde_Service_Twitter-DEPEND= ${PEARDIR}/Horde/Service/Twitter.php:${PORTSDIR}/www/pear-Horde_Service_Twitter -horde-Horde_Service_UrlShortener-DEPEND= ${PEARDIR}/Horde/Service/UrlShortener.php:${PORTSDIR}/www/pear-Horde_Service_UrlShortener -horde-Horde_Service_Weather-DEPEND= ${PEARDIR}/Horde/Service/Weather.php:${PORTSDIR}/www/pear-Horde_Service_Weather -horde-Horde_Support-DEPEND= ${PEARDIR}/Horde/Support/Array.php:${PORTSDIR}/devel/pear-Horde_Support -horde-Horde_SyncMl-DEPEND= ${PEARDIR}/Horde/SyncMl.php:${PORTSDIR}/comms/pear-Horde_SyncMl -horde-Horde_Url-DEPEND= ${PEARDIR}/Horde/Url.php:${PORTSDIR}/net/pear-Horde_Url -horde-Horde_Util-DEPEND= ${PEARDIR}/Horde/Util.php:${PORTSDIR}/devel/pear-Horde_Util -horde-Horde_Template-DEPEND= ${PEARDIR}/Horde/Template.php:${PORTSDIR}/www/pear-Horde_Template -horde-Horde_Text_Diff-DEPEND= ${PEARDIR}/Horde/Text/Diff.php:${PORTSDIR}/textproc/pear-Horde_Text_Diff -horde-Horde_Text_Filter-DEPEND= ${PEARDIR}/Horde/Text/Filter.php:${PORTSDIR}/textproc/pear-Horde_Text_Filter -horde-Horde_Text_Filter_Csstidy-DEPEND= ${PEARDIR}/Horde/Text/Filter/Csstidy.php:${PORTSDIR}/textproc/pear-Horde_Text_Filter_Csstidy -horde-Horde_Text_Flowed-DEPEND= ${PEARDIR}/Horde/Text/Flowed.php:${PORTSDIR}/textproc/pear-Horde_Text_Flowed -horde-Horde_Thrift-DEPEND= ${PEARDIR}/Horde/Thrift.php:${PORTSDIR}/devel/pear-Horde_Thrift -horde-Horde_Timezone-DEPEND= ${PEARDIR}/Horde/Timezone.php:${PORTSDIR}/devel/pear-Horde_Timezone -horde-Horde_Token-DEPEND= ${PEARDIR}/Horde/Token.php:${PORTSDIR}/devel/pear-Horde_Token -horde-Horde_Translation-DEPEND= ${PEARDIR}/Horde/Translation.php:${PORTSDIR}/devel/pear-Horde_Translation -horde-Horde_Tree-DEPEND= ${PEARDIR}/Horde/Tree.php:${PORTSDIR}/devel/pear-Horde_Tree -horde-Horde_Vfs-DEPEND= ${PEARDIR}/Horde/Vfs.php:${PORTSDIR}/sysutils/pear-Horde_Vfs -horde-Horde_View-DEPEND= ${PEARDIR}/Horde/View.php:${PORTSDIR}/devel/pear-Horde_View -horde-Horde_Xml_Element-DEPEND= ${PEARDIR}/Horde/Xml/Element.php:${PORTSDIR}/textproc/pear-Horde_Xml_Element -horde-Horde_Xml_Wbxml-DEPEND= ${PEARDIR}/Horde/Xml/Wbxml.php:${PORTSDIR}/textproc/pear-Horde_Xml_Wbxml -horde-content-DEPEND= ${LOCALBASE}/${HORDE_DIR}/content/lib/Tagger.php:${PORTSDIR}/devel/horde-content -horde-gollem-DEPEND= ${LOCALBASE}/${HORDE_DIR}/gollem/index.php:${PORTSDIR}/ftp/horde-gollem -horde-horde-DEPEND= ${LOCALBASE}/${HORDE_DIR}/index.php:${PORTSDIR}/www/horde-base -horde-imp-DEPEND= ${LOCALBASE}/${HORDE_DIR}/imp/index.php:${PORTSDIR}/mail/horde-imp -horde-ingo-DEPEND= ${LOCALBASE}/${HORDE_DIR}/ingo/index.php:${PORTSDIR}/mail/horde-ingo -horde-kronolith-DEPEND= ${LOCALBASE}/${HORDE_DIR}/kronolith/index.php:${PORTSDIR}/deskutils/horde-kronolith -horde-mnemo-DEPEND= ${LOCALBASE}/${HORDE_DIR}/mnemo/index.php:${PORTSDIR}/deskutils/horde-mnemo -horde-nag-DEPEND= ${LOCALBASE}/${HORDE_DIR}/nag/index.php:${PORTSDIR}/deskutils/horde-nag -horde-timeobjects-DEPEND= ${LOCALBASE}/${HORDE_DIR}/timeobjects/lib/Driver.php:${PORTSDIR}/devel/horde-timeobjects -horde-trean-DEPEND= ${LOCALBASE}/${HORDE_DIR}/trean/index.php:${PORTSDIR}/www/horde-trean -horde-turba-DEPEND= ${LOCALBASE}/${HORDE_DIR}/turba/index.php:${PORTSDIR}/mail/horde-turba +horde-Horde_ActiveSync-DEPEND= ${PEARDIR}/Horde/ActiveSync.php:comms/pear-Horde_ActiveSync +horde-Horde_Alarm-DEPEND= ${PEARDIR}/Horde/Alarm.php:devel/pear-Horde_Alarm +horde-Horde_Auth-DEPEND= ${PEARDIR}/Horde/Auth.php:security/pear-Horde_Auth +horde-Horde_Autoloader-DEPEND= ${PEARDIR}/Horde/Autoloader.php:devel/pear-Horde_Autoloader +horde-Horde_Autoloader_Cache-DEPEND= ${PEARDIR}/Horde/Autoloader/Cache.php:devel/pear-Horde_Autoloader_Cache +horde-Horde_Argv-DEPEND= ${PEARDIR}/Horde/Argv/Parser.php:devel/pear-Horde_Argv +horde-Horde_Browser-DEPEND= ${PEARDIR}/Horde/Browser.php:www/pear-Horde_Browser +horde-Horde_Cache-DEPEND= ${PEARDIR}/Horde/Cache.php:devel/pear-Horde_Cache +horde-Horde_Cli-DEPEND= ${PEARDIR}/Horde/Cli.php:devel/pear-Horde_Cli +horde-Horde_Compress-DEPEND= ${PEARDIR}/Horde/Compress.php:archivers/pear-Horde_Compress +horde-Horde_Compress_Fast-DEPEND= ${PEARDIR}/Horde/Compress/Fast.php:archivers/pear-Horde_Compress_Fast +horde-Horde_Constraint-DEPEND= ${PEARDIR}/Horde/Constraint.php:devel/pear-Horde_Constraint +horde-Horde_Controller-DEPEND= ${PEARDIR}/Horde/Controller.php:devel/pear-Horde_Controller +horde-Horde_Core-DEPEND= ${PEARDIR}/Horde.php:devel/pear-Horde_Core +horde-Horde_Crypt-DEPEND= ${PEARDIR}/Horde/Crypt.php:security/pear-Horde_Crypt +horde-Horde_Crypt_Blowfish-DEPEND= ${PEARDIR}/Horde/Crypt/Blowfish.php:security/pear-Horde_Crypt_Blowfish +horde-Horde_CssMinify-DEPEND= ${PEARDIR}/Horde/CssMinify.php:textproc/pear-Horde_CssMinify +horde-Horde_Css_Parser-DEPEND= ${PEARDIR}/Horde/Css/Parser.php:www/pear-Horde_Css_Parser +horde-Horde_Data-DEPEND= ${PEARDIR}/Horde/Data.php:devel/pear-Horde_Data +horde-Horde_Date-DEPEND= ${PEARDIR}/Horde/Date.php:devel/pear-Horde_Date +horde-Horde_Date_Parser-DEPEND= ${PEARDIR}/Horde/Date/Parser.php:devel/pear-Horde_Date_Parser +horde-Horde_Dav-DEPEND= ${PEARDIR}/Horde/Dav/Client.php:www/pear-Horde_Dav +horde-Horde_Db-DEPEND= ${PEARDIR}/Horde/Db.php:databases/pear-Horde_Db +horde-Horde_Editor-DEPEND= ${PEARDIR}/Horde/Editor.php:www/pear-Horde_Editor +horde-Horde_Exception-DEPEND= ${PEARDIR}/Horde/Exception.php:devel/pear-Horde_Exception +horde-Horde_Feed-DEPEND= ${PEARDIR}/Horde/Feed.php:www/pear-Horde_Feed +horde-Horde_Form-DEPEND= ${PEARDIR}/Horde/Form.php:www/pear-Horde_Form +horde-Horde_Group-DEPEND= ${PEARDIR}/Horde/Group/Base.php:security/pear-Horde_Group +horde-Horde_HashTable-DEPEND= ${PEARDIR}/Horde/HashTable/Base.php:databases/pear-Horde_HashTable +horde-Horde_History-DEPEND= ${PEARDIR}/Horde/History.php:devel/pear-Horde_History +horde-Horde_Http-DEPEND= ${PEARDIR}/Horde/Http.php:www/pear-Horde_Http +horde-Horde_Icalendar-DEPEND= ${PEARDIR}/Horde/Icalendar.php:devel/pear-Horde_Icalendar +horde-Horde_Idna-DEPEND= ${PEARDIR}/Horde/Idna.php:dns/pear-Horde_Idna +horde-Horde_Image-DEPEND= ${PEARDIR}/Horde/Image.php:graphics/pear-Horde_Image +horde-Horde_Imap_Client-DEPEND= ${PEARDIR}/Horde/Imap/Client.php:mail/pear-Horde_Imap_Client +horde-Horde_Imsp-DEPEND= ${PEARDIR}/Horde/Imsp.php:databases/pear-Horde_Imsp +horde-Horde_Itip-DEPEND= ${PEARDIR}/Horde/Itip.php:devel/pear-Horde_Itip +horde-Horde_Injector-DEPEND= ${PEARDIR}/Horde/Injector.php:devel/pear-Horde_Injector +horde-Horde_JavascriptMinify-DEPEND= ${PEARDIR}/Horde/JavascriptMinify.php:textproc/pear-Horde_JavascriptMinify +horde-Horde_Kolab_Format-DEPEND= ${PEARDIR}/Horde/Kolab/Format.php:textproc/pear-Horde_Kolab_Format +horde-Horde_Kolab_Server-DEPEND= ${PEARDIR}/Horde/Kolab/Server/Factory.php:net/pear-Horde_Kolab_Server +horde-Horde_Kolab_Session-DEPEND= ${PEARDIR}/Horde/Kolab/Session.php:net/pear-Horde_Kolab_Session +horde-Horde_Kolab_Storage-DEPEND= ${PEARDIR}/Horde/Kolab/Storage.php:mail/pear-Horde_Kolab_Storage +horde-Horde_Ldap-DEPEND= ${PEARDIR}/Horde/Ldap.php:net/pear-Horde_Ldap +horde-Horde_ListHeaders-DEPEND= ${PEARDIR}/Horde/ListHeaders.php:mail/pear-Horde_ListHeaders +horde-Horde_Lock-DEPEND= ${PEARDIR}/Horde/Lock.php:devel/pear-Horde_Lock +horde-Horde_Log-DEPEND= ${PEARDIR}/Horde/Log.php:sysutils/pear-Horde_Log +horde-Horde_LoginTasks-DEPEND= ${PEARDIR}/Horde/LoginTasks.php:devel/pear-Horde_LoginTasks +horde-Horde_Mail-DEPEND= ${PEARDIR}/Horde/Mail/Transport.php:mail/pear-Horde_Mail +horde-Horde_Mail_Autoconfig-DEPEND= ${PEARDIR}/Horde/Mail/Autoconfig.php:mail/pear-Horde_Mail_Autoconfig +horde-Horde_Mapi-DEPEND= ${PEARDIR}/Horde/Mapi.php:mail/pear-Horde_Mapi +horde-Horde_Memcache-DEPEND= ${PEARDIR}/Horde/Memcache.php:databases/pear-Horde_Memcache +horde-Horde_Mime-DEPEND= ${PEARDIR}/Horde/Mime.php:mail/pear-Horde_Mime +horde-Horde_Mime_Viewer-DEPEND= ${PEARDIR}/Horde/Mime/Viewer.php:mail/pear-Horde_Mime_Viewer +horde-Horde_Mongo-DEPEND= ${PEARDIR}/Horde/Mongo/Client.php:databases/pear-Horde_Mongo +horde-Horde_Nls-DEPEND= ${PEARDIR}/Horde/Nls.php:devel/pear-Horde_Nls +horde-Horde_Notification-DEPEND= ${PEARDIR}/Horde/Notification.php:devel/pear-Horde_Notification +horde-Horde_Oauth-DEPEND= ${PEARDIR}/Horde/Oauth/Consumer.php:security/pear-Horde_Oauth +horde-Horde_Pack-DEPEND= ${PEARDIR}/Horde/Pack.php:archivers/pear-Horde_Pack +horde-Horde_Pdf-DEPEND= ${PEARDIR}/Horde/Pdf/Writer.php:textproc/pear-Horde_Pdf +horde-Horde_Perms-DEPEND= ${PEARDIR}/Horde/Perms.php:security/pear-Horde_Perms +horde-Horde_Prefs-DEPEND= ${PEARDIR}/Horde/Prefs.php:devel/pear-Horde_Prefs +horde-Horde_Queue-DEPEND= ${PEARDIR}/Horde/Queue/Runner.php:devel/pear-Horde_Queue +horde-Horde_Rdo-DEPEND= ${PEARDIR}/Horde/Rdo.php:devel/pear-Horde_Rdo +horde-Horde_Role-DEPEND= ${PEARDIR}/PEAR/Installer/Role/Horde/Role.php:devel/pear-Horde_Role +horde-Horde_Rpc-DEPEND= ${PEARDIR}/Horde/Rpc.php:net/pear-Horde_Rpc +horde-Horde_Routes-DEPEND= ${PEARDIR}/Horde/Routes/Route.php:www/pear-Horde_Routes +horde-Horde_Secret-DEPEND= ${PEARDIR}/Horde/Secret.php:security/pear-Horde_Secret +horde-Horde_Serialize-DEPEND= ${PEARDIR}/Horde/Serialize.php:devel/pear-Horde_Serialize +horde-Horde_SessionHandler-DEPEND= ${PEARDIR}/Horde/SessionHandler.php:www/pear-Horde_SessionHandler +horde-Horde_Scheduler-DEPEND= ${PEARDIR}/Horde/Scheduler.php:devel/pear-Horde_Scheduler +horde-Horde_Scribe-DEPEND= ${PEARDIR}/Horde/Scribe.php:net/pear-Horde_Scribe +horde-Horde_Share-DEPEND= ${PEARDIR}/Horde/Share/Base.php:security/pear-Horde_Share +horde-Horde_Smtp-DEPEND= ${PEARDIR}/Horde/Smtp.php:mail/pear-Horde_Smtp +horde-Horde_Socket_Client-DEPEND= ${PEARDIR}/Horde/Socket/Client.php:net/pear-Horde_Socket_Client +horde-Horde_SpellChecker-DEPEND= ${PEARDIR}/Horde/SpellChecker.php:textproc/pear-Horde_SpellChecker +horde-Horde_Stream-DEPEND= ${PEARDIR}/Horde/Stream.php:devel/pear-Horde_Stream +horde-Horde_Stream_Filter-DEPEND= ${PEARDIR}/Horde/Stream/Filter/Crc32.php:devel/pear-Horde_Stream_Filter +horde-Horde_Stream_Wrapper-DEPEND= ${PEARDIR}/Horde/Stream/Wrapper/StringStream.php:devel/pear-Horde_Stream_Wrapper +horde-Horde_Service_Facebook-DEPEND= ${PEARDIR}/Horde/Service/Facebook.php:www/pear-Horde_Service_Facebook +horde-Horde_Service_Twitter-DEPEND= ${PEARDIR}/Horde/Service/Twitter.php:www/pear-Horde_Service_Twitter +horde-Horde_Service_UrlShortener-DEPEND= ${PEARDIR}/Horde/Service/UrlShortener.php:www/pear-Horde_Service_UrlShortener +horde-Horde_Service_Weather-DEPEND= ${PEARDIR}/Horde/Service/Weather.php:www/pear-Horde_Service_Weather +horde-Horde_Support-DEPEND= ${PEARDIR}/Horde/Support/Array.php:devel/pear-Horde_Support +horde-Horde_SyncMl-DEPEND= ${PEARDIR}/Horde/SyncMl.php:comms/pear-Horde_SyncMl +horde-Horde_Url-DEPEND= ${PEARDIR}/Horde/Url.php:net/pear-Horde_Url +horde-Horde_Util-DEPEND= ${PEARDIR}/Horde/Util.php:devel/pear-Horde_Util +horde-Horde_Template-DEPEND= ${PEARDIR}/Horde/Template.php:www/pear-Horde_Template +horde-Horde_Text_Diff-DEPEND= ${PEARDIR}/Horde/Text/Diff.php:textproc/pear-Horde_Text_Diff +horde-Horde_Text_Filter-DEPEND= ${PEARDIR}/Horde/Text/Filter.php:textproc/pear-Horde_Text_Filter +horde-Horde_Text_Filter_Csstidy-DEPEND= ${PEARDIR}/Horde/Text/Filter/Csstidy.php:textproc/pear-Horde_Text_Filter_Csstidy +horde-Horde_Text_Flowed-DEPEND= ${PEARDIR}/Horde/Text/Flowed.php:textproc/pear-Horde_Text_Flowed +horde-Horde_Thrift-DEPEND= ${PEARDIR}/Horde/Thrift.php:devel/pear-Horde_Thrift +horde-Horde_Timezone-DEPEND= ${PEARDIR}/Horde/Timezone.php:devel/pear-Horde_Timezone +horde-Horde_Token-DEPEND= ${PEARDIR}/Horde/Token.php:devel/pear-Horde_Token +horde-Horde_Translation-DEPEND= ${PEARDIR}/Horde/Translation.php:devel/pear-Horde_Translation +horde-Horde_Tree-DEPEND= ${PEARDIR}/Horde/Tree.php:devel/pear-Horde_Tree +horde-Horde_Vfs-DEPEND= ${PEARDIR}/Horde/Vfs.php:sysutils/pear-Horde_Vfs +horde-Horde_View-DEPEND= ${PEARDIR}/Horde/View.php:devel/pear-Horde_View +horde-Horde_Xml_Element-DEPEND= ${PEARDIR}/Horde/Xml/Element.php:textproc/pear-Horde_Xml_Element +horde-Horde_Xml_Wbxml-DEPEND= ${PEARDIR}/Horde/Xml/Wbxml.php:textproc/pear-Horde_Xml_Wbxml +horde-content-DEPEND= ${LOCALBASE}/${HORDE_DIR}/content/lib/Tagger.php:devel/horde-content +horde-gollem-DEPEND= ${LOCALBASE}/${HORDE_DIR}/gollem/index.php:ftp/horde-gollem +horde-horde-DEPEND= ${LOCALBASE}/${HORDE_DIR}/index.php:www/horde-base +horde-imp-DEPEND= ${LOCALBASE}/${HORDE_DIR}/imp/index.php:mail/horde-imp +horde-ingo-DEPEND= ${LOCALBASE}/${HORDE_DIR}/ingo/index.php:mail/horde-ingo +horde-kronolith-DEPEND= ${LOCALBASE}/${HORDE_DIR}/kronolith/index.php:deskutils/horde-kronolith +horde-mnemo-DEPEND= ${LOCALBASE}/${HORDE_DIR}/mnemo/index.php:deskutils/horde-mnemo +horde-nag-DEPEND= ${LOCALBASE}/${HORDE_DIR}/nag/index.php:deskutils/horde-nag +horde-timeobjects-DEPEND= ${LOCALBASE}/${HORDE_DIR}/timeobjects/lib/Driver.php:devel/horde-timeobjects +horde-trean-DEPEND= ${LOCALBASE}/${HORDE_DIR}/trean/index.php:www/horde-trean +horde-turba-DEPEND= ${LOCALBASE}/${HORDE_DIR}/turba/index.php:mail/horde-turba .if defined(USE_HORDE_RUN) . for DEP in ${USE_HORDE_RUN} Modified: head/Mk/Uses/iconv.mk ============================================================================== --- head/Mk/Uses/iconv.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/iconv.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -24,11 +24,11 @@ ICONV_INCLUDE_PATH= ${LOCALBASE}/include ICONV_LIB_PATH= ${LOCALBASE}/lib/libiconv.so .if ${iconv_ARGS:Mbuild} -BUILD_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}/converters/libiconv +BUILD_DEPENDS+= ${ICONV_CMD}:converters/libiconv .elif ${iconv_ARGS:Mpatch} -PATCH_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}/converters/libiconv +PATCH_DEPENDS+= ${ICONV_CMD}:converters/libiconv .else -LIB_DEPENDS+= libiconv.so:${PORTSDIR}/converters/libiconv +LIB_DEPENDS+= libiconv.so:converters/libiconv .endif .else @@ -44,7 +44,7 @@ ICONV_LIB_PATH= /usr/lib/libc.so .if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \ || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \ || exists(${LOCALBASE}/include/iconv.h) -BUILD_DEPENDS+= libiconv>=1.14_9:${PORTSDIR}/converters/libiconv +BUILD_DEPENDS+= libiconv>=1.14_9:converters/libiconv CPPFLAGS+= -DLIBICONV_PLUG CFLAGS+= -DLIBICONV_PLUG CXXFLAGS+= -DLIBICONV_PLUG Modified: head/Mk/Uses/imake.mk ============================================================================== --- head/Mk/Uses/imake.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/imake.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -18,7 +18,7 @@ _INCLUDE_USES_IMAKE_MK= yes IGNORE= USES=imake:${imake_ARGS:S/ /,/g} is not a valid argument .endif -BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake +BUILD_DEPENDS+= imake:devel/imake .if defined(USE_GCC) IMAKECPP= ${CPP} @@ -26,7 +26,7 @@ IMAKECPPFLAGS= -DCppCmd=${CPP} -DCcCmd= .else IMAKECPP= tradcpp IMAKECPPFLAGS= -DCppCmd=tradcpp -DCcCmd=${CC} -DCplusplusCmd=${CXX} -BUILD_DEPENDS+= tradcpp:${PORTSDIR}/devel/tradcpp +BUILD_DEPENDS+= tradcpp:devel/tradcpp .endif MAKE_ENV+= IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}" CONFIGURE_ENV+= IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}" Modified: head/Mk/Uses/jpeg.mk ============================================================================== --- head/Mk/Uses/jpeg.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/jpeg.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -23,14 +23,14 @@ jpeg_ARGS= lib .endif .if ${jpeg_ARGS} == lib -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/${JPEG_PORT} +LIB_DEPENDS+= libjpeg.so:${JPEG_PORT} .elif ${jpeg_ARGS} == build -BUILD_DEPENDS+= cjpeg:${PORTSDIR}/${JPEG_PORT} +BUILD_DEPENDS+= cjpeg:${JPEG_PORT} .elif ${jpeg_ARGS} == run -RUN_DEPENDS+= cjpeg:${PORTSDIR}/${JPEG_PORT} +RUN_DEPENDS+= cjpeg:${JPEG_PORT} .elif ${jpeg_ARGS} == both -BUILD_DEPENDS+= cjpeg:${PORTSDIR}/${JPEG_PORT} -RUN_DEPENDS+= cjpeg:${PORTSDIR}/${JPEG_PORT} +BUILD_DEPENDS+= cjpeg:${JPEG_PORT} +RUN_DEPENDS+= cjpeg:${JPEG_PORT} .else IGNORE= USES=jpeg - invalid args: [${jpeg_ARGS}] specified .endif Modified: head/Mk/Uses/lha.mk ============================================================================== --- head/Mk/Uses/lha.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/lha.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -14,7 +14,7 @@ EXTRACT_SUFX?= .lzh IGNORE= Incorrect 'USES+=lha:${lha_ARGS}' expecting 'USES+=lha' .endif -EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha +EXTRACT_DEPENDS+= lha:archivers/lha EXTRACT_CMD?= ${LHA_CMD} EXTRACT_BEFORE_ARGS?= xfpw=${WRKDIR} EXTRACT_AFTER_ARGS?= Modified: head/Mk/Uses/libarchive.mk ============================================================================== --- head/Mk/Uses/libarchive.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/libarchive.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -12,5 +12,5 @@ _INCLUDE_USES_LIBARCHIVE_MK= yes .include "${USESDIR}/localbase.mk" -LIB_DEPENDS+= libarchive.so.13:${PORTSDIR}/archivers/libarchive +LIB_DEPENDS+= libarchive.so.13:archivers/libarchive .endif Modified: head/Mk/Uses/libedit.mk ============================================================================== --- head/Mk/Uses/libedit.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/libedit.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -12,5 +12,5 @@ _INCLUDE_USES_LIBEDIT_MK= yes .include "${USESDIR}/localbase.mk" -LIB_DEPENDS+= libedit.so.0:${PORTSDIR}/devel/libedit +LIB_DEPENDS+= libedit.so.0:devel/libedit .endif Modified: head/Mk/Uses/libtool.mk ============================================================================== --- head/Mk/Uses/libtool.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/libtool.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -18,7 +18,7 @@ _INCLUDE_USES_LIBTOOL_MK= yes _USES_POST+= libtool .if ${libtool_ARGS:Mbuild} -BUILD_DEPENDS+= libtool:${PORTSDIR}/devel/libtool +BUILD_DEPENDS+= libtool:devel/libtool .endif .endif Modified: head/Mk/Uses/lua.mk ============================================================================== --- head/Mk/Uses/lua.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/lua.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -97,11 +97,11 @@ MAKE_ENV+= LUA_MODLIBDIR=${LUA_MODLIBDIR LUA_LIBDIR=${LUA_LIBDIR} .if ${lua_ARGS:Mbuild} -BUILD_DEPENDS+= ${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR} +BUILD_DEPENDS+= ${LUA_CMD}:lang/lua${LUA_VER_STR} .elif ${lua_ARGS:Mrun} -RUN_DEPENDS+= ${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR} +RUN_DEPENDS+= ${LUA_CMD}:lang/lua${LUA_VER_STR} .else -LIB_DEPENDS+= liblua-${LUA_VER}.so:${PORTSDIR}/lang/lua${LUA_VER_STR} +LIB_DEPENDS+= liblua-${LUA_VER}.so:lang/lua${LUA_VER_STR} .endif .endif Modified: head/Mk/Uses/makeinfo.mk ============================================================================== --- head/Mk/Uses/makeinfo.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/makeinfo.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -16,7 +16,7 @@ IGNORE= USES=makeinfo - expects no argum .endif .if !exists(/usr/bin/makeinfo) -BUILD_DEPENDS+= makeinfo:${PORTSDIR}/print/texinfo +BUILD_DEPENDS+= makeinfo:print/texinfo .endif .endif Modified: head/Mk/Uses/makeself.mk ============================================================================== --- head/Mk/Uses/makeself.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/makeself.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -14,7 +14,7 @@ _INCLUDE_USES_MAKESELF_MK= yes IGNORE= Incorrect 'USES+= makeself:${makeself_ARGS}' makeself takes no arguments .endif -EXTRACT_DEPENDS+= ${UNMAKESELF_CMD}:${PORTSDIR}/archivers/unmakeself +EXTRACT_DEPENDS+= ${UNMAKESELF_CMD}:archivers/unmakeself EXTRACT_CMD= ${UNMAKESELF_CMD} EXTRACT_BEFORE_ARGS= Modified: head/Mk/Uses/mono.mk ============================================================================== --- head/Mk/Uses/mono.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/mono.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -19,8 +19,8 @@ IGNORE= USES=mono takes no arguments MONO_SHARED_DIR= ${WRKDIR} CONFIGURE_ENV+= MONO_SHARED_DIR="${MONO_SHARED_DIR}" MAKE_ENV+= MONO_SHARED_DIR="${MONO_SHARED_DIR}" TZ=UTC -BUILD_DEPENDS+= mono:${PORTSDIR}/lang/mono -RUN_DEPENDS+= mono:${PORTSDIR}/lang/mono +BUILD_DEPENDS+= mono:lang/mono +RUN_DEPENDS+= mono:lang/mono # Set the location that webaps served by XSP should use. XSP_DOCROOT= ${PREFIX}/www/xsp Modified: head/Mk/Uses/motif.mk ============================================================================== --- head/Mk/Uses/motif.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/motif.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -18,10 +18,10 @@ IGNORE= USES=motif takes no arguments .endif .if defined(WANT_LESSTIF) -LIB_DEPENDS+= libXm.so:${PORTSDIR}/x11-toolkits/lesstif +LIB_DEPENDS+= libXm.so:x11-toolkits/lesstif .else USE_XORG+= xpm -LIB_DEPENDS+= libXm.so.4:${PORTSDIR}/x11-toolkits/open-motif +LIB_DEPENDS+= libXm.so.4:x11-toolkits/open-motif .endif MOTIFLIB?= -L${LOCALBASE}/lib -lXm -lXp Modified: head/Mk/Uses/ncurses.mk ============================================================================== --- head/Mk/Uses/ncurses.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/ncurses.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -73,8 +73,8 @@ NCURSES_SHLIBVER?= ${NCURSES_SHLIBFILE:E NCURSES_PORT?= devel/ncurses NCURSES_SHLIBVER?= 5 -BUILD_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${PORTSDIR}/${NCURSES_PORT} -RUN_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${PORTSDIR}/${NCURSES_PORT} +BUILD_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT} +RUN_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT} NCURSESRPATH= ${NCURSESBASE}/lib .else Modified: head/Mk/Uses/ninja.mk ============================================================================== --- head/Mk/Uses/ninja.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/ninja.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -21,7 +21,7 @@ IGNORE= Incorrect 'USES+= ninja:${ninja_ MAKE_ARGS+= -v .endif -BUILD_DEPENDS+= ninja:${PORTSDIR}/devel/ninja +BUILD_DEPENDS+= ninja:devel/ninja CMAKE_ARGS+= -GNinja MAKEFILE= Modified: head/Mk/Uses/objc.mk ============================================================================== --- head/Mk/Uses/objc.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/objc.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -46,7 +46,7 @@ CC= /usr/bin/clang CPP= /usr/bin/clang-cpp CXX= /usr/bin/clang++ .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:lang/clang34 CPP= ${LOCALBASE}/bin/clang-cpp34 CC= ${LOCALBASE}/bin/clang34 CXX= ${LOCALBASE}/bin/clang++34 @@ -58,7 +58,7 @@ LDFLAGS+= -B${LOCALBASE}/bin .endif .if ! ${objc_ARGS:Mcompiler} -LIB_DEPENDS+= libobjc.so.4.6:${PORTSDIR}/lang/libobjc2 +LIB_DEPENDS+= libobjc.so.4.6:lang/libobjc2 OBJCFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif Modified: head/Mk/Uses/openal.mk ============================================================================== --- head/Mk/Uses/openal.mk Wed Oct 14 16:47:15 2015 (r399277) +++ head/Mk/Uses/openal.mk Wed Oct 14 16:49:35 2015 (r399278) @@ -17,9 +17,9 @@ _INCLUDE_USES_OPENAL_MK= yes _valid_ARGS= al si soft alut -_si_DEPENDS= libopenal.so.0:${PORTSDIR}/audio/openal -_soft_DEPENDS= libopenal.so.1:${PORTSDIR}/audio/openal-soft -_alut_DEPENDS= libalut.so.0:${PORTSDIR}/audio/freealut +_si_DEPENDS= libopenal.so.0:audio/openal +_soft_DEPENDS= libopenal.so.1:audio/openal-soft *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***