3 files changed, 78 insertions, 29 deletions

diff --git a/audio/ruby-smf/Makefile b/audio/ruby-smf/Makefile
index 84c13d268f47..215b7bdc6251 100644
--- a/audio/ruby-smf/Makefile
+++ b/audio/ruby-smf/Makefile
@@ -6,36 +6,32 @@
 #
 
 PORTNAME=	smf
-PORTVERSION=	0.14.3
+PORTVERSION=	0.15.7
 CATEGORIES=	audio ruby
 MASTER_SITES=	http://www.funaba.org/archive/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ruby module to handle Standard MIDI Files
 
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
 RUBY_SETUP=	install.rb
+RUBY_SHEBANG_FILES=	sample/*.rb
 
 DOCS_EN=	MANUAL.en MANUAL.en.html MANUAL.en.rd README.en
 DOCS_JA=	MANUAL MANUAL.html MANUAL.rd README
-EXAMPLES_EN=	sample/*
+EXAMPLES=	sample/*
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-.for f in ${EXAMPLES_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
-.endfor
+	${MKDIR} ${RUBY_MODDOCDIR}/en
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
-.for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
-.for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
-.endfor
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${RUBY_MODEXAMPLESDIR}/
+	${INSTALL_DATA} ${DOCS_EN:S,^,${WRKSRC}/,} ${RUBY_MODDOCDIR}/en/
+	${INSTALL_DATA} ${DOCS_JA:S,^,${WRKSRC}/,} ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/ruby-smf/distinfo b/audio/ruby-smf/distinfo
index 0993c6885d17..3616070b5295 100644
--- a/audio/ruby-smf/distinfo
+++ b/audio/ruby-smf/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/smf-0.14.3.tar.gz) = 5b69cffe2da65aef180348049ae63756
-SHA256 (ruby/smf-0.14.3.tar.gz) = 4c747f1834cbbeec1a6218caca705d4c42510a56fb9a73fda6842d0c2652d952
-SIZE (ruby/smf-0.14.3.tar.gz) = 30530
+MD5 (ruby/smf-0.15.7.tar.gz) = e4620da91387788f9554fd363074c32a
+SHA256 (ruby/smf-0.15.7.tar.gz) = fa02634eff18d694a7fd52d5140817d862dd8c2d86fdb14d09198e7c041a69d1
+SIZE (ruby/smf-0.15.7.tar.gz) = 50631
diff --git a/audio/ruby-smf/pkg-plist b/audio/ruby-smf/pkg-plist
index 0bb97f7dcf9c..fba03fc06bbd 100644
--- a/audio/ruby-smf/pkg-plist
+++ b/audio/ruby-smf/pkg-plist
@@ -1,24 +1,77 @@
+%%RUBY_SITELIBDIR%%/gopt.rb
 %%RUBY_SITELIBDIR%%/smf.rb
 %%RUBY_SITELIBDIR%%/smf/divert.rb
-@dirrm %%RUBY_SITELIBDIR%%/smf
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bwv772a.mid
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bwv772a.mml
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dump.rb
+%%RUBY_SITELIBDIR%%/smf/io.rb
+%%RUBY_SITELIBDIR%%/smf/toy/beatmap.rb
+%%RUBY_SITELIBDIR%%/smf/toy/gm.rb
+%%RUBY_SITELIBDIR%%/smf/toy/groove.rb
+%%RUBY_SITELIBDIR%%/smf/toy/macro.rb
+%%RUBY_SITELIBDIR%%/smf/toy/macro/mml.rb
+%%RUBY_SITELIBDIR%%/smf/toy/macro/mml/parser.rb
+%%RUBY_SITELIBDIR%%/smf/toy/macro/mml/parser.ry
+%%RUBY_SITELIBDIR%%/smf/toy/macro/stt.rb
+%%RUBY_SITELIBDIR%%/smf/toy/morse.rb
+%%RUBY_SITELIBDIR%%/smf/toy/quantize.rb
+%%RUBY_SITELIBDIR%%/smf/toy/rmi.rb
+%%RUBY_SITELIBDIR%%/smf/toy/searchsegment.rb
+%%RUBY_SITELIBDIR%%/smf/toy/shuffle.rb
+%%RUBY_SITELIBDIR%%/smf/toy/tempomap.rb
+%%RUBY_SITELIBDIR%%/smf/toy/text.rb
+%%RUBY_SITELIBDIR%%/smf/toy/velcomp.rb
+%%RUBY_SITELIBDIR%%/smf/toy/virtual.rb
+%%RUBY_SITELIBDIR%%/smf/toy/xml.rb
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/en/MANUAL.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/en/MANUAL.en.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/en/MANUAL.en.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/en/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/MANUAL
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/MANUAL.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/MANUAL.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bwv772.mml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bwv775.mml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bwv787.mml
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/groove.grv
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/groove.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ltvddpd2.stt
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/merge.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/mml-samp.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/mml.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/mml.ry
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/morse-samp.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/morse.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/play-oss.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/play-oss2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/play-oss3.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/play-spkr.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/play-win.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/quantize.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rand1.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rand2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rmi2smf.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/shuffle.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/smf2rmi.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/smf2smf.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/smf2text.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/smf2wav.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/smf2xml.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/split.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/stt-samp.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/stt.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/text2smf.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/velcomp.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/virtual-samp.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xml2smf.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/MANUAL.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/MANUAL.en.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/MANUAL.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/MANUAL
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/MANUAL.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/MANUAL.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README
+%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/en
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
+@dirrm %%RUBY_SITELIBDIR%%/smf/toy/macro/mml
+@dirrm %%RUBY_SITELIBDIR%%/smf/toy/macro
+@dirrm %%RUBY_SITELIBDIR%%/smf/toy
+@dirrm %%RUBY_SITELIBDIR%%/smf
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+@dirrmtry lib/ruby