Index: head/audio/alsa-lib/Makefile
===================================================================
--- head/audio/alsa-lib/Makefile	(revision 464375)
+++ head/audio/alsa-lib/Makefile	(revision 464376)
@@ -1,48 +1,47 @@
 # Created by: Aragon Gouveia <aragon@phat.za.net>
 # $FreeBSD$
 
 PORTNAME=	alsa-lib
 PORTVERSION=	1.1.2
 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_ENV=	ac_cv_header_endian_h=no
 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}
-CPPFLAGS+=	-D_WANT_SEMUN
 
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_SUB=	yes
 
 PYTHON_CONFIGURE_ENABLE=python
 PYTHON_USES=	python:2.7
 
 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: head/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c
===================================================================
--- head/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c	(revision 464375)
+++ head/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c	(revision 464376)
@@ -1,19 +1,20 @@
 --- src/pcm/pcm_direct.c.orig	2016-03-31 13:10:39 UTC
 +++ src/pcm/pcm_direct.c
-@@ -44,12 +44,16 @@
+@@ -44,12 +44,17 @@
   *
   */
   
-+#if defined(__NetBSD__)
-+typedef __semun semun;
-+#elif !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
++#if !defined(__DragonFly__) && !defined(__OpenBSD__) \
++  && !(defined(__FreeBSD__) && __FreeBSD__ < 12)
  union semun {
  	int              val;    /* Value for SETVAL */
  	struct semid_ds *buf;    /* Buffer for IPC_STAT, IPC_SET */
  	unsigned short  *array;  /* Array for GETALL, SETALL */
++#ifdef __linux__
  	struct seminfo  *__buf;  /* Buffer for IPC_INFO (Linux specific) */
++#endif
  };
 +#endif
   
  /*
   * FIXME: