aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2002-09-21 07:11:33 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2002-09-21 07:11:33 +0000
commite7adaf2a02a4c7dd3c11ed93a4cf6bfb5241fae1 (patch)
tree96777ce3759dc136cce0095a6a1045bf877dc452 /ports-mgmt
parent598667b8d4f59ab4b27867072574aec01fc2d591 (diff)
downloadports-e7adaf2a02a4c7dd3c11ed93a4cf6bfb5241fae1.tar.gz
ports-e7adaf2a02a4c7dd3c11ed93a4cf6bfb5241fae1.zip
Define USE_RUBY_FEATURES instead of hardcoding conditional *_DEPENDS.
Notes
Notes: svn path=/head/; revision=67000
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portupgrade-devel/Makefile5
-rw-r--r--ports-mgmt/portupgrade/Makefile5
2 files changed, 2 insertions, 8 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 16aed7712e66..897ced101ff4 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -30,6 +30,7 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1
USE_BZIP2= yes
USE_RUBY= yes
+USE_RUBY_FEATURES= optparse ruby18
MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}"
@@ -63,10 +64,6 @@ PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE}
IGNORE= pkg_create does not support -b. Please update pkg_* tools or stick with portupgrade-20020920 + pkg_tarup-1.2_3, which work just fine
.endif
-.if ${RUBY_VER} < 1.7
-RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/features/ruby18/file_ruby18.so:${PORTSDIR}/lang/ruby16-shim-ruby18
-.endif
-
post-install:
if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 16aed7712e66..897ced101ff4 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -30,6 +30,7 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1
USE_BZIP2= yes
USE_RUBY= yes
+USE_RUBY_FEATURES= optparse ruby18
MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}"
@@ -63,10 +64,6 @@ PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE}
IGNORE= pkg_create does not support -b. Please update pkg_* tools or stick with portupgrade-20020920 + pkg_tarup-1.2_3, which work just fine
.endif
-.if ${RUBY_VER} < 1.7
-RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/features/ruby18/file_ruby18.so:${PORTSDIR}/lang/ruby16-shim-ruby18
-.endif
-
post-install:
if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \