Merge branch 'master' into gstreamer

14 files changed, 70 insertions, 33 deletions

diff --git a/audio/checkmate/Makefile b/audio/checkmate/Makefile
index 213438eb6402..43a63119ee1a 100644
--- a/audio/checkmate/Makefile
+++ b/audio/checkmate/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	checkmate
-PORTVERSION=	0.20
+PORTVERSION=	0.21
 CATEGORIES=	audio
 MASTER_SITES=	http://checkmate.gissen.nl/ \
 		LOCAL/ehaupt
diff --git a/audio/checkmate/distinfo b/audio/checkmate/distinfo
index 3d05d0c2f863..35c73a46c6a9 100644
--- a/audio/checkmate/distinfo
+++ b/audio/checkmate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491816094
-SHA256 (checkmate-0.20.tar.gz) = 41117c59e167747fe217e28e21dc183a3d6c9037581dc61a1da6e5312b8e21dc
-SIZE (checkmate-0.20.tar.gz) = 166877
+TIMESTAMP = 1499004619
+SHA256 (checkmate-0.21.tar.gz) = a27b4843ec06b069a46363836efda3e56e1daaf193a73a4da875e77f0945dd7a
+SIZE (checkmate-0.21.tar.gz) = 182030
diff --git a/audio/libmatemixer/Makefile b/audio/libmatemixer/Makefile
index 8d1a5e7e101d..83396c6929e1 100644
--- a/audio/libmatemixer/Makefile
+++ b/audio/libmatemixer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libmatemixer
-PORTVERSION=	1.12.1
+PORTVERSION=	1.18.0
 CATEGORIES=	audio mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/audio/libmatemixer/distinfo b/audio/libmatemixer/distinfo
index 0ba291d8d5cf..01545aafeb1b 100644
--- a/audio/libmatemixer/distinfo
+++ b/audio/libmatemixer/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/libmatemixer-1.12.1.tar.xz) = decddd15f3cfb7410428922a30e210d89ac9b87b4433919ae152f14a61ce0ff0
-SIZE (mate/libmatemixer-1.12.1.tar.xz) = 382444
+TIMESTAMP = 1491618757
+SHA256 (mate/libmatemixer-1.18.0.tar.xz) = b99209e310ba614c5b0bd6a97545ba974bc34a74cd29fd50189a5365a9ed7e27
+SIZE (mate/libmatemixer-1.18.0.tar.xz) = 418772
diff --git a/audio/libmatemixer/pkg-plist b/audio/libmatemixer/pkg-plist
index 5dee9d65d4d3..f79cdeda59f1 100644
--- a/audio/libmatemixer/pkg-plist
+++ b/audio/libmatemixer/pkg-plist
@@ -40,7 +40,6 @@ share/gtk-doc/html/libmatemixer/api-index-full.html
 share/gtk-doc/html/libmatemixer/ch01.html
 share/gtk-doc/html/libmatemixer/home.png
 share/gtk-doc/html/libmatemixer/index.html
-share/gtk-doc/html/libmatemixer/index.sgml
 share/gtk-doc/html/libmatemixer/left-insensitive.png
 share/gtk-doc/html/libmatemixer/left.png
 share/gtk-doc/html/libmatemixer/libmatemixer-MateMixer.html
@@ -53,27 +52,43 @@ share/gtk-doc/html/libmatemixer/up.png
 share/locale/am/LC_MESSAGES/libmatemixer.mo
 share/locale/ar/LC_MESSAGES/libmatemixer.mo
 share/locale/be/LC_MESSAGES/libmatemixer.mo
+share/locale/bg/LC_MESSAGES/libmatemixer.mo
+share/locale/bs/LC_MESSAGES/libmatemixer.mo
+share/locale/ca/LC_MESSAGES/libmatemixer.mo
+share/locale/ca@valencia/LC_MESSAGES/libmatemixer.mo
 share/locale/cs/LC_MESSAGES/libmatemixer.mo
+share/locale/cy/LC_MESSAGES/libmatemixer.mo
 share/locale/da/LC_MESSAGES/libmatemixer.mo
 share/locale/de/LC_MESSAGES/libmatemixer.mo
 share/locale/el/LC_MESSAGES/libmatemixer.mo
 share/locale/en_AU/LC_MESSAGES/libmatemixer.mo
 share/locale/en_GB/LC_MESSAGES/libmatemixer.mo
 share/locale/es/LC_MESSAGES/libmatemixer.mo
+share/locale/es_CO/LC_MESSAGES/libmatemixer.mo
+share/locale/es_MX/LC_MESSAGES/libmatemixer.mo
 share/locale/et/LC_MESSAGES/libmatemixer.mo
 share/locale/eu/LC_MESSAGES/libmatemixer.mo
+share/locale/fa/LC_MESSAGES/libmatemixer.mo
 share/locale/fr/LC_MESSAGES/libmatemixer.mo
+share/locale/fr_CA/LC_MESSAGES/libmatemixer.mo
+share/locale/frp/LC_MESSAGES/libmatemixer.mo
 share/locale/hr/LC_MESSAGES/libmatemixer.mo
 share/locale/hu/LC_MESSAGES/libmatemixer.mo
 share/locale/hy/LC_MESSAGES/libmatemixer.mo
 share/locale/id/LC_MESSAGES/libmatemixer.mo
+share/locale/is/LC_MESSAGES/libmatemixer.mo
 share/locale/it/LC_MESSAGES/libmatemixer.mo
 share/locale/ja/LC_MESSAGES/libmatemixer.mo
+share/locale/jv/LC_MESSAGES/libmatemixer.mo
 share/locale/ko/LC_MESSAGES/libmatemixer.mo
+share/locale/ku_IQ/LC_MESSAGES/libmatemixer.mo
 share/locale/lt/LC_MESSAGES/libmatemixer.mo
 share/locale/ms/LC_MESSAGES/libmatemixer.mo
+share/locale/nb/LC_MESSAGES/libmatemixer.mo
 share/locale/nl/LC_MESSAGES/libmatemixer.mo
+share/locale/oc/LC_MESSAGES/libmatemixer.mo
 share/locale/pl/LC_MESSAGES/libmatemixer.mo
+share/locale/pms/LC_MESSAGES/libmatemixer.mo
 share/locale/pt/LC_MESSAGES/libmatemixer.mo
 share/locale/pt_BR/LC_MESSAGES/libmatemixer.mo
 share/locale/ro/LC_MESSAGES/libmatemixer.mo
@@ -84,5 +99,6 @@ share/locale/sr/LC_MESSAGES/libmatemixer.mo
 share/locale/sv/LC_MESSAGES/libmatemixer.mo
 share/locale/tr/LC_MESSAGES/libmatemixer.mo
 share/locale/uk/LC_MESSAGES/libmatemixer.mo
+share/locale/uz/LC_MESSAGES/libmatemixer.mo
 share/locale/zh_CN/LC_MESSAGES/libmatemixer.mo
 share/locale/zh_TW/LC_MESSAGES/libmatemixer.mo
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 551822f605d5..ac70ba140182 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libmikmod
-PORTVERSION=	3.3.8
+PORTVERSION=	3.3.11.1
 CATEGORIES=	audio
 MASTER_SITES=	SF/mikmod/libmikmod/${PORTVERSION}/
 
diff --git a/audio/libmikmod/distinfo b/audio/libmikmod/distinfo
index 6f04a6ca4101..1286ae650438 100644
--- a/audio/libmikmod/distinfo
+++ b/audio/libmikmod/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libmikmod-3.3.8.tar.gz) = 4acf6634a477d8b95f18b55a3e2e76052c149e690d202484e8b0ac7589cf37a2
-SIZE (libmikmod-3.3.8.tar.gz) = 1254702
+TIMESTAMP = 1499152109
+SHA256 (libmikmod-3.3.11.1.tar.gz) = ad9d64dfc8f83684876419ea7cd4ff4a41d8bcd8c23ef37ecb3a200a16b46d19
+SIZE (libmikmod-3.3.11.1.tar.gz) = 1240373
diff --git a/audio/mate-media/Makefile b/audio/mate-media/Makefile
index a653bbc42643..877747752c50 100644
--- a/audio/mate-media/Makefile
+++ b/audio/mate-media/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-media
-PORTVERSION=	1.12.1
+PORTVERSION=	1.18.0
 CATEGORIES=	audio mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -12,21 +12,22 @@ COMMENT=	Multimedia applications for the MATE desktop
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra \
-		libmatemixer.so:audio/libmatemixer \
-		libunique-1.0.so:x11-toolkits/unique
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libstartup-notification-1.so:x11/startup-notification \
+		libunique-3.0.so:x11-toolkits/libunique3
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
-USE_MATE=	desktop panel
-USE_GNOME=	glib20 gtk20 intlhack libxml2
+USES=		gettext gmake libtool localbase pathfix \
+		pkgconfig tar:xz
+USE_MATE=	desktop mixer panel
+USE_GNOME=	cairo glib20 gtk30 intlhack libxml2
+USE_XORG=	x11
 USE_LDCONFIG=	yes
-USE_GSTREAMER=	good
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gtk=2.0
 INSTALLS_ICONS=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/audio/mate-media/distinfo b/audio/mate-media/distinfo
index 54c6ceb451e6..32f8fb49a73f 100644
--- a/audio/mate-media/distinfo
+++ b/audio/mate-media/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-media-1.12.1.tar.xz) = c6d19a5d88e031156bcc0bc156c3eeaf4becb9953bb75b6f88e419154f393efc
-SIZE (mate/mate-media-1.12.1.tar.xz) = 507976
+TIMESTAMP = 1491777405
+SHA256 (mate/mate-media-1.18.0.tar.xz) = 94d26b96199a3b30e2050596d17e0125f86edf9ef009d4eb318308896f54296c
+SIZE (mate/mate-media-1.18.0.tar.xz) = 492648
diff --git a/audio/mate-media/pkg-plist b/audio/mate-media/pkg-plist
index 958ee63c7613..3e812d88e69a 100644
--- a/audio/mate-media/pkg-plist
+++ b/audio/mate-media/pkg-plist
@@ -11,7 +11,6 @@ share/locale/as/LC_MESSAGES/mate-media.mo
 share/locale/ast/LC_MESSAGES/mate-media.mo
 share/locale/az/LC_MESSAGES/mate-media.mo
 share/locale/be/LC_MESSAGES/mate-media.mo
-share/locale/be@latin/LC_MESSAGES/mate-media.mo
 share/locale/bg/LC_MESSAGES/mate-media.mo
 share/locale/bn/LC_MESSAGES/mate-media.mo
 share/locale/bn_IN/LC_MESSAGES/mate-media.mo
@@ -26,16 +25,21 @@ share/locale/da/LC_MESSAGES/mate-media.mo
 share/locale/de/LC_MESSAGES/mate-media.mo
 share/locale/dz/LC_MESSAGES/mate-media.mo
 share/locale/el/LC_MESSAGES/mate-media.mo
-share/locale/en@shaw/LC_MESSAGES/mate-media.mo
 share/locale/en_AU/LC_MESSAGES/mate-media.mo
 share/locale/en_CA/LC_MESSAGES/mate-media.mo
 share/locale/en_GB/LC_MESSAGES/mate-media.mo
 share/locale/es/LC_MESSAGES/mate-media.mo
+share/locale/es_AR/LC_MESSAGES/mate-media.mo
+share/locale/es_CO/LC_MESSAGES/mate-media.mo
+share/locale/es_MX/LC_MESSAGES/mate-media.mo
+share/locale/es_PR/LC_MESSAGES/mate-media.mo
 share/locale/et/LC_MESSAGES/mate-media.mo
 share/locale/eu/LC_MESSAGES/mate-media.mo
 share/locale/fa/LC_MESSAGES/mate-media.mo
 share/locale/fi/LC_MESSAGES/mate-media.mo
 share/locale/fr/LC_MESSAGES/mate-media.mo
+share/locale/fr_CA/LC_MESSAGES/mate-media.mo
+share/locale/frp/LC_MESSAGES/mate-media.mo
 share/locale/ga/LC_MESSAGES/mate-media.mo
 share/locale/gl/LC_MESSAGES/mate-media.mo
 share/locale/gu/LC_MESSAGES/mate-media.mo
@@ -43,14 +47,18 @@ share/locale/he/LC_MESSAGES/mate-media.mo
 share/locale/hi/LC_MESSAGES/mate-media.mo
 share/locale/hr/LC_MESSAGES/mate-media.mo
 share/locale/hu/LC_MESSAGES/mate-media.mo
+share/locale/hy/LC_MESSAGES/mate-media.mo
 share/locale/id/LC_MESSAGES/mate-media.mo
+share/locale/is/LC_MESSAGES/mate-media.mo
 share/locale/it/LC_MESSAGES/mate-media.mo
 share/locale/ja/LC_MESSAGES/mate-media.mo
+share/locale/jv/LC_MESSAGES/mate-media.mo
 share/locale/ka/LC_MESSAGES/mate-media.mo
 share/locale/kk/LC_MESSAGES/mate-media.mo
 share/locale/kn/LC_MESSAGES/mate-media.mo
 share/locale/ko/LC_MESSAGES/mate-media.mo
 share/locale/ku/LC_MESSAGES/mate-media.mo
+share/locale/ku_IQ/LC_MESSAGES/mate-media.mo
 share/locale/ky/LC_MESSAGES/mate-media.mo
 share/locale/lt/LC_MESSAGES/mate-media.mo
 share/locale/lv/LC_MESSAGES/mate-media.mo
@@ -70,11 +78,13 @@ share/locale/oc/LC_MESSAGES/mate-media.mo
 share/locale/or/LC_MESSAGES/mate-media.mo
 share/locale/pa/LC_MESSAGES/mate-media.mo
 share/locale/pl/LC_MESSAGES/mate-media.mo
+share/locale/pms/LC_MESSAGES/mate-media.mo
 share/locale/pt/LC_MESSAGES/mate-media.mo
 share/locale/pt_BR/LC_MESSAGES/mate-media.mo
 share/locale/ro/LC_MESSAGES/mate-media.mo
 share/locale/ru/LC_MESSAGES/mate-media.mo
 share/locale/rw/LC_MESSAGES/mate-media.mo
+share/locale/sc/LC_MESSAGES/mate-media.mo
 share/locale/si/LC_MESSAGES/mate-media.mo
 share/locale/sk/LC_MESSAGES/mate-media.mo
 share/locale/sl/LC_MESSAGES/mate-media.mo
@@ -90,6 +100,7 @@ share/locale/tr/LC_MESSAGES/mate-media.mo
 share/locale/ug/LC_MESSAGES/mate-media.mo
 share/locale/uk/LC_MESSAGES/mate-media.mo
 share/locale/ur/LC_MESSAGES/mate-media.mo
+share/locale/uz/LC_MESSAGES/mate-media.mo
 share/locale/vi/LC_MESSAGES/mate-media.mo
 share/locale/wa/LC_MESSAGES/mate-media.mo
 share/locale/xh/LC_MESSAGES/mate-media.mo
diff --git a/audio/musicpc/Makefile b/audio/musicpc/Makefile
index 02aa685a87ee..c6bb2d3d10c3 100644
--- a/audio/musicpc/Makefile
+++ b/audio/musicpc/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.musicpd.org/download/mpc/0/
 DISTNAME=	mpc-${PORTVERSION}
 
-MAINTAINER=	udvzsolt@gmail.com
+MAINTAINER=	uzsolt@uzsolt.hu
 COMMENT=	Command line client for the musicpd
 
 LICENSE=	GPLv2+
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 8c5cc46f7b5b..3c3729697040 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	snd
 PORTVERSION=	15.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
 		SF
diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile
index 2434a43079a6..ffbf7cea542f 100644
--- a/audio/teamspeak3-server/Makefile
+++ b/audio/teamspeak3-server/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://dl.4players.de/ts/releases/${PORTVERSION}/ \
 		http://teamspeak.gameserver.gamed.de/ts3/releases/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_freebsd_${TEAMSPEAK_ARCH}-${PORTVERSION}
 
-MAINTAINER=	ultima1252@gmail.com
+MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	Server side of the TeamSpeak group voice chat system
 
 LICENSE=	teamspeak
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 5e640d72be76..35d8993b8f44 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xmp
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
@@ -14,29 +15,34 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libxmp.so:audio/libxmp
 
-USES=		pkgconfig gmake
+USES=		gmake localbase:ldflags pkgconfig
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 CONFIG_FILES=	xmp.conf modules.conf
 
-OPTIONS_DEFINE=	ALSA PULSEAUDIO
+OPTIONS_DEFAULT=	OSS
+OPTIONS_DEFINE=	ALSA OSS PULSEAUDIO SNDIO
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_CONFIGURE_ENABLE=	alsa
 
+OSS_CONFIGURE_ENABLE=	oss
+
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
 
+SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|\ install-conf||' ${WRKSRC}/Makefile.in
 
+post-patch-SNDIO-on:
+	@${REINPLACE_CMD} -e 's|openbsd\*)|\*)|' ${WRKSRC}/configure
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 .for f in ${CONFIG_FILES}