- Stage support

Reviewed by:	antoine/swills
Thanks to:	antoine (so testing)
Approved by:	swills (ruby@)

2 files changed, 30 insertions, 29 deletions

diff --git a/lang/ruby19/Makefile b/lang/ruby19/Makefile
index 13272e20b0c5..387450da3aa5 100644
--- a/lang/ruby19/Makefile
+++ b/lang/ruby19/Makefile
@@ -26,6 +26,7 @@ WRKSRC=		${RUBY_WRKSRC}
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--enable-shared \
 		--enable-pthread \
+		--disable-rpath \
 		--with-ruby-version=minor \
 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
@@ -49,7 +50,6 @@ OPTIONS_DEFINE=	RDOC DEBUG
 RDOC_DESC=	Build and install Rdoc indexes
 DEBUG_DESC=	Compile-in debug info
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # PORTEPOCH/PORTREVISION hack
@@ -100,9 +100,6 @@ EXTDOCS=	bigdecimal/bigdecimal_*.html	\
 		stringio/README			\
 		syslog/syslog.txt
 
-MAN1=		${RUBY_NAME}.1 erb${RUBY_SUFFIX}.1  irb${RUBY_SUFFIX}.1 \
-		ri${RUBY_SUFFIX}.1
-
 # Macros to change variables in rbconfig.rb
 RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' --
 
@@ -151,19 +148,19 @@ post-build:
 	@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
 
 pre-su-install:
-	${MKDIR}	${RUBY_DOCDIR}		\
-			${RUBY_EXAMPLESDIR}	\
-			${RUBY_RIDIR}		\
-			${RUBY_SITERIDIR}	\
-			${RUBY_SITEARCHLIBDIR}	\
-			${RUBY_VENDORARCHLIBDIR}
-
-	${SETENV} LC_TIME=C /bin/date > ${RUBY_RIDIR}/created.rid
-	${SETENV} LC_TIME=C /bin/date > ${RUBY_SITERIDIR}/created.rid
-	${TOUCH} ${RUBY_EXAMPLESDIR}/.keep_me
-	${TOUCH} ${RUBY_DOCDIR}/.keep_me
-	${TOUCH} ${RUBY_SITEARCHLIBDIR}/.keep_me
-	${TOUCH} ${RUBY_VENDORARCHLIBDIR}/.keep_me
+	${MKDIR}	${STAGEDIR}${RUBY_DOCDIR}		\
+			${STAGEDIR}${RUBY_EXAMPLESDIR}	\
+			${STAGEDIR}${RUBY_RIDIR}		\
+			${STAGEDIR}${RUBY_SITERIDIR}	\
+			${STAGEDIR}${RUBY_SITEARCHLIBDIR}	\
+			${STAGEDIR}${RUBY_VENDORARCHLIBDIR}
+
+	${SETENV} LC_TIME=C /bin/date > ${STAGEDIR}${RUBY_RIDIR}/created.rid
+	${SETENV} LC_TIME=C /bin/date > ${STAGEDIR}${RUBY_SITERIDIR}/created.rid
+	${TOUCH} ${STAGEDIR}${RUBY_EXAMPLESDIR}/.keep_me
+	${TOUCH} ${STAGEDIR}${RUBY_DOCDIR}/.keep_me
+	${TOUCH} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/.keep_me
+	${TOUCH} ${STAGEDIR}${RUBY_VENDORARCHLIBDIR}/.keep_me
 
 post-install:
 #
@@ -171,7 +168,7 @@ post-install:
 # bogus to hack.
 #
 .if defined(STRIP) && ${STRIP} == -s
-	${STRIP_CMD} ${PREFIX}/bin/${RUBY_NAME}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${RUBY_NAME}
 .endif
 
 #
@@ -179,38 +176,38 @@ post-install:
 #
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 . for FILE in ${INSTALLED_SCRIPTS}
-	${LN} -f ${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${PREFIX}/bin/${FILE}
+	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
 . endfor
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 	# Create all dirs required (":u" isn't avaiable in STABLE yet :-()
-	${MKDIR} ${EXTSAMPLES:C,^([^/]+)/.*,\1,:S,^,${RUBY_EXAMPLESDIR}/,}
-	${MKDIR} ${EXTDOCS:C,^([^/]+)/.*,\1,:S,^,${RUBY_DOCDIR}/,}
+	${MKDIR} ${EXTSAMPLES:C,^([^/]+)/.*,\1,:S,^,${STAGEDIR}${RUBY_EXAMPLESDIR}/,}
+	${MKDIR} ${EXTDOCS:C,^([^/]+)/.*,\1,:S,^,${STAGEDIR}${RUBY_DOCDIR}/,}
 .for FILE in ${EXTSAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
-		${RUBY_EXAMPLESDIR}/${FILE:C,^([^/]+)/.*,\1,}/
+		${STAGEDIR}${RUBY_EXAMPLESDIR}/${FILE:C,^([^/]+)/.*,\1,}/
 .endfor
 .for FILE in ${EXTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
-		${RUBY_DOCDIR}/${FILE:C,^([^/]+)/.*,\1,}/
+		${STAGEDIR}${RUBY_DOCDIR}/${FILE:C,^([^/]+)/.*,\1,}/
 .endfor
-	@(cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} \* ${RUBY_EXAMPLESDIR}/)
-	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${RUBY_DOCDIR}/)
+	@(cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_EXAMPLESDIR}/)
+	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/)
 	${INSTALL_DATA} ${WRKSRC}/COPYING*	\
 			${WRKSRC}/ChangeLog	\
 			${WRKSRC}/LEGAL		\
 			${WRKSRC}/README*	\
-			${RUBY_DOCDIR}/
+			${STAGEDIR}${RUBY_DOCDIR}/
 .endif
 
 #
 # Add generated RI files to pkg-plist
 #
 	@${FIND} -ds ${RUBY_RIDIR}/ ! -type d ! -name created.rid | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} -ds ${RUBY_RIDIR}/ -type d -mindepth 1 | \
-		${SED} -E -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+		${SED} -E -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 
 #
@@ -309,6 +306,6 @@ validate:
 	rm -rf ${WRKSRC}/rubyspec/*
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/rubyspec.git)
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/mspec.git)
-	(cd ${WRKSRC}/rubyspec/rubyspec && env PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${PREFIX}/bin/ruby${RUBY_SUFFIX})
+	(cd ${WRKSRC}/rubyspec/rubyspec && env PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${STAGEDIR}${PREFIX}/bin/ruby${RUBY_SUFFIX})
 
 .include <bsd.port.post.mk>
diff --git a/lang/ruby19/pkg-plist b/lang/ruby19/pkg-plist
index e43fe9144531..0c5899ddb72e 100644
--- a/lang/ruby19/pkg-plist
+++ b/lang/ruby19/pkg-plist
@@ -14,6 +14,10 @@ lib/lib%%RUBY_NAME%%-static.a
 lib/lib%%RUBY_NAME%%.so
 lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 libdata/pkgconfig/ruby-1.9.pc
+man/man1/erb%%RUBY_SHLIBVER%%.1.gz
+man/man1/irb%%RUBY_SHLIBVER%%.1.gz
+man/man1/ri%%RUBY_SHLIBVER%%.1.gz
+man/man1/ruby%%RUBY_SHLIBVER%%.1.gz
 include/ruby-1.9/%%RUBY_ARCH%%/ruby/config.h
 include/ruby-1.9/ruby/backward/classext.h
 include/ruby-1.9/ruby/backward/rubyio.h