ports/147137: MK/bsd.ruby.mk: [patch]: support devel/rubygem-rake under lang/ruby19
Philip M. Gollucci
pgollucci at frieza.p6m7g8.net
Thu May 27 18:10:05 UTC 2010
>Number: 147137
>Category: ports
>Synopsis: MK/bsd.ruby.mk: [patch]: support devel/rubygem-rake under lang/ruby19
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu May 27 18:10:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Philip M. Gollucci
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Apr 26 16:20:00 EDT 2010 root at frieza.p6m7g8.net:/usr/obj/usr/src/sys/FRIEZA amd64
>Description:
consolidates and fixes ports/143661 and ports/144606
>How-To-Repeat:
>Fix:
--- rake.diff begins here ---
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
--- rake.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list