- Update to 0.9.12

- Many minor tweaks
- Pass maintainership to submitter

PR:		ports/126768
Submitted by:	Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>

6 files changed, 161 insertions, 94 deletions

diff --git a/irc/rbot/Makefile b/irc/rbot/Makefile
index 04b879e6370e..3e98a3ec5bd4 100644
--- a/irc/rbot/Makefile
+++ b/irc/rbot/Makefile
@@ -6,20 +6,32 @@
 #
 
 PORTNAME=	rbot
-PORTVERSION=	0.9.10
+PORTVERSION=	0.9.12
 CATEGORIES=	irc ruby
-MASTER_SITES=	http://linuxbrit.co.uk/downloads/
+MASTER_SITES=	http://ruby-rbot.org/download/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	clsung@FreeBSD.org
+MAINTAINER=	yzlin@cs.nctu.edu.tw
 COMMENT=	Ruby IRC bot similar to infobot
 
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 
 USE_RUBY=	yes
-USE_RUBY_FEATURES=	rexml
 USE_RUBY_SETUP=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX}
 
-CONFIGURE_ARGS=	--prefix=${PREFIX} --datadir=${PREFIX}/share/doc/${RUBY_NAME}
+PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+
+PORTDOCS=	README REQUIREMENTS ChangeLog
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for x in ${PORTDOCS}
+	${INSTALL_MAN} ${WRKSRC}/${x} ${DOCSDIR}
+.endfor
+.endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/irc/rbot/distinfo b/irc/rbot/distinfo
index 4ba8ed4750fe..0ae8af4a050b 100644
--- a/irc/rbot/distinfo
+++ b/irc/rbot/distinfo
@@ -1,3 +1,3 @@
-MD5 (rbot-0.9.10.tgz) = 886cc08498daa67ef275ca64d0a4ca70
-SHA256 (rbot-0.9.10.tgz) = 4429b2338fe008b763c811beffb0c23bdd457bb831aad1ca9df3272ae9ba909a
-SIZE (rbot-0.9.10.tgz) = 385108
+MD5 (rbot-0.9.12.tgz) = ec0ed10f040039a40ced6f5e1582c13b
+SHA256 (rbot-0.9.12.tgz) = 52bcd3ed45af1911eb3d33db6969211798ee721e4ea50dfc42cb9968f124b3fc
+SIZE (rbot-0.9.12.tgz) = 628189
diff --git a/irc/rbot/files/pkg-message.in b/irc/rbot/files/pkg-message.in
new file mode 100644
index 000000000000..38728890e188
--- /dev/null
+++ b/irc/rbot/files/pkg-message.in
@@ -0,0 +1,7 @@
+===============================================================================
+  There are many plugins supported by rbot. Each plugin may require specific
+  libraries. Before these plugins run correctly, you should make sure those
+  libs required are available.
+
+  For more details, please check %%DOCSDIR%%/REQUIREMENTS.
+===============================================================================
diff --git a/irc/rbot/pkg-descr b/irc/rbot/pkg-descr
index 8a15665418a1..6aedc0560bb1 100644
--- a/irc/rbot/pkg-descr
+++ b/irc/rbot/pkg-descr
@@ -10,4 +10,4 @@ features, and a nicer plugin scheme. His main features include:
     * Multi-language support - comes with english definition only so far - 
       translations welcome
 
-WWW: http://linuxbrit.co.uk/rbot/
+WWW: http://ruby-rbot.org
diff --git a/irc/rbot/pkg-message b/irc/rbot/pkg-message
deleted file mode 100644
index 31486ca94a17..000000000000
--- a/irc/rbot/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-NOTE!  If you are upgrading from Ruby 1.6.x to 1.8.x, the Marshal serialization
-format has changed, and your plugin_registry.db will BREAK!  I fixed this by
-compiling marshal.c from the Ruby 1.6 distribution into a module for Ruby 1.8,
-then writing a converter.  YMMV.
diff --git a/irc/rbot/pkg-plist b/irc/rbot/pkg-plist
index 17ab177314fa..9184e8a4c881 100644
--- a/irc/rbot/pkg-plist
+++ b/irc/rbot/pkg-plist
@@ -1,12 +1,27 @@
 bin/rbot
-%%RUBY_SITELIBDIR%%/rbot/auth.rb
-%%RUBY_SITELIBDIR%%/rbot/channel.rb
+bin/rbot-remote
+%%RUBY_SITELIBDIR%%/rbot/botuser.rb
+%%RUBY_SITELIBDIR%%/rbot/config-compat.rb
 %%RUBY_SITELIBDIR%%/rbot/config.rb
+%%RUBY_SITELIBDIR%%/rbot/core/auth.rb
+%%RUBY_SITELIBDIR%%/rbot/core/basics.rb
+%%RUBY_SITELIBDIR%%/rbot/core/config.rb
+%%RUBY_SITELIBDIR%%/rbot/core/filters_ui.rb
+%%RUBY_SITELIBDIR%%/rbot/core/irclog.rb
+%%RUBY_SITELIBDIR%%/rbot/core/remote.rb
+%%RUBY_SITELIBDIR%%/rbot/core/unicode.rb
+%%RUBY_SITELIBDIR%%/rbot/core/userdata.rb
+%%RUBY_SITELIBDIR%%/rbot/core/utils/extends.rb
+%%RUBY_SITELIBDIR%%/rbot/core/utils/filters.rb
+%%RUBY_SITELIBDIR%%/rbot/core/utils/httputil.rb
+%%RUBY_SITELIBDIR%%/rbot/core/utils/utils.rb
 %%RUBY_SITELIBDIR%%/rbot/dbhash.rb
-%%RUBY_SITELIBDIR%%/rbot/httputil.rb
+%%RUBY_SITELIBDIR%%/rbot/irc.rb
 %%RUBY_SITELIBDIR%%/rbot/ircbot.rb
 %%RUBY_SITELIBDIR%%/rbot/ircsocket.rb
 %%RUBY_SITELIBDIR%%/rbot/language.rb
+%%RUBY_SITELIBDIR%%/rbot/load-gettext.rb
+%%RUBY_SITELIBDIR%%/rbot/maskdb.rb
 %%RUBY_SITELIBDIR%%/rbot/message.rb
 %%RUBY_SITELIBDIR%%/rbot/messagemapper.rb
 %%RUBY_SITELIBDIR%%/rbot/pkgconfig.rb
@@ -15,82 +30,119 @@ bin/rbot
 %%RUBY_SITELIBDIR%%/rbot/registry.rb
 %%RUBY_SITELIBDIR%%/rbot/rfc2812.rb
 %%RUBY_SITELIBDIR%%/rbot/timer.rb
-%%RUBY_SITELIBDIR%%/rbot/utils.rb
+%%PORTDATA%%%%DATADIR%%/contrib/plugins/stats.rb
+%%PORTDATA%%%%DATADIR%%/contrib/plugins/vandale.rb
+%%PORTDATA%%%%DATADIR%%/languages/dutch.lang
+%%PORTDATA%%%%DATADIR%%/languages/english.lang
+%%PORTDATA%%%%DATADIR%%/languages/french.lang
+%%PORTDATA%%%%DATADIR%%/languages/german.lang
+%%PORTDATA%%%%DATADIR%%/languages/italian.lang
+%%PORTDATA%%%%DATADIR%%/languages/japanese.lang
+%%PORTDATA%%%%DATADIR%%/languages/russian.lang
+%%PORTDATA%%%%DATADIR%%/languages/traditional_chinese.lang
+%%PORTDATA%%%%DATADIR%%/plugins/alias.rb
+%%PORTDATA%%%%DATADIR%%/plugins/autoop.rb
+%%PORTDATA%%%%DATADIR%%/plugins/autorejoin.rb
+%%PORTDATA%%%%DATADIR%%/plugins/bans.rb
+%%PORTDATA%%%%DATADIR%%/plugins/bash.rb
+%%PORTDATA%%%%DATADIR%%/plugins/botsnack.rb
+%%PORTDATA%%%%DATADIR%%/plugins/cal.rb
+%%PORTDATA%%%%DATADIR%%/plugins/chanserv.rb
+%%PORTDATA%%%%DATADIR%%/plugins/chucknorris.rb
+%%PORTDATA%%%%DATADIR%%/plugins/chucknorris.yml.gz
+%%PORTDATA%%%%DATADIR%%/plugins/debugger.rb
+%%PORTDATA%%%%DATADIR%%/plugins/deepthoughts.rb
+%%PORTDATA%%%%DATADIR%%/plugins/delicious.rb
+%%PORTDATA%%%%DATADIR%%/plugins/dice.rb
+%%PORTDATA%%%%DATADIR%%/plugins/dict.rb
+%%PORTDATA%%%%DATADIR%%/plugins/dictclient.rb
+%%PORTDATA%%%%DATADIR%%/plugins/digg.rb
+%%PORTDATA%%%%DATADIR%%/plugins/eightball.rb
+%%PORTDATA%%%%DATADIR%%/plugins/excuse.rb
+%%PORTDATA%%%%DATADIR%%/plugins/factoids.rb
+%%PORTDATA%%%%DATADIR%%/plugins/figlet.rb
+%%PORTDATA%%%%DATADIR%%/plugins/fish.rb
+%%PORTDATA%%%%DATADIR%%/plugins/forecast.rb
+%%PORTDATA%%%%DATADIR%%/plugins/fortune.rb
+%%PORTDATA%%%%DATADIR%%/plugins/freshmeat.rb
+%%PORTDATA%%%%DATADIR%%/plugins/games/azgame.rb
+%%PORTDATA%%%%DATADIR%%/plugins/games/quiz.rb
+%%PORTDATA%%%%DATADIR%%/plugins/games/roshambo.rb
+%%PORTDATA%%%%DATADIR%%/plugins/games/roulette.rb
+%%PORTDATA%%%%DATADIR%%/plugins/games/shiritori.rb
+%%PORTDATA%%%%DATADIR%%/plugins/games/uno.rb
+%%PORTDATA%%%%DATADIR%%/plugins/games/wheelfortune.rb
+%%PORTDATA%%%%DATADIR%%/plugins/grouphug.rb
+%%PORTDATA%%%%DATADIR%%/plugins/hl2.rb
+%%PORTDATA%%%%DATADIR%%/plugins/host.rb
+%%PORTDATA%%%%DATADIR%%/plugins/httpd.rb.disabled
+%%PORTDATA%%%%DATADIR%%/plugins/imdb.rb
+%%PORTDATA%%%%DATADIR%%/plugins/insult.rb
+%%PORTDATA%%%%DATADIR%%/plugins/iplookup.rb
+%%PORTDATA%%%%DATADIR%%/plugins/karma.rb
+%%PORTDATA%%%%DATADIR%%/plugins/keywords.rb
+%%PORTDATA%%%%DATADIR%%/plugins/lart.rb
+%%PORTDATA%%%%DATADIR%%/plugins/lastfm.rb
+%%PORTDATA%%%%DATADIR%%/plugins/linkbot.rb
+%%PORTDATA%%%%DATADIR%%/plugins/markov.rb
+%%PORTDATA%%%%DATADIR%%/plugins/math.rb
+%%PORTDATA%%%%DATADIR%%/plugins/modes.rb
+%%PORTDATA%%%%DATADIR%%/plugins/nickrecover.rb
+%%PORTDATA%%%%DATADIR%%/plugins/nickserv.rb
+%%PORTDATA%%%%DATADIR%%/plugins/nslookup.rb
+%%PORTDATA%%%%DATADIR%%/plugins/plugin.header
+%%PORTDATA%%%%DATADIR%%/plugins/quakeauth.rb
+%%PORTDATA%%%%DATADIR%%/plugins/quotes.rb
+%%PORTDATA%%%%DATADIR%%/plugins/reaction.rb
+%%PORTDATA%%%%DATADIR%%/plugins/remind.rb
+%%PORTDATA%%%%DATADIR%%/plugins/remotectl.rb
+%%PORTDATA%%%%DATADIR%%/plugins/ri.rb
+%%PORTDATA%%%%DATADIR%%/plugins/rot13.rb
+%%PORTDATA%%%%DATADIR%%/plugins/rss.rb
+%%PORTDATA%%%%DATADIR%%/plugins/salut.rb
+%%PORTDATA%%%%DATADIR%%/plugins/script.rb
+%%PORTDATA%%%%DATADIR%%/plugins/search.rb
+%%PORTDATA%%%%DATADIR%%/plugins/seen.rb
+%%PORTDATA%%%%DATADIR%%/plugins/shortenurls.rb
+%%PORTDATA%%%%DATADIR%%/plugins/slashdot.rb
+%%PORTDATA%%%%DATADIR%%/plugins/spell.rb
+%%PORTDATA%%%%DATADIR%%/plugins/theyfightcrime.rb
+%%PORTDATA%%%%DATADIR%%/plugins/threat.rb
+%%PORTDATA%%%%DATADIR%%/plugins/time.rb
+%%PORTDATA%%%%DATADIR%%/plugins/topic.rb
+%%PORTDATA%%%%DATADIR%%/plugins/translator.rb
+%%PORTDATA%%%%DATADIR%%/plugins/tube.rb
+%%PORTDATA%%%%DATADIR%%/plugins/twitter.rb
+%%PORTDATA%%%%DATADIR%%/plugins/urban.rb
+%%PORTDATA%%%%DATADIR%%/plugins/url.rb
+%%PORTDATA%%%%DATADIR%%/plugins/usermodes.rb
+%%PORTDATA%%%%DATADIR%%/plugins/wall.rb
+%%PORTDATA%%%%DATADIR%%/plugins/weather.rb
+%%PORTDATA%%%%DATADIR%%/plugins/wow.rb
+%%PORTDATA%%%%DATADIR%%/plugins/wserver.rb
+%%PORTDATA%%%%DATADIR%%/plugins/youtube.rb
+%%PORTDATA%%%%DATADIR%%/templates/keywords.rbot
+%%PORTDATA%%%%DATADIR%%/templates/lart/larts-english
+%%PORTDATA%%%%DATADIR%%/templates/lart/larts-italian
+%%PORTDATA%%%%DATADIR%%/templates/lart/larts-japanese
+%%PORTDATA%%%%DATADIR%%/templates/lart/praises-english
+%%PORTDATA%%%%DATADIR%%/templates/lart/praises-italian
+%%PORTDATA%%%%DATADIR%%/templates/lart/praises-japanese
+%%PORTDATA%%%%DATADIR%%/templates/quiz/win_messages
+%%PORTDATA%%%%DATADIR%%/templates/salut/salut-english
+%%PORTDATA%%%%DATADIR%%/templates/salut/salut-french
+%%PORTDATA%%%%DATADIR%%/templates/salut/salut-italian
+%%PORTDATA%%%%DATADIR%%/templates/salut/salut-japanese
+%%PORTDATA%%@dirrm %%DATADIR%%/templates/salut
+%%PORTDATA%%@dirrm %%DATADIR%%/templates/quiz
+%%PORTDATA%%@dirrm %%DATADIR%%/templates/lart
+%%PORTDATA%%@dirrm %%DATADIR%%/templates
+%%PORTDATA%%@dirrm %%DATADIR%%/plugins/games
+%%PORTDATA%%@dirrm %%DATADIR%%/plugins
+%%PORTDATA%%@dirrm %%DATADIR%%/languages
+%%PORTDATA%%@dirrm %%DATADIR%%/contrib/plugins
+%%PORTDATA%%@dirrm %%DATADIR%%/contrib
+%%PORTDATA%%@dirrm %%DATADIR%%
+@dirrm %%RUBY_SITELIBDIR%%/rbot/core/utils
+@dirrm %%RUBY_SITELIBDIR%%/rbot/core
 @dirrm %%RUBY_SITELIBDIR%%/rbot
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/contrib/plugins/figlet.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/contrib/plugins/ri.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/contrib/plugins/stats.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/contrib/plugins/vandale.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/languages/dutch.lang
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/languages/english.lang
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/languages/french.lang
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/languages/german.lang
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/languages/russian.lang
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/autoop.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/autorejoin.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/bans.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/bash.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/cal.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/chucknorris.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/chucknorris.yml.gz
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/deepthoughts.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/demauro.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/dice.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/digg.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/eightball.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/excuse.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/figlet.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/fish.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/forecast.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/fortune.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/freshmeat.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/google.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/grouphug.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/host.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/httpd.rb.disabled
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/imdb.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/insult.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/iplookup.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/karma.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/keywords.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/lart.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/lastfm.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/markov.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/math.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/nickserv.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/nslookup.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/opme.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/quakeauth.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/quotes.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/remind.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/roshambo.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/rot13.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/roulette.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/rss.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/rubyurl.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/seen.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/slashdot.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/spell.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/theyfightcrime.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/threat.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/tinyurl.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/topic.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/tube.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/urban.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/url.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/weather.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/wow.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/wserver.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/plugins/xmlrpc.rb.disabled
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/templates/keywords.rbot
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/templates/lart/larts
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/templates/lart/praises
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/templates/levels.rbot
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/templates/users.rbot
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/templates/lart
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/templates
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/plugins
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/languages
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/contrib/plugins
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/contrib
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%