Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Apr 2014 01:13:40 +0000 (UTC)
From:      Akinori MUSHA <knu@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r350058 - head/lang/jruby
Message-ID:  <201404040113.s341DeQd098083@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: knu
Date: Fri Apr  4 01:13:39 2014
New Revision: 350058
URL: http://svnweb.freebsd.org/changeset/ports/350058
QAT: https://qat.redports.org/buildarchive/r350058/

Log:
  Update to 1.7.11 and (attempt to) remove NO_STAGE.

Modified:
  head/lang/jruby/Makefile
  head/lang/jruby/distinfo

Modified: head/lang/jruby/Makefile
==============================================================================
--- head/lang/jruby/Makefile	Fri Apr  4 00:31:07 2014	(r350057)
+++ head/lang/jruby/Makefile	Fri Apr  4 01:13:39 2014	(r350058)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jruby
-PORTVERSION=	1.7.10
+PORTVERSION=	1.7.11
 CATEGORIES=	lang ruby java
 MASTER_SITES=	http://jruby.org.s3.amazonaws.com/downloads/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
@@ -26,7 +26,6 @@ SHEBANG_FILES=	rake spec spec_translator
 
 PLIST_SUB+=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} JRUBY_HOME=${JRUBY_HOME:S,${PREFIX}/,,}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 pre-patch:
@@ -58,31 +57,31 @@ do-install:
 	@${ECHO_MSG} -n ">> Installing JRuby files..."
 
 	@cd ${WRKSRC}/bin \
-	  && ${FIND} . -type d -exec ${MKDIR} ${JRUBY_HOME}/bin/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_SCRIPT} {} ${JRUBY_HOME}/bin/{} \;
+	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${JRUBY_HOME}/bin/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_SCRIPT} {} ${STAGEDIR}${JRUBY_HOME}/bin/{} \;
 	@cd ${WRKSRC}/lib \
-	  && ${FIND} . -type d -exec ${MKDIR} ${JRUBY_HOME}/lib/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${JRUBY_HOME}/lib/{} \;
+	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${JRUBY_HOME}/lib/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${JRUBY_HOME}/lib/{} \;
 
 	@${ECHO_MSG} " [ DONE ]"
 
-	@${ECHO_MSG} -n ">> Installing symlinks in ${PREFIX}/bin..."
-	@${LN} -sf ${JRUBY_HOME}/bin/jruby ${PREFIX}/bin/jruby
-	@${LN} -sf ${JRUBY_HOME}/bin/jirb ${PREFIX}/bin/jirb
+	@${ECHO_MSG} -n ">> Installing symlinks in ${STAGEDIR}${PREFIX}/bin..."
+	@${LN} -sf ${JRUBY_HOME}/bin/jruby ${STAGEDIR}${PREFIX}/bin/jruby
+	@${LN} -sf ${JRUBY_HOME}/bin/jirb ${STAGEDIR}${PREFIX}/bin/jirb
 	@${ECHO_MSG} " [ DONE ]"
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing Documents files..."
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/ \
-	  && ${COPYTREE_SHARE} [A-Z]\* ${DOCSDIR})
+	  && ${COPYTREE_SHARE} [A-Z]\* ${STAGEDIR}${DOCSDIR})
 	@(cd ${WRKSRC}/docs \
-	  && ${COPYTREE_SHARE} \* ${DOCSDIR})
+	  && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/samples \
-	  && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
+	  && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 

Modified: head/lang/jruby/distinfo
==============================================================================
--- head/lang/jruby/distinfo	Fri Apr  4 00:31:07 2014	(r350057)
+++ head/lang/jruby/distinfo	Fri Apr  4 01:13:39 2014	(r350058)
@@ -1,2 +1,2 @@
-SHA256 (jruby-bin-1.7.10.tar.gz) = 223285ee2fca5a4825f017b8a441232ec05d3fba5de213336c7ef6b6a36de651
-SIZE (jruby-bin-1.7.10.tar.gz) = 19800571
+SHA256 (jruby-bin-1.7.11.tar.gz) = d634ffc692a8ee5bae513266956609d41d785f912facf11749609a7763120fb3
+SIZE (jruby-bin-1.7.11.tar.gz) = 19813308



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404040113.s341DeQd098083>