Index: branches/2016Q2/audio/alsa-lib/Makefile
===================================================================
--- branches/2016Q2/audio/alsa-lib/Makefile	(revision 414433)
+++ branches/2016Q2/audio/alsa-lib/Makefile	(revision 414434)
@@ -1,45 +1,46 @@
 # Created by: Aragon Gouveia <aragon@phat.za.net>
 # $FreeBSD$
 
 PORTNAME=	alsa-lib
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/lib/ \
 		GENTOO
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	ALSA compatibility library
 
 LICENSE=	LGPL21+
 
 USES=		cpe libtool:keepla tar:bzip2
 USE_LDCONFIG=	yes
 CPE_VENDOR=	alsa
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pkgconfdir="\$${prefix}/libdata/pkgconfig"
 INSTALL_TARGET=	install-strip
 TEST_ENV=	${MAKE_ENV} ALSA_CONFIG_PATH="${FILESDIR}/asound.conf.sample"
 TEST_TARGET=	check
 CPPFLAGS+=	-I${FILESDIR}
 
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_SUB=	yes
 
 PYTHON_CONFIGURE_ENABLE=python
 PYTHON_USES=	python:2
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/LIBS/ { s/-ldl//g; s/-lrt//g; }' \
 		-e 's/python-config/${PYTHON_CMD:T}-config/g' \
 		-e '/pythonlibs/s/--libs/--ldflags/' \
 		-e '/_GNU_SOURCE/d' \
 		-e '/lt_cv_dlopen/s/-ldl//g' ${WRKSRC}/configure
 	${REINPLACE_CMD} '/LIBADD/s/-ldl//g' \
 		${WRKSRC}/modules/mixer/simple/Makefile.in
 	${REINPLACE_CMD} 's|/etc|${PREFIX}&|g' \
 		${WRKSRC}/src/conf/alsa.conf
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/asound.conf.sample ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>
Index: branches/2016Q2/audio/alsa-lib/files/asound.conf.sample
===================================================================
--- branches/2016Q2/audio/alsa-lib/files/asound.conf.sample	(revision 414433)
+++ branches/2016Q2/audio/alsa-lib/files/asound.conf.sample	(revision 414434)
@@ -1,36 +1,36 @@
 #
 # FreeBSD/OSS
 #
-pcm.!default {
-	type plug
-	slave.pcm.type oss
+pcm.oss {
+	type oss
+	hint.description "Open Sound System"
 }
 
-ctl.!default {
+ctl.oss {
 	type oss
 }
 
+pcm.!sysdefault pcm.plug:oss
+ctl.!sysdefault ctl.oss
+pcm.!default pcm.sysdefault
+ctl.!default ctl.sysdefault
+
 #
 # Pulseaudio
 #
-# pcm.!default {
-# 	type pulse
-# }
-# 
-# ctl.!default {
-# 	type pulse
-# }
+# pcm.!default pcm.pulse
+# ctl.!default ctl.pulse
 
 #
 # Remap all possible surround stuffs.
 #
 pcm.!front pcm.default
 pcm.!rear pcm.default
 pcm.!center_lfe pcm.default
 pcm.!side pcm.default
 pcm.!surround21 pcm.default
 pcm.!surround40 pcm.default
 pcm.!surround41 pcm.default
 pcm.!surround50 pcm.default
 pcm.!surround51 pcm.default
 pcm.!surround71 pcm.default
Index: branches/2016Q2
===================================================================
--- branches/2016Q2	(revision 414433)
+++ branches/2016Q2	(revision 414434)

Property changes on: branches/2016Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r414376