Index: head/audio/shairport-sync/Makefile
===================================================================
--- head/audio/shairport-sync/Makefile	(revision 439489)
+++ head/audio/shairport-sync/Makefile	(revision 439490)
@@ -1,44 +1,50 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	shairport-sync
-PORTVERSION=	3.0.2
+DISTVERSION=	3.1.d6
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	AirPlay audio player with multi-room audio synchronisation capability
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
 		libconfig.so:devel/libconfig \
 		libdaemon.so:devel/libdaemon \
 		libpopt.so:devel/popt \
-		libsoxr.so:audio/libsoxr \
-		libasound.so:audio/alsa-lib
+		libsoxr.so:audio/libsoxr
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf libtool pkgconfig ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mikebrady
 
 USE_RC_SUBR=	${PORTNAME}
 
-OPTIONS_DEFINE=	ALAC
+OPTIONS_DEFINE=	ALAC ALSA SNDIO
+OPTIONS_DEFAULT=SNDIO
 ALAC_DESC=	Build with libalac support (experimental)
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc \
 		--with-piddir=/var/run/shairport-sync --with-avahi \
-		--with-ssl=openssl --with-metadata --with-soxr --with-alsa \
+		--with-ssl=openssl --with-metadata --with-soxr \
 		--with-stdout --with-pipe
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lcrypto
 
 CONFIGURE_ENV+=	SSL_CFLAGS=-I${OPENSSLINC} SSL_LIBS=-L${OPENSSLLIB}
 
 ALAC_LIB_DEPENDS=	libalac.so:audio/alac
 ALAC_CONFIGURE_ON=	--with-apple-alac
+
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_CONFIGURE_ON=	--with-alsa
+
+SNDIO_CONFIGURE_ON=	--with-sndio
+SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 
 .include <bsd.port.mk>
Index: head/audio/shairport-sync/distinfo
===================================================================
--- head/audio/shairport-sync/distinfo	(revision 439489)
+++ head/audio/shairport-sync/distinfo	(revision 439490)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489396712
-SHA256 (mikebrady-shairport-sync-3.0.2_GH0.tar.gz) = b348b9b3cf3994d9222430bc514c94a22f2ed173956fdb097f3354cdba8fd198
-SIZE (mikebrady-shairport-sync-3.0.2_GH0.tar.gz) = 265448
+TIMESTAMP = 1493192871
+SHA256 (mikebrady-shairport-sync-3.1.d6_GH0.tar.gz) = 3dd95da4a218cf4897b659bb5914e3d4f3cece0f90a8469b95910a0ff80ef9c9
+SIZE (mikebrady-shairport-sync-3.1.d6_GH0.tar.gz) = 283919