From owner-freebsd-ports  Sat Aug 21 15:20:18 1999
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 914A31543C
	for <freebsd-ports@FreeBSD.org>; Sat, 21 Aug 1999 15:20:09 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id PAA51769;
	Sat, 21 Aug 1999 15:20:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from smtp.teleway.ne.jp (smtp.teleway.ne.jp [203.140.129.13])
	by hub.freebsd.org (Postfix) with ESMTP id 0C6F015399
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 21 Aug 1999 15:10:40 -0700 (PDT)
	(envelope-from yasuf@big.or.jp)
Received: from localhost (kokura1-55.teleway.ne.jp [210.234.51.55])
	by smtp.teleway.ne.jp (8.9.3+3.2W/3.7W) with ESMTP id HAA07622
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Aug 1999 07:10:07 +0900 (JST)
	(envelope-from yasuf@big.or.jp)
Message-Id: <19990822071001B.yasuf@big.or.jp>
Date: Sun, 22 Aug 1999 07:10:01 +0900
From: yasuf@big.or.jp
Reply-To: yasuf@big.or.jp
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/13306: Update: lang/irb
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         13306
>Category:       ports
>Synopsis:       Update: lang/irb
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 21 15:20:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Yasuhiro Fukuma
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:

	

>Description:

This patch contains:

  - Measures to cope with Ruby 1.4.

>How-To-Repeat:

	

>Fix:
Index: irb/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/irb/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	1999/07/13 03:00:51	1.2
+++ Makefile	1999/08/13 20:49:03
@@ -21,8 +21,10 @@
 RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 
 WRKSRC=		${WRKDIR}/irb
+PLIST_SUB+=	RUBY_VER="${RUBY_VER}"
 
 RUBY=		${LOCALBASE}/bin/ruby
+RUBY_VER=	1.4
 
 do-build:
 	( cd ${WRKSRC}; \
@@ -31,9 +33,11 @@
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/irb ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/lib/ruby/irb
-	${INSTALL_DATA} ${WRKSRC}/*.rb ${PREFIX}/lib/ruby/irb
+	${MKDIR} ${PREFIX}/lib/ruby/${RUBY_VER}/irb
+	${INSTALL_DATA} ${WRKSRC}/*.rb ${PREFIX}/lib/ruby/${RUBY_VER}/irb
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/ruby/irb
 	${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/ruby/irb
+.endif
 
 .include <bsd.port.mk>
Index: irb/pkg/PLIST
===================================================================
RCS file: /home/ncvs/ports/lang/irb/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST	1999/07/13 02:56:48	1.1.1.1
+++ PLIST	1999/08/13 18:48:04
@@ -1,16 +1,16 @@
 bin/irb
-lib/ruby/irb/frame.rb
-lib/ruby/irb/input-method.rb
-lib/ruby/irb/loader.rb
-lib/ruby/irb/main.rb
-lib/ruby/irb/multi-irb.rb
-lib/ruby/irb/rtags.rb
-lib/ruby/irb/ruby-lex.rb
-lib/ruby/irb/ruby-token.rb
-lib/ruby/irb/slex.rb
-lib/ruby/irb/version.rb
-lib/ruby/irb/xmp.rb
-@dirrm lib/ruby/irb
+lib/ruby/%%RUBY_VER%%/irb/frame.rb
+lib/ruby/%%RUBY_VER%%/irb/input-method.rb
+lib/ruby/%%RUBY_VER%%/irb/loader.rb
+lib/ruby/%%RUBY_VER%%/irb/main.rb
+lib/ruby/%%RUBY_VER%%/irb/multi-irb.rb
+lib/ruby/%%RUBY_VER%%/irb/rtags.rb
+lib/ruby/%%RUBY_VER%%/irb/ruby-lex.rb
+lib/ruby/%%RUBY_VER%%/irb/ruby-token.rb
+lib/ruby/%%RUBY_VER%%/irb/slex.rb
+lib/ruby/%%RUBY_VER%%/irb/version.rb
+lib/ruby/%%RUBY_VER%%/irb/xmp.rb
+@dirrm lib/ruby/%%RUBY_VER%%/irb
 share/doc/ruby/irb/README
 share/doc/ruby/irb/README-add
 share/doc/ruby/irb/README-install

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message