D7008.diff
No OneTemporary
Actions

Size

13 KB

Referenced Files

None

Subscribers

None

D7008.diff
View Options

	Index: Mk/bsd.ruby.mk
	===================================================================
	--- Mk/bsd.ruby.mk
	+++ Mk/bsd.ruby.mk
	@@ -44,7 +44,6 @@
	# build.
	# RUBY_SETUP - Set to the alternative name of setup.rb
	# (default: setup.rb).
	-# USE_RUBY_RDTOOL - Says that the port uses rdtool to generate documents.
	# USE_RUBY_RDOC - Says that the port uses rdoc to generate documents.
	# RUBY_REQUIRE - Set to a Ruby expression to evaluate before building
	# the port. The constant "Ruby" is set to the integer
	@@ -52,10 +51,6 @@
	# expression will be set to RUBY_PROVIDED, which is
	# left undefined if the result is nil, false or a
	# zero-length string. Implies USE_RUBY.
	-# RUBY_RD_FILES - Specify the RD files which you want to generate HTML
	-# documents from. If this is defined and not empty,
	-# USE_RUBY_RDTOOL is implied and RUBY_RD_HTML_FILES is
	-# defined.
	# USE_RUBYGEMS - Do not use this -- instead USES=gem
	#
	# [variables that each port should not (re)define]
	@@ -95,18 +90,15 @@
	#
	# RUBY_MODNAME - Set to the module name (default: ${PORTNAME}).
	#
	-# RUBY_RD2 - Full path of rd2 executable.
	# RUBY_RDOC - Full path of rdoc executable.
	#
	# RUBY_BASE_PORT - Port path of base ruby without PORTSDIR, without
	# suffix except version.
	# RUBY_PORT - Port path of ruby without PORTSDIR.
	-# RUBY_RDTOOL_PORT - Port path of rdtool without PORTSDIR.
	# RUBY_RDOC_PORT - Port path of rdoc without PORTSDIR.
	#
	# DEPEND_LIBRUBY - LIB_DEPENDS entry for libruby.
	# DEPEND_RUBY - BUILD_DEPENDS/RUN_DEPENDS entry for ruby.
	-# DEPEND_RUBY_RDTOOL - BUILD_DEPENDS entry for rdtool.
	# DEPEND_RUBY_RDOC - BUILD_DEPENDS entry for rdoc.
	#
	# RUBY_LIBDIR - Installation path for architecture independent
	@@ -278,18 +270,15 @@
	RUBY_MODNAME?= ${PORTNAME}

	# Commands
	-RUBY_RD2?= ${LOCALBASE}/bin/rd2
	RUBY_RDOC?= ${LOCALBASE}/bin/rdoc${RUBY_VER:S/.//}

	# Ports
	RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//}
	RUBY_PORT?= ${RUBY_BASE_PORT}
	-RUBY_RDTOOL_PORT?= textproc/ruby-rdtool

	# Depends
	DEPEND_LIBRUBY?= lib${RUBY_NAME}.so.${RUBY_SHLIBVER}:${RUBY_PORT}
	DEPEND_RUBY?= ${RUBY}:${RUBY_PORT}
	-DEPEND_RUBY_RDTOOL?= ${RUBY_RD2}:${RUBY_RDTOOL_PORT}

	# Directories
	RUBY_LIBDIR?= ${_RUBY_SYSLIBDIR}/ruby/${RUBY_VER}
	@@ -427,45 +416,5 @@
	.endif
	.endif

	-# documents
	-
	-RUBY_NO_RD_HTML= yes
	-
	-.if defined(RUBY_RD_HTML)
	-.undef RUBY_NO_RD_HTML
	-.endif
	-
	-.if defined(NOPORTDOCS)
	-RUBY_NO_RD_HTML= yes
	-.endif
	-
	-.if defined(RUBY_RD_FILES) && !defined(RUBY_NO_RD_HTML)
	-USE_RUBY_RDTOOL= yes
	-
	-RUBY_RD_HTML_FILES= ${RUBY_RD_FILES:S/.rb$//:S/.rd././:S/.rd$//:S/$/.html/}
	-
	-PLIST_SUB+= RUBY_RD_HTML_FILES=""
	-
	-.if !empty(RUBY_RD_FILES)
	-_USES_install+= 290:ruby-rd-build
	-ruby-rd-build:
	- @${ECHO_MSG} "===> Generating HTML documents from RD documents"
	- @cd ${WRKSRC}; for rd in ${RUBY_RD_FILES}; do \
	- html=$$(echo $$rd \| ${SED} 's/\.rb$$//;s/\.rd\././;s/\.rd$$//').html; \
	- ${ECHO_MSG} "${RUBY_RD2} $$rd > $$html"; \
	- ${RUBY_RD2} $$rd > $$html; \
	- done
	-.endif
	-
	-.else
	-RUBY_RD_HTML_FILES= # empty
	-
	-PLIST_SUB+= RUBY_RD_HTML_FILES="@comment "
	-.endif
	-
	-.if !defined(NOPORTDOCS) && defined(USE_RUBY_RDTOOL)
	-BUILD_DEPENDS+= ${DEPEND_RUBY_RDTOOL}
	-.endif
	-
	.endif # _INVALID_RUBY_VER
	.endif
	Index: audio/ruby-mp3tag/Makefile
	===================================================================
	--- audio/ruby-mp3tag/Makefile
	+++ audio/ruby-mp3tag/Makefile
	@@ -21,11 +21,6 @@
	USE_RUBY= yes
	USE_RUBY_RDOC= yes

	-RUBY_RD_FILES= mp3tag.rb
	-
	-DOCS= README \
	- ${RUBY_RD_HTML_FILES}
	-
	post-patch:
	@${REINPLACE_CMD} -E \
	-e "s,^(require[[:space:]]+')\./mp3tag(.*),\1mp3tag\2," \
	@@ -37,7 +32,7 @@

	do-install-DOCS-on:
	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/
	- cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${RUBY_MODDOCDIR}/
	+ cd ${WRKSRC}/ && ${INSTALL_DATA} README ${STAGEDIR}${RUBY_MODDOCDIR}/

	do-install-EXAMPLES-on:
	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
	Index: audio/ruby-mp3tag/pkg-plist
	===================================================================
	--- audio/ruby-mp3tag/pkg-plist
	+++ audio/ruby-mp3tag/pkg-plist
	@@ -1,4 +1,3 @@
	%%RUBY_SITELIBDIR%%/mp3tag.rb
	%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/mp3tag.html
	%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/mp3tag_test.rb
	Index: audio/ruby-taglib/Makefile
	===================================================================
	--- audio/ruby-taglib/Makefile
	+++ audio/ruby-taglib/Makefile
	@@ -22,16 +22,14 @@
	USE_RUBY= yes
	USES= tar:bzip2

	-RUBY_RD_FILES= taglib.rb
	-
	-DOCS= README
	-
	OPTIONS_DEFINE= DOCS

	do-install:
	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
	${INSTALL_DATA} ${WRKSRC}/lib/taglib.rb ${STAGEDIR}${RUBY_SITELIBDIR}
	+
	+do-install-DOCS-on:
	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
	- ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${RUBY_MODDOCDIR}
	+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${RUBY_MODDOCDIR}

	.include <bsd.port.mk>
	Index: devel/ruby-bsearch/Makefile
	===================================================================
	--- devel/ruby-bsearch/Makefile
	+++ devel/ruby-bsearch/Makefile
	@@ -16,24 +16,14 @@

	NO_BUILD= yes

	-RUBY_RD_FILES= bsearch.en.rd bsearch.ja.rd
	-DOCS_EN= ChangeLog \
	- ${RUBY_RD_FILES:M*.en.rd} \
	- ${RUBY_RD_HTML_FILES:M*.en.html}
	-DOCS_JA= ${RUBY_RD_FILES:M*.ja.rd} \
	- ${RUBY_RD_HTML_FILES:M*.ja.html}
	-
	OPTIONS_DEFINE= DOCS

	do-install:
	@${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
	${INSTALL_SCRIPT} ${WRKSRC}/bsearch.rb ${STAGEDIR}${RUBY_SITELIBDIR}
	- ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja
	-.for f in ${DOCS_EN}
	- ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}
	-.endfor
	-.for f in ${DOCS_JA}
	- ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/ja
	-.endfor

	+do-install-DOCS-on:
	+ ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
	+ ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${RUBY_MODDOCDIR}
	+
	.include <bsd.port.mk>
	Index: devel/ruby-bsearch/pkg-plist
	===================================================================
	--- devel/ruby-bsearch/pkg-plist
	+++ devel/ruby-bsearch/pkg-plist
	@@ -1,6 +1,2 @@
	%%RUBY_SITELIBDIR%%/bsearch.rb
	%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/bsearch.en.html
	-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/bsearch.en.rd
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/bsearch.ja.html
	-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/bsearch.ja.rd
	Index: devel/ruby-tzfile/Makefile
	===================================================================
	--- devel/ruby-tzfile/Makefile
	+++ devel/ruby-tzfile/Makefile
	@@ -17,9 +17,6 @@

	NO_BUILD= yes

	-RUBY_RD_FILES= tzfile.rb
	-RUBY_RD_HTML= yes
	-
	WRKSRC= ${WRKDIR}/${PORTNAME}

	do-install:
	@@ -26,8 +23,4 @@
	@${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/
	${INSTALL_DATA} ${WRKSRC}/tzfile.rb ${STAGEDIR}${RUBY_SITELIBDIR}/

	-do-install-DOCS-on:
	- @${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/
	- cd ${WRKSRC} && ${INSTALL_DATA} ${RUBY_RD_HTML_FILES} ${STAGEDIR}${RUBY_MODDOCDIR}/
	-
	.include <bsd.port.mk>
	Index: devel/ruby-tzfile/pkg-plist
	===================================================================
	--- devel/ruby-tzfile/pkg-plist
	+++ devel/ruby-tzfile/pkg-plist
	@@ -1,2 +1 @@
	%%RUBY_SITELIBDIR%%/tzfile.rb
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/tzfile.html
	Index: graphics/ruby-image_size/Makefile
	===================================================================
	--- graphics/ruby-image_size/Makefile
	+++ graphics/ruby-image_size/Makefile
	@@ -19,26 +19,18 @@

	NO_BUILD= yes

	-RUBY_RD_FILES= readme.ja.rd readme.rd
	+OPTIONS_DEFINE= DOCS

	-DOCS_EN= ${RUBY_RD_FILES:N*.ja.rd} \
	- ${RUBY_RD_HTML_FILES:N*.ja.html}
	-DOCS_JA= ${RUBY_RD_FILES:M*.ja.rd} \
	- ${RUBY_RD_HTML_FILES:M*.ja.html}
	+DOCS= readme.ja.rd readme.rd

	-OPTIONS_DEFINE= DOCS
	-
	do-install:
	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/
	${INSTALL_DATA} ${WRKSRC}/lib/image_size.rb ${STAGEDIR}${RUBY_SITELIBDIR}/

	-post-install:
	- ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja
	-.for f in ${DOCS_EN}
	- ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/
	+do-install-DOCS-on:
	+ ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
	+.for f in ${DOCS}
	+ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}
	.endfor
	-.for f in ${DOCS_JA}
	- ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/ja/
	-.endfor

	.include <bsd.port.mk>
	Index: graphics/ruby-image_size/pkg-plist
	===================================================================
	--- graphics/ruby-image_size/pkg-plist
	+++ graphics/ruby-image_size/pkg-plist
	@@ -1,5 +1,3 @@
	%%RUBY_SITELIBDIR%%/image_size.rb
	%%PORTDOCS%%%%RUBY_MODDOCDIR%%/readme.rd
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/readme.html
	-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/readme.ja.rd
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/readme.ja.html
	+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/readme.ja.rd
	Index: japanese/ruby-romkan/Makefile
	===================================================================
	--- japanese/ruby-romkan/Makefile
	+++ japanese/ruby-romkan/Makefile
	@@ -15,18 +15,12 @@

	NO_BUILD= yes

	-EXAMPLES_JA= test.rb test.sh
	+EXAMPLES= test.rb test.sh

	-RUBY_RD_FILES= romkan.en.rd romkan.ja.rd
	+DOCS= ChangeLog romkan.en.rd romkan.ja.rd

	-DOCS_EN= ChangeLog \
	- ${RUBY_RD_FILES:M*.en.rd} \
	- ${RUBY_RD_HTML_FILES:M*.en.html}
	-DOCS_JA= ${RUBY_RD_FILES:M*.ja.rd} \
	- ${RUBY_RD_HTML_FILES:M*.ja.html}
	+OPTIONS_DEFINE= DOCS EXAMPLES

	-OPTIONS_DEFINE= DOCS
	-
	.include <bsd.port.pre.mk>

	PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
	@@ -35,17 +29,16 @@
	${MKDIR} ${STAGEDIR}/${RUBY_SITELIBDIR}
	${INSTALL_SCRIPT} ${WRKSRC}/romkan.rb ${STAGEDIR}${RUBY_SITELIBDIR}/

	-post-install:
	- ${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ja
	-.for f in ${EXAMPLES_JA}
	- ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ja/
	+do-install-EXAMPLES-on:
	+ ${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
	+.for f in ${EXAMPLES}
	+ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
	.endfor
	- ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja
	-.for f in ${DOCS_EN}
	+
	+do-install-DOCS-on:
	+ ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
	+.for f in ${DOCS}
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/
	.endfor
	-.for f in ${DOCS_JA}
	- ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/ja/
	-.endfor

	.include <bsd.port.post.mk>
	Index: japanese/ruby-romkan/pkg-plist
	===================================================================
	--- japanese/ruby-romkan/pkg-plist
	+++ japanese/ruby-romkan/pkg-plist
	@@ -1,8 +1,6 @@
	%%RUBY_SITELIBDIR%%/romkan.rb
	-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test.rb
	-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/test.sh
	+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
	+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.sh
	%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/romkan.en.html
	%%PORTDOCS%%%%RUBY_MODDOCDIR%%/romkan.en.rd
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/romkan.ja.html
	-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/romkan.ja.rd
	+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/romkan.ja.rd
	Index: textproc/ruby-htree/Makefile
	===================================================================
	--- textproc/ruby-htree/Makefile
	+++ textproc/ruby-htree/Makefile
	@@ -19,7 +19,6 @@
	LIB_FILES= htree.rb htree

	DOCS= README \
	- ${RUBY_RD_HTML_FILES} \
	doc
	DOCSDIR= ${RUBY_MODDOCDIR}
	PORTDOCS= *
	@@ -34,6 +33,8 @@
	do-install:
	@${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
	cd ${INSTALL_WRKSRC}; ${CP} -R ${LIB_FILES} ${STAGEDIR}${RUBY_SITELIBDIR}/
	+
	+do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
	.for f in ${DOCS}
	${CP} -R ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/
	Index: textproc/ruby-rttool/Makefile
	===================================================================
	--- textproc/ruby-rttool/Makefile
	+++ textproc/ruby-rttool/Makefile
	@@ -18,11 +18,12 @@
	USE_RUBY= yes
	USES= shebangfix
	USE_RUBY_SETUP= yes
	-USE_RUBY_RDTOOL= yes

	SHEBANG_FILES= bin/rt/* lib/rt/*
	RUBY_MODNAME= rt

	+BUILD_DEPENDS= rd2:textproc/ruby-rdtool
	+
	DOCS_EN= rttool.en.html rttool.en.rd
	DOCS_JA= rttool.ja.html rttool.ja.rd

	Index: textproc/ruby-sary/Makefile
	===================================================================
	--- textproc/ruby-sary/Makefile
	+++ textproc/ruby-sary/Makefile
	@@ -28,21 +28,14 @@
	USE_RUBY_EXTCONF= yes
	USES= pkgconfig

	-RUBY_RD_FILES= .en.rd .ja.rd
	+DOCS= ChangeLog .en.rd .ja.rd

	-DOCS_EN= ChangeLog \
	- ${RUBY_RD_FILES:M*.en.rd} \
	- ${RUBY_RD_HTML_FILES:M*.en.html}
	-DOCS_JA= ${RUBY_RD_FILES:M*.ja.rd} \
	- ${RUBY_RD_HTML_FILES:M*.ja.html}
	-
	post-install:
	${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR:C/^${LOCALBASE}/${PREFIX}/}/sary.so
	${INSTALL_SCRIPT} ${WRKSRC}/rsary.rb ${STAGEDIR}${PREFIX}/bin/

	-post-install-DOCS-on:
	- ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja/
	- cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS_EN} ${STAGEDIR}${RUBY_MODDOCDIR}/
	- cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS_JA} ${STAGEDIR}${RUBY_MODDOCDIR}/ja/
	+do-install-DOCS-on:
	+ ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
	+ cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${RUBY_MODDOCDIR}/

	.include <bsd.port.mk>
	Index: textproc/ruby-sary/pkg-plist
	===================================================================
	--- textproc/ruby-sary/pkg-plist
	+++ textproc/ruby-sary/pkg-plist
	@@ -1,11 +1,7 @@
	bin/rsary.rb
	%%RUBY_SITEARCHLIBDIR%%/sary.so
	%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/README.en.html
	%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en.rd
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/Reference.en.html
	%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Reference.en.rd
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/README.ja.html
	-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja.rd
	-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/ja/Reference.ja.html
	-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Reference.ja.rd
	+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.ja.rd
	+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Reference.ja.rd

File Metadata

Mime Type: text/plain
Expires: Fri, Oct 24, 4:13 PM (5 h, 53 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 24136830
Default Alt Text: D7008.diff (13 KB)

D7008.diffNo OneTemporaryActions

D7008.diffView Options

File Metadata

Event Timeline

D7008.diff
No OneTemporary
Actions

D7008.diff
View Options