From owner-svn-ports-head@freebsd.org Sun Mar 27 01:23:29 2016 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 B1061ADF200; Sun, 27 Mar 2016 01:23:29 +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 57CA317FE; Sun, 27 Mar 2016 01:23:29 +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 u2R1NSjK018370; Sun, 27 Mar 2016 01:23:28 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2R1NPSc018339; Sun, 27 Mar 2016 01:23:25 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201603270123.u2R1NPSc018339@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 27 Mar 2016 01:23:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411970 - in head/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.21 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: Sun, 27 Mar 2016 01:23:29 -0000 Author: bapt Date: Sun Mar 27 01:23:25 2016 New Revision: 411970 URL: https://svnweb.freebsd.org/changeset/ports/411970 Log: Remove the now unneeded ${PORTSDIR} from dependency definition in The infrastructure Makefiles PR: 206569 Exp run by: antoine Differential Revision: D5047 Modified: 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/firebird.mk head/Mk/Uses/fmake.mk head/Mk/Uses/fonts.mk head/Mk/Uses/fortran.mk head/Mk/Uses/fuse.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/gnome.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/mate.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/pyqt.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/sqlite.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.apache.mk head/Mk/bsd.autotools.mk head/Mk/bsd.ccache.mk head/Mk/bsd.database.mk head/Mk/bsd.fpc.mk head/Mk/bsd.gcc.mk head/Mk/bsd.gecko.mk head/Mk/bsd.gstreamer.mk head/Mk/bsd.java.mk head/Mk/bsd.kde4.mk head/Mk/bsd.ldap.mk head/Mk/bsd.linux-rpm.mk head/Mk/bsd.octave.mk head/Mk/bsd.openssl.mk head/Mk/bsd.php.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/Mk/Uses/ada.mk ============================================================================== --- head/Mk/Uses/ada.mk Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/ada.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -29,10 +29,10 @@ ADAXX= gcc6 . 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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/autoreconf.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 AUTORECONF?= ${LOCALBASE}/bin/autoreconf Modified: head/Mk/Uses/bison.mk ============================================================================== --- head/Mk/Uses/bison.mk Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/bison.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/blaslapack.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/cmake.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/compiler.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -161,7 +161,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 @@ -183,7 +183,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 @@ -205,7 +205,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 CHOSEN_COMPILER_TYPE= clang CPP= ${LOCALBASE}/bin/clang-cpp34 CC= ${LOCALBASE}/bin/clang34 @@ -227,7 +227,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 CHOSEN_COMPILER_TYPE= clang CPP= ${LOCALBASE}/bin/clang-cpp34 CC= ${LOCALBASE}/bin/clang34 @@ -243,7 +243,7 @@ CHOSEN_COMPILER_TYPE= gcc .if ${COMPILER_FEATURES:Mlibc++} LDFLAGS+= -L${LOCALBASE}/lib/c++ CXXFLAGS+= -nostdinc++ -isystem ${LOCALBASE}/include/c++/v1 -BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++ +BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ .endif .endif Modified: head/Mk/Uses/cran.mk ============================================================================== --- head/Mk/Uses/cran.mk Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/cran.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/desktop-file-utils.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/display.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/drupal.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -78,7 +78,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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/elixir.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -58,15 +58,15 @@ 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} -RUN_DEPENDS+= ${depend:T}>=0:${PORTSDIR}/${depend} +RUN_DEPENDS+= ${depend:T}>=0:${depend} .endfor .if !target(do-build) Modified: head/Mk/Uses/erlang.mk ============================================================================== --- head/Mk/Uses/erlang.mk Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/erlang.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/execinfo.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/fakeroot.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/fam.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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/firebird.mk ============================================================================== --- head/Mk/Uses/firebird.mk Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/firebird.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -16,7 +16,7 @@ FIREBIRD_VER= ${firebird_ARGS} FIREBIRD_VER?= ${FIREBIRD_DEFAULT:S/.//} .if ${FIREBIRD_VER} == 25 -LIB_DEPENDS+= libfbclient.so:${PORTSDIR}/databases/firebird25-client +LIB_DEPENDS+= libfbclient.so:databases/firebird25-client .else IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} .endif Modified: head/Mk/Uses/fmake.mk ============================================================================== --- head/Mk/Uses/fmake.mk Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/fmake.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/fonts.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/fortran.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/fuse.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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/gettext-runtime.mk ============================================================================== --- head/Mk/Uses/gettext-runtime.mk Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/gettext-runtime.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/gettext-tools.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/ghostscript.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -92,9 +92,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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/gmake.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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/gnome.mk ============================================================================== --- head/Mk/Uses/gnome.mk Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/gnome.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -117,314 +117,314 @@ gnomeprefix_CONFIGURE_ARGS=--localstated --with-gconf-source=${GCONF_CONFIG_SOURCE} atkmm_DETECT= ${LOCALBASE}/libdata/pkgconfig/atkmm-1.6.pc -atkmm_LIB_DEPENDS= libatkmm-1.6.so:${PORTSDIR}/accessibility/atkmm +atkmm_LIB_DEPENDS= libatkmm-1.6.so:accessibility/atkmm atkmm_USE_GNOME_IMPL= glibmm atk libxml++26_DETECT= ${LOCALBASE}/libdata/pkgconfig/libxml++-2.6.pc -libxml++26_LIB_DEPENDS= libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 +libxml++26_LIB_DEPENDS= libxml++-2.6.so:textproc/libxml++26 libxml++26_USE_GNOME_IMPL= glibmm libxml2 cairo_DETECT= ${LOCALBASE}/libdata/pkgconfig/cairo.pc -cairo_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo +cairo_LIB_DEPENDS= libcairo.so:graphics/cairo cairomm_DETECT= ${LOCALBASE}/libdata/pkgconfig/cairomm-1.0.pc -cairomm_LIB_DEPENDS= libcairomm-1.0.so:${PORTSDIR}/graphics/cairomm +cairomm_LIB_DEPENDS= libcairomm-1.0.so:graphics/cairomm cairomm_USE_GNOME_IMPL= cairo libxml++26 gconfmm26_DETECT= ${LOCALBASE}/libdata/pkgconfig/gconfmm-2.6.pc -gconfmm26_LIB_DEPENDS= libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 +gconfmm26_LIB_DEPENDS= libgconfmm-2.6.so:devel/gconfmm26 gconfmm26_USE_GNOME_IMPL= glibmm gconf2 glibmm_DETECT= ${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc -glibmm_LIB_DEPENDS= libglibmm-2.4.so:${PORTSDIR}/devel/glibmm +glibmm_LIB_DEPENDS= libglibmm-2.4.so:devel/glibmm glibmm_USE_GNOME_IMPL= libsigc++20 glib20 gsound_DETECT= ${LOCALBASE}/libdata/pkgconfig/gsound.pc -gsound_BUILD_DEPENDS= gsound-play:${PORTSDIR}/audio/gsound -gsound_LIB_DEPENDS= libgsound.so:${PORTSDIR}/audio/gsound -gsound_RUN_DEPENDS= gsound-play:${PORTSDIR}/audio/gsound +gsound_BUILD_DEPENDS= gsound-play:audio/gsound +gsound_LIB_DEPENDS= libgsound.so:audio/gsound +gsound_RUN_DEPENDS= gsound-play:audio/gsound gsound_USE_GNOME_IMPL= glib20 gtkmm20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc -gtkmm20_LIB_DEPENDS= libgtkmm-2.0.so:${PORTSDIR}/x11-toolkits/gtkmm20 +gtkmm20_LIB_DEPENDS= libgtkmm-2.0.so:x11-toolkits/gtkmm20 gtkmm20_USE_GNOME_IMPL= libsigc++12 gtk20 gtkmm24_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc -gtkmm24_LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 +gtkmm24_LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24 gtkmm24_USE_GNOME_IMPL= glibmm cairomm atkmm pangomm gtk20 gtkmm30_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtkmm-3.0.pc -gtkmm30_LIB_DEPENDS= libgtkmm-3.0.so:${PORTSDIR}/x11-toolkits/gtkmm30 +gtkmm30_LIB_DEPENDS= libgtkmm-3.0.so:x11-toolkits/gtkmm30 gtkmm30_USE_GNOME_IMPL= glibmm cairomm atkmm pangomm gtk30 gtksourceviewmm3_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceviewmm-3.0.pc -gtksourceviewmm3_LIB_DEPENDS= libgtksourceviewmm-3.0.so:${PORTSDIR}/x11-toolkits/gtksourceviewmm3 +gtksourceviewmm3_LIB_DEPENDS= libgtksourceviewmm-3.0.so:x11-toolkits/gtksourceviewmm3 gtksourceviewmm3_USE_GNOME_IMPL= gtkmm30 gtksourceview3 libgdamm_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgdamm-4.0.pc -libgdamm_LIB_DEPENDS= libgdamm-4.0.so:${PORTSDIR}/databases/libgdamm +libgdamm_LIB_DEPENDS= libgdamm-4.0.so:databases/libgdamm libgdamm_USE_GNOME_IMPL=libgda4 glibmm libgdamm5_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgdamm-5.0.pc -libgdamm5_LIB_DEPENDS= libgdamm-5.0.so:${PORTSDIR}/databases/libgdamm5 +libgdamm5_LIB_DEPENDS= libgdamm-5.0.so:databases/libgdamm5 libgdamm5_USE_GNOME_IMPL= libgda5 glibmm libgtksourceviewmm_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceviewmm-2.0.pc -libgtksourceviewmm_LIB_DEPENDS= libgtksourceviewmm-2.0.so:${PORTSDIR}/x11-toolkits/libgtksourceviewmm +libgtksourceviewmm_LIB_DEPENDS= libgtksourceviewmm-2.0.so:x11-toolkits/libgtksourceviewmm libgtksourceviewmm_USE_GNOME_IMPL= gtksourceview2 gtkmm24 libsigc++12_DETECT= ${LOCALBASE}/libdata/pkgconfig/sigc++-1.2.pc -libsigc++12_LIB_DEPENDS= libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12 +libsigc++12_LIB_DEPENDS= libsigc-1.2.so:devel/libsigc++12 libsigc++20_DETECT= ${LOCALBASE}/libdata/pkgconfig/sigc++-2.0.pc -libsigc++20_LIB_DEPENDS= libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 +libsigc++20_LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 pangomm_DETECT= ${LOCALBASE}/libdata/pkgconfig/pangomm-1.4.pc -pangomm_LIB_DEPENDS= libpangomm-1.4.so:${PORTSDIR}/x11-toolkits/pangomm +pangomm_LIB_DEPENDS= libpangomm-1.4.so:x11-toolkits/pangomm pangomm_USE_GNOME_IMPL= pango glibmm cairomm ESD_CONFIG?= ${LOCALBASE}/bin/esd-config -esound_LIB_DEPENDS= libesd.so:${PORTSDIR}/audio/esound +esound_LIB_DEPENDS= libesd.so:audio/esound esound_CONFIGURE_ENV= ESD_CONFIG="${ESD_CONFIG}" esound_MAKE_ENV= ESD_CONFIG="${ESD_CONFIG}" esound_DETECT= ${ESD_CONFIG} GLIB_CONFIG?= ${LOCALBASE}/bin/glib-config -glib12_LIB_DEPENDS= libglib.so:${PORTSDIR}/devel/glib12 +glib12_LIB_DEPENDS= libglib.so:devel/glib12 glib12_CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" glib12_MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" glib12_DETECT= ${GLIB_CONFIG} GTK_CONFIG?= ${LOCALBASE}/bin/gtk-config -gtk12_LIB_DEPENDS= libgtk.so:${PORTSDIR}/x11-toolkits/gtk12 +gtk12_LIB_DEPENDS= libgtk.so:x11-toolkits/gtk12 gtk12_CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" gtk12_MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" gtk12_DETECT= ${GTK_CONFIG} gtk12_USE_GNOME_IMPL= glib12 GDK_PIXBUF_CONFIG?= ${LOCALBASE}/bin/gdk-pixbuf-config -gdkpixbuf_LIB_DEPENDS= libgdk_pixbuf.so:${PORTSDIR}/graphics/gdk-pixbuf +gdkpixbuf_LIB_DEPENDS= libgdk_pixbuf.so:graphics/gdk-pixbuf gdkpixbuf_CONFIGURE_ENV=GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}" gdkpixbuf_MAKE_ENV= GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}" gdkpixbuf_DETECT= ${GDK_PIXBUF_CONFIG} gdkpixbuf_USE_GNOME_IMPL=gtk12 gnomemimedata_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc -gnomemimedata_BUILD_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data -gnomemimedata_RUN_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data +gnomemimedata_BUILD_DEPENDS=${gnomemimedata_DETECT}:misc/gnome-mime-data +gnomemimedata_RUN_DEPENDS=${gnomemimedata_DETECT}:misc/gnome-mime-data -glib20_LIB_DEPENDS= libglib-2.0.so:${PORTSDIR}/devel/glib20 +glib20_LIB_DEPENDS= libglib-2.0.so:devel/glib20 glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc -atk_LIB_DEPENDS= libatk-1.0.so:${PORTSDIR}/accessibility/atk +atk_LIB_DEPENDS= libatk-1.0.so:accessibility/atk atk_DETECT= ${LOCALBASE}/libdata/pkgconfig/atk.pc atk_USE_GNOME_IMPL= glib20 -dconf_BUILD_DEPENDS= dconf:${PORTSDIR}/devel/dconf -dconf_LIB_DEPENDS= libdconf.so:${PORTSDIR}/devel/dconf -dconf_RUN_DEPENDS= dconf:${PORTSDIR}/devel/dconf +dconf_BUILD_DEPENDS= dconf:devel/dconf +dconf_LIB_DEPENDS= libdconf.so:devel/dconf +dconf_RUN_DEPENDS= dconf:devel/dconf dconf_DETECT= ${LOCALBASE}/libdata/pkgconfig/dconf.pc dconf_USE_GNOME_IMPL= glib20 -pango_LIB_DEPENDS= libpango-1.0.so:${PORTSDIR}/x11-toolkits/pango +pango_LIB_DEPENDS= libpango-1.0.so:x11-toolkits/pango pango_DETECT= ${LOCALBASE}/libdata/pkgconfig/pango.pc pango_USE_GNOME_IMPL= glib20 -pangox-compat_LIB_DEPENDS= libpangox-1.0.so:${PORTSDIR}/x11-toolkits/pangox-compat +pangox-compat_LIB_DEPENDS= libpangox-1.0.so:x11-toolkits/pangox-compat pangox-compat_DETECT= ${LOCALBASE}/libdata/pkgconfig/pangox.pc pangox-compat_USE_GNOME_IMPL= glib20 pango -gdkpixbuf2_LIB_DEPENDS= libgdk_pixbuf-2.0.so:${PORTSDIR}/graphics/gdk-pixbuf2 +gdkpixbuf2_LIB_DEPENDS= libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2 gdkpixbuf2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gdk-pixbuf-2.0.pc gdkpixbuf2_USE_GNOME_IMPL=glib20 -gtk-update-icon-cache_BUILD_DEPENDS= gtk-update-icon-cache:${PORTSDIR}/graphics/gtk-update-icon-cache -gtk-update-icon-cache_RUN_DEPENDS= gtk-update-icon-cache:${PORTSDIR}/graphics/gtk-update-icon-cache +gtk-update-icon-cache_BUILD_DEPENDS= gtk-update-icon-cache:graphics/gtk-update-icon-cache +gtk-update-icon-cache_RUN_DEPENDS= gtk-update-icon-cache:graphics/gtk-update-icon-cache gtk-update-icon-cache_DETECT= ${LOCALBASE}/bin/gtk-update-icon-cache gtk-update-icon-cache_USE_GNOME_IMPL= atk pango gdkpixbuf2 -gtk20_LIB_DEPENDS= libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +gtk20_LIB_DEPENDS= libgtk-x11-2.0.so:x11-toolkits/gtk20 gtk20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk+-x11-2.0.pc gtk20_USE_GNOME_IMPL= atk pango GTK2_VERSION= 2.10.0 -gtk30_LIB_DEPENDS= libgtk-3.so:${PORTSDIR}/x11-toolkits/gtk30 +gtk30_LIB_DEPENDS= libgtk-3.so:x11-toolkits/gtk30 gtk30_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk+-3.0.pc gtk30_USE_GNOME_IMPL= atk pango GTK3_VERSION= 3.0.0 -libidl_LIB_DEPENDS= libIDL-2.so:${PORTSDIR}/devel/libIDL +libidl_LIB_DEPENDS= libIDL-2.so:devel/libIDL libidl_DETECT= ${LOCALBASE}/libdata/pkgconfig/libIDL-2.0.pc libidl_USE_GNOME_IMPL= glib20 -orbit2_LIB_DEPENDS= libORBit-2.so:${PORTSDIR}/devel/ORBit2 +orbit2_LIB_DEPENDS= libORBit-2.so:devel/ORBit2 orbit2_DETECT= ${LOCALBASE}/libdata/pkgconfig/ORBit-2.0.pc orbit2_USE_GNOME_IMPL= libidl -libglade2_LIB_DEPENDS= libglade-2.0.so:${PORTSDIR}/devel/libglade2 +libglade2_LIB_DEPENDS= libglade-2.0.so:devel/libglade2 libglade2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libglade-2.0.pc libglade2_USE_GNOME_IMPL=libxml2 gtk20 -libxml2_BUILD_DEPENDS= xml2-config:${PORTSDIR}/textproc/libxml2 -libxml2_LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 -libxml2_RUN_DEPENDS= xml2-config:${PORTSDIR}/textproc/libxml2 +libxml2_BUILD_DEPENDS= xml2-config:textproc/libxml2 +libxml2_LIB_DEPENDS= libxml2.so:textproc/libxml2 +libxml2_RUN_DEPENDS= xml2-config:textproc/libxml2 libxml2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc -libxslt_BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt -libxslt_LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt +libxslt_BUILD_DEPENDS= xsltproc:textproc/libxslt +libxslt_LIB_DEPENDS= libxslt.so:textproc/libxslt libxslt_RUN_DEPENDS= ${libxslt_BUILD_DEPENDS} libxslt_DETECT= ${LOCALBASE}/libdata/pkgconfig/libxslt.pc libxslt_USE_GNOME_IMPL= libxml2 -libbonobo_LIB_DEPENDS= libbonobo-2.so:${PORTSDIR}/devel/libbonobo +libbonobo_LIB_DEPENDS= libbonobo-2.so:devel/libbonobo libbonobo_DETECT= ${LOCALBASE}/libdata/pkgconfig/libbonobo-2.0.pc libbonobo_USE_GNOME_IMPL=libxml2 orbit2 introspection_DETECT= ${LOCALBASE}/libdata/pkgconfig/gobject-introspection-1.0.pc -introspection_BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -introspection_LIB_DEPENDS= libgirepository-1.0.so:${PORTSDIR}/devel/gobject-introspection -introspection_RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +introspection_BUILD_DEPENDS= g-ir-scanner:devel/gobject-introspection +introspection_LIB_DEPENDS= libgirepository-1.0.so:devel/gobject-introspection +introspection_RUN_DEPENDS= g-ir-scanner:devel/gobject-introspection introspection_USE_GNOME_IMPL= glib20 introspection_MAKE_ENV= GI_SCANNER_DISABLE_CACHE=1 XDG_CACHE_HOME=${WRKDIR} -gconf2_LIB_DEPENDS= libgconf-2.so:${PORTSDIR}/devel/gconf2 +gconf2_LIB_DEPENDS= libgconf-2.so:devel/gconf2 gconf2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gconf-2.0.pc gconf2_USE_GNOME_IMPL= orbit2 libxml2 gtk20 -gnomevfs2_LIB_DEPENDS= libgnomevfs-2.so:${PORTSDIR}/devel/gnome-vfs +gnomevfs2_LIB_DEPENDS= libgnomevfs-2.so:devel/gnome-vfs gnomevfs2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-vfs-2.0.pc gnomevfs2_USE_GNOME_IMPL=gconf2 gnomemimedata -libgnomecanvas_LIB_DEPENDS= libgnomecanvas-2.so:${PORTSDIR}/graphics/libgnomecanvas +libgnomecanvas_LIB_DEPENDS= libgnomecanvas-2.so:graphics/libgnomecanvas libgnomecanvas_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2 -libartlgpl2_LIB_DEPENDS= libart_lgpl_2.so:${PORTSDIR}/graphics/libart_lgpl +libartlgpl2_LIB_DEPENDS= libart_lgpl_2.so:graphics/libart_lgpl libartlgpl2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc -libgnomeprint_LIB_DEPENDS= libgnomeprint-2-2.so:${PORTSDIR}/print/libgnomeprint +libgnomeprint_LIB_DEPENDS= libgnomeprint-2-2.so:print/libgnomeprint libgnomeprint_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomeprint-2.2.pc libgnomeprint_USE_GNOME_IMPL= libbonobo libartlgpl2 gtk20 -libgnomeprintui_LIB_DEPENDS= libgnomeprintui-2-2.so:${PORTSDIR}/x11-toolkits/libgnomeprintui +libgnomeprintui_LIB_DEPENDS= libgnomeprintui-2-2.so:x11-toolkits/libgnomeprintui libgnomeprintui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomeprintui-2.2.pc libgnomeprintui_USE_GNOME_IMPL= libgnomeprint libgnomecanvas -libgnome_LIB_DEPENDS= libgnome-2.so:${PORTSDIR}/x11/libgnome +libgnome_LIB_DEPENDS= libgnome-2.so:x11/libgnome libgnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-2.0.pc libgnome_USE_GNOME_IMPL=gnomevfs2 esound libbonobo -libbonoboui_LIB_DEPENDS= libbonoboui-2.so:${PORTSDIR}/x11-toolkits/libbonoboui +libbonoboui_LIB_DEPENDS= libbonoboui-2.so:x11-toolkits/libbonoboui libbonoboui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libbonoboui-2.0.pc libbonoboui_USE_GNOME_IMPL= libgnomecanvas libgnome -libgnomeui_LIB_DEPENDS= libgnomeui-2.so:${PORTSDIR}/x11-toolkits/libgnomeui +libgnomeui_LIB_DEPENDS= libgnomeui-2.so:x11-toolkits/libgnomeui libgnomeui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomeui-2.0.pc libgnomeui_USE_GNOME_IMPL= libbonoboui -atspi_LIB_DEPENDS= libspi.so:${PORTSDIR}/accessibility/at-spi +atspi_LIB_DEPENDS= libspi.so:accessibility/at-spi atspi_DETECT= ${LOCALBASE}/libdata/pkgconfig/cspi-1.0.pc atspi_USE_GNOME_IMPL= gtk20 libbonobo -libgtkhtml_LIB_DEPENDS= libgtkhtml-2.so:${PORTSDIR}/www/libgtkhtml +libgtkhtml_LIB_DEPENDS= libgtkhtml-2.so:www/libgtkhtml libgtkhtml_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2 -gnomedesktop3_LIB_DEPENDS= libgnome-desktop-3.so:${PORTSDIR}/x11/gnome-desktop +gnomedesktop3_LIB_DEPENDS= libgnome-desktop-3.so:x11/gnome-desktop gnomedesktop3_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-3.0.pc gnomedesktop3_USE_GNOME_IMPL= gtk30 -libwnck_LIB_DEPENDS= libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck +libwnck_LIB_DEPENDS= libwnck-1.so:x11-toolkits/libwnck libwnck_DETECT= ${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc libwnck_USE_GNOME_IMPL= gtk20 -libwnck3_LIB_DEPENDS= libwnck-3.so:${PORTSDIR}/x11-toolkits/libwnck3 +libwnck3_LIB_DEPENDS= libwnck-3.so:x11-toolkits/libwnck3 libwnck3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libwnck-3.0.pc libwnck3_USE_GNOME_IMPL=gtk30 -vte_LIB_DEPENDS= libvte.so:${PORTSDIR}/x11-toolkits/vte +vte_LIB_DEPENDS= libvte.so:x11-toolkits/vte vte_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte.pc vte_USE_GNOME_IMPL= gtk20 -vte3_LIB_DEPENDS= libvte-2.91.so:${PORTSDIR}/x11-toolkits/vte3 +vte3_LIB_DEPENDS= libvte-2.91.so:x11-toolkits/vte3 vte3_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte-2.91.pc vte3_USE_GNOME_IMPL= gtk30 -librsvg2_LIB_DEPENDS= librsvg-2.so:${PORTSDIR}/graphics/librsvg2 +librsvg2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 librsvg2_DETECT= ${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc librsvg2_USE_GNOME_IMPL=libgsf gdkpixbuf2 pango -nautilus3_LIB_DEPENDS= libnautilus-extension.so:${PORTSDIR}/x11-fm/nautilus +nautilus3_LIB_DEPENDS= libnautilus-extension.so:x11-fm/nautilus nautilus3_DETECT= ${LOCALBASE}/share/gir-1.0/Nautilus-3.0.gir nautilus3_USE_GNOME_IMPL=gnomedesktop3 gvfs libxml2 -metacity_LIB_DEPENDS= libmetacity-private.so:${PORTSDIR}/x11-wm/metacity +metacity_LIB_DEPENDS= libmetacity-private.so:x11-wm/metacity metacity_DETECT= ${LOCALBASE}/libdata/pkgconfig/libmetacity-private.pc -gal2_LIB_DEPENDS= libgal-2.4.so:${PORTSDIR}/x11-toolkits/gal2 +gal2_LIB_DEPENDS= libgal-2.4.so:x11-toolkits/gal2 gal2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gal-2.4.pc gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui gnomecontrolcenter3_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc -gnomecontrolcenter3_BUILD_DEPENDS= ${gnomecontrolcenter3_DETECT}:${PORTSDIR}/sysutils/gnome-control-center -gnomecontrolcenter3_RUN_DEPENDS= ${gnomecontrolcenter3_DETECT}:${PORTSDIR}/sysutils/gnome-control-center +gnomecontrolcenter3_BUILD_DEPENDS= ${gnomecontrolcenter3_DETECT}:sysutils/gnome-control-center +gnomecontrolcenter3_RUN_DEPENDS= ${gnomecontrolcenter3_DETECT}:sysutils/gnome-control-center gnomecontrolcenter3_USE_GNOME_IMPL= gnomedesktop3 -libgda4_LIB_DEPENDS= libgda-4.0.so:${PORTSDIR}/databases/libgda4 +libgda4_LIB_DEPENDS= libgda-4.0.so:databases/libgda4 libgda4_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-4.0.pc libgda4_USE_GNOME_IMPL= glib20 libxslt -libgda5_LIB_DEPENDS= libgda-5.0.so:${PORTSDIR}/databases/libgda5 +libgda5_LIB_DEPENDS= libgda-5.0.so:databases/libgda5 libgda5_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-5.0.pc libgda5_USE_GNOME_IMPL= glib20 libxslt -libgda5-ui_LIB_DEPENDS= libgda-ui-5.0.so:${PORTSDIR}/databases/libgda5-ui +libgda5-ui_LIB_DEPENDS= libgda-ui-5.0.so:databases/libgda5-ui libgda5-ui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-ui-5.0.pc libgda5-ui_USE_GNOME_IMPL=glib20 libxslt libgda5 -gtksourceview_LIB_DEPENDS= libgtksourceview-1.0.so:${PORTSDIR}/x11-toolkits/gtksourceview +gtksourceview_LIB_DEPENDS= libgtksourceview-1.0.so:x11-toolkits/gtksourceview gtksourceview_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceview-1.0.pc gtksourceview_USE_GNOME_IMPL=libgnome libgnomeprintui -gtksourceview2_LIB_DEPENDS= libgtksourceview-2.0.so:${PORTSDIR}/x11-toolkits/gtksourceview2 +gtksourceview2_LIB_DEPENDS= libgtksourceview-2.0.so:x11-toolkits/gtksourceview2 gtksourceview2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceview-2.0.pc gtksourceview2_USE_GNOME_IMPL=gtk20 libxml2 -gtksourceview3_LIB_DEPENDS= libgtksourceview-3.0.so:${PORTSDIR}/x11-toolkits/gtksourceview3 +gtksourceview3_LIB_DEPENDS= libgtksourceview-3.0.so:x11-toolkits/gtksourceview3 gtksourceview3_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksoureview-3.0.pc gtksourceview3_USE_GNOME_IMPL=gtk30 libxml2 -libgsf_LIB_DEPENDS= libgsf-1.so:${PORTSDIR}/devel/libgsf +libgsf_LIB_DEPENDS= libgsf-1.so:devel/libgsf libgsf_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-1.pc libgsf_USE_GNOME_IMPL= glib20 libxml2 pygobject_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc -pygobject_BUILD_DEPENDS= pygobject-codegen-2.0:${PORTSDIR}/devel/py-gobject -pygobject_RUN_DEPENDS= pygobject-codegen-2.0:${PORTSDIR}/devel/py-gobject +pygobject_BUILD_DEPENDS= pygobject-codegen-2.0:devel/py-gobject +pygobject_RUN_DEPENDS= pygobject-codegen-2.0:devel/py-gobject pygobject_USE_GNOME_IMPL= glib20 py3gobject3_DETECT= ${LOCALBASE}/share/py3gobject3/.keep -py3gobject3_BUILD_DEPENDS= py3?-gobject3>=0:${PORTSDIR}/devel/py3-gobject3 -py3gobject3_RUN_DEPENDS= py3?-gobject3>=0:${PORTSDIR}/devel/py3-gobject3 +py3gobject3_BUILD_DEPENDS= py3?-gobject3>=0:devel/py3-gobject3 +py3gobject3_RUN_DEPENDS= py3?-gobject3>=0:devel/py3-gobject3 py3gobject3_USE_GNOME_IMPL= glib20 pygobject3_DETECT= ${LOCALBASE}/share/pygobject3/.keep -pygobject3_BUILD_DEPENDS= py2?-gobject3>=0:${PORTSDIR}/devel/py-gobject3 -pygobject3_RUN_DEPENDS= py2?-gobject3>=0:${PORTSDIR}/devel/py-gobject3 +pygobject3_BUILD_DEPENDS= py2?-gobject3>=0:devel/py-gobject3 +pygobject3_RUN_DEPENDS= py2?-gobject3>=0:devel/py-gobject3 pygobject3_USE_GNOME_IMPL= glib20 pygtk2_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc -pygtk2_BUILD_DEPENDS= ${pygtk2_DETECT}:${PORTSDIR}/x11-toolkits/py-gtk2 -pygtk2_RUN_DEPENDS= ${pygtk2_DETECT}:${PORTSDIR}/x11-toolkits/py-gtk2 +pygtk2_BUILD_DEPENDS= ${pygtk2_DETECT}:x11-toolkits/py-gtk2 +pygtk2_RUN_DEPENDS= ${pygtk2_DETECT}:x11-toolkits/py-gtk2 pygtk2_USE_GNOME_IMPL= libglade2 pygobject pygnome2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-python-2.0.pc -pygnome2_BUILD_DEPENDS= ${pygnome2_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome2 -pygnome2_RUN_DEPENDS= ${pygnome2_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome2 +pygnome2_BUILD_DEPENDS= ${pygnome2_DETECT}:x11-toolkits/py-gnome2 +pygnome2_RUN_DEPENDS= ${pygnome2_DETECT}:x11-toolkits/py-gnome2 pygnome2_USE_GNOME_IMPL=libgnomeui pygtk2 intltool_DETECT= ${LOCALBASE}/bin/intltool-extract -intltool_BUILD_DEPENDS= ${intltool_DETECT}:${PORTSDIR}/textproc/intltool +intltool_BUILD_DEPENDS= ${intltool_DETECT}:textproc/intltool intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} \ 's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \ @@ -435,59 +435,59 @@ intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -n 's/DATADIRNAME=lib/DATADIRNAME=share/' intlhack_USE_GNOME_IMPL=intltool -gtkhtml3_LIB_DEPENDS= libgtkhtml-3.14.so:${PORTSDIR}/www/gtkhtml3 +gtkhtml3_LIB_DEPENDS= libgtkhtml-3.14.so:www/gtkhtml3 gtkhtml3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.14.pc gtkhtml3_USE_GNOME_IMPL=libglade2 -gtkhtml4_LIB_DEPENDS= libgtkhtml-4.0.so:${PORTSDIR}/www/gtkhtml4 +gtkhtml4_LIB_DEPENDS= libgtkhtml-4.0.so:www/gtkhtml4 gtkhtml4_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-4.0.pc gtkhtml4_USE_GNOME_IMPL=gtk30 libxml2 -gnomespeech_LIB_DEPENDS=libgnomespeech.so:${PORTSDIR}/accessibility/gnome-speech +gnomespeech_LIB_DEPENDS=libgnomespeech.so:accessibility/gnome-speech gnomespeech_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc gnomespeech_USE_GNOME_IMPL=libbonobo -evolutiondataserver3_LIB_DEPENDS= libedataserver-1.2.so:${PORTSDIR}/databases/evolution-data-server +evolutiondataserver3_LIB_DEPENDS= libedataserver-1.2.so:databases/evolution-data-server evolutiondataserver3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libedataserverui-3.0.pc evolutiondataserver3_USE_GNOME_IMPL= libxml2 gtk30 -gnomemenus3_BUILD_DEPENDS= gnome-menus>=3.2.0:${PORTSDIR}/x11/gnome-menus -gnomemenus3_RUN_DEPENDS= gnome-menus>=3.2.0:${PORTSDIR}/x11/gnome-menus +gnomemenus3_BUILD_DEPENDS= gnome-menus>=3.2.0:x11/gnome-menus +gnomemenus3_RUN_DEPENDS= gnome-menus>=3.2.0:x11/gnome-menus gnomemenus3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-menu-3.0.pc gnomemenus3_USE_GNOME_IMPL= glib20 gnomedocutils_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-doc-utils.pc -gnomedocutils_BUILD_DEPENDS= ${gnomedocutils_DETECT}:${PORTSDIR}/textproc/gnome-doc-utils -gnomedocutils_RUN_DEPENDS= ${gnomedocutils_DETECT}:${PORTSDIR}/textproc/gnome-doc-utils +gnomedocutils_BUILD_DEPENDS= ${gnomedocutils_DETECT}:textproc/gnome-doc-utils +gnomedocutils_RUN_DEPENDS= ${gnomedocutils_DETECT}:textproc/gnome-doc-utils gnomedocutils_USE_GNOME_IMPL= libxslt gtksharp10_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc -gtksharp10_BUILD_DEPENDS= ${gtksharp10_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp10 -gtksharp10_RUN_DEPENDS= ${gtksharp10_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp10 +gtksharp10_BUILD_DEPENDS= ${gtksharp10_DETECT}:x11-toolkits/gtk-sharp10 +gtksharp10_RUN_DEPENDS= ${gtksharp10_DETECT}:x11-toolkits/gtk-sharp10 gtksharp10_USE_GNOME_IMPL= gtk20 gtksharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp-2.0.pc -gtksharp20_BUILD_DEPENDS= ${gtksharp20_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp20 -gtksharp20_RUN_DEPENDS= ${gtksharp20_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp20 +gtksharp20_BUILD_DEPENDS= ${gtksharp20_DETECT}:x11-toolkits/gtk-sharp20 +gtksharp20_RUN_DEPENDS= ${gtksharp20_DETECT}:x11-toolkits/gtk-sharp20 gtksharp20_USE_GNOME_IMPL= gtk20 gnomesharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-sharp-2.0.pc -gnomesharp20_BUILD_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20 -gnomesharp20_RUN_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20 +gnomesharp20_BUILD_DEPENDS= ${gnomesharp20_DETECT}:x11-toolkits/gnome-sharp20 +gnomesharp20_RUN_DEPENDS= ${gnomesharp20_DETECT}:x11-toolkits/gnome-sharp20 gnomesharp20_USE_GNOME_IMPL= gnomevfs2 gtkhtml3 gtksharp20 librsvg2 vte libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc -libgnomekbd_LIB_DEPENDS= libgnomekbd.so:${PORTSDIR}/x11/libgnomekbd +libgnomekbd_LIB_DEPENDS= libgnomekbd.so:x11/libgnomekbd libgnomekbd_USE_GNOME_IMPL= gtk30 libxml2 pygtksourceview_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc -pygtksourceview_BUILD_DEPENDS= ${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview -pygtksourceview_RUN_DEPENDS= ${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview +pygtksourceview_BUILD_DEPENDS= ${pygtksourceview_DETECT}:x11-toolkits/py-gtksourceview +pygtksourceview_RUN_DEPENDS= ${pygtksourceview_DETECT}:x11-toolkits/py-gtksourceview pygtksourceview_USE_GNOME_IMPL= gtksourceview2 pygtk2 gvfs_DETECT= ${LOCALBASE}/lib/gvfs/libgvfscommon.so -gvfs_BUILD_DEPENDS= gvfs>=0:${PORTSDIR}/devel/gvfs -gvfs_RUN_DEPENDS= gvfs>=0:${PORTSDIR}/devel/gvfs +gvfs_BUILD_DEPENDS= gvfs>=0:devel/gvfs +gvfs_RUN_DEPENDS= gvfs>=0:devel/gvfs gvfs_USE_GNOME_IMPL= glib20 .if defined(INSTALLS_ICONS) @@ -659,7 +659,7 @@ PLIST_SUB+= GNOME:="" NOGNOME:="@comment .if defined(USE_GNOME_SUBR) GNOME_SUBR= ${LOCALBASE}/etc/gnome.subr -RUN_DEPENDS+= ${GNOME_SUBR}:${PORTSDIR}/sysutils/gnome_subr +RUN_DEPENDS+= ${GNOME_SUBR}:sysutils/gnome_subr SUB_LIST+= GNOME_SUBR=${GNOME_SUBR} .endif Modified: head/Mk/Uses/gnustep.mk ============================================================================== --- head/Mk/Uses/gnustep.mk Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/gnustep.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/gperf.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/gssapi.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 Sun Mar 27 01:10:18 2016 (r411969) +++ head/Mk/Uses/horde.mk Sun Mar 27 01:23:25 2016 (r411970) @@ -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 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***