diff options
author | bapt <bapt@FreeBSD.org> | 2015-10-15 00:49:35 +0800 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2015-10-15 00:49:35 +0800 |
commit | fe149e93dc167d1fb2cfd567cb6bb47b29d7616e (patch) | |
tree | 253c001da30db94087f88bf237955915bfb0f012 /Mk/bsd.ruby.mk | |
parent | 272e7189dabf5351b4cf86d3b7ab8ba8c2c22032 (diff) | |
download | freebsd-ports-gnome-fe149e93dc167d1fb2cfd567cb6bb47b29d7616e.tar.gz freebsd-ports-gnome-fe149e93dc167d1fb2cfd567cb6bb47b29d7616e.tar.zst freebsd-ports-gnome-fe149e93dc167d1fb2cfd567cb6bb47b29d7616e.zip |
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
Diffstat (limited to 'Mk/bsd.ruby.mk')
-rw-r--r-- | Mk/bsd.ruby.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 58668eedda29..2d1c7cc721fc 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -305,9 +305,9 @@ RUBY_PORT?= ${RUBY_BASE_PORT} 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} @@ -412,15 +412,15 @@ RUBY_FLAGS+= -d # .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 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 @@ -584,7 +584,7 @@ RUN_DEPENDS+= ${DEPEND_RUBY} .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 |