From a7fd4c1eb220d4b5c1620536cd30420769de8b71 Mon Sep 17 00:00:00 2001 From: TAKATSU Tomonari Date: Sat, 20 Aug 2011 21:55:06 +0000 Subject: [PATCH] - Update to 1.0.4 --- misc/rabbit/Makefile | 58 ++++++++++++++++++-------- misc/rabbit/distinfo | 4 +- misc/rabbit/files/patch-base.rb | 11 +++++ misc/rabbit/files/patch-rabbirack | 10 +++++ misc/rabbit/files/patch-rabbit-command | 11 +++++ misc/rabbit/pkg-plist | 38 ++++++++++++----- 6 files changed, 102 insertions(+), 30 deletions(-) create mode 100644 misc/rabbit/files/patch-base.rb create mode 100644 misc/rabbit/files/patch-rabbirack create mode 100644 misc/rabbit/files/patch-rabbit-command diff --git a/misc/rabbit/Makefile b/misc/rabbit/Makefile index 8d7b644d762f..5f6e7e116c63 100644 --- a/misc/rabbit/Makefile +++ b/misc/rabbit/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rabbit -PORTVERSION= 0.9.3 +PORTVERSION= 1.0.4 CATEGORIES= misc ruby MASTER_SITES= http://rabbit-shockers.org/download/ \ ${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/rabbit|} @@ -20,37 +20,58 @@ LICENSE_FILE= ${WRKSRC}/GPL RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \ ${RUBY_SITEARCHLIBDIR}/rsvg2.so:${PORTSDIR}/graphics/ruby-rsvg2 \ ${RUBY_SITEARCHLIBDIR}/poppler.so:${PORTSDIR}/x11-toolkits/ruby-poppler \ + hikidoc:${PORTSDIR}/textproc/ruby-hikidoc \ + rubygem-nokogiri>0:${PORTSDIR}/textproc/rubygem-nokogiri \ + rubygem-sinatra>0:${PORTSDIR}/www/rubygem-sinatra \ + rubygem-rack>0:${PORTSDIR}/www/rubygem-rack \ + rubygem-haml>0:${PORTSDIR}/www/rubygem-haml \ rd2:${PORTSDIR}/textproc/ruby-rdtool \ - ${RUBY_SITELIBDIR}/div.rb:${PORTSDIR}/www/ruby-div \ - rubygem-net-irc>=0.0.9:${PORTSDIR}/irc/rubygem-net-irc \ - ruby-pwgen:${PORTSDIR}/security/ruby-password \ - rubygem-twitter-stream>=0:${PORTSDIR}/net/rubygem-twitter-stream \ - rubygem-twitter_oauth>=0:${PORTSDIR}/security/rubygem-twitter_oauth \ - hikidoc:${PORTSDIR}/textproc/ruby-hikidoc + rubygem-coderay>0:${PORTSDIR}/textproc/rubygem-coderay USE_RUBY= yes USE_RUBY_SETUP= yes .if defined(WITHOUT_NLS) PLIST_SUB+= NLS="@comment " .else -USE_GETTEXT= build +USE_GETTEXT= yes RUN_DEPENDS+= rubygem-gettext>0:${PORTSDIR}/devel/rubygem-gettext PLIST_SUB+= NLS="" .endif -RUBY_SHEBANG_FILES= update-mo.rb update-po.rb \ - bin/rabbirc bin/rabbit bin/rabbit-command \ - bin/rabbit-theme-manager bin/rabbiter bin/rabrick \ - bin/rabwii +RUBY_SHEBANG_FILES= bin/rabbirack \ + bin/rabbirc \ + bin/rabbit \ + bin/rabbit-command \ + bin/rabbit-theme-manager \ + bin/rabbiter \ + bin/rabrick PORTDOCS= * PORTEXAMPLES= * PORTDATA= * -.if !defined(WITHOUT_NLS) -pre-build: - @cd ${BUILD_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} update-mo.rb +OPTIONS= MIMETEX "Run with mimetex" off \ + TWITTER "Run with Twitter" off + +.include + +.if defined(WITH_MIMETEX) +RUN_DEPENDS+= ${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex +.endif + +.if defined(WITH_TWITTER) +RUN_DEPENDS+= rubygem-twitter_oauth>=0:${PORTSDIR}/security/rubygem-twitter_oauth \ + rubygem-twitter-stream>=0:${PORTSDIR}/net/rubygem-twitter-stream +.endif + +post-patch: + ${RM} ${WRKSRC}/bin/rabwii + ${RUBY} -i -pe 'sub %r|((\s*)require "rack")|, %Q|\\2require "rubygems"\n\\1|' ${WRKSRC}/bin/rabbirack + ${RUBY} -i -pe 'sub %r|(require "hikidoc")|, %Q|require "rubygems"\n\\1|' ${WRKSRC}/lib/rabbit/parser/wiki.rb + ${RUBY} -i -pe "sub %r|((\s*)require 'twitter_oauth')|, %Q|\\\2require 'rubygems'\n\\\1|" ${WRKSRC}/lib/rabbit/twitter.rb +.if defined(WITH_MIMETEX) + ${REINPLACE_CMD} -e 's|"mimetex.cgi"|"${PREFIX}/www/mimetex/cgi-bin/mimetex.cgi"|' \ + ${WRKSRC}/lib/rabbit/parser/ext/tex.rb .endif post-install: @@ -63,6 +84,9 @@ post-install: @${MKDIR} ${EXAMPLESDIR} @cd ${WRKSRC}/sample && ${COPYTREE_SHARE} . ${EXAMPLESDIR} .endif +.if defined(NOPORTDATA) + @${RM} -r ${DATADIR} +.endif # This target is only meant to be used by the port maintainer. x-generate-plist: @@ -71,9 +95,7 @@ x-generate-plist: ${ECHO} ${f} >> pkg-plist.new .endfor ${FIND} ${RUBY_SITELIBDIR}/rabbit -type f | ${SORT} | ${SED} -e 's,${RUBY_SITELIBDIR},%%RUBY_SITELIBDIR%%,' >> pkg-plist.new - ${FIND} ${RUBY_SITELIBDIR}/rwiki -type f | ${SORT} | ${SED} -e 's,${RUBY_SITELIBDIR},%%RUBY_SITELIBDIR%%,' >> pkg-plist.new ${FIND} ${PREFIX}/share/locale -type f -name rabbit.mo | ${SORT} | ${SED} -e 's,^${PREFIX}/,%%NLS%%,' >> pkg-plist.new - ${FIND} ${RUBY_SITELIBDIR}/rwiki -type d -depth | ${SORT} -r | ${SED} -e 's,${RUBY_SITELIBDIR},@dirrm %%RUBY_SITELIBDIR%%,' >> pkg-plist.new ${FIND} ${RUBY_SITELIBDIR}/rabbit -type d -depth | ${SORT} -r | ${SED} -e 's,${RUBY_SITELIBDIR},@dirrm %%RUBY_SITELIBDIR%%,' >> pkg-plist.new .include diff --git a/misc/rabbit/distinfo b/misc/rabbit/distinfo index ac0f193c8bb6..a5af2d8d89ca 100644 --- a/misc/rabbit/distinfo +++ b/misc/rabbit/distinfo @@ -1,2 +1,2 @@ -SHA256 (rabbit-0.9.3.tar.gz) = 6ce8ffa5075c495eb536ff7db253ebb732890c0209380d06693afdf893845f40 -SIZE (rabbit-0.9.3.tar.gz) = 4086090 +SHA256 (rabbit-1.0.4.tar.gz) = 4f04ffe71a02a6323a66c3b0dd55f07d17c7558dbd346f1b4c6cc72510cb69b9 +SIZE (rabbit-1.0.4.tar.gz) = 5891669 diff --git a/misc/rabbit/files/patch-base.rb b/misc/rabbit/files/patch-base.rb new file mode 100644 index 000000000000..5d0e77207af0 --- /dev/null +++ b/misc/rabbit/files/patch-base.rb @@ -0,0 +1,11 @@ +--- lib/rabbit/logger/base.rb.orig 2011-04-29 16:19:39.000000000 +0900 ++++ lib/rabbit/logger/base.rb 2011-08-20 18:53:13.000000000 +0900 +@@ -65,7 +65,7 @@ + log(INFO, message_or_error, &block) + end + +- def warn(message_or_error=nil, &block) ++ def warning(message_or_error=nil, &block) + log(WARNING, message_or_error, &block) + end + diff --git a/misc/rabbit/files/patch-rabbirack b/misc/rabbit/files/patch-rabbirack new file mode 100644 index 000000000000..72faaf1c4234 --- /dev/null +++ b/misc/rabbit/files/patch-rabbirack @@ -0,0 +1,10 @@ +--- bin/rabbirack.orig 2011-08-20 22:42:21.000000000 +0900 ++++ bin/rabbirack 2011-08-21 03:44:41.000000000 +0900 +@@ -90,6 +90,6 @@ + else + require "rack" + ARGV.shift if rack_runner == "rackup" +- ARGV.unshift("--option", "config=#{config_ru_path}") ++ ARGV.unshift(":config", "#{config_ru_path}") + Rack::Server.start + end diff --git a/misc/rabbit/files/patch-rabbit-command b/misc/rabbit/files/patch-rabbit-command new file mode 100644 index 000000000000..bc1d1b3090fa --- /dev/null +++ b/misc/rabbit/files/patch-rabbit-command @@ -0,0 +1,11 @@ +--- bin/rabbit-command.orig 2011-07-13 20:05:07.000000000 +0900 ++++ bin/rabbit-command 2011-08-20 19:22:06.000000000 +0900 +@@ -98,7 +98,7 @@ + if options.druby_uri_specified + logger.warning(_("--druby-uri is deprecated. Use --rabbit-uri instead.")) + end +- rabbit = DRbObject.new_with_uri(options.druby_uri) ++ rabbit = DRbObject.new_with_uri(options.rabbit_uri) + options.commands.each do |output, method, *args| + result = rabbit.send(method, *args) + send(output, result) if output diff --git a/misc/rabbit/pkg-plist b/misc/rabbit/pkg-plist index 1a4b0d7d122c..5f8be88d8645 100644 --- a/misc/rabbit/pkg-plist +++ b/misc/rabbit/pkg-plist @@ -1,10 +1,10 @@ +bin/rabbirack bin/rabbirc bin/rabbit bin/rabbit-command bin/rabbit-theme-manager bin/rabbiter bin/rabrick -bin/rabwii %%RUBY_SITELIBDIR%%/rabbit/action.rb %%RUBY_SITELIBDIR%%/rabbit/action/basic.rb %%RUBY_SITELIBDIR%%/rabbit/action/radio.rb @@ -50,6 +50,7 @@ bin/rabwii %%RUBY_SITELIBDIR%%/rabbit/element/preformatted.rb %%RUBY_SITELIBDIR%%/rabbit/element/slide-element.rb %%RUBY_SITELIBDIR%%/rabbit/element/slide.rb +%%RUBY_SITELIBDIR%%/rabbit/element/syntax-highlighting.rb %%RUBY_SITELIBDIR%%/rabbit/element/table.rb %%RUBY_SITELIBDIR%%/rabbit/element/tag.rb %%RUBY_SITELIBDIR%%/rabbit/element/text-block-element.rb @@ -83,10 +84,17 @@ bin/rabwii %%RUBY_SITELIBDIR%%/rabbit/logger/gui.rb %%RUBY_SITELIBDIR%%/rabbit/logger/stderr.rb %%RUBY_SITELIBDIR%%/rabbit/menu.rb +%%RUBY_SITELIBDIR%%/rabbit/middleware/config.ru +%%RUBY_SITELIBDIR%%/rabbit/middleware/controller.rb +%%RUBY_SITELIBDIR%%/rabbit/middleware/public/stylesheets/rabbirack.css +%%RUBY_SITELIBDIR%%/rabbit/middleware/views/index.haml +%%RUBY_SITELIBDIR%%/rabbit/middleware/views/layout.haml %%RUBY_SITELIBDIR%%/rabbit/parser.rb %%RUBY_SITELIBDIR%%/rabbit/parser/base.rb %%RUBY_SITELIBDIR%%/rabbit/parser/ext/aafigure.rb -%%RUBY_SITELIBDIR%%/rabbit/parser/ext/anthy.rb +%%RUBY_SITELIBDIR%%/rabbit/parser/ext/blockdiag.rb +%%RUBY_SITELIBDIR%%/rabbit/parser/ext/coderay.rb +%%RUBY_SITELIBDIR%%/rabbit/parser/ext/emacs.rb %%RUBY_SITELIBDIR%%/rabbit/parser/ext/enscript.rb %%RUBY_SITELIBDIR%%/rabbit/parser/ext/entity.rb %%RUBY_SITELIBDIR%%/rabbit/parser/ext/escape.rb @@ -97,16 +105,12 @@ bin/rabwii %%RUBY_SITELIBDIR%%/rabbit/parser/pause-support.rb %%RUBY_SITELIBDIR%%/rabbit/parser/pdf.rb %%RUBY_SITELIBDIR%%/rabbit/parser/rd.rb -%%RUBY_SITELIBDIR%%/rabbit/parser/rd/ext/aafigure.rb -%%RUBY_SITELIBDIR%%/rabbit/parser/rd/ext/anthy.rb %%RUBY_SITELIBDIR%%/rabbit/parser/rd/ext/base.rb %%RUBY_SITELIBDIR%%/rabbit/parser/rd/ext/block-verbatim.rb -%%RUBY_SITELIBDIR%%/rabbit/parser/rd/ext/enscript.rb %%RUBY_SITELIBDIR%%/rabbit/parser/rd/ext/entity.rb %%RUBY_SITELIBDIR%%/rabbit/parser/rd/ext/image.rb %%RUBY_SITELIBDIR%%/rabbit/parser/rd/ext/inline-verbatim.rb %%RUBY_SITELIBDIR%%/rabbit/parser/rd/ext/refer.rb -%%RUBY_SITELIBDIR%%/rabbit/parser/rd/ext/tex.rb %%RUBY_SITELIBDIR%%/rabbit/parser/rd/rd2rabbit-lib.rb %%RUBY_SITELIBDIR%%/rabbit/parser/rd/rt/rt2rabbit-lib.rb %%RUBY_SITELIBDIR%%/rabbit/parser/rd/visitor.rb @@ -165,7 +169,6 @@ bin/rabwii %%RUBY_SITELIBDIR%%/rabbit/source/file.rb %%RUBY_SITELIBDIR%%/rabbit/source/hiki.rb %%RUBY_SITELIBDIR%%/rabbit/source/memory.rb -%%RUBY_SITELIBDIR%%/rabbit/source/rwiki.rb %%RUBY_SITELIBDIR%%/rabbit/source/slide-share.rb %%RUBY_SITELIBDIR%%/rabbit/source/uri.rb %%RUBY_SITELIBDIR%%/rabbit/stock.rb @@ -232,6 +235,8 @@ bin/rabwii %%RUBY_SITELIBDIR%%/rabbit/theme/debian/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/default-block-quote/default-block-quote.rb %%RUBY_SITELIBDIR%%/rabbit/theme/default-block-quote/property.rb +%%RUBY_SITELIBDIR%%/rabbit/theme/default-comment/default-comment.rb +%%RUBY_SITELIBDIR%%/rabbit/theme/default-comment/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/default-description/default-description.rb %%RUBY_SITELIBDIR%%/rabbit/theme/default-description/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/default-foot-text/default-foot-text.rb @@ -295,14 +300,13 @@ bin/rabwii %%RUBY_SITELIBDIR%%/rabbit/theme/manager.rb %%RUBY_SITELIBDIR%%/rabbit/theme/mirror-effect/mirror-effect.rb %%RUBY_SITELIBDIR%%/rabbit/theme/mirror-effect/property.rb +%%RUBY_SITELIBDIR%%/rabbit/theme/nari/nari.rb %%RUBY_SITELIBDIR%%/rabbit/theme/newline-in-slides/newline-in-slides.rb %%RUBY_SITELIBDIR%%/rabbit/theme/newline-in-slides/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/newline-in-title/newline-in-title.rb %%RUBY_SITELIBDIR%%/rabbit/theme/newline-in-title/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/night-black/night-black.rb %%RUBY_SITELIBDIR%%/rabbit/theme/night-black/property.rb -%%RUBY_SITELIBDIR%%/rabbit/theme/pdf-tortoise-and-hare/pdf-tortoise-and-hare.rb -%%RUBY_SITELIBDIR%%/rabbit/theme/pdf-tortoise-and-hare/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/pdf/pdf.rb %%RUBY_SITELIBDIR%%/rabbit/theme/pdf/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/per-slide-background-color/per-slide-background-color.rb @@ -347,6 +351,8 @@ bin/rabwii %%RUBY_SITELIBDIR%%/rabbit/theme/ruby-gnome2-slide/ruby-gnome2-slide.rb %%RUBY_SITELIBDIR%%/rabbit/theme/ruby-gnome2/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/ruby-gnome2/ruby-gnome2.rb +%%RUBY_SITELIBDIR%%/rabbit/theme/rubykaigi2011/property.rb +%%RUBY_SITELIBDIR%%/rabbit/theme/rubykaigi2011/rubykaigi2011.rb %%RUBY_SITELIBDIR%%/rabbit/theme/scroll-effect/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/scroll-effect/scroll-effect.rb %%RUBY_SITELIBDIR%%/rabbit/theme/searcher.rb @@ -370,6 +376,8 @@ bin/rabwii %%RUBY_SITELIBDIR%%/rabbit/theme/slide-show/slide-show.rb %%RUBY_SITELIBDIR%%/rabbit/theme/stream-comment/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/stream-comment/stream-comment.rb +%%RUBY_SITELIBDIR%%/rabbit/theme/syntax-highlighting/property.rb +%%RUBY_SITELIBDIR%%/rabbit/theme/syntax-highlighting/syntax-highlighting.rb %%RUBY_SITELIBDIR%%/rabbit/theme/table/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/table/table.rb %%RUBY_SITELIBDIR%%/rabbit/theme/tag/property.rb @@ -386,6 +394,8 @@ bin/rabwii %%RUBY_SITELIBDIR%%/rabbit/theme/title-on-image-toolkit/title-on-image-toolkit.rb %%RUBY_SITELIBDIR%%/rabbit/theme/title-shadow/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/title-shadow/title-shadow.rb +%%RUBY_SITELIBDIR%%/rabbit/theme/title-slide-background-image/property.rb +%%RUBY_SITELIBDIR%%/rabbit/theme/title-slide-background-image/title-slide-background-image.rb %%RUBY_SITELIBDIR%%/rabbit/theme/twitter-comment/property.rb %%RUBY_SITELIBDIR%%/rabbit/theme/twitter-comment/twitter-comment.rb %%RUBY_SITELIBDIR%%/rabbit/trackball.rb @@ -399,6 +409,7 @@ bin/rabwii %%NLS%%share/locale/ja/LC_MESSAGES/rabbit.mo @dirrm %%RUBY_SITELIBDIR%%/rabbit/xmlrpc @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/twitter-comment +@dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/title-slide-background-image @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/title-shadow @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/title-on-image-toolkit @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/title-logo @@ -407,6 +418,7 @@ bin/rabwii @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/timer @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/tag @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/table +@dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/syntax-highlighting @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/stream-comment @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/slide-show @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/slide-number @@ -418,6 +430,7 @@ bin/rabwii @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/simple-item-mark @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/show-frame @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/scroll-effect +@dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/rubykaigi2011 @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/ruby-gnome2-slide @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/ruby-gnome2-preformatted @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/ruby-gnome2-item-mark @@ -439,11 +452,11 @@ bin/rabwii @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/powered-by @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/per-slide-background-image @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/per-slide-background-color -@dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/pdf-tortoise-and-hare @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/pdf @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/night-black @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/newline-in-title @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/newline-in-slides +@dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/nari @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/mirror-effect @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/lightning-talk-toolkit @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/lightning-talk @@ -473,6 +486,7 @@ bin/rabwii @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/default-icon @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/default-foot-text @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/default-description +@dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/default-comment @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/default-block-quote @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/default @dirrm %%RUBY_SITELIBDIR%%/rabbit/theme/debian @@ -518,6 +532,10 @@ bin/rabwii @dirrm %%RUBY_SITELIBDIR%%/rabbit/parser/rd @dirrm %%RUBY_SITELIBDIR%%/rabbit/parser/ext @dirrm %%RUBY_SITELIBDIR%%/rabbit/parser +@dirrm %%RUBY_SITELIBDIR%%/rabbit/middleware/views +@dirrm %%RUBY_SITELIBDIR%%/rabbit/middleware/public/stylesheets +@dirrm %%RUBY_SITELIBDIR%%/rabbit/middleware/public +@dirrm %%RUBY_SITELIBDIR%%/rabbit/middleware @dirrm %%RUBY_SITELIBDIR%%/rabbit/logger @dirrm %%RUBY_SITELIBDIR%%/rabbit/image @dirrm %%RUBY_SITELIBDIR%%/rabbit/html