Index: Mk/bsd.ruby.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.ruby.mk,v
retrieving revision 1.195
diff -u -r1.195 bsd.ruby.mk
--- Mk/bsd.ruby.mk	28 Apr 2010 23:59:55 -0000	1.195
+++ Mk/bsd.ruby.mk	27 May 2010 17:41:31 -0000
@@ -137,6 +137,7 @@
 #
 
 RUBY_DEFAULT_VER?=	1.8
+RAKE_VER=	0.8.7
 
 RUBY_VER?=		${RUBY_DEFAULT_VER}
 
@@ -534,12 +535,12 @@
 .endif
 
 .if defined(USE_RAKE)
-. if ${RUBY_VER} == 1.8
 BUILD_DEPENDS+=		${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
-RAKE_BIN=	 ${LOCALBASE}/bin/rake
-. else
-RAKE_BIN=	 ${LOCALBASE}/bin/${RUBY_VER:S/.//}
-. endif
+.if ${RUBY_VER} == 1.8
+RAKE_BIN=	${LOCALBASE}/bin/rake
+.else
+RAKE_BIN=	${GEM_LIB_DIR}/bin/rake${RUBY_VER:S/.//}
+.endif
 .endif
 
 .if defined(USE_RUBY_AMSTD)
Index: devel/rubygem-rake/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/rubygem-rake/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- devel/rubygem-rake/Makefile	27 Apr 2010 22:55:18 -0000	1.20
+++ devel/rubygem-rake/Makefile	27 May 2010 17:41:09 -0000
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/devel/rubygem-rake/Makefile,v 1.20 2010/04/27 22:55:18 pgollucci Exp $
 
 PORTNAME=	rake
-PORTVERSION=	0.8.7
+PORTVERSION=	${RAKE_VER}
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RF
 
@@ -15,20 +15,17 @@
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
-PLIST_FILES=	bin/rake
 
 MANCOMPRESSED=	yes
 MAN1=		rake.1
 
 .include <bsd.port.pre.mk>
-
-.if ${RUBY_VER} == 1.9
-IGNORE=	already included in ruby distribution
+.if ${RUBY_VER} == 1.8
+PLIST_FILES=	bin/rake
 .endif
 
 post-install:
-	${MV} ${PREFIX}/${GEM_LIB_DIR}/doc/rake.1.gz \
-		${PREFIX}/man/man1
+	${MV} ${PREFIX}/${GEM_LIB_DIR}/doc/rake.1.gz ${PREFIX}/man/man1
 	${CHMOD} ${MANMODE} ${PREFIX}/man/man1/rake.1.gz
 	${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/man/man1/rake.1.gz