Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Nov 2013 05:58:14 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334997 - in head: graphics/ruby-gd graphics/rubygem-scruffy irc/ruby-rica
Message-ID:  <201311270558.rAR5wEG5024587@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Wed Nov 27 05:58:14 2013
New Revision: 334997
URL: http://svnweb.freebsd.org/changeset/ports/334997

Log:
  - use STAGEDIR

Modified:
  head/graphics/ruby-gd/Makefile
  head/graphics/rubygem-scruffy/Makefile
  head/irc/ruby-rica/Makefile

Modified: head/graphics/ruby-gd/Makefile
==============================================================================
--- head/graphics/ruby-gd/Makefile	Wed Nov 27 05:41:11 2013	(r334996)
+++ head/graphics/ruby-gd/Makefile	Wed Nov 27 05:58:14 2013	(r334997)
@@ -16,7 +16,7 @@ COMMENT=	Ruby extension library to use T
 
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
-NO_STAGE=	yes
+NEED_ROOT=	yes
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--enable-gd2_0 \
 		--with-gd-include="${LOCALBASE}/include"
 LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 # Hmm, GREP and TRUE seem to be defined in the bsd.port.post.mk stage.
 .if exists(${LOCALBASE}/bin/gd2topng)
@@ -66,20 +66,20 @@ post-patch:
 	${RUBY} -i -pe 'sub %r:%%GD%%:, "gd"' ${WRKSRC}/extconf.rb
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-.for f in ${EXAMPLES_EN}
-	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_MODEXAMPLESDIR}/
-.endfor
-.endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODDOCDIR}/ja
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/ja/
+.endfor
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
+.for f in ${EXAMPLES_EN}
+	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/rubygem-scruffy/Makefile
==============================================================================
--- head/graphics/rubygem-scruffy/Makefile	Wed Nov 27 05:41:11 2013	(r334996)
+++ head/graphics/rubygem-scruffy/Makefile	Wed Nov 27 05:58:14 2013	(r334997)
@@ -16,10 +16,9 @@ USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST= yes
 
-NO_STAGE=	yes
 post-install:
 	${REINPLACE_CMD} -e 's|#{options|0 0 #{options|' \
-		${PREFIX}/${GEM_LIB_DIR}/lib/scruffy/renderers/base.rb
-	grep options ${PREFIX}/${GEM_LIB_DIR}/lib/scruffy/renderers/base.rb
+		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/scruffy/renderers/base.rb
+	grep options ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/scruffy/renderers/base.rb
 
 .include <bsd.port.mk>

Modified: head/irc/ruby-rica/Makefile
==============================================================================
--- head/irc/ruby-rica/Makefile	Wed Nov 27 05:41:11 2013	(r334996)
+++ head/irc/ruby-rica/Makefile	Wed Nov 27 05:58:14 2013	(r334997)
@@ -26,21 +26,23 @@ MODULES=	rica.rb \
 DOCS=		CHANGES	README	classes_and_methods.txt	event.lst *.png
 EXAMPLES=	erica.* ricaco.rb rica-example.rb
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 do-install:
+	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
 .for f in ${MODULES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_SITELIBDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_SITELIBDIR}/
 .endfor
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
 .endfor
 .endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODDOCDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/
 .endfor
 .endif
 



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