[Midnightbsd-cvs] mports [24230] trunk/Mk/extensions: use relative paths

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Sep 5 20:24:13 EDT 2018 

Revision: 24230
          http://svnweb.midnightbsd.org/mports/?rev=24230
Author:   laffer1
Date:     2018-09-05 20:24:12 -0400 (Wed, 05 Sep 2018)
Log Message:
-----------
use relative paths

Modified Paths:
--------------
    trunk/Mk/extensions/makeinfo.mk
    trunk/Mk/extensions/objc.mk
    trunk/Mk/extensions/openal.mk
    trunk/Mk/extensions/perl5.mk
    trunk/Mk/extensions/readline.mk
    trunk/Mk/extensions/ruby.mk
    trunk/Mk/extensions/shared-mime-info.mk
    trunk/Mk/extensions/sqlite.mk
    trunk/Mk/extensions/tcl.mk
    trunk/Mk/extensions/xfce.mk
    trunk/Mk/extensions/zip.mk

Modified: trunk/Mk/extensions/makeinfo.mk
===================================================================
--- trunk/Mk/extensions/makeinfo.mk	2018-09-06 00:19:05 UTC (rev 24229)
+++ trunk/Mk/extensions/makeinfo.mk	2018-09-06 00:24:12 UTC (rev 24230)
@@ -15,7 +15,7 @@
 .endif
 
 .if !exists(/usr/bin/makeinfo)
-BUILD_DEPENDS+=	makeinfo:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS+=	makeinfo:print/texinfo
 .endif
 
 .endif

Modified: trunk/Mk/extensions/objc.mk
===================================================================
--- trunk/Mk/extensions/objc.mk	2018-09-06 00:19:05 UTC (rev 24229)
+++ trunk/Mk/extensions/objc.mk	2018-09-06 00:24:12 UTC (rev 24230)
@@ -39,7 +39,7 @@
 
 # We do always need clang
 .if (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 34) || ${COMPILER_TYPE} != clang
-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
@@ -49,7 +49,7 @@
 .endif
 .endif
 
-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
 CONFIGURE_ENV+=	OBJC="${CC}" OBJCFLAGS="${OBJCFLAGS}"

Modified: trunk/Mk/extensions/openal.mk
===================================================================
--- trunk/Mk/extensions/openal.mk	2018-09-06 00:19:05 UTC (rev 24229)
+++ trunk/Mk/extensions/openal.mk	2018-09-06 00:24:12 UTC (rev 24230)
@@ -17,9 +17,9 @@
 _valid_ARGS=	al si soft alut
 _openal_ARGS=	${openal_ARGS:C/,/ /g}
 
-_si_DEPENDS=	libopenal.so.0:${PORTSDIR}/audio/openal
-_soft_DEPENDS=	libopenal.so.1:${PORTSDIR}/audio/openal-soft
-_alut_DEPENDS=	libalut.so.1:${PORTSDIR}/audio/freealut
+_si_DEPENDS=	libopenal.so.0:audio/openal
+_soft_DEPENDS=	libopenal.so.1:audio/openal-soft
+_alut_DEPENDS=	libalut.so.1:audio/freealut
 
 _OPENAL_LIBS=	si soft
 _DEFAULT_OPENAL=	soft

Modified: trunk/Mk/extensions/perl5.mk
===================================================================
--- trunk/Mk/extensions/perl5.mk	2018-09-06 00:19:05 UTC (rev 24229)
+++ trunk/Mk/extensions/perl5.mk	2018-09-06 00:24:12 UTC (rev 24230)
@@ -175,12 +175,12 @@
 
 .if (${PERL_NO_DEPENDS:tu} == "NO") && !defined(_CORE_PERL)
 .if defined(USE_PERL5_BUILD)
-EXTRACT_DEPENDS+=${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
-PATCH_DEPENDS+=	${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
-BUILD_DEPENDS+=	${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
+EXTRACT_DEPENDS+=${PERL5}:lang/${PERL_PORT}
+PATCH_DEPENDS+=	${PERL5}:lang/${PERL_PORT}
+BUILD_DEPENDS+=	${PERL5}:lang/${PERL_PORT}
 .endif
 .if defined(USE_PERL5) || defined(USE_PERL5_RUN)
-RUN_DEPENDS+=	${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
+RUN_DEPENDS+=	${PERL5}:lang/${PERL_PORT}
 .endif
 .endif
 
@@ -206,7 +206,7 @@
 PL_BUILD?=		Build
 CONFIGURE_SCRIPT?=	Build.PL
 .if ${PORTNAME} != Module-Build
-BUILD_DEPENDS+=		${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build
+BUILD_DEPENDS+=		${SITE_PERL}/Module/Build.pm:devel/p5-Module-Build
 .endif
 CONFIGURE_ARGS+= \
 	create_packlist=0 \

Modified: trunk/Mk/extensions/readline.mk
===================================================================
--- trunk/Mk/extensions/readline.mk	2018-09-06 00:19:05 UTC (rev 24229)
+++ trunk/Mk/extensions/readline.mk	2018-09-06 00:24:12 UTC (rev 24230)
@@ -15,7 +15,7 @@
 .endif
 
 .if ${readline_ARGS} == port
-LIB_DEPENDS+=		libreadline.so.6:${PORTSDIR}/devel/readline
+LIB_DEPENDS+=		libreadline.so.6:devel/readline
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 .endif

Modified: trunk/Mk/extensions/ruby.mk
===================================================================
--- trunk/Mk/extensions/ruby.mk	2018-09-06 00:19:05 UTC (rev 24229)
+++ trunk/Mk/extensions/ruby.mk	2018-09-06 00:24:12 UTC (rev 24230)
@@ -317,9 +317,9 @@
 RUBY_RDTOOL_PORT?=	textproc/ruby-rdtool
 
 # Depends
-DEPEND_LIBRUBY?=	lib${RUBY_NAME}.so.${RUBY_SHLIBVER}:${PORTSDIR}/${RUBY_PORT}
-DEPEND_RUBY?=		${RUBY}:${PORTSDIR}/${RUBY_PORT}
-DEPEND_RUBY_RDTOOL?=	${RUBY_RD2}:${PORTSDIR}/${RUBY_RDTOOL_PORT}
+DEPEND_LIBRUBY?=	lib${RUBY_NAME}.so.${RUBY_SHLIBVER}:${RUBY_PORT}
+DEPEND_RUBY?=		${RUBY}:${RUBY_PORT}
+DEPEND_RUBY_RDTOOL?=	${RUBY_RD2}:${RUBY_RDTOOL_PORT}
 
 # Directories
 RUBY_LIBDIR?=		${_RUBY_SYSLIBDIR}/ruby/${RUBY_VER}
@@ -425,8 +425,8 @@
 #
 .if defined(USE_RUBYGEMS)
 
-BUILD_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
-RUN_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
+BUILD_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
+RUN_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
 
 PKGNAMEPREFIX?=	rubygem-
 EXTRACT_SUFX=	.gem
@@ -433,7 +433,7 @@
 EXTRACT_ONLY=
 DIST_SUBDIR=	rubygem
 
-EXTRACT_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
+EXTRACT_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
 GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
 GEMS_DIR=	${GEMS_BASE_DIR}/gems
 DOC_DIR=	${GEMS_BASE_DIR}/doc
@@ -597,7 +597,7 @@
 .endif
 
 .if defined(USE_RAKE)
-BUILD_DEPENDS+=		${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
+BUILD_DEPENDS+=		${LOCALBASE}/bin/rake:devel/rubygem-rake
 RAKE_BIN=	${LOCALBASE}/bin/rake
 .endif
 

Modified: trunk/Mk/extensions/shared-mime-info.mk
===================================================================
--- trunk/Mk/extensions/shared-mime-info.mk	2018-09-06 00:19:05 UTC (rev 24229)
+++ trunk/Mk/extensions/shared-mime-info.mk	2018-09-06 00:24:12 UTC (rev 24230)
@@ -14,8 +14,8 @@
 IGNORE=	USES=shared-mime-info does not require args
 .endif
 
-BUILD_DEPENDS+=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
-RUN_DEPENDS+=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
+BUILD_DEPENDS+=	update-mime-database:misc/shared-mime-info
+RUN_DEPENDS+=	update-mime-database:misc/shared-mime-info
 
 # bolt our post-install target to post-install
 post-install: shared-mime-post-install

Modified: trunk/Mk/extensions/sqlite.mk
===================================================================
--- trunk/Mk/extensions/sqlite.mk	2018-09-06 00:19:05 UTC (rev 24229)
+++ trunk/Mk/extensions/sqlite.mk	2018-09-06 00:24:12 UTC (rev 24230)
@@ -26,7 +26,7 @@
 # USE_SQLITE is specified incorrectly, so mark this as IGNORE
 .if ${_SQLITE_VER} == "3"
 .	if ${OSVERSION} < 2000
-LIB_DEPENDS+=	sqlite${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
+LIB_DEPENDS+=	sqlite${_SQLITE_VER}:databases/sqlite${_SQLITE_VER}
 SQLITE_VER=	${_SQLITE_VER}
 .	endif
 .else

Modified: trunk/Mk/extensions/tcl.mk
===================================================================
--- trunk/Mk/extensions/tcl.mk	2018-09-06 00:19:05 UTC (rev 24229)
+++ trunk/Mk/extensions/tcl.mk	2018-09-06 00:24:12 UTC (rev 24230)
@@ -98,10 +98,10 @@
 
 # Set RUN_DEPENDS for wrappers
 . if defined(USE_TCL_WRAPPER)
-RUN_DEPENDS+=		tclsh:${PORTSDIR}/lang/tcl-wrapper
+RUN_DEPENDS+=		tclsh:lang/tcl-wrapper
 . endif
 . if defined(USE_TK_WRAPPER)
-RUN_DEPENDS+=		wish:${PORTSDIR}/x11-toolkits/tk-wrapper
+RUN_DEPENDS+=		wish:x11-toolkits/tk-wrapper
 . endif
 
 # Process USE_TCL_BUILD and USE_TCL_RUN
@@ -276,13 +276,13 @@
 # Add dependencies
 .   if !defined(_TK_ONLY)
 .    if !defined(_TCL_RUN_DEPENDS) && !defined(_TCL_BUILD_DEPENDS)
-LIB_DEPENDS+=	tcl${USE_TCL}:${PORTSDIR}/lang/tcl${USE_TCL}
+LIB_DEPENDS+=	tcl${USE_TCL}:lang/tcl${USE_TCL}
 .    else
 .     if defined(_TCL_BUILD_DEPENDS)
-BUILD_DEPENDS+=	tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${USE_TCL}
+BUILD_DEPENDS+=	tclsh${TCL_VER}:lang/tcl${USE_TCL}
 .     endif
 .     if defined(_TCL_RUN_DEPENDS)
-RUN_DEPENDS+=	tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${USE_TCL}
+RUN_DEPENDS+=	tclsh${TCL_VER}:lang/tcl${USE_TCL}
 .     endif
 .    endif
 .   endif
@@ -301,13 +301,13 @@
 TK_VER:=	${USE_TCL:S/8/8./}
 
 .   if !defined(_TK_RUN_DEPENDS) && !defined(_TK_BUILD_DEPENDS)
-LIB_DEPENDS+=	tk${USE_TK}:${PORTSDIR}/x11-toolkits/tk${USE_TK}
+LIB_DEPENDS+=	tk${USE_TK}:x11-toolkits/tk${USE_TK}
 .   else
 .    if defined(_TK_BUILD_DEPENDS)
-BUILD_DEPENDS+=	wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${USE_TK}
+BUILD_DEPENDS+=	wish${TK_VER}:x11-toolkits/tk${USE_TK}
 .    endif
 .    if defined(_TK_RUN_DEPENDS)
-RUN_DEPENDS+=	wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${USE_TK}
+RUN_DEPENDS+=	wish${TK_VER}:x11-toolkits/tk${USE_TK}
 .    endif
 .   endif
 

Modified: trunk/Mk/extensions/xfce.mk
===================================================================
--- trunk/Mk/extensions/xfce.mk	2018-09-06 00:19:05 UTC (rev 24229)
+++ trunk/Mk/extensions/xfce.mk	2018-09-06 00:24:12 UTC (rev 24230)
@@ -25,29 +25,29 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=	-L${LOCALBASE}/lib
 
-garcon_LIB_DEPENDS=	libgarcon-1.so:${PORTSDIR}/sysutils/garcon
+garcon_LIB_DEPENDS=	libgarcon-1.so:sysutils/garcon
 garcon_USE_XFCE_REQ=	libmenu
 
-libexo_LIB_DEPENDS=	libexo-1.so:${PORTSDIR}/x11/libexo
+libexo_LIB_DEPENDS=	libexo-1.so:x11/libexo
 libexo_USE_XFCE_REQ=	libmenu
 
-libgui_LIB_DEPENDS=	libxfcegui4.so:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_LIB_DEPENDS=	libxfcegui4.so:x11-toolkits/libxfce4gui
 libgui_USE_XFCE_REQ=	libutil
 
-libmenu_LIB_DEPENDS=	libxfce4ui-1.so:${PORTSDIR}/x11/libxfce4menu
+libmenu_LIB_DEPENDS=	libxfce4ui-1.so:x11/libxfce4menu
 libmenu_USE_XFCE_REQ=	xfconf
 
-libutil_LIB_DEPENDS=	libxfce4util.so:${PORTSDIR}/x11/libxfce4util
+libutil_LIB_DEPENDS=	libxfce4util.so:x11/libxfce4util
 
-panel_LIB_DEPENDS=	libxfce4panel-1.0.so:${PORTSDIR}/x11-wm/xfce4-panel
-panel_RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+panel_LIB_DEPENDS=	libxfce4panel-1.0.so:x11-wm/xfce4-panel
+panel_RUN_DEPENDS=	xfce4-panel:x11-wm/xfce4-panel
 panel_USE_XFCE_REQ=	garcon libexo xfconf
 
-thunar_LIB_DEPENDS=	libthunarx-2.so:${PORTSDIR}/x11-fm/thunar
-thunar_RUN_DEPENDS=	Thunar:${PORTSDIR}/x11-fm/thunar
+thunar_LIB_DEPENDS=	libthunarx-2.so:x11-fm/thunar
+thunar_RUN_DEPENDS=	Thunar:x11-fm/thunar
 thunar_USE_XFCE_REQ=	xfconf libmenu
 
-xfconf_LIB_DEPENDS=	libxfconf-0.so:${PORTSDIR}/x11/xfce4-conf
+xfconf_LIB_DEPENDS=	libxfconf-0.so:x11/xfce4-conf
 xfconf_USE_XFCE_REQ=	libutil
 
 .if defined(USE_XFCE)

Modified: trunk/Mk/extensions/zip.mk
===================================================================
--- trunk/Mk/extensions/zip.mk	2018-09-06 00:19:05 UTC (rev 24229)
+++ trunk/Mk/extensions/zip.mk	2018-09-06 00:24:12 UTC (rev 24230)
@@ -16,7 +16,7 @@
 .if empty(zip_ARGS)
 EXTRACT_CMD?=		${UNZIP_NATIVE_CMD}
 .elif ${zip_ARGS} == "infozip"
-EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
 EXTRACT_CMD?=		${UNZIP_CMD}
 .else
 IGNORE=	Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'

More information about the Midnightbsd-cvs mailing list