From 26a5decc21d5346ac279d24e9a5f550a5df7df86 Mon Sep 17 00:00:00 2001
From: knu <knu@FreeBSD.org>
Date: Sat, 21 Sep 2002 07:11:33 +0000
Subject: Define USE_RUBY_FEATURES instead of hardcoding conditional *_DEPENDS.

---
 sysutils/portupgrade/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'sysutils/portupgrade')

diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 16aed77..897ced1 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/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; \
-- 
cgit v1.1