Index: branches/2015Q3/audio/cmus/Makefile
===================================================================
--- branches/2015Q3/audio/cmus/Makefile	(revision 395576)
+++ branches/2015Q3/audio/cmus/Makefile	(revision 395577)
@@ -1,212 +1,212 @@
 # Created by: Adam Weinberger
 # $FreeBSD$
 
 PORTNAME=	cmus
 PORTVERSION=	2.6.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	h.skuhra@gmail.com
 COMMENT=	Console-based music player with really cool features
 
 LICENSE=	GPLv2
 
 USE_GITHUB=	yes
 
 USES=		gmake pkgconfig iconv ncurses
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	HOSTCC=${CC}
 CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \
 		exampledir=${EXAMPLESDIR} \
 		CONFIG_ALSA=n CONFIG_ARTS=n CONFIG_ROAR=n
 
 OPTIONS_DEFINE=	AAC AO CDDB CDIO CUE DISCID FFMPEG FLAC JACK MAD MIKMOD \
 		MODPLUG MP4 MUSEPACK OPUS PULSEAUDIO SAMPLERATE TREMOR \
 		VORBIS WAVPACK
 OPTIONS_DEFAULT=FLAC MAD VORBIS
 DISCID_DESC=	DISCID support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFLAC}
 LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=CONFIG_FLAC=y
 PLIST_SUB+=	FLAC=""
 .else
 CONFIGURE_ARGS+=CONFIG_FLAC=n
 PLIST_SUB+=	FLAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMAD}
 LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
 CONFIGURE_ARGS+=CONFIG_MAD=y
 PLIST_SUB+=	MAD=""
 .else
 CONFIGURE_ARGS+=CONFIG_MAD=n
 PLIST_SUB+=	MAD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMODPLUG}
 LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
 CONFIGURE_ARGS+=CONFIG_MODPLUG=y
 PLIST_SUB+=	MODPLUG=""
 .else
 CONFIGURE_ARGS+=CONFIG_MODPLUG=n
 PLIST_SUB+=	MODPLUG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMIKMOD}
 LIB_DEPENDS+=	libmikmod.so:${PORTSDIR}/audio/libmikmod
 CONFIGURE_ARGS+=CONFIG_MIKMOD=y
 PLIST_SUB+=	MIKMOD=""
 .else
 PLIST_SUB+=	MIKMOD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMUSEPACK}
 LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
 CONFIGURE_ARGS+=CONFIG_MPC=y
 PLIST_SUB+=	MPC=""
 .else
 CONFIGURE_ARGS+=CONFIG_MPC=n
 PLIST_SUB+=	MPC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPUS}
 LIB_DEPENDS+=	libopusfile.so:${PORTSDIR}/audio/opusfile
 CONFIGURE_ARGS+=CONFIG_OPUS=y
 PLIST_SUB+=	OPUS=""
 .else
 CONFIGURE_ARGS+=CONFIG_OPUS=n
 PLIST_SUB+=	OPUS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MTREMOR}
 LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=CONFIG_VORBIS=y
 PLIST_SUB+=	VORBIS=""
 .else
 CONFIGURE_ARGS+=CONFIG_VORBIS=n
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTREMOR}
 LIB_DEPENDS+=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
 CONFIGURE_ARGS+=CONFIG_TREMOR=y
 .endif
 
 .if ${PORT_OPTIONS:MMP4}
 LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 LIB_DEPENDS+=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
 CONFIGURE_ARGS+=CONFIG_MP4=y
 PLIST_SUB+=	MP4=""
 .else
 CONFIGURE_ARGS+=CONFIG_MP4=n
 PLIST_SUB+=	MP4="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAAC}
 LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 CONFIGURE_ARGS+=CONFIG_AAC=y
 PLIST_SUB+=	AAC=""
 .else
 CONFIGURE_ARGS+=CONFIG_AAC=n
 PLIST_SUB+=	AAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWAVPACK}
 LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
 CONFIGURE_ARGS+=CONFIG_WAVPACK=y
 PLIST_SUB+=	WAVPACK=""
 .else
 CONFIGURE_ARGS+=CONFIG_WAVPACK=n
 PLIST_SUB+=	WAVPACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
 BUILD_DEPENDS+=	ffmpeg>=2:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS+=	ffmpeg>=2:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=CONFIG_FFMPEG=y
 PLIST_SUB+=	FFMPEG=""
 .else
 CONFIGURE_ARGS+=CONFIG_FFMPEG=n
 PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAO}
 LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
 CONFIGURE_ARGS+=CONFIG_AO=y
 PLIST_SUB+=	AO=""
 .else
 CONFIGURE_ARGS+=CONFIG_AO=n
 PLIST_SUB+=	AO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 CONFIGURE_ARGS+=CONFIG_PULSE=y
 PLIST_SUB+=	PULSEAUDIO=""
 .else
 CONFIGURE_ARGS+=CONFIG_PULSE=n
 PLIST_SUB+=	PULSEAUDIO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCDDB} && ${PORT_OPTIONS:MCDIO}
 LIB_DEPENDS+=	libcddb.so:${PORTSDIR}/audio/libcddb
 CONFIGURE_ARGS+=CONFIG_CDDB=y
 .else
 CONFIGURE_ARGS+=CONFIG_CDDB=n
 .endif
 
 .if ${PORT_OPTIONS:MCDIO}
 LIB_DEPENDS+=	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia
 CONFIGURE_ARGS+=CONFIG_CDIO=y
 PLIST_SUB+=	CDIO=""
 .else
 CONFIGURE_ARGS+=CONFIG_CDIO=n
 PLIST_SUB+=	CDIO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCUE}
 LIB_DEPENDS+=	libcue.so:${PORTSDIR}/textproc/libcue
 CONFIGURE_ARGS+=CONFIG_CUE=y
 PLIST_SUB+=	CUE=""
 .else
 CONFIGURE_ARGS+=CONFIG_CUE=n
 PLIST_SUB+=	CUE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDISCID}
 LIB_DEPENDS+=	libdiscid.so:${PORTSDIR}/audio/libdiscid
 CONFIGURE_ARGS+=CONFIG_DISCID=y
 .else
 CONFIGURE_ARGS+=CONFIG_DISCID=n
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 CONFIGURE_ARGS+=CONFIG_JACK=y
 PLIST_SUB+=	JACK=""
 .else
 CONFIGURE_ARGS+=CONFIG_JACK=n
 PLIST_SUB+=	JACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSAMPLERATE} && ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 CONFIGURE_ARGS+=CONFIG_SAMPLERATE=y
 .else
 CONFIGURE_ARGS+=CONFIG_SAMPLERATE=n
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,doc/cmus/examples,examples/cmus,g' \
 		${WRKSRC}/Doc/cmus.txt
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' ${WRKSRC}/Doc/cmus.txt
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cmus*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cmus/[io]p/*.so
 
 .include <bsd.port.mk>
Index: branches/2015Q3/audio/gogglesmm/Makefile
===================================================================
--- branches/2015Q3/audio/gogglesmm/Makefile	(revision 395576)
+++ branches/2015Q3/audio/gogglesmm/Makefile	(revision 395577)
@@ -1,119 +1,120 @@
 # Created by: Sascha Klauder <sklauder@trimind.de>
 # $FreeBSD$
 
 PORTNAME=	gogglesmm
 PORTVERSION=	0.14.2
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Music collection manager and player
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libGLEW.so:${PORTSDIR}/graphics/glew \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libFOX-1.7.so:${PORTSDIR}/x11-toolkits/fox17
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		compiler:c++0x desktop-file-utils gmake pkgconfig
 USE_SQLITE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	LINK="${CXX}" \
 		OPT_CFLAGS="${CXXFLAGS}" \
 		OPT_LDFLAGS="${LDFLAGS}" \
 		RESWRAP="${LOCALBASE}/bin/fox-1.7/reswrap"
 CONFIGURE_ARGS=	--prefix=${PREFIX} --fox-prefix=${LOCALBASE} \
 		--without-rsound --without-mpcdec
 INSTALLS_ICONS=	yes
 
 USE_LDCONFIG=	${PREFIX}/lib/gogglesmm
 
 PORTDOCS=	AUTHORS ChangeLog README
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 OPTIONS_DEFINE=		ALSA CDIO DOCS FAAD FFMPEG FLAC GCRYPT JACK \
 			MAD MMS NLS OPUS PULSEAUDIO SAMPLERATE SMB TREMOR \
 			VORBIS WAVPACK
 OPTIONS_DEFAULT=	CDIO FAAD FLAC MAD OPUS SAMPLERATE SMB \
 			VORBIS WAVPACK
 OPTIONS_SUB=		yes
 
 ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 ALSA_CONFIGURE_OFF=	--without-alsa
 CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
 CDIO_CONFIGURE_OFF=	--without-cdda
 #DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
 #DBUS_CONFIGURE_OFF=	--without-dbus
 FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
 FAAD_CONFIGURE_ON=	--faad-prefix=${LOCALBASE}
 FAAD_CONFIGURE_OFF=	--without-faad
 FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 FFMPEG_CONFIGURE_ON=	--with-avcodec
 FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
 FLAC_CONFIGURE_OFF=	--without-flac
 GCRYPT_DESC=		Use libgcrypt for md5 calculation
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 GCRYPT_CONFIGURE_ON=	--with-md5=gcrypt
 GCRYPT_CONFIGURE_OFF=	--with-md5=internal
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 JACK_CONFIGURE_OFF=	--without-jack
 MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
 MAD_CONFIGURE_ON=	--mad-prefix=${LOCALBASE}
 MAD_CONFIGURE_OFF=	--without-mad
 MMS_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
 MMS_CONFIGURE_OFF=	--without-mms
 NLS_USES=		gettext
 NLS_LIBS=		-lintl
 NLS_CONFIGURE_OFF=	--without-nls
 OPUS_DESC=		Opus decoding with libopus
 OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
 OPUSE_CONFIGURE_OFF=	--without-opus
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--without-pulse
 SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 SAMPLERATE_CONFIGURE_OFF=	--without-samplerate
 SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
 SMB_CONFIGURE_ON=	--smb-prefix=${LOCALBASE}
 SMB_CONFIGURE_OFF=	--without-smb
 TREMOR_LIB_DEPENDS=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
 TREMOR_CONFIGURE_ON=	--with-tremor
 VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 VORBIS_CONFIGURE_OFF=	--without-off --without-vorbis
 WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
 WAVPACK_CONFIGURE_OFF=	--without-wavpack
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|share/man|man|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|$$(sharedir)/man|$$(installdir)/man| ; \
 		 /INSTALL/s|-D|-c| ; \
 		 s|@$$(CXX)|$$(CXX)|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e \
 		's|@$$(LINK)|$$(LINK)|' ${WRKSRC}/build/*.mk
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gogglesmm
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
 	@${MKDIR} ${STAGEDIR}${DATADIR}/utils
 .for i in 16 22 24 32 48
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gogglesmm/libgap_*.so
 
 .include <bsd.port.mk>
Index: branches/2015Q3/audio/musicpd/Makefile
===================================================================
--- branches/2015Q3/audio/musicpd/Makefile	(revision 395576)
+++ branches/2015Q3/audio/musicpd/Makefile	(revision 395577)
@@ -1,217 +1,218 @@
 # $FreeBSD$
 
 PORTNAME=	musicpd
 PORTVERSION=	0.18.23
+PORTREVISION=	1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Remote-controllable music daemon
 
 LICENSE=	GPLv2
 
 USES=		gmake pkgconfig compiler:c++11-lib tar:xz
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 
 USE_RC_SUBR=	${PORTNAME}
 CONFIGURE_ARGS+=--disable-alsa --disable-systemd-daemon --disable-roar
 CFLAGS+=	-I${PREFIX}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/sidplay/builders
 
 PORTDOCS=	AUTHORS README COPYING NEWS UPGRADING
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	ID3TAG IPV6 ARCHIVE SAMPLERATE SQLITE3 \
 		CDPARANOIA LAME MMS VORBISENC DOCS
 
 OPTIONS_RADIO=	ZEROCONF
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
 
 OPTIONS_MULTI=	FILE_FORMAT
 OPTIONS_MULTI_FILE_FORMAT=	AAC ADPLUG FFMPEG FLAC FLUIDSYNTH \
 	   GME MAD MIKMOD MODPLUG MPG123 MUSEPACK \
 	   OPUS SIDPLAY2 SNDFILE TREMOR TWOLAME \
 	   VORBIS WAV WAVPACK WILDMIDI
 
 OPTIONS_GROUP=	PLAYBACK
 OPTIONS_GROUP_PLAYBACK=	AO CURL HTTPD JACK OPENAL OSS PULSEAUDIO SHOUTCAST
 
 ADPLUG_DESC=	AdPlug support
 FLUIDSYNTH_DESC=FludSynth support (MIDI files)
 GME_DESC=	GME support (video game music files)
 LAME_DESC=	Support for MP3 Icecast Streams
 SIDPLAY2_DESC=	Sidplay support (C64 mono and stereo files)
 TREMOR_DESC=	Tremor decoder (not with SHOUTCAST; use VORBIS)
 TWOLAME_DESC=	TwoLAME support (mp2)
 VORBISENC_DESC=	Ogg Vorbis encoder
 WILDMIDI_DESC=	WildMIDI support (MIDI files)
 
 OPTIONS_DEFAULT=ID3TAG IPV6 MAD OSS FLAC VORBIS WAV FFMPEG SNDFILE CURL
 
 AAC_CONFIGURE_ENABLE=aac
 AAC_LIB_DEPENDS=libfaad.so:${PORTSDIR}/audio/faad
 ADPLUG_CONFIGURE_ENABLE=adplug
 ADPLUG_LIB_DEPENDS=libadplug.so:${PORTSDIR}/audio/libadplug
 AO_CONFIGURE_ENABLE=ao
 AO_LIB_DEPENDS=libao.so:${PORTSDIR}/audio/libao
 CDPARANOIA_CONFIGURE_ENABLE=cdio-paranoia
 CDPARANOIA_LIB_DEPENDS=libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
 CURL_CONFIGURE_ENABLE=curl
 CURL_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl
 FFMPEG_CONFIGURE_ENABLE=ffmpeg
 FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 			libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
 			libavutil.so:${PORTSDIR}/multimedia/ffmpeg
 FLAC_CONFIGURE_ENABLE=flac
 FLAC_LIB_DEPENDS=libFLAC.so:${PORTSDIR}/audio/flac
 FLUIDSYNTH_CONFIGURE_ENABLE=fluidsynth
 FLUIDSYNTH_LIB_DEPENDS=libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
 GME_CONFIGURE_ENABLE=gme
 GME_LIB_DEPENDS=libgme.so:${PORTSDIR}/audio/libgme
 HTTPD_CONFIGURE_ENABLE=httpd-output
 ID3TAG_CONFIGURE_ENABLE=id3
 ID3TAG_LIB_DEPENDS=libid3tag.so:${PORTSDIR}/audio/libid3tag
 IPV6_CONFIGURE_ENABLE=ipv6
 JACK_CONFIGURE_ENABLE=jack
 JACK_LIB_DEPENDS=libjack.so:${PORTSDIR}/audio/jack
 LAME_CONFIGURE_ENABLE=lame-encoder
 LAME_LIB_DEPENDS=libmp3lame.so:${PORTSDIR}/audio/lame
 MAD_CONFIGURE_ENABLE=mad
 MAD_LIB_DEPENDS=libmad.so:${PORTSDIR}/audio/libmad
 MIKMOD_CONFIGURE_ENABLE=mikmod
 MIKMOD_LIB_DEPENDS=libmikmod.so:${PORTSDIR}/audio/libmikmod
 MMS_CONFIGURE_ENABLE=mms
 MMS_LIB_DEPENDS=libmms.so:${PORTSDIR}/net/libmms
 MODPLUG_CONFIGURE_ENABLE=modplug
 MODPLUG_LIB_DEPENDS=libmodplug.so:${PORTSDIR}/audio/libmodplug
 MPG123_CONFIGURE_ENABLE=mpg123
 MPG123_LIB_DEPENDS=libmpg123.so:${PORTSDIR}/audio/mpg123
 MUSEPACK_CONFIGURE_ENABLE=mpc
 MUSEPACK_LIB_DEPENDS=libmpcdec.so:${PORTSDIR}/audio/musepack
 OPENAL_CONFIGURE_ENABLE=openal
 OPENAL_LIB_DEPENDS=libopenal.so:${PORTSDIR}/audio/openal
 OPUS_CONFIGURE_ENABLE=opus
 OPUS_LIB_DEPENDS=libopus.so:${PORTSDIR}/audio/opus
 OSS_CONFIGURE_ENABLE=oss
 PULSEAUDIO_CONFIGURE_ENABLE=pulse
 PULSEAUDIO_LIB_DEPENDS=libpulse.so:${PORTSDIR}/audio/pulseaudio
 SAMPLERATE_CONFIGURE_ENABLE=lsr
 SAMPLERATE_LIB_DEPENDS=libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 SIDPLAY2_CONFIGURE_ENABLE=sidplay
 SIDPLAY2_LIB_DEPENDS=libsidplay2.so:${PORTSDIR}/audio/libsidplay2
 SNDFILE_CONFIGURE_ENABLE=sndfile
 SNDFILE_LIB_DEPENDS=libsndfile.so:${PORTSDIR}/audio/libsndfile
 SQLITE3_CONFIGURE_ENABLE=sqlite
 SQLITE3_LIB_DEPENDS=libsqlite3.so:${PORTSDIR}/databases/sqlite3
 TREMOR_CONFIGURE_WITH=tremor
 TREMOR_LIB_DEPENDS=libvorbisidec.so:${PORTSDIR}/audio/libtremor
 TWOLAME_CONFIGURE_ENABLE=twolame-encoder
 TWOLAME_LIB_DEPENDS=libtwolame.so:${PORTSDIR}/audio/twolame
 VORBISENC_CONFIGURE_ENABLE=vorbis-encoder
 VORBISENC_LIB_DEPENDS=libvorbisenc.so:${PORTSDIR}/audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=vorbis
 VORBIS_LIB_DEPENDS=libvorbis.so:${PORTSDIR}/audio/libvorbis
 WAV_CONFIGURE_ENABLE=audiofile
 WAV_LIB_DEPENDS=libaudiofile.so:${PORTSDIR}/audio/libaudiofile
 WAVPACK_CONFIGURE_ENABLE=wavpack
 WAVPACK_LIB_DEPENDS=libwavpack.so:${PORTSDIR}/audio/wavpack
 WILDMIDI_CONFIGURE_ENABLE=wildmidi
 WILDMIDI_LIB_DEPENDS=libWildMidi.so:${PORTSDIR}/audio/wildmidi
 
 MPDUSER?=	mpd
 MPDGROUP?=	mpd
 
 USERS=	${MPDUSER}
 GROUPS=	${MPDGROUP}
 
 .include <bsd.port.options.mk>
 
 .ifdef MPDCONF
 IGNORE=Please remove the MPDCONF line from make.conf, then rename ${PREFIX}/etc/${MPDCONF} to musicpd.conf, if it exists
 .endif
 
 .if exists(${PREFIX}/etc/mpd.conf)
 MSG=does not expect ${PREFIX}/etc/mpd.conf to exist.
 .if !exists(${PREFIX}/etc/musicpd.conf)
 IGNORE=${MSG}  Move it to ${PREFIX}/etc/musicpd.conf.
 .else
 IGNORE=${MSG}  You also have musicpd.conf-- check carefully to see which one you want, and remove mpd.conf.
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MARCHIVE}
 CONFIGURE_ARGS+=--enable-bzip2 \
 		--enable-zzip \
 		--enable-iso9660
 LIB_DEPENDS+=	libzzip.so:${PORTSDIR}/devel/zziplib \
 		libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
 .else
 CONFIGURE_ARGS+=--disable-bzip2 \
 		--disable-zzip \
 		--disable-iso9660
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=--with-zeroconf=avahi
 LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 .else
 CONFIGURE_ARGS+=--with-zeroconf=no
 .endif
 
 .if ${PORT_OPTIONS:MMDNSRESPONDER}
 CONFIGURE_ARGS+=--with-zeroconf=bonjour
 LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 .else
 CONFIGURE_ARGS+=--with-zeroconf=no
 .endif
 
 # libshout streaming support will be disabled by configure script when built
 # also with tremor since the latter does not support vorbis encoding
 .if ${PORT_OPTIONS:MSHOUTCAST}
 .  if ${PORT_OPTIONS:MTREMOR}
 IGNORE=		shoutcast and tremor do not coexist; use vorbis instead
 .  endif
 LIB_DEPENDS+=	libshout.so:${PORTSDIR}/audio/libshout
 CONFIGURE_ARGS+=--enable-vorbis-encoder \
 		--enable-shout
 .else
 CONFIGURE_ARGS+=--disable-shout
 .endif
 
 post-patch:
 # Replace ~/ with /var/mpd and make musicpd run as mpd by default
 	@${REINPLACE_CMD} -e 's,^#\([^"]*"\)~/,\1/var/mpd,g' \
 		-e 's,^#\(user[^"]*"\)nobody,\1${MPDUSER},g' \
 		${WRKSRC}/doc/mpdconf.example
 # Uncomment OSS audio output part from MPDCONF; dragons!
 	start=$$(expr $$(${SED} -n '/^#	type	*"oss"/=' \
 		${WRKSRC}/doc/mpdconf.example) - 1); \
 	 finish=$$(for n in $$(${JOT} 10 $$start); do \
 	 	     [ "$$(${SED} -n $${n}p ${WRKSRC}/doc/mpdconf.example)" = \
 				"#}" ] && echo $$n || true; done); \
 	 ${REINPLACE_CMD} -e "$${start},$${finish}s,^#,," \
 		${WRKSRC}/doc/mpdconf.example
 # Fix man pages for executable names
 	@${REINPLACE_CMD} -e 's/^\(\.B m\)pd/\1usicpd/' \
 		-e 's#^\(\.BI \)/etc/mpd.conf#\1${PREFIX}/etc/${PORTNAME}.conf#' \
 		-e 's#^mpd.conf#${PORTNAME}.conf#' \
 		-e 's#^mpd(1)#musicpd(1)#' \
 		${WRKSRC}/doc/mpd.1 ${WRKSRC}/doc/mpd.conf.5
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mpd \
 		${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 \
 		${STAGEDIR}/${PREFIX}/man/man1/${PORTNAME}.1
 	${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 \
 		${STAGEDIR}/${PREFIX}/man/man5/${PORTNAME}.conf.5
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}/${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \
 		${STAGEDIR}/${PREFIX}/etc/${PORTNAME}.conf.sample
 
 .include <bsd.port.mk>
Index: branches/2015Q3/audio/xmms2/Makefile
===================================================================
--- branches/2015Q3/audio/xmms2/Makefile	(revision 395576)
+++ branches/2015Q3/audio/xmms2/Makefile	(revision 395577)
@@ -1,386 +1,386 @@
 # Created by: Alexander Botero-Lowry <alex@foxybanana.com>
 # $FreeBSD$
 
 PORTNAME?=	xmms2
 PORTVERSION=	0.8
 DISTVERSIONSUFFIX=DrO_o
-PORTREVISION?=	15
+PORTREVISION?=	16
 CATEGORIES?=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
 
 MAINTAINER?=	madpilot@FreeBSD.org
 COMMENT?=	Rewrite of xmms as a client/server system (developer release)
 
 USES+=		pkgconfig tar:bzip2 waf
 
 CONFIGURE_ARGS+=	--conf-prefix=${LOCALBASE} \
 		--mandir=${MANPREFIX}/man
 INSTALL_TARGET=	install --without-ldconfig
 
 .if !defined(XMMS2_SLAVE)
 USE_GNOME=	glib20
 USE_SQLITE=	3
 
 USE_LDCONFIG=	yes
 
 PLIST_SUB+=	INCLUDEDIR="include/${PORTNAME}" LIBDIR="lib/${PORTNAME}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	AIRPLAY AO APE AVCODEC CDDA CURL ET FAAD FAM FLAC \
 		GME GVFS ICES JACK MAD MDNS MMS \
 		MODPLUG MPG123 MUSEPACK OFA PULSEAUDIO SAMBA SID \
 		SNDFILE SPEEX TREMOR VISUAL VOCODER VORBIS WAVPACK XML
 OPTIONS_SINGLE=	MDNS
 OPTIONS_SINGLE_MDNS=	MDNS_APPLE MDNS_AVAHI
 OPTIONS_DEFAULT=	CURL FAAD FLAC MAD MDNS MDNS_APPLE VORBIS
 
 AIRPLAY_DESC=	Support output via Airport Express
 AVCODEC_DESC=	Avcodevc playback support
 ET_DESC=	Install usage feedback reporting client
 FAM_DESC=	Support to update Media Library on file change
 GME_DESC=	Video game music files support
 GVFS_DESC=	Playback files via GVFS
 ICES_DESC=	Playback files to an icecast server
 MDNS_DESC=	Announce XMMS2d via mDNS (Choose implementation)
 MDNS_APPLE_DESC=	Use Apple mDNS implementation
 MDNS_AVAHI_DESC=	Use Avahi mDNS implementation
 OFA_DESC=	Collect MusicDNS fingerprints
 SAMBA_DESC=	Playback files via SMB
 SID_DESC=	Playback SID files
 VISUAL_DESC=	Visualization plugins support
 VOCODER_DESC=	Phase Vocoder effect plugin
 XML_DESC=	Support XML based playlists (XSPF, RSS)
 
 .endif # !XMMS_SLAVE
 
 .include <bsd.port.options.mk>
 
 .if defined(XMMS2_SLAVE)
 CONFIGURE_ARGS+=	--without-xmms2d
 
 .if   ${XMMS2_SLAVE} == "python"
 CONFIGURE_ARGS+=	--with-optionals="python"
 .elif ${XMMS2_SLAVE} == "ruby"
 CONFIGURE_ARGS+=	--with-optionals="ruby"
 .elif ${XMMS2_SLAVE} == "perl"
 CONFIGURE_ARGS+=	--with-optionals="perl"
 .elif ${XMMS2_SLAVE} == "ruby-ecore"
 CONFIGURE_ARGS+=	--with-optionals="ruby" --with-optionals="xmmsclient-ecore"
 .elif ${XMMS2_SLAVE} == "cpp"
 CONFIGURE_ARGS+=	--with-optionals="xmmsclient++" \
 		--with-optionals="xmmsclient++-glib"
 .endif
 
 .else # XMMS2_SLAVE
 CONFIGURE_ARGS+=	--without-optionals="python" \
 		--without-optionals="ruby" \
 		--without-optionals="xmmsclient-ecore" \
 		--without-optionals="xmmsclient++" \
 		--without-optionals="xmmsclient++-glib" \
 		--without-optionals="perl"
 .endif # XMMS2_SLAVE
 
 .if !defined(XMMS2_SLAVE)
 
 .if ${PORT_OPTIONS:MAIRPLAY}
 USE_OPENSSL=	yes
 PLIST_SUB+=	AIRPLAY=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="airplay"
 PLIST_SUB+=	AIRPLAY="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAO}
 LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
 PLIST_SUB+=	AO=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="ao"
 PLIST_SUB+=	AO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAPE}
 LIB_DEPENDS+=	libmac.so:${PORTSDIR}/audio/mac
 PLIST_SUB+=	MAC=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="mac"
 PLIST_SUB+=	MAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAVCODEC}
 LIB_DEPENDS+=	libavutil.so:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=	AVCODEC=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="avcodec"
 PLIST_SUB+=	AVCODEC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCDDA}
 LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
 		libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia \
 		libdiscid.so:${PORTSDIR}/audio/libdiscid
 PLIST_SUB+=	CDDA=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="cdda"
 PLIST_SUB+=	CDDA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 PLIST_SUB+=	CURL=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="curl" --without-plugins="icymetaint"
 PLIST_SUB+=	CURL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFAAD}
 LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 PLIST_SUB+=	FAAD=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="faad" --without-plugins="mp4"
 PLIST_SUB+=	FAAD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFAM}
 USES+=		fam:gamin
 PLIST_SUB+=	FAM=""
 .else
 CONFIGURE_ARGS+=	--without-optionals="medialib-updater"
 PLIST_SUB+=	FAM="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
 LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 PLIST_SUB+=	FLAC=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="flac"
 PLIST_SUB+=	FLAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGME}
 LIB_DEPENDS+=	libgme.so:${PORTSDIR}/audio/libgme
 PLIST_SUB+=	GME=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="gme"
 PLIST_SUB+=	GME="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGVFS}
 USE_GNOME+=	gvfs
 PLIST_SUB+=	GVFS=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="gvfs"
 PLIST_SUB+=	GVFS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MICES}
 LIB_DEPENDS+=	libshout.so:${PORTSDIR}/audio/libshout
 PLIST_SUB+=	ICES=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="ices"
 PLIST_SUB+=	ICES="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 PLIST_SUB+=	JACK=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="jack"
 PLIST_SUB+=	JACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMAD}
 LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
 PLIST_SUB+=	MAD=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="mad"
 PLIST_SUB+=	MAD="@comment "
 .endif
 
 .if empty(PORT_OPTIONS:MMDNS)
 CONFIGURE_ARGS+=	--without-optionals="mdns"
 .endif
 
 .if ${PORT_OPTIONS:MMDNS_APPLE}
 CONFIGURE_ARGS+=	--with-mdns-backend="dns_sd"
 LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 PLIST_SUB+=	MDNS_APPLE=""
 .else
 PLIST_SUB+=	MDNS_APPLE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMDNS_AVAHI}
 CONFIGURE_ARGS+=	--with-mdns-backend="avahi"
 LIB_DEPENDS+=	libavahi-core.so:${PORTSDIR}/net/avahi-app
 PLIST_SUB+=	MDNS_AVAHI=""
 MAN1+=		xmms2-mdns-avahi.1
 .else
 PLIST_SUB+=	MDNS_AVAHI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMMS}
 LIB_DEPENDS+=	libmms.so:${PORTSDIR}/net/libmms
 PLIST_SUB+=	MMS=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="mms"
 PLIST_SUB+=	MMS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMODPLUG}
 LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
 PLIST_SUB+=	MODPLUG=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="modplug"
 PLIST_SUB+=	MODPLUG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMPG123}
 LIB_DEPENDS+=	libmpg123.so:${PORTSDIR}/audio/mpg123
 PLIST_SUB+=	MPG123=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="mpg123"
 PLIST_SUB+=	MPG123="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMUSEPACK}
 LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
 PLIST_SUB+=	MUSEPACK=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="musepack"
 PLIST_SUB+=	MUSEPACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOFA}
 LIB_DEPENDS+=	libofa.so:${PORTSDIR}/audio/libofa
 PLIST_SUB+=	OFA=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="ofa"
 PLIST_SUB+=	OFA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="pulse"
 PLIST_SUB+=	PULSE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSAMBA}
 LIB_DEPENDS+=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
 PLIST_SUB+=	SAMBA=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="samba"
 PLIST_SUB+=	SAMBA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSID}
 LIB_DEPENDS+=	libsidplay2.so:${PORTSDIR}/audio/libsidplay2
 PLIST_SUB+=	SID=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="sid"
 PLIST_SUB+=	SID="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSNDFILE}
 LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 PLIST_SUB+=	SNDFILE=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="sndfile"
 PLIST_SUB+=	SNDFILE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
 LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
 PLIST_SUB+=	SPEEX=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="speex"
 PLIST_SUB+=	SPEEX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTREMOR}
 LIB_DEPENDS+=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
 PLIST_SUB+=	TREMOR=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="tremor"
 PLIST_SUB+=	TREMOR="@comment "
 .endif
 
 # xmms2-ripper
 .if ${PORT_OPTIONS:MVISUAL} && ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-clients-vistest-wscript
 .endif
 
 # XXX: shm support requires semtimedop(2)
 .if ${PORT_OPTIONS:MVISUAL}
 USE_SDL=	yes
 LIB_DEPENDS+=	libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
 .else
 CONFIGURE_ARGS+=	--without-optionals="vistest"
 .endif
 
 .if ${PORT_OPTIONS:MVISUAL} && ${CONFIGURE_ARGS:M--with-vis-reference-clients}
 PLIST_SUB+=	VISUAL=""
 .else
 PLIST_SUB+=	VISUAL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVOCODER}
 LIB_DEPENDS+=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 PLIST_SUB+=	VOCODER=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="vocoder"
 PLIST_SUB+=	VOCODER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="vorbis"
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWAVPACK}
 LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
 PLIST_SUB+=	WAVPACK=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="wavpack"
 PLIST_SUB+=	WAVPACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MXML}
 USE_GNOME+=	libxml2
 PLIST_SUB+=	XML=""
 .else
 CONFIGURE_ARGS+=	--without-plugins="xml" --without-plugins="rss" \
 		--without-plugins="xspf"
 PLIST_SUB+=	XML="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MET}
 PLIST_SUB+=	ET=""
 MAN1+=		xmms2-et.1
 .else
 CONFIGURE_ARGS+=	--without-optionals="et"
 PLIST_SUB+=	ET="@comment "
 .endif
 
 .endif # !XMMS2_SLAVE
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|" ${WRKSRC}/wscript
 .if ${PORT_OPTIONS:MVISUAL} && ${PORT_OPTIONS:MVORBIS}
 	@${REINPLACE_CMD} -e "s|'vorbisenc',|'vorbisenc vorbis ogg',|" \
 		${WRKSRC}/src/clients/vistest/wscript
 .endif
 
 post-install:
 .if !defined(XMMS2_SLAVE)
 	${MKDIR} ${STAGEDIR}${DATADIR}/scripts/startup.d
 .endif
 
 .include <bsd.port.mk>
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 395576)
+++ branches/2015Q3	(revision 395577)

Property changes on: branches/2015Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r395574