- Remove dependency to autoconf.

- Propagate RUBY_VER with MAKEFLAGS.

4 files changed, 17 insertions, 7 deletions

diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
index 10a6009f019..60cd6201609 100644
--- a/lang/ruby-base/Makefile
+++ b/lang/ruby-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/01/04 09:44:59 taca Exp $
+# $NetBSD: Makefile,v 1.5 2002/01/22 17:05:20 taca Exp $
 # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -11,8 +11,6 @@ MAINTAINER=	taca@netbsd.org
 HOMEPAGE=	http://www.ruby-lang.org/en/
 COMMENT= 	base installation of Ruby
 
-BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
-
 DIST_SUBDIR=	ruby
 USE_RUBY=	yes
 RUBY_DEPENDS=	no
@@ -62,7 +60,6 @@ pre-configure:
 	${RM} -f ${WRKSRC}/ext/readline/MANIFEST
 	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
 	${RM} -f ${WRKSRC}/ext/tk/MANIFEST
-	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf
 
 pre-build:
 	@${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
diff --git a/lang/ruby-base/Makefile.common b/lang/ruby-base/Makefile.common
index bafe0f5ff08..d87b6cdcc39 100644
--- a/lang/ruby-base/Makefile.common
+++ b/lang/ruby-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2002/01/04 09:44:59 taca Exp $
+# $NetBSD: Makefile.common,v 1.5 2002/01/22 17:05:20 taca Exp $
 # FreeBSD: ports/Mk/bsd.ruby.mk,v 1.11 2000/11/16 17:59:40 knu Exp
 # Makefile.common: ruby common makefile, based on FreeBSD's bsd.ruby.mk.
 
@@ -99,7 +99,7 @@ RUBY_DOCDIR?=		${LOCALBASE}/share/doc/${RUBY_NAME}
 RUBY_EXAMPLESDIR?=	${LOCALBASE}/share/examples/${RUBY_NAME}
 
 # MAKE_ENV
-MAKE_ENV+=		RUBY_VER=${RUBY_VER}
+MAKEFLAGS+=		RUBY_VER=${RUBY_VER}
 
 # PLIST
 PLIST_RUBY_DIRS=	RUBY_LIBDIR="${RUBY_LIBDIR}" \
diff --git a/lang/ruby-base/distinfo b/lang/ruby-base/distinfo
index 4babf84e983..e5690e52753 100644
--- a/lang/ruby-base/distinfo
+++ b/lang/ruby-base/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/12/30 16:21:51 taca Exp $
+$NetBSD: distinfo,v 1.3 2002/01/22 17:05:20 taca Exp $
 
 SHA1 (ruby/ruby-1.6.6.tar.gz) = 922712ae41b51e255e43bcc421b566507b7c8278
 Size (ruby/ruby-1.6.6.tar.gz) = 976606 bytes
 SHA1 (patch-aa) = e1c43ada8f8e8f9add0f70bced30259430db03ba
+SHA1 (patch-ab) = 8b2e6ab89f6b9b89e20004a148a807de697c823c
 SHA1 (patch-ac) = 5b897041345ec4077fa2165e3c4c58a6671b942d
 SHA1 (patch-ae) = 294af53a7509372f0d7c17230c605d790f1e7bb2
 SHA1 (patch-af) = 87d349aa9b5b721eacafba2977f85ec1262fd622
diff --git a/lang/ruby-base/patches/patch-ab b/lang/ruby-base/patches/patch-ab
new file mode 100644
index 00000000000..e9b4d8c0bf7
--- /dev/null
+++ b/lang/ruby-base/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2002/01/22 17:05:21 taca Exp $
+
+--- configure.orig	Tue Dec 11 02:12:35 2001
++++ configure
+@@ -5648,6 +5648,7 @@
+ s%@setup@%$setup%g
+ s%@MINIRUBY@%$MINIRUBY%g
+ s%@PREP@%$PREP%g
++s%@X11BASE@%$X11BASE%g
+ s%@LIBRUBY_LDSHARED@%$LIBRUBY_LDSHARED%g
+ s%@LIBRUBY_DLDFLAGS@%$LIBRUBY_DLDFLAGS%g
+ s%@RUBY_INSTALL_NAME@%$RUBY_INSTALL_NAME%g