From 4a941f757da29eb973645c92b6b575e0d1638315 Mon Sep 17 00:00:00 2001 From: Jason Helfman Date: Fri, 10 Jun 2016 23:23:32 +0000 Subject: [PATCH] - remove applicable ${PORTSDIR} referrences PR: 210066 Reported by: rwestlun@gmail.com --- .../porters-handbook/makefiles/chapter.xml | 42 +++++++++---------- .../porting-samplem/chapter.xml | 2 +- .../porters-handbook/special/chapter.xml | 4 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml index 1787bb800f..813e317e30 100644 --- a/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml @@ -3239,7 +3239,7 @@ ALWAYS_KEEP_DISTFILES= yes directory in which to find it in case it is not available. For example, - LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg + LIB_DEPENDS= libjpeg.so:graphics/jpeg will check for a shared jpeg library with any version, and descend into the graphics/jpeg @@ -3274,8 +3274,8 @@ ALWAYS_KEEP_DISTFILES= yes For example, - RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn \ - xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr + RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:news/inn \ + xmlcatmgr:textproc/xmlcatmgr will check if the file or directory /usr/local/news/bin/innd exists, and @@ -3335,8 +3335,8 @@ ALWAYS_KEEP_DISTFILES= yes BUILD_DEPENDS and RUN_DEPENDS: - MY_DEPENDS= some:${PORTSDIR}/devel/some \ - other:${PORTSDIR}/lang/other + MY_DEPENDS= some:devel/some \ + other:lang/other BUILD_DEPENDS= ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} @@ -3358,7 +3358,7 @@ RUN_DEPENDS= ${MY_DEPENDS} path:dir:target tuples. For example, - BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip + BUILD_DEPENDS= unzip:archivers/unzip will check for an executable called unzip, and descend into the @@ -3382,7 +3382,7 @@ RUN_DEPENDS= ${MY_DEPENDS} path:dir:target tuples. For example, - FETCH_DEPENDS= ncftp2:${PORTSDIR}/net/ncftp2 + FETCH_DEPENDS= ncftp2:net/ncftp2 will check for an executable called ncftp2, and descend into the @@ -3403,7 +3403,7 @@ RUN_DEPENDS= ${MY_DEPENDS} path:dir:target tuples. For example, - EXTRACT_DEPENDS= unzip:${PORTSDIR}/archivers/unzip + EXTRACT_DEPENDS= unzip:archivers/unzip will check for an executable called unzip, and descend into the @@ -3433,7 +3433,7 @@ RUN_DEPENDS= ${MY_DEPENDS} path:dir:target tuples. For example, - PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/java/jfc:extract + PATCH_DEPENDS= ${NONEXISTENT}:java/jfc:extract will descend into the java/jfc subdirectory of the ports tree to extract it. @@ -3560,7 +3560,7 @@ RUN_DEPENDS= ${MY_DEPENDS} except LIB_DEPENDS using this syntax: - p5-Spiffy>=0.26:${PORTSDIR}/devel/p5-Spiffy + p5-Spiffy>=0.26:devel/p5-Spiffy The first field contains a dependent package name, which must match the entry in the package database, a comparison @@ -3598,7 +3598,7 @@ RUN_DEPENDS= ${MY_DEPENDS} be saved by specifying the target too. For instance - BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract + BUILD_DEPENDS= ${NONEXISTENT}:graphics/jpeg:extract will always descend to the jpeg port and extract it. @@ -3640,7 +3640,7 @@ RUN_DEPENDS= ${MY_DEPENDS} .include <bsd.port.pre.mk> .if exists(${LOCALBASE}/bin/foo) -LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/bar +LIB_DEPENDS= libbar.so:foo/bar .endif @@ -3660,7 +3660,7 @@ LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/bar OPTIONS_DEFINE= BAR BAR_DESC= Calling cellphones via bar -BAR_LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/bar +BAR_LIB_DEPENDS= libbar.so:foo/bar Testing option variables is the correct method. It will @@ -3972,7 +3972,7 @@ OPTIONS_DEFAULT=FOO # Will add --with-foo / --without-foo FOO_CONFIGURE_WITH= foo -BAR_RUN_DEPENDS= bar:${PORTSDIR}/bar/bar +BAR_RUN_DEPENDS= bar:bar/bar .include <bsd.port.mk> @@ -4019,7 +4019,7 @@ PGSQL_USE= pgsql=yes # Will add --enable-postgres / --disable-postgres PGSQL_CONFIGURE_ENABLE= postgres -ICU_LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu +ICU_LIB_DEPENDS= libicuuc.so:devel/icu # Will add --with-examples / --without-examples EXAMPLES_CONFIGURE_WITH= examples @@ -4080,7 +4080,7 @@ EXAMPLES_CONFIGURE_WITH= examples Wrong Handling of an Option .if ${PORT_OPTIONS:MFOO} -LIB_DEPENDS+= libfoo.so:${PORTSDIR}/devel/foo +LIB_DEPENDS+= libfoo.so:devel/foo CONFIGURE_ARGS+= --enable-foo .endif @@ -4098,7 +4098,7 @@ CONFIGURE_ARGS+= --enable-foo Correct Handling of an Option - FOO_LIB_DEPENDS= libfoo.so:${PORTSDIR}/devel/foo + FOO_LIB_DEPENDS= libfoo.so:devel/foo # Will add --enable-foo / --disable-foo FOO_CONFIGURE_ENABLE= foo @@ -4603,8 +4603,8 @@ BIN3_BUILD= no selected. For example: OPTIONS_DEFINE= OPT1 -OPT1_LIB_DEPENDS= liba.so:${PORTSDIR}/devel/a -OPT1_LIB_DEPENDS_OFF= libb.so:${PORTSDIR}/devel/b +OPT1_LIB_DEPENDS= liba.so:devel/a +OPT1_LIB_DEPENDS_OFF= libb.so:devel/b is equivalent to: @@ -4613,9 +4613,9 @@ OPT1_LIB_DEPENDS_OFF= libb.so:${PORTSDIR}/devel/b .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MOPT1} -LIB_DEPENDS+= liba.so:${PORTSDIR}/devel/a +LIB_DEPENDS+= liba.so:devel/a .else -LIB_DEPENDS+= libb.so:${PORTSDIR}/devel/b +LIB_DEPENDS+= libb.so:devel/b .endif diff --git a/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml index 34c2626d4c..b50c1c2f4f 100644 --- a/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml @@ -66,7 +66,7 @@ MAINTAINER= asami@FreeBSD.org COMMENT= DVI Previewer for the X Window System [dependencies -- can be empty] -RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript +RUN_DEPENDS= gs:print/ghostscript [this section is for other standard bsd.port.mk variables that do not belong to any of the above] diff --git a/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml index 3ecdebcc85..c7b088ef36 100644 --- a/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml @@ -840,7 +840,7 @@ CMAKE_SOURCE_PATH= ${WRKSRC}/subproject libltdl.so, add a dependency on it: - LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl + LIB_DEPENDS= libltdl.so:devel/libltdl @@ -1148,7 +1148,7 @@ PLIST_SUB+= NLS="@comment " Perl Dependency Example - p5-IO-Tee>=0.64:${PORTSDIR}/devel/p5-IO-Tee + p5-IO-Tee>=0.64:devel/p5-IO-Tee For Perl ports that install manual pages, the macro