- Add ruby 1.9 support

- Implement new knobs for gems and rake (these are included in
  ruby 1.9 distribution already). Also move gem bits from
  ruby-gems/Makefile.common to bsd.ruby.mk[1]. Now to depend
  on gems or rake you should define USE_RUBYGEMS/USE_RAKE
  accordingly. Also RAKE_BIN variable is provided for
  pointing to the right rake executable.
- Rewrite RUBY_SCHEBANG in awk to eliminate build dependency
  on ruby.

Discussed with:	Jonathan Weiss <jw@innerewut.de> [1] (gems maintainer)
Tested by:	ports@

5 files changed, 14 insertions, 16 deletions

diff --git a/audio/euphoria/Makefile b/audio/euphoria/Makefile
index 34f9c0b3dbe3..318dc6ea942f 100644
--- a/audio/euphoria/Makefile
+++ b/audio/euphoria/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	XMMS2 GUI frontend written with Enlightenment e17 libraries
 
-BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
-		edje_cc:${PORTSDIR}/graphics/edje
+BUILD_DEPENDS=	edje_cc:${PORTSDIR}/graphics/edje
 RUN_DEPENDS=	${SADIR}/edje.so:${PORTSDIR}/graphics/ruby-edje \
 		${SADIR}/esmart.so:${PORTSDIR}/graphics/ruby-esmart \
 		${SADIR}/evas.so:${PORTSDIR}/graphics/ruby-evas \
@@ -27,6 +26,7 @@ SADIR=		${RUBY_SITEARCHLIBDIR}
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
+USE_RAKE=	yes
 RUBY_SHEBANG_FILES=	${WRKSRC}/bin/euphoria
 
 IGNORE=	Not updated to the DrJekyll clientlib API
@@ -37,10 +37,10 @@ BROKEN=		edje is broken on ia64
 .endif
 
 do-build:
-	@(cd ${WRKSRC}; ${LOCALBASE}/bin/rake)
+	@(cd ${WRKSRC}; ${RAKE_BIN})
 
 do-install:
-	@(cd ${WRKSRC}; ${LOCALBASE}/bin/rake install)
+	@(cd ${WRKSRC}; ${RAKE_BIN} install)
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/audio/rubygem-mp3info/Makefile b/audio/rubygem-mp3info/Makefile
index 6f3dce08ac3c..93b8283f3d17 100644
--- a/audio/rubygem-mp3info/Makefile
+++ b/audio/rubygem-mp3info/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	tha_walka@hotmail.com
 COMMENT=	A Ruby library to access information on mp3 files
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/rubygem-ruby-mp3info/Makefile b/audio/rubygem-ruby-mp3info/Makefile
index 6f3dce08ac3c..93b8283f3d17 100644
--- a/audio/rubygem-ruby-mp3info/Makefile
+++ b/audio/rubygem-ruby-mp3info/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	tha_walka@hotmail.com
 COMMENT=	A Ruby library to access information on mp3 files
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/snett/Makefile b/audio/snett/Makefile
index 817d24f335ea..65bc85ac5e9d 100644
--- a/audio/snett/Makefile
+++ b/audio/snett/Makefile
@@ -14,15 +14,15 @@ MAINTAINER=	alexbl@FreeBSD.org
 COMMENT=	A simple XMMS2 client inspired by strange-quark
 
 BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmmsclient.so:${PORTSDIR}/audio/ruby-xmms2 \
-		${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
-		${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
+		${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
+USE_RAKE=	yes
 NO_BUILD=	yes
 
 BROKEN=	Not updated to the DrJekyll clientlib API
 do-install:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/rake PREFIX=${PREFIX}/ ${INSTALL_TARGET}
+	@cd ${WRKSRC} && ${RAKE_BIN} PREFIX=${PREFIX}/ ${INSTALL_TARGET}
 
 .include <bsd.port.mk>
diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile
index da1dcebbb54b..4de91ff9e92f 100644
--- a/audio/xmms2-scrobbler/Makefile
+++ b/audio/xmms2-scrobbler/Makefile
@@ -13,12 +13,12 @@ MAINTAINER=	alexbl@FreeBSD.org
 COMMENT=	A last.fm submission client for XMMS2
 
 BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmmsclient_ext.so:${PORTSDIR}/audio/ruby-xmms2 \
-		${RUBY_SITELIBDIR}/event-loop.rb:${PORTSDIR}/devel/ruby-event-loop \
-		${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
+		${RUBY_SITELIBDIR}/event-loop.rb:${PORTSDIR}/devel/ruby-event-loop
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmmsclient_ext.so:${PORTSDIR}/audio/ruby-xmms2 \
 		${RUBY_SITELIBDIR}/event-loop.rb:${PORTSDIR}/devel/ruby-event-loop
 
 USE_RUBY=	yes
+USE_RAKE=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/xmms2-scrobbler \
@@ -29,7 +29,7 @@ PLIST_DIRS=	%%DATADIR%%/filters %%DATADIR%%
 SUB_FILES=	pkg-message
 
 do-install:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/rake PREFIX=${PREFIX}/ ${INSTALL_TARGET}
+	@cd ${WRKSRC} && ${RAKE_BIN} PREFIX=${PREFIX}/ ${INSTALL_TARGET}
 
 post-install:
 	@${ECHO_MSG}