Index: branches/2018Q4/audio/alsa-lib/Makefile
===================================================================
--- branches/2018Q4/audio/alsa-lib/Makefile	(revision 481945)
+++ branches/2018Q4/audio/alsa-lib/Makefile	(revision 481946)
@@ -1,47 +1,47 @@
 # Created by: Aragon Gouveia <aragon@phat.za.net>
 # $FreeBSD$
 
 PORTNAME=	alsa-lib
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 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}
 
 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: branches/2018Q4/audio/alsa-lib/files/patch-include_alsa-symbols.h
===================================================================
--- branches/2018Q4/audio/alsa-lib/files/patch-include_alsa-symbols.h	(nonexistent)
+++ branches/2018Q4/audio/alsa-lib/files/patch-include_alsa-symbols.h	(revision 481946)
@@ -0,0 +1,59 @@
+commit 3bad0a21b4d13d8d10691f382c836897fa7a7cb9
+Author: Breno Leitao <leitao@debian.org>
+Date:   Wed Feb 22 16:45:00 2017 -0300
+
+    Drop ppc64-specific workaround for versioned symbols
+    
+    Currently aserver fails to build when using parameter
+    --without-versioned, due to an workaround for ppc64
+    (06221f86d207cb33ddd4867ca5301eeb247c4400).  This workaround is
+    not required anymore on the ppc64 ABI v2, and, in fact is breaking the
+    compilation. Reverting this commit
+    
+    Signed-off-by: Breno Leitao <leitao@debian.org>
+    Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+--- include/alsa-symbols.h.orig	2016-08-02 17:48:38 UTC
++++ include/alsa-symbols.h
+@@ -29,19 +29,10 @@
+ #define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post
+ #define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name)
+ 
+-#ifdef __powerpc64__
+-# define symbol_version(real, name, version) 			\
+-	__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version);	\
+-	__asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@" #version)
+-# define default_symbol_version(real, name, version) 		\
+-	__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version);	\
+-	__asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@@" #version)
+-#else
+ # define symbol_version(real, name, version) \
+ 	__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version)
+ # define default_symbol_version(real, name, version) \
+ 	__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version)
+-#endif
+ 
+ #ifdef USE_VERSIONED_SYMBOLS
+ #define use_symbol_version(real, name, version) \
+@@ -50,13 +41,6 @@
+ 		default_symbol_version(real, name, version)
+ #else
+ #define use_symbol_version(real, name, version) /* nothing */
+-#ifdef __powerpc64__
+-#define use_default_symbol_version(real, name, version) \
+-	__asm__ (".weak " ASM_NAME(#name)); 			\
+-	__asm__ (".weak ." ASM_NAME(#name)); 			\
+-	__asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real));		\
+-	__asm__ (".set ." ASM_NAME(#name) ",." ASM_NAME(#real))
+-#else
+ #if defined(__alpha__) || defined(__mips__)
+ #define use_default_symbol_version(real, name, version) \
+         __asm__ (".weak " ASM_NAME(#name)); \
+@@ -65,7 +49,6 @@
+ #define use_default_symbol_version(real, name, version) \
+ 	__asm__ (".weak " ASM_NAME(#name)); \
+ 	__asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real))
+-#endif
+ #endif
+ #endif
+ 

Property changes on: branches/2018Q4/audio/alsa-lib/files/patch-include_alsa-symbols.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q4
===================================================================
--- branches/2018Q4	(revision 481945)
+++ branches/2018Q4	(revision 481946)

Property changes on: branches/2018Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r481945