*/*: sync with upstream

Taken from: FreeBSD
2016-04-28 07:17:55 +02:00 · 2016-04-28 07:17:55 +02:00 · 0eb428a8f5
parent f72e2bf12b
commit 0eb428a8f5
1303 changed files with 1940 additions and 2751 deletions
--- a/accessibility/rubygem-atk/Makefile
+++ b/accessibility/rubygem-atk/Makefile
@ -14,7 +14,6 @@ RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2

 USE_GNOME=	atk
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gzip
-PORTVERSION=	1.7
+PORTVERSION=	1.8
 CATEGORIES=	archivers
 MASTER_SITES=	GNU

--- a/archivers/gzip/distinfo
+++ b/archivers/gzip/distinfo
@ -1,2 +1,2 @@
-SHA256 (gzip-1.7.tar.gz) = eccbaa178c7801618c887956f1668d45bb57863a9d2678bfc3e36d01fb951904
-SIZE (gzip-1.7.tar.gz) = 1185337
+SHA256 (gzip-1.8.tar.gz) = 1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e
+SIZE (gzip-1.8.tar.gz) = 1120232
--- a/archivers/rubygem-archive-tar-minitar/Makefile
+++ b/archivers/rubygem-archive-tar-minitar/Makefile
@ -14,8 +14,7 @@ LICENSE_COMB=	dual
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 PLIST_FILES=	bin/minitar

--- a/archivers/rubygem-archive-zip/Makefile
+++ b/archivers/rubygem-archive-zip/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-io-like>=0.3.0:devel/rubygem-io-like

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/archivers/rubygem-bzip2-ruby/Makefile
+++ b/archivers/rubygem-bzip2-ruby/Makefile
@ -14,7 +14,6 @@ LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/archivers/rubygem-libarchive/Makefile
+++ b/archivers/rubygem-libarchive/Makefile
@ -12,10 +12,8 @@ COMMENT=	Ruby bindings for libarchive

 LICENSE=	BSD3CLAUSE

-USES=		dos2unix libarchive
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		dos2unix gem libarchive

 DOS2UNIX_FILES=	ext/depend

--- a/archivers/rubygem-minitar/Makefile
+++ b/archivers/rubygem-minitar/Makefile
@ -15,8 +15,7 @@ LICENSE_COMB=	dual
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 PLIST_FILES=	bin/minitar

--- a/archivers/rubygem-ruby-xz/Makefile
+++ b/archivers/rubygem-ruby-xz/Makefile
@ -9,7 +9,6 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby bindings for the liblzma library

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/archivers/rubygem-rubyzip/Makefile
+++ b/archivers/rubygem-rubyzip/Makefile
@ -14,7 +14,6 @@ LICENSE_COMB=	dual

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/archivers/rubygem-rubyzip2/Makefile
+++ b/archivers/rubygem-rubyzip2/Makefile
@ -12,7 +12,6 @@ COMMENT=	Ruby compatible Zip library
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	mma
-PORTVERSION=	15.01
+PORTVERSION=	15.12
 PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mellowood.ca/${PORTNAME}/
@ -13,13 +13,13 @@ COMMENT=	Musical MIDI Accompaniment generator

 LICENSE=	GPLv2

-BROKEN=		unfetchable
-
 RUN_DEPENDS=	aplaymidi:audio/alsa-utils \
 		timidity:audio/timidity++

 MMABIN=	${PREFIX}/bin/mma

+NO_ARCH=	yes
+
 OPTIONS_DEFINE=	DOCS EXAMPLES

 REINPLACE_ARGS=	-i.bak -E -e 's,/usr(/bin/(aplaymidi|arecord|timidity)),${LOCALBASE}\1,g'
--- a/audio/mma/distinfo
+++ b/audio/mma/distinfo
@ -1,4 +1,4 @@
-SHA256 (mma-bin-15.01.tar.gz) = 24b4655de3ebf55b73a69ac167a4631f4c27741b20f9852d8056a6caf3fba66f
-SIZE (mma-bin-15.01.tar.gz) = 2350993
-SHA256 (mma-pdf-15.01.tar.gz) = ccb24a181a17e0ac76ef882c35229cf76581c64b6f9709e5161f9225792dd3af
-SIZE (mma-pdf-15.01.tar.gz) = 1855347
+SHA256 (mma-bin-15.12.tar.gz) = fd49943791c21c3a28df0bf3bd1a286ff4996dc48b85d5d192bc76e5329b674c
+SIZE (mma-bin-15.12.tar.gz) = 2679508
+SHA256 (mma-pdf-15.12.tar.gz) = 578545fec2aac6f03acb43a94977c47c1c9c5ae4d82445d68db964f446508702
+SIZE (mma-pdf-15.12.tar.gz) = 1930879
--- a/audio/mma/pkg-plist
+++ b/audio/mma/pkg-plist
@ -615,6 +615,7 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock_basicrock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock_basicrock4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock_basicrock4intro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock_basicrock4sus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock_basicrockend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/basicrock_basicrockintro.html
@ -695,6 +696,7 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/boggiewoggie_boggiewoggie3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/boggiewoggie_boggiewoggie3sus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/boggiewoggie_boggiewoggieend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/boggiewoggie_boggiewoggieintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/boggiewoggie_boggiewoggiesus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bolero.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/bolero_bolero.html
@ -951,6 +953,18 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastblues_fastbluessus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastblues_fastblueswalk.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastblues_fastblueswalksus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz_fastjazzwaltz.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz_fastjazzwaltz1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz_fastjazzwaltz1end.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz_fastjazzwaltz1sus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz_fastjazzwaltz2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz_fastjazzwaltz2sus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz_fastjazzwaltzend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz_fastjazzwaltzfill.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz_fastjazzwaltzintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz_fastjazzwaltzintro8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastjazzwaltz_fastjazzwaltzsus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastswing.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastswing_fastswing.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/fastswing_fastswingend.html
@ -1055,6 +1069,17 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hillcountry_hillcountryplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hillcountry_hillcountrysus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hillcountry_hillcountrysusplus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hymn.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hymn_hymn.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hymn_hymnend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hymn_hymnintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hymn_hymnplus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hymn_hymnroot.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hymn_hymnrootplus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hymn_hymnrootwalk.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hymn_hymnrootwalkplus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hymn_hymnwalk.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/hymn_hymnwalkplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazz-54.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazz-54_jazz54.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/jazz-54_jazz54drumintro.html
@ -1160,6 +1185,7 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/latinwaltz.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/latinwaltz_latinwaltz.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/latinwaltz_latinwaltzend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/latinwaltz_latinwaltzfill.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/latinwaltz_latinwaltzintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/latinwaltz_latinwaltzintro8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/latinwaltz_latinwaltzplus.html
@ -1297,6 +1323,7 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/popspiritual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/popspiritual_popspiritual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/popspiritual_popspiritualend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/popspiritual_popspiritualintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/popspiritual_popspiritualplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/popspiritual_popspiritualsus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/popspiritual_popspiritualsusplus.html
@ -1399,6 +1426,7 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/samba_sambafill.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/samba_sambaintro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/samba_sambaintro1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/samba_sambaintro8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/samba_sambaplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/samba_sambasus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/samba_sambasusfill.html
@ -1449,6 +1477,7 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowbolero_slowbolero1sus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowbolero_slowboleroend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowbolero_slowbolerointro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowbolero_slowbolerointrosus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowbolero_slowboleroplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowbolero_slowbolerosus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowbolero_slowbolerosusplus.html
@ -1495,6 +1524,13 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowjazz_slowjazzsusplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowjazz_slowjazzwalk.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowjazz_slowjazzwalksus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowspiritual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowspiritual_slowspiritual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowspiritual_slowspiritualend.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowspiritual_slowspiritualintro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowspiritual_slowspiritualplus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowspiritual_slowspiritualsus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/slowspiritual_slowspiritualsusplus.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/softrock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/softrock_softrock.html
 %%PORTDOCS%%%%DOCSDIR%%/html/lib/stdlib/softrock_softrock1.html
@ -1839,6 +1875,7 @@ man/man8/mma-libdoc.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node33.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node34.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node35.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ref/node36.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node4.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node5.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref/node6.html
@ -1946,6 +1983,8 @@ man/man8/mma-libdoc.8.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/cascade.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/extended-voice.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/extended-voice.mma
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/fretnoise.mid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/fretnoise.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/grooves.mid
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/grooves.mma
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/macros-all.mma
@ -2019,12 +2058,16 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/MMA/chordtable.pyo
 %%DATADIR%%/MMA/common.py
 %%DATADIR%%/MMA/common.pyo
+%%DATADIR%%/MMA/debug.py
+%%DATADIR%%/MMA/debug.pyo
 %%DATADIR%%/MMA/docs.py
 %%DATADIR%%/MMA/docs.pyo
 %%DATADIR%%/MMA/exits.py
 %%DATADIR%%/MMA/exits.pyo
 %%DATADIR%%/MMA/file.py
 %%DATADIR%%/MMA/file.pyo
+%%DATADIR%%/MMA/func.py
+%%DATADIR%%/MMA/func.pyo
 %%DATADIR%%/MMA/gbl.py
 %%DATADIR%%/MMA/gbl.pyo
 %%DATADIR%%/MMA/grooves.py
@ -2063,6 +2106,8 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/MMA/ornament.pyo
 %%DATADIR%%/MMA/parse.py
 %%DATADIR%%/MMA/parse.pyo
+%%DATADIR%%/MMA/parseCL.py
+%%DATADIR%%/MMA/parseCL.pyo
 %%DATADIR%%/MMA/pat.py
 %%DATADIR%%/MMA/pat.pyo
 %%DATADIR%%/MMA/patAria.py
@ -2093,6 +2138,8 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/MMA/readmidi.pyo
 %%DATADIR%%/MMA/roman.py
 %%DATADIR%%/MMA/roman.pyo
+%%DATADIR%%/MMA/rpitch.py
+%%DATADIR%%/MMA/rpitch.pyo
 %%DATADIR%%/MMA/safe_eval.py
 %%DATADIR%%/MMA/safe_eval.pyo
 %%DATADIR%%/MMA/seqrnd.py
@ -2103,6 +2150,8 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/MMA/swing.pyo
 %%DATADIR%%/MMA/tempo.py
 %%DATADIR%%/MMA/tempo.pyo
+%%DATADIR%%/MMA/timesig.py
+%%DATADIR%%/MMA/timesig.pyo
 %%DATADIR%%/MMA/translate.py
 %%DATADIR%%/MMA/translate.pyo
 %%DATADIR%%/MMA/trigger.py
@ -2120,11 +2169,100 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/includes/init.mma
 %%DATADIR%%/includes/pfpats01.mma
 %%DATADIR%%/includes/reset.mma
+%%DATADIR%%/includes/roland-mt32.mma
 %%DATADIR%%/includes/stdpats.mma
 %%DATADIR%%/includes/stdpats34.mma
 %%DATADIR%%/includes/stdpats54.mma
 %%DATADIR%%/includes/stdpats68.mma
+%%DATADIR%%/lib/.mmaDB
 %%DATADIR%%/lib/README
+%%DATADIR%%/lib/alexis/.mmaDB
+%%DATADIR%%/lib/alexis/README
+%%DATADIR%%/lib/alexis/hiphop.mma
+%%DATADIR%%/lib/alexis/teamtechno.mma
+%%DATADIR%%/lib/browserDB
+%%DATADIR%%/lib/casio/.mmaDB
+%%DATADIR%%/lib/casio/16beat1.mma
+%%DATADIR%%/lib/casio/16beat2.mma
+%%DATADIR%%/lib/casio/16beat3.mma
+%%DATADIR%%/lib/casio/16beatballad1.mma
+%%DATADIR%%/lib/casio/16beatballad2.mma
+%%DATADIR%%/lib/casio/16beatballad3.mma
+%%DATADIR%%/lib/casio/16shuffle1.mma
+%%DATADIR%%/lib/casio/16shuffle2.mma
+%%DATADIR%%/lib/casio/60spop.mma
+%%DATADIR%%/lib/casio/60srock.mma
+%%DATADIR%%/lib/casio/60ssoul.mma
+%%DATADIR%%/lib/casio/68ballad.mma
+%%DATADIR%%/lib/casio/80spop.mma
+%%DATADIR%%/lib/casio/8beat1.mma
+%%DATADIR%%/lib/casio/8beat2.mma
+%%DATADIR%%/lib/casio/8beat3.mma
+%%DATADIR%%/lib/casio/8beatballad1.mma
+%%DATADIR%%/lib/casio/8beatballad2.mma
+%%DATADIR%%/lib/casio/8beatballad3.mma
+%%DATADIR%%/lib/casio/8beatdance.mma
+%%DATADIR%%/lib/casio/8beatpop1.mma
+%%DATADIR%%/lib/casio/8beatpop2.mma
+%%DATADIR%%/lib/casio/8beatpop3.mma
+%%DATADIR%%/lib/casio/README
+%%DATADIR%%/lib/casio/ambient1.mma
+%%DATADIR%%/lib/casio/ambient2.mma
+%%DATADIR%%/lib/casio/ambient3.mma
+%%DATADIR%%/lib/casio/blues.mma
+%%DATADIR%%/lib/casio/dance1.mma
+%%DATADIR%%/lib/casio/dance2.mma
+%%DATADIR%%/lib/casio/dancepop1.mma
+%%DATADIR%%/lib/casio/dancepop2.mma
+%%DATADIR%%/lib/casio/dancepop3.mma
+%%DATADIR%%/lib/casio/digitalrock.mma
+%%DATADIR%%/lib/casio/discosoul.mma
+%%DATADIR%%/lib/casio/electricpop.mma
+%%DATADIR%%/lib/casio/fastbigband.mma
+%%DATADIR%%/lib/casio/foxtrot.mma
+%%DATADIR%%/lib/casio/funk1.mma
+%%DATADIR%%/lib/casio/funk2.mma
+%%DATADIR%%/lib/casio/fusion.mma
+%%DATADIR%%/lib/casio/heavymetal.mma
+%%DATADIR%%/lib/casio/hip-hop.mma
+%%DATADIR%%/lib/casio/house.mma
+%%DATADIR%%/lib/casio/jazzcombo.mma
+%%DATADIR%%/lib/casio/jazzwaltz.mma
+%%DATADIR%%/lib/casio/latinfusion.mma
+%%DATADIR%%/lib/casio/latinhouse.mma
+%%DATADIR%%/lib/casio/mellowrb.mma
+%%DATADIR%%/lib/casio/middlebigband.mma
+%%DATADIR%%/lib/casio/modernjazz.mma
+%%DATADIR%%/lib/casio/modernrb.mma
+%%DATADIR%%/lib/casio/oldieballad.mma
+%%DATADIR%%/lib/casio/pop.mma
+%%DATADIR%%/lib/casio/popballad.mma
+%%DATADIR%%/lib/casio/poprock1.mma
+%%DATADIR%%/lib/casio/poprock2.mma
+%%DATADIR%%/lib/casio/popshuffle1.mma
+%%DATADIR%%/lib/casio/popshuffle2.mma
+%%DATADIR%%/lib/casio/popwaltz.mma
+%%DATADIR%%/lib/casio/quickstep.mma
+%%DATADIR%%/lib/casio/r+b.mma
+%%DATADIR%%/lib/casio/rave.mma
+%%DATADIR%%/lib/casio/rock1.mma
+%%DATADIR%%/lib/casio/rock2.mma
+%%DATADIR%%/lib/casio/serenade.mma
+%%DATADIR%%/lib/casio/shuffleboogie.mma
+%%DATADIR%%/lib/casio/shufflerock.mma
+%%DATADIR%%/lib/casio/slow16beat.mma
+%%DATADIR%%/lib/casio/slowbigband.mma
+%%DATADIR%%/lib/casio/slowrock.mma
+%%DATADIR%%/lib/casio/slowswing.mma
+%%DATADIR%%/lib/casio/soul.mma
+%%DATADIR%%/lib/casio/soulpop.mma
+%%DATADIR%%/lib/casio/swing.mma
+%%DATADIR%%/lib/casio/techno.mma
+%%DATADIR%%/lib/casio/trance1.mma
+%%DATADIR%%/lib/casio/trance2.mma
+%%DATADIR%%/lib/casio/triphop.mma
+%%DATADIR%%/lib/casio/twist.mma
+%%DATADIR%%/lib/casio/worldpop.mma
 %%DATADIR%%/lib/kara/.mmaDB
 %%DATADIR%%/lib/kara/2beatp.mma
 %%DATADIR%%/lib/kara/8beatmotown.mma
@ -2136,6 +2274,27 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/lib/kara/kbossa.mma
 %%DATADIR%%/lib/kara/kwestballad.mma
 %%DATADIR%%/lib/kara/twi.mma
+%%DATADIR%%/lib/lib-files.tar.gz
+%%DATADIR%%/lib/pflib/.mmaDB
+%%DATADIR%%/lib/pflib/16beat1.mid
+%%DATADIR%%/lib/pflib/16beat1.mma
+%%DATADIR%%/lib/pflib/16beat2.mid
+%%DATADIR%%/lib/pflib/16beat2.mma
+%%DATADIR%%/lib/pflib/8beat1.mid
+%%DATADIR%%/lib/pflib/8beat1.mma
+%%DATADIR%%/lib/pflib/8beat2.mid
+%%DATADIR%%/lib/pflib/8beat2.mma
+%%DATADIR%%/lib/pflib/README
+%%DATADIR%%/lib/pflib/highfive.mid
+%%DATADIR%%/lib/pflib/highfive.mma
+%%DATADIR%%/lib/pflib/metal1.mid
+%%DATADIR%%/lib/pflib/metal1.mma
+%%DATADIR%%/lib/pflib/metal2.mid
+%%DATADIR%%/lib/pflib/metal2.mma
+%%DATADIR%%/lib/pflib/rock1.mid
+%%DATADIR%%/lib/pflib/rock1.mma
+%%DATADIR%%/lib/pflib/slowrock.mid
+%%DATADIR%%/lib/pflib/slowrock.mma
 %%DATADIR%%/lib/stdlib/#68swing.mma#
 %%DATADIR%%/lib/stdlib/.mmaDB
 %%DATADIR%%/lib/stdlib/50srock.mma
@ -2179,6 +2338,7 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/lib/stdlib/easyswing.mma
 %%DATADIR%%/lib/stdlib/evansish.mma
 %%DATADIR%%/lib/stdlib/fastblues.mma
+%%DATADIR%%/lib/stdlib/fastjazzwaltz.mma
 %%DATADIR%%/lib/stdlib/fastswing.mma
 %%DATADIR%%/lib/stdlib/fastwaltz.mma
 %%DATADIR%%/lib/stdlib/folk.mma
@ -2189,6 +2349,7 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/lib/stdlib/frenchwaltz.mma
 %%DATADIR%%/lib/stdlib/guitarballad.mma
 %%DATADIR%%/lib/stdlib/hillcountry.mma
+%%DATADIR%%/lib/stdlib/hymn.mma
 %%DATADIR%%/lib/stdlib/jazz-54.mma
 %%DATADIR%%/lib/stdlib/jazzcombo.mma
 %%DATADIR%%/lib/stdlib/jazzguitar.mma
@ -2232,6 +2393,7 @@ man/man8/mma-libdoc.8.gz
 %%DATADIR%%/lib/stdlib/slowbroadway.mma
 %%DATADIR%%/lib/stdlib/slowcountry.mma
 %%DATADIR%%/lib/stdlib/slowjazz.mma
+%%DATADIR%%/lib/stdlib/slowspiritual.mma
 %%DATADIR%%/lib/stdlib/softrock.mma
 %%DATADIR%%/lib/stdlib/softshoe.mma
 %%DATADIR%%/lib/stdlib/son.mma
--- a/audio/rubygem-librmpd/Makefile
+++ b/audio/rubygem-librmpd/Makefile
@ -12,7 +12,6 @@ COMMENT=	Is a simple yet powerful Music Player Daemon library
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/audio/rubygem-ruby-mp3info/Makefile
+++ b/audio/rubygem-ruby-mp3info/Makefile
@ -14,7 +14,6 @@ LICENSE=	MIT
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/audio/rubygem-ruby-ogginfo/Makefile
+++ b/audio/rubygem-ruby-ogginfo/Makefile
@ -13,7 +13,6 @@ LICENSE=	GPLv3

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/audio/rubygem-ruby-shout/Makefile
+++ b/audio/rubygem-ruby-shout/Makefile
@ -16,7 +16,6 @@ LIB_DEPENDS=	libshout.so:audio/libshout

 CONFIGURE_ARGS=	--with-opt-include="${LOCALBASE}/include"
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/benchmarks/rubygem-benchmark-ips/Makefile
+++ b/benchmarks/rubygem-benchmark-ips/Makefile
@ -13,7 +13,6 @@ LICENSE=	MIT

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/benchmarks/rubygem-railsbench/Makefile
+++ b/benchmarks/rubygem-railsbench/Makefile
@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 PLIST_FILES=	bin/railsbench

--- a/benchmarks/stress-ng/Makefile
+++ b/benchmarks/stress-ng/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	stress-ng
-PORTVERSION=	0.05.24
+PORTVERSION=	0.05.25
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://kernel.ubuntu.com/~cking/tarballs/stress-ng/

--- a/benchmarks/stress-ng/distinfo
+++ b/benchmarks/stress-ng/distinfo
@ -1,2 +1,2 @@
-SHA256 (stress-ng-0.05.24.tar.gz) = 72080d9c273d77e507d3e5b2dc9ad3349699a7c6c4575c5a828e8c9d7d419526
-SIZE (stress-ng-0.05.24.tar.gz) = 303850
+SHA256 (stress-ng-0.05.25.tar.gz) = 651761026dee9591e09089a4dae652abca54fdcf4d5f06f682946b65c023898d
+SIZE (stress-ng-0.05.25.tar.gz) = 303975
--- a/comms/gr-osmosdr/Makefile
+++ b/comms/gr-osmosdr/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	gr-osmosdr
 PORTVERSION=	20150716
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
@ -19,7 +20,7 @@ LIB_DEPENDS=	libgnuradio-runtime.so:comms/gnuradio \
 		libboost_system.so:devel/boost-libs \
 		libboost_thread.so:devel/boost-libs

-USES=	cmake pkgconfig python tar:tgz
+USES=	cmake fortran pkgconfig python tar:tgz
 USE_LDCONFIG=	yes

 # See lib/CMakeLists.txt to enable more components
--- a/comms/rubygem-callsign/Makefile
+++ b/comms/rubygem-callsign/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-hashie>=0:devel/rubygem-hashie \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/comms/rubygem-ruby-termios/Makefile
+++ b/comms/rubygem-ruby-termios/Makefile
@ -12,7 +12,6 @@ LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/converters/rubygem-bsdconv/Makefile
+++ b/converters/rubygem-bsdconv/Makefile
@ -19,7 +19,6 @@ CONFIGURE_ARGS+=--with-bsdconv-dir=${LOCALBASE}
 GEM_NAME=	${DISTNAME}

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/hbase/Makefile
+++ b/databases/hbase/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	hbase
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION} \
 		http://kev009.com/freebsd/:maven
--- a/databases/hbase/files/hbase_master.in
+++ b/databases/hbase/files/hbase_master.in
@ -21,6 +21,7 @@ load_rc_config "${name}"
 : ${hbase_master_user:=%%HBASE_USER%%}

 command="%%PREFIX%%/hbase/bin/hbase-daemon.sh"
+command_interpreter="bash"
 command_args='--config %%ETCDIR%% start master'

 stop_cmd=hbase_master_stop
--- a/databases/hbase/files/hbase_regionserver.in
+++ b/databases/hbase/files/hbase_regionserver.in
@ -21,6 +21,7 @@ load_rc_config "${name}"
 : ${hbase_regionserver_user:=%%HBASE_USER%%}

 command="%%PREFIX%%/hbase/bin/hbase-daemon.sh"
+command_interpreter="bash"
 command_args='--config %%ETCDIR%% start regionserver'

 stop_cmd=hbase_regionserver_stop
--- a/databases/puppetdb/Makefile
+++ b/databases/puppetdb/Makefile
@ -28,7 +28,6 @@ SHEBANG_FILES=	ext/files/puppetdb \
 		ext/files/puppetdb-legacy \
 		ext/files/puppetdb-ssl-setup
 USE_JAVA=	yes
-USE_RAKE=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.7+
--- a/databases/rubygem-activemodel/Makefile
+++ b/databases/rubygem-activemodel/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-activesupport>=${PORTVERSION}:devel/rubygem-activesupport \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-activemodel4/Makefile
+++ b/databases/rubygem-activemodel4/Makefile
@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-activerecord-jdbc-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbc-adapter/Makefile
@ -17,7 +17,6 @@ RUN_DEPENDS=	jruby:lang/jruby \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
@ -18,7 +18,6 @@ RUN_DEPENDS=	jruby:lang/jruby \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-activerecord-mysql-adapter/Makefile
+++ b/databases/rubygem-activerecord-mysql-adapter/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-activerecord>=3.2.9:databases/rubygem-activerecord \
 		rubygem-mysql>=2.9.0:databases/rubygem-mysql

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-activerecord-session_store/Makefile
+++ b/databases/rubygem-activerecord-session_store/Makefile
@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-actionpack4>=4.0.0:www/rubygem-actionpack4 \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-activerecord/Makefile
+++ b/databases/rubygem-activerecord/Makefile
@ -19,8 +19,7 @@ RUN_DEPENDS=	rubygem-activemodel>=${PORTVERSION}:databases/rubygem-activemodel \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3
 MYSQL_DESC=	Use native MySQL bindings
--- a/databases/rubygem-activerecord4/Makefile
+++ b/databases/rubygem-activerecord4/Makefile
@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-activemodel4>=${PORTVERSION}:databases/rubygem-activemodel4

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-after_commit_queue/Makefile
+++ b/databases/rubygem-after_commit_queue/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS?=	rubygem-activerecord4>=3.0:databases/rubygem-activerecord4

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-amalgalite/Makefile
+++ b/databases/rubygem-amalgalite/Makefile
@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	rubygem-arrayfields>=4.9:devel/rubygem-arrayfields

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 PLIST_FILES=	bin/amalgalite-pack

--- a/databases/rubygem-arel-helpers/Makefile
+++ b/databases/rubygem-arel-helpers/Makefile
@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-activerecord>=3.1.0:databases/rubygem-activerecord

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-arel/Makefile
+++ b/databases/rubygem-arel/Makefile
@ -13,7 +13,6 @@ LICENSE=	MIT

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-arel3/Makefile
+++ b/databases/rubygem-arel3/Makefile
@ -15,8 +15,7 @@ LICENSE=	MIT
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 PORTSCOUT=	ignore

--- a/databases/rubygem-arel5/Makefile
+++ b/databases/rubygem-arel5/Makefile
@ -14,7 +14,6 @@ LICENSE=	MIT

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-arel6/Makefile
+++ b/databases/rubygem-arel6/Makefile
@ -14,7 +14,6 @@ LICENSE=	MIT
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-awesome_nested_set/Makefile
+++ b/databases/rubygem-awesome_nested_set/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-activerecord4>=4.0.0:databases/rubygem-activerecord4

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-bdb1/Makefile
+++ b/databases/rubygem-bdb1/Makefile
@ -11,10 +11,8 @@ COMMENT=	Ruby interface to Berkeley DB revision 1.8x with full feature support
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual

-USES=		execinfo
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		execinfo gem

 .include <bsd.port.pre.mk>

--- a/databases/rubygem-bigrecord/Makefile
+++ b/databases/rubygem-bigrecord/Makefile
@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-activerecord4>=0:databases/rubygem-activerecord4 \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-couchrest/Makefile
+++ b/databases/rubygem-couchrest/Makefile
@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-mime-types>=1.15:misc/rubygem-mime-types \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-data_objects/Makefile
+++ b/databases/rubygem-data_objects/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-addressable>=2.1:www/rubygem-addressable

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-datamapper/Makefile
+++ b/databases/rubygem-datamapper/Makefile
@ -25,7 +25,6 @@ RUN_DEPENDS=	rubygem-dm-aggregates>=${PORTVERSION}:databases/rubygem-dm-aggregat
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dbd-mysql/Makefile
+++ b/databases/rubygem-dbd-mysql/Makefile
@ -14,7 +14,6 @@ RUN_DEPENDS=	rubygem-dbi>=0:databases/rubygem-dbi \
 		rubygem-mysql>=0:databases/rubygem-mysql

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dbd-odbc/Makefile
+++ b/databases/rubygem-dbd-odbc/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dbi>=0:databases/rubygem-dbi \
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dbd-pg/Makefile
+++ b/databases/rubygem-dbd-pg/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dbi>=0.4.0:databases/rubygem-dbi \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dbd-sqlite3/Makefile
+++ b/databases/rubygem-dbd-sqlite3/Makefile
@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-dbi>=0.4.0:databases/rubygem-dbi \
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dbi/Makefile
+++ b/databases/rubygem-dbi/Makefile
@ -18,8 +18,7 @@ RUN_DEPENDS=	rubygem-deprecated2>=2.0.1:devel/rubygem-deprecated2 \
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 PLIST_FILES=	bin/dbi bin/test_broken_dbi

--- a/databases/rubygem-dm-active_model/Makefile
+++ b/databases/rubygem-dm-active_model/Makefile
@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-activemodel>=3.0:databases/rubygem-activemodel \
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-aggregates/Makefile
+++ b/databases/rubygem-dm-aggregates/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-chunked_query/Makefile
+++ b/databases/rubygem-dm-chunked_query/Makefile
@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-dm-aggregates>=1.0:databases/rubygem-dm-aggregates \
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-constraints/Makefile
+++ b/databases/rubygem-dm-constraints/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-core/Makefile
+++ b/databases/rubygem-dm-core/Makefile
@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-devise/Makefile
+++ b/databases/rubygem-dm-devise/Makefile
@ -21,7 +21,6 @@ RUN_DEPENDS=	rubygem-devise>=1.3:devel/rubygem-devise \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-do-adapter/Makefile
+++ b/databases/rubygem-dm-do-adapter/Makefile
@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-data_objects>=0.10.6:databases/rubygem-data_objects \
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-migrations/Makefile
+++ b/databases/rubygem-dm-migrations/Makefile
@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-mysql-adapter/Makefile
+++ b/databases/rubygem-dm-mysql-adapter/Makefile
@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-dm-do-adapter>=${PORTVERSION}:databases/rubygem-dm-do-adapt
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-observer/Makefile
+++ b/databases/rubygem-dm-observer/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-pager/Makefile
+++ b/databases/rubygem-dm-pager/Makefile
@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-dm-aggregates>=0.10.1:databases/rubygem-dm-aggregates \
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-paperclip/Makefile
+++ b/databases/rubygem-dm-paperclip/Makefile
@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-postgres-adapter/Makefile
+++ b/databases/rubygem-dm-postgres-adapter/Makefile
@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-dm-do-adapter>=${PORTVERSION}:databases/rubygem-dm-do-adapt
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-rails/Makefile
+++ b/databases/rubygem-dm-rails/Makefile
@ -20,7 +20,6 @@ RUN_DEPENDS=	rubygem-actionpack>=3.0:www/rubygem-actionpack \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-serializer/Makefile
+++ b/databases/rubygem-dm-serializer/Makefile
@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-timestamps/Makefile
+++ b/databases/rubygem-dm-timestamps/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-transactions/Makefile
+++ b/databases/rubygem-dm-transactions/Makefile
@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-types/Makefile
+++ b/databases/rubygem-dm-types/Makefile
@ -23,7 +23,6 @@ RUN_DEPENDS=	rubygem-bcrypt-ruby>=3.0:security/rubygem-bcrypt-ruby \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-dm-validations/Makefile
+++ b/databases/rubygem-dm-validations/Makefile
@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-do_mysql/Makefile
+++ b/databases/rubygem-do_mysql/Makefile
@ -13,7 +13,6 @@ RUN_DEPENDS=	rubygem-data_objects>=0.10.13:databases/rubygem-data_objects

 USE_MYSQL=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-do_postgres/Makefile
+++ b/databases/rubygem-do_postgres/Makefile
@ -11,10 +11,7 @@ COMMENT=	Ruby DataObjects driver for PostgreSQL

 RUN_DEPENDS=	rubygem-data_objects>=0.10.13:databases/rubygem-data_objects

-USES+=		pgsql
-
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem pgsql

 .include <bsd.port.mk>
--- a/databases/rubygem-do_sqlite3/Makefile
+++ b/databases/rubygem-do_sqlite3/Makefile
@ -14,8 +14,7 @@ LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	rubygem-data_objects>=0.10.13:databases/rubygem-data_objects

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}

--- a/databases/rubygem-em-redis-unified/Makefile
+++ b/databases/rubygem-em-redis-unified/Makefile
@ -13,8 +13,7 @@ LICENSE=	MIT
 RUN_DEPENDS=	rubygem-eventmachine>=0.12.10:devel/rubygem-eventmachine

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem
 NO_ARCH=	yes

 .include <bsd.port.mk>
--- a/databases/rubygem-familia/Makefile
+++ b/databases/rubygem-familia/Makefile
@ -20,7 +20,6 @@ RUN_DEPENDS=	rubygem-gibbler>=0.8.6:devel/rubygem-gibbler \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-globalid/Makefile
+++ b/databases/rubygem-globalid/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-activesupport4>=4.1.0:devel/rubygem-activesupport4

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-her/Makefile
+++ b/databases/rubygem-her/Makefile
@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-activemodel4>=3.0.0:databases/rubygem-activemodel4 \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-hiredis/Makefile
+++ b/databases/rubygem-hiredis/Makefile
@ -15,8 +15,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	redis>=0:databases/redis

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
-USES=		gmake
+USES=		gem gmake

 .include <bsd.port.mk>
--- a/databases/rubygem-jdbc-mysql/Makefile
+++ b/databases/rubygem-jdbc-mysql/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	jruby:lang/jruby
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-leo_manager_client/Makefile
+++ b/databases/rubygem-leo_manager_client/Makefile
@ -14,7 +14,6 @@ LICENSE=	APACHE20
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-memcache-client/Makefile
+++ b/databases/rubygem-memcache-client/Makefile
@ -14,8 +14,7 @@ LICENSE=	BSD3CLAUSE
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 PLIST_FILES=	bin/memcached_top

--- a/databases/rubygem-memcache/Makefile
+++ b/databases/rubygem-memcache/Makefile
@ -17,7 +17,6 @@ LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 CONFIGURE_ARGS=	--with-opt-dir=${LOCALBASE}
 GEM_ENV=	EXTERNAL_LIB="yes"
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-mysql/Makefile
+++ b/databases/rubygem-mysql/Makefile
@ -14,7 +14,6 @@ LICENSE_COMB=	dual

 USE_MYSQL=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-mysql2/Makefile
+++ b/databases/rubygem-mysql2/Makefile
@ -13,7 +13,6 @@ LICENSE=	MIT

 USE_MYSQL=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-openid-redis-store/Makefile
+++ b/databases/rubygem-openid-redis-store/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-redis>=0:databases/rubygem-redis \
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-paranoia/Makefile
+++ b/databases/rubygem-paranoia/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS?=	rubygem-activerecord4>=0:databases/rubygem-activerecord4

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-pg/Makefile
+++ b/databases/rubygem-pg/Makefile
@ -15,9 +15,7 @@ LICENSE_COMB=	dual
 CONFIGURE_ARGS=	--with-pgsql-include-dir=`${PG_CONFIG} --includedir` \
 		--with-pgsql-lib-dir=`${PG_CONFIG} --libdir`
 PG_CONFIG=	${LOCALBASE}/bin/pg_config
-USES=		pgsql
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem pgsql

 .include <bsd.port.mk>
--- a/databases/rubygem-rbase/Makefile
+++ b/databases/rubygem-rbase/Makefile
@ -12,7 +12,6 @@ COMMENT=	Library to create/read/write to XBase databases (*.DBF files)
 NO_ARCH=	yes

 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-redis-actionpack/Makefile
+++ b/databases/rubygem-redis-actionpack/Makefile
@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-actionpack4>=4:www/rubygem-actionpack4 \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-redis-namespace/Makefile
+++ b/databases/rubygem-redis-namespace/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-redis>=3.0.4:databases/rubygem-redis

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-redis/Makefile
+++ b/databases/rubygem-redis/Makefile
@ -13,7 +13,6 @@ LICENSE=	MIT

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-rubyrep/Makefile
+++ b/databases/rubygem-rubyrep/Makefile
@ -21,9 +21,7 @@ RUN_DEPENDS=	flog>=0:sysutils/flog \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
-USES=		shebangfix
+USES=		gem shebangfix
 SHEBANG_FILES=	bin/rubyrep rubyrep

 USE_RC_SUBR=	rubyrep
--- a/databases/rubygem-seed-fu/Makefile
+++ b/databases/rubygem-seed-fu/Makefile
@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-activerecord4>=3.1:databases/rubygem-activerecord4 \

 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/databases/rubygem-sqlite3-ruby/Makefile
+++ b/databases/rubygem-sqlite3-ruby/Makefile
@ -19,8 +19,7 @@ RUN_DEPENDS=	rubygem-sqlite3>=1.3.3:databases/rubygem-sqlite3
 CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 PLIST_FILES=	bin/sqlite3_ruby

--- a/databases/rubygem-sqlite3/Makefile
+++ b/databases/rubygem-sqlite3/Makefile
@ -17,7 +17,6 @@ LIB_DEPENDS=	libsqlite3.so:databases/sqlite3

 CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem

 .include <bsd.port.mk>
--- a/Show More
+++ b/Show More