From ef19b346c19e1e342e952f369c5aff7ab7128a10 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Thu, 7 Sep 2000 07:23:43 +0000 Subject: [PATCH] Update fundamental ruby ports first with bsd.ruby.mk. --- devel/ruby-amstd/Makefile | 24 +++++------- devel/ruby-amstd/pkg-plist | 52 ++++++++++++------------- devel/ruby-optparse/Makefile | 31 +++++++-------- devel/ruby-optparse/pkg-plist | 30 +++++++-------- devel/ruby-racc-runtime/pkg-plist | 8 ++-- devel/ruby-racc/Makefile | 64 ++++++++++++++----------------- devel/ruby-racc/pkg-plist | 62 +++++++++++++++--------------- devel/ruby-strscan/Makefile | 38 +++++------------- devel/ruby-strscan/pkg-plist | 26 ++++++------- textproc/ruby-rdtool/Makefile | 35 +++++++---------- textproc/ruby-rdtool/pkg-plist | 50 ++++++++++++------------ 11 files changed, 189 insertions(+), 231 deletions(-) diff --git a/devel/ruby-amstd/Makefile b/devel/ruby-amstd/Makefile index 7ae1114399f8..b60257189421 100644 --- a/devel/ruby-amstd/Makefile +++ b/devel/ruby-amstd/Makefile @@ -9,21 +9,15 @@ PORTNAME= amstd PORTVERSION= 1.9.3 CATEGORIES= devel ruby MASTER_SITES= http://www1.u-netsurf.ne.jp/~brew/mine/soft/ -PKGNAMEPREFIX= ruby- +PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org -RUN_DEPENDS= ruby:${PORTSDIR}/lang/ruby +USE_RUBY= yes NO_BUILD= yes -PLIST_SUB= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}" - -RUBY?= ${LOCALBASE}/bin/ruby -RUBY_VER?= 1.4 -RUBY_ARCH?= ${ARCH}-freebsd${OSREL} - DOCS_EN= README.en DOCS_JA= README.ja MODULES= bench.rb \ @@ -49,19 +43,21 @@ MODULES= bench.rb \ version.rb do-install: - ${MKDIR} ${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/amstd + ${MKDIR} ${RUBY_SITELIBDIR}/amstd .for f in ${MODULES} ${INSTALL_DATA} ${WRKSRC}/lib/amstd/${f} \ - ${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/amstd/ + ${RUBY_SITELIBDIR}/amstd/ .endfor .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/ruby/amstd/ja + ${MKDIR} ${RUBY_DOCDIR}/amstd/ja .for f in ${DOCS_EN} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/amstd/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/amstd/ .endfor .for f in ${DOCS_JA} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/amstd/ja/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/amstd/ja/ .endfor .endif -.include +.include +.include "${PORTSDIR}/Mk/bsd.ruby.mk" +.include diff --git a/devel/ruby-amstd/pkg-plist b/devel/ruby-amstd/pkg-plist index 3c401737d6ae..a0c9f781be89 100644 --- a/devel/ruby-amstd/pkg-plist +++ b/devel/ruby-amstd/pkg-plist @@ -1,26 +1,26 @@ -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/bench.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/bug.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/collfrom.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/dispatch.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/errutil.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/extmod.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/fileutils.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/futils.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/gconst.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/getdep.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/info.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/must.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/pipeline.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/rbparams.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/recycle.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/rubyemu.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/strquote.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/symbol.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/timer.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/to_s.rb -lib/ruby/site_ruby/%%RUBY_VER%%/amstd/version.rb -@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/amstd -share/doc/ruby/amstd/README.en -share/doc/ruby/amstd/ja/README.ja -@dirrm share/doc/ruby/amstd/ja -@dirrm share/doc/ruby/amstd +%%RUBY_SITELIBDIR%%/amstd/bench.rb +%%RUBY_SITELIBDIR%%/amstd/bug.rb +%%RUBY_SITELIBDIR%%/amstd/collfrom.rb +%%RUBY_SITELIBDIR%%/amstd/dispatch.rb +%%RUBY_SITELIBDIR%%/amstd/errutil.rb +%%RUBY_SITELIBDIR%%/amstd/extmod.rb +%%RUBY_SITELIBDIR%%/amstd/fileutils.rb +%%RUBY_SITELIBDIR%%/amstd/futils.rb +%%RUBY_SITELIBDIR%%/amstd/gconst.rb +%%RUBY_SITELIBDIR%%/amstd/getdep.rb +%%RUBY_SITELIBDIR%%/amstd/info.rb +%%RUBY_SITELIBDIR%%/amstd/must.rb +%%RUBY_SITELIBDIR%%/amstd/pipeline.rb +%%RUBY_SITELIBDIR%%/amstd/rbparams.rb +%%RUBY_SITELIBDIR%%/amstd/recycle.rb +%%RUBY_SITELIBDIR%%/amstd/rubyemu.rb +%%RUBY_SITELIBDIR%%/amstd/strquote.rb +%%RUBY_SITELIBDIR%%/amstd/symbol.rb +%%RUBY_SITELIBDIR%%/amstd/timer.rb +%%RUBY_SITELIBDIR%%/amstd/to_s.rb +%%RUBY_SITELIBDIR%%/amstd/version.rb +@dirrm %%RUBY_SITELIBDIR%%/amstd +%%RUBY_DOCDIR%%/amstd/README.en +%%RUBY_DOCDIR%%/amstd/ja/README.ja +@dirrm %%RUBY_DOCDIR%%/amstd/ja +@dirrm %%RUBY_DOCDIR%%/amstd diff --git a/devel/ruby-optparse/Makefile b/devel/ruby-optparse/Makefile index dd2405155605..612402472411 100644 --- a/devel/ruby-optparse/Makefile +++ b/devel/ruby-optparse/Makefile @@ -9,42 +9,37 @@ PORTNAME= optparse PORTVERSION= 0.7.5 CATEGORIES= devel ruby MASTER_SITES= http://member.nifty.ne.jp/nokada/archive/ -PKGNAMEPREFIX= ruby- +PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org -BUILD_DEPENDS= ruby:${PORTSDIR}/lang/ruby -RUN_DEPENDS= ruby:${PORTSDIR}/lang/ruby +USE_RUBY= yes NO_BUILD= yes -PLIST_SUB= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}" - -RUBY?= ${LOCALBASE}/bin/ruby -RUBY_VER?= 1.4 -RUBY_ARCH?= ${ARCH}-freebsd${OSREL} - do-install: - ${MKDIR} ${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/optparse + ${MKDIR} ${RUBY_SITELIBDIR}/optparse .for f in optparse.rb optparse/shellwords.rb optparse/time.rb - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/${f} + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_SITELIBDIR}/${f} .endfor .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/examples/ruby/optparse/ja - ${MKDIR} ${PREFIX}/share/doc/ruby/optparse/ja + ${MKDIR} ${RUBY_EXAMPLESDIR}/optparse/ja + ${MKDIR} ${RUBY_DOCDIR}/optparse/ja .for f in optparse.rlog - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/optparse/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/optparse/ .endfor .for f in optparse.ja.rd - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/optparse/ja/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/optparse/ja/ .endfor .for f in cmd-ls.rb cmd.rb getopts.test.en opttest.rb - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/examples/ruby/optparse/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/optparse/ .endfor .for f in getopts.test - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/examples/ruby/optparse/ja + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/optparse/ja .endfor .endif -.include +.include +.include "${PORTSDIR}/Mk/bsd.ruby.mk" +.include diff --git a/devel/ruby-optparse/pkg-plist b/devel/ruby-optparse/pkg-plist index d05a1b66a99c..5dbbf8c74ef1 100644 --- a/devel/ruby-optparse/pkg-plist +++ b/devel/ruby-optparse/pkg-plist @@ -1,15 +1,15 @@ -lib/ruby/site_ruby/%%RUBY_VER%%/optparse/shellwords.rb -lib/ruby/site_ruby/%%RUBY_VER%%/optparse/time.rb -lib/ruby/site_ruby/%%RUBY_VER%%/optparse.rb -@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/optparse -share/examples/ruby/optparse/ja/getopts.test -share/examples/ruby/optparse/cmd-ls.rb -share/examples/ruby/optparse/cmd.rb -share/examples/ruby/optparse/getopts.test.en -share/examples/ruby/optparse/opttest.rb -share/doc/ruby/optparse/ja/optparse.ja.rd -share/doc/ruby/optparse/optparse.rlog -@dirrm share/examples/ruby/optparse/ja -@dirrm share/examples/ruby/optparse -@dirrm share/doc/ruby/optparse/ja -@dirrm share/doc/ruby/optparse +%%RUBY_SITELIBDIR%%/optparse/shellwords.rb +%%RUBY_SITELIBDIR%%/optparse/time.rb +%%RUBY_SITELIBDIR%%/optparse.rb +@dirrm %%RUBY_SITELIBDIR%%/optparse +%%RUBY_EXAMPLESDIR%%/optparse/ja/getopts.test +%%RUBY_EXAMPLESDIR%%/optparse/cmd-ls.rb +%%RUBY_EXAMPLESDIR%%/optparse/cmd.rb +%%RUBY_EXAMPLESDIR%%/optparse/getopts.test.en +%%RUBY_EXAMPLESDIR%%/optparse/opttest.rb +%%RUBY_DOCDIR%%/optparse/ja/optparse.ja.rd +%%RUBY_DOCDIR%%/optparse/optparse.rlog +@dirrm %%RUBY_EXAMPLESDIR%%/optparse/ja +@dirrm %%RUBY_EXAMPLESDIR%%/optparse +@dirrm %%RUBY_DOCDIR%%/optparse/ja +@dirrm %%RUBY_DOCDIR%%/optparse diff --git a/devel/ruby-racc-runtime/pkg-plist b/devel/ruby-racc-runtime/pkg-plist index 0c547b7a1d34..f793951456e7 100644 --- a/devel/ruby-racc-runtime/pkg-plist +++ b/devel/ruby-racc-runtime/pkg-plist @@ -1,4 +1,4 @@ -lib/ruby/site_ruby/%%RUBY_VER%%/racc/parser.rb -lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/racc/cparse.so -@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/racc -@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/racc +%%RUBY_SITELIBDIR%%/racc/parser.rb +%%RUBY_SITEARCHLIBDIR%%/racc/cparse.so +@dirrm %%RUBY_SITELIBDIR%%/racc +@dirrm %%RUBY_SITEARCHLIBDIR%%/racc diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile index 45fa6ef062d4..f0af4ab11bcc 100644 --- a/devel/ruby-racc/Makefile +++ b/devel/ruby-racc/Makefile @@ -9,37 +9,40 @@ PORTNAME= racc PORTVERSION= 1.2.3 CATEGORIES= devel ruby MASTER_SITES= http://www1.u-netsurf.ne.jp/~brew/mine/soft/ -PKGNAMEPREFIX= ruby- +PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org -BUILD_DEPENDS= ruby:${PORTSDIR}/lang/ruby -RUN_DEPENDS= ruby:${PORTSDIR}/lang/ruby \ - ${RUBY_SITELIBDIR}/amstd/info.rb:${PORTSDIR}/devel/ruby-amstd - .if !defined(RUNTIME) -RUN_DEPENDS+= ${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime +RUN_DEPENDS= ${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime .endif[ -PLIST_SUB= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}" +USE_RUBY= yes +USE_RUBY_AMSTD= yes +USE_RUBY_SETUP= yes -RUBY?= ${LOCALBASE}/bin/ruby -RUBY_VER?= 1.4 -RUBY_ARCH?= ${ARCH}-freebsd${OSREL} - -RUBY_SITELIBDIR?= ${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER} -RUBY_SITEARCHLIBDIR?= ${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH} - -MODULES= facade.rb format.rb grammer.rb info.rb iset.rb \ - libracc.rb raccp.rb raccs.rb state.rb -MODULES_RT= parser.rb DOCS_EN= changes.html command.html debug.html grammer.html \ index.html usage.html DOCS_JA= changes.html command.html debug.html grammer.html \ index.html parser.html usage.html EXAMPLES= calc-ja.y calc.y conflict.y lalr.y syntax.y yyerr.y +post-extract: + ${PERL} -i -ne '/^amstd\b/ || print' ${WRKSRC}/lib/PATHCONV + ${RM} -rf ${WRKSRC}/lib/amstd +.if defined(RUNTIME) + ${PERL} -i -ne '/^racc\b/ || print' ${WRKSRC}/bin/PATHCONV + ${RM} -rf ${WRKSRC}/bin/racc + ${PERL} -i -ne '/^racc\b/ || print' ${WRKSRC}/lib/PATHCONV + ${RM} -rf ${WRKSRC}/lib/racc +.else + ${PERL} -i -ne '/^cparse\b/ || print' ${WRKSRC}/ext/PATHCONV + ${RM} -rf ${WRKSRC}/ext/cparse + ${PERL} -i -ne '/^raccrt\b/ || print' ${WRKSRC}/lib/PATHCONV + ${RM} -rf ${WRKSRC}/lib/raccrt +.endif + .if !defined(RUNTIME) post-patch: ${RM} -rf ${WRKSRC}/ext @@ -48,39 +51,28 @@ post-patch: ${WRKSRC}/misc/y2racc .endif -do-configure: - @cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} setup.rb config - -do-build: - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${RUBY} setup.rb setup - do-install: .if defined(RUNTIME) ${MKDIR} ${RUBY_SITELIBDIR}/racc -.for f in ${MODULES_RT} - ${INSTALL_DATA} ${WRKSRC}/lib/raccrt/${f} ${RUBY_SITELIBDIR}/racc/ -.endfor ${MKDIR} ${RUBY_SITEARCHLIBDIR}/racc - ${INSTALL_DATA} ${WRKSRC}/ext/cparse/cparse.so ${RUBY_SITEARCHLIBDIR}/racc/ .else ${INSTALL_SCRIPT} ${WRKSRC}/bin/racc/racc \ ${WRKSRC}/misc/racc2y ${WRKSRC}/misc/y2racc ${PREFIX}/bin/ -.for f in ${MODULES} - ${INSTALL_DATA} ${WRKSRC}/lib/racc/${f} ${RUBY_SITELIBDIR}/racc/ -.endfor .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/examples/ruby/racc + ${MKDIR} ${RUBY_EXAMPLESDIR}/racc .for f in ${EXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/sample/${f} ${PREFIX}/share/examples/ruby/racc/ + ${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_EXAMPLESDIR}/racc/ .endfor - ${MKDIR} ${PREFIX}/share/doc/ruby/racc/ja + ${MKDIR} ${RUBY_DOCDIR}/racc/ja .for f in ${DOCS_EN} - ${INSTALL_DATA} ${WRKSRC}/doc.en/${f} ${PREFIX}/share/doc/ruby/racc/ + ${INSTALL_DATA} ${WRKSRC}/doc.en/${f} ${RUBY_DOCDIR}/racc/ .endfor .for f in ${DOCS_JA} - ${INSTALL_DATA} ${WRKSRC}/doc.ja/${f} ${PREFIX}/share/doc/ruby/racc/ja/ + ${INSTALL_DATA} ${WRKSRC}/doc.ja/${f} ${RUBY_DOCDIR}/racc/ja/ .endfor .endif .endif -.include +.include +.include "${PORTSDIR}/Mk/bsd.ruby.mk" +.include diff --git a/devel/ruby-racc/pkg-plist b/devel/ruby-racc/pkg-plist index 21660fedf3af..f7f955d30cd4 100644 --- a/devel/ruby-racc/pkg-plist +++ b/devel/ruby-racc/pkg-plist @@ -1,34 +1,34 @@ bin/racc bin/racc2y bin/y2racc -lib/ruby/site_ruby/%%RUBY_VER%%/racc/facade.rb -lib/ruby/site_ruby/%%RUBY_VER%%/racc/format.rb -lib/ruby/site_ruby/%%RUBY_VER%%/racc/grammer.rb -lib/ruby/site_ruby/%%RUBY_VER%%/racc/info.rb -lib/ruby/site_ruby/%%RUBY_VER%%/racc/iset.rb -lib/ruby/site_ruby/%%RUBY_VER%%/racc/libracc.rb -lib/ruby/site_ruby/%%RUBY_VER%%/racc/raccp.rb -lib/ruby/site_ruby/%%RUBY_VER%%/racc/raccs.rb -lib/ruby/site_ruby/%%RUBY_VER%%/racc/state.rb -share/examples/ruby/racc/calc-ja.y -share/examples/ruby/racc/calc.y -share/examples/ruby/racc/conflict.y -share/examples/ruby/racc/lalr.y -share/examples/ruby/racc/syntax.y -share/examples/ruby/racc/yyerr.y -share/doc/ruby/racc/ja/changes.html -share/doc/ruby/racc/ja/command.html -share/doc/ruby/racc/ja/debug.html -share/doc/ruby/racc/ja/grammer.html -share/doc/ruby/racc/ja/index.html -share/doc/ruby/racc/ja/parser.html -share/doc/ruby/racc/ja/usage.html -share/doc/ruby/racc/changes.html -share/doc/ruby/racc/command.html -share/doc/ruby/racc/debug.html -share/doc/ruby/racc/grammer.html -share/doc/ruby/racc/index.html -share/doc/ruby/racc/usage.html -@dirrm share/examples/ruby/racc -@dirrm share/doc/ruby/racc/ja -@dirrm share/doc/ruby/racc +%%RUBY_SITELIBDIR%%/racc/facade.rb +%%RUBY_SITELIBDIR%%/racc/format.rb +%%RUBY_SITELIBDIR%%/racc/grammer.rb +%%RUBY_SITELIBDIR%%/racc/info.rb +%%RUBY_SITELIBDIR%%/racc/iset.rb +%%RUBY_SITELIBDIR%%/racc/libracc.rb +%%RUBY_SITELIBDIR%%/racc/raccp.rb +%%RUBY_SITELIBDIR%%/racc/raccs.rb +%%RUBY_SITELIBDIR%%/racc/state.rb +%%RUBY_EXAMPLESDIR%%/racc/calc-ja.y +%%RUBY_EXAMPLESDIR%%/racc/calc.y +%%RUBY_EXAMPLESDIR%%/racc/conflict.y +%%RUBY_EXAMPLESDIR%%/racc/lalr.y +%%RUBY_EXAMPLESDIR%%/racc/syntax.y +%%RUBY_EXAMPLESDIR%%/racc/yyerr.y +%%RUBY_DOCDIR%%/racc/ja/changes.html +%%RUBY_DOCDIR%%/racc/ja/command.html +%%RUBY_DOCDIR%%/racc/ja/debug.html +%%RUBY_DOCDIR%%/racc/ja/grammer.html +%%RUBY_DOCDIR%%/racc/ja/index.html +%%RUBY_DOCDIR%%/racc/ja/parser.html +%%RUBY_DOCDIR%%/racc/ja/usage.html +%%RUBY_DOCDIR%%/racc/changes.html +%%RUBY_DOCDIR%%/racc/command.html +%%RUBY_DOCDIR%%/racc/debug.html +%%RUBY_DOCDIR%%/racc/grammer.html +%%RUBY_DOCDIR%%/racc/index.html +%%RUBY_DOCDIR%%/racc/usage.html +@dirrm %%RUBY_EXAMPLESDIR%%/racc +@dirrm %%RUBY_DOCDIR%%/racc/ja +@dirrm %%RUBY_DOCDIR%%/racc diff --git a/devel/ruby-strscan/Makefile b/devel/ruby-strscan/Makefile index 194678382296..cebd164df5e1 100644 --- a/devel/ruby-strscan/Makefile +++ b/devel/ruby-strscan/Makefile @@ -9,24 +9,14 @@ PORTNAME= strscan PORTVERSION= 0.5.8 CATEGORIES= devel ruby MASTER_SITES= http://www1.u-netsurf.ne.jp/~brew/mine/soft/ -PKGNAMEPREFIX= ruby- +PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org -BUILD_DEPENDS= ruby:${PORTSDIR}/lang/ruby \ - ${RUBY_SITELIBDIR}/amstd/info.rb:${PORTSDIR}/devel/ruby-amstd -RUN_DEPENDS= ruby:${PORTSDIR}/lang/ruby \ - ${RUBY_SITELIBDIR}/amstd/info.rb:${PORTSDIR}/devel/ruby-amstd - -PLIST_SUB= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}" - -RUBY?= ${LOCALBASE}/bin/ruby -RUBY_VER?= 1.4 -RUBY_ARCH?= ${ARCH}-freebsd${OSREL} - -RUBY_SITELIBDIR?= ${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER} -RUBY_SITEARCHLIBDIR?= ${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH} +USE_RUBY= yes +USE_RUBY_AMSTD= yes +USE_RUBY_SETUP= yes DOCS_EN= README.en \ doc.en/changes.html doc.en/index.html \ @@ -38,25 +28,17 @@ post-patch: ${PERL} -i -ne '/\bstrscan\b/ and print' ${WRKSRC}/lib/PATHCONV for d in amstd; do ${RM} -rf ${WRKSRC}/lib/$$d; done -do-configure: - @cd ${WRKSRC}; \ - ${SETENV} ${CONFIGURE_ENV} ${RUBY} setup.rb config - -do-build: - @cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${RUBY} setup.rb setup - do-install: - @cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${RUBY} setup.rb install .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/ruby/strscan/ja + ${MKDIR} ${RUBY_DOCDIR}/strscan/ja .for f in ${DOCS_EN} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/strscan/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/strscan/ .endfor .for f in ${DOCS_JA} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/strscan/ja/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/strscan/ja/ .endfor .endif -.include +.include +.include "${PORTSDIR}/Mk/bsd.ruby.mk" +.include diff --git a/devel/ruby-strscan/pkg-plist b/devel/ruby-strscan/pkg-plist index 483e0514cd24..1044a293c4e3 100644 --- a/devel/ruby-strscan/pkg-plist +++ b/devel/ruby-strscan/pkg-plist @@ -1,13 +1,13 @@ -lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/strscan.so -lib/ruby/site_ruby/%%RUBY_VER%%/scanner.rb -share/doc/ruby/strscan/README.en -share/doc/ruby/strscan/changes.html -share/doc/ruby/strscan/index.html -share/doc/ruby/strscan/reference.html -share/doc/ruby/strscan/usage.html -share/doc/ruby/strscan/ja/changes.html -share/doc/ruby/strscan/ja/index.html -share/doc/ruby/strscan/ja/reference.html -share/doc/ruby/strscan/ja/usage.html -@dirrm share/doc/ruby/strscan/ja -@dirrm share/doc/ruby/strscan +%%RUBY_SITEARCHLIBDIR%%/strscan.so +%%RUBY_SITELIBDIR%%/scanner.rb +%%RUBY_DOCDIR%%/strscan/README.en +%%RUBY_DOCDIR%%/strscan/changes.html +%%RUBY_DOCDIR%%/strscan/index.html +%%RUBY_DOCDIR%%/strscan/reference.html +%%RUBY_DOCDIR%%/strscan/usage.html +%%RUBY_DOCDIR%%/strscan/ja/changes.html +%%RUBY_DOCDIR%%/strscan/ja/index.html +%%RUBY_DOCDIR%%/strscan/ja/reference.html +%%RUBY_DOCDIR%%/strscan/ja/usage.html +@dirrm %%RUBY_DOCDIR%%/strscan/ja +@dirrm %%RUBY_DOCDIR%%/strscan diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile index a7ff22b6520b..bb54add29ac0 100644 --- a/textproc/ruby-rdtool/Makefile +++ b/textproc/ruby-rdtool/Makefile @@ -9,28 +9,19 @@ PORTNAME= rdtool PORTVERSION= 0.6.5 CATEGORIES= textproc ruby MASTER_SITES= http://www2.pos.to/~tosh/ruby/rdtool/archive/ -PKGNAMEPREFIX= ruby- +PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org -BUILD_DEPENDS= ruby:${PORTSDIR}/lang/ruby \ - racc:${PORTSDIR}/devel/ruby-racc \ +BUILD_DEPENDS= racc:${PORTSDIR}/devel/ruby-racc \ ${RUBY_SITEARCHLIBDIR}/strscan.so:${PORTSDIR}/devel/ruby-strscan \ ${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse -RUN_DEPENDS= ruby:${PORTSDIR}/lang/ruby \ - ${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime \ +RUN_DEPENDS= ${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime \ ${RUBY_SITEARCHLIBDIR}/strscan.so:${PORTSDIR}/devel/ruby-strscan \ ${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse -PLIST_SUB= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}" - -RUBY?= ${LOCALBASE}/bin/ruby -RUBY_VER?= 1.4 -RUBY_ARCH?= ${ARCH}-freebsd${OSREL} - -RUBY_SITELIBDIR?= ${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER} -RUBY_SITEARCHLIBDIR?= ${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH} +USE_RUBY= yes EMACSLISPDIR= ${PREFIX}/share/emacs/site-lisp XEMACSLISPDIR= ${PREFIX}/lib/xemacs/site-lisp @@ -69,18 +60,20 @@ post-install: ${LN} -sf ${EMACSLISPDIR}/rd-mode.el ${XEMACSLISPDIR} ${INSTALL_SCRIPT} ${WRKSRC}/utils/rdswap.rb ${PREFIX}/bin/rdswap .if !defined(NOPORTDOCS) - rd2 ${PREFIX}/share/doc/ruby/optparse/ja/optparse.ja.rd \ - > ${PREFIX}/share/doc/ruby/optparse/ja/optparse.ja.html - ${MKDIR} ${PREFIX}/share/examples/ruby/rd - ${CP} ${RUBY_SITELIBDIR}/rd/dot.rd2rc ${PREFIX}/share/examples/ruby/rd/ - ${MKDIR} ${PREFIX}/share/doc/ruby/rd/ja + rd2 ${RUBY_DOCDIR}/optparse/ja/optparse.ja.rd \ + > ${RUBY_DOCDIR}/optparse/ja/optparse.ja.html + ${MKDIR} ${RUBY_EXAMPLESDIR}/rd + ${CP} ${RUBY_SITELIBDIR}/rd/dot.rd2rc ${RUBY_EXAMPLESDIR}/rd/ + ${MKDIR} ${RUBY_DOCDIR}/rd/ja .for f in ${DOCS_EN} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/rd/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rd/ .endfor .for f in ${DOCS_JA} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/rd/ja/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rd/ja/ .endfor .endif @${CAT} ${PKGMESSAGE} -.include +.include +.include "${PORTSDIR}/Mk/bsd.ruby.mk" +.include diff --git a/textproc/ruby-rdtool/pkg-plist b/textproc/ruby-rdtool/pkg-plist index d7056c3c91ed..fcbbd697f3e3 100644 --- a/textproc/ruby-rdtool/pkg-plist +++ b/textproc/ruby-rdtool/pkg-plist @@ -2,32 +2,32 @@ bin/rd2 bin/rdswap bin/rmi2html bin/rmi2html.rb -lib/ruby/site_ruby/%%RUBY_VER%%/rd/dot.rd2rc -lib/ruby/site_ruby/%%RUBY_VER%%/rd/filter.rb -lib/ruby/site_ruby/%%RUBY_VER%%/rd/rd2html-lib.rb -lib/ruby/site_ruby/%%RUBY_VER%%/rd/rd2html-opt.rb -lib/ruby/site_ruby/%%RUBY_VER%%/rd/rd2man-lib.rb -lib/ruby/site_ruby/%%RUBY_VER%%/rd/rd2rdo-lib.rb -lib/ruby/site_ruby/%%RUBY_VER%%/rd/rd2rmi-lib.rb -lib/ruby/site_ruby/%%RUBY_VER%%/rd/rdblockparser.tab.rb -lib/ruby/site_ruby/%%RUBY_VER%%/rd/rdfmt.rb -lib/ruby/site_ruby/%%RUBY_VER%%/rd/rdinlineparser.tab.rb -lib/ruby/site_ruby/%%RUBY_VER%%/rd/rdvisitor.rb -@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/rd -share/examples/ruby/rd/dot.rd2rc -@dirrm share/examples/ruby/rd +%%RUBY_SITELIBDIR%%/rd/dot.rd2rc +%%RUBY_SITELIBDIR%%/rd/filter.rb +%%RUBY_SITELIBDIR%%/rd/rd2html-lib.rb +%%RUBY_SITELIBDIR%%/rd/rd2html-opt.rb +%%RUBY_SITELIBDIR%%/rd/rd2man-lib.rb +%%RUBY_SITELIBDIR%%/rd/rd2rdo-lib.rb +%%RUBY_SITELIBDIR%%/rd/rd2rmi-lib.rb +%%RUBY_SITELIBDIR%%/rd/rdblockparser.tab.rb +%%RUBY_SITELIBDIR%%/rd/rdfmt.rb +%%RUBY_SITELIBDIR%%/rd/rdinlineparser.tab.rb +%%RUBY_SITELIBDIR%%/rd/rdvisitor.rb +@dirrm %%RUBY_SITELIBDIR%%/rd +%%RUBY_EXAMPLESDIR%%/rd/dot.rd2rc +@dirrm %%RUBY_EXAMPLESDIR%%/rd share/emacs/site-lisp/rd-mode.el lib/xemacs/site-lisp/rd-mode.el @unexec rmdir -p %D/share/emacs/site-lisp 2>/dev/null || true @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true -share/doc/ruby/optparse/ja/optparse.ja.html -share/doc/ruby/rd/README.html -share/doc/ruby/rd/rd-draft.html -share/doc/ruby/rd/rd-draft.rd -share/doc/ruby/rd/ja/README.ja.html -share/doc/ruby/rd/ja/dev-note.ja.html -share/doc/ruby/rd/ja/dev-note.rd.ja -share/doc/ruby/rd/ja/rd-draft.ja.html -share/doc/ruby/rd/ja/rd-draft.rd.ja -@dirrm share/doc/ruby/rd/ja -@dirrm share/doc/ruby/rd +%%RUBY_DOCDIR%%/optparse/ja/optparse.ja.html +%%RUBY_DOCDIR%%/rd/README.html +%%RUBY_DOCDIR%%/rd/rd-draft.html +%%RUBY_DOCDIR%%/rd/rd-draft.rd +%%RUBY_DOCDIR%%/rd/ja/README.ja.html +%%RUBY_DOCDIR%%/rd/ja/dev-note.ja.html +%%RUBY_DOCDIR%%/rd/ja/dev-note.rd.ja +%%RUBY_DOCDIR%%/rd/ja/rd-draft.ja.html +%%RUBY_DOCDIR%%/rd/ja/rd-draft.rd.ja +@dirrm %%RUBY_DOCDIR%%/rd/ja +@dirrm %%RUBY_DOCDIR%%/rd