Index: head/audio/audiere/Makefile
===================================================================
--- head/audio/audiere/Makefile	(revision 434056)
+++ head/audio/audiere/Makefile	(revision 434057)
@@ -1,78 +1,76 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	audiere
 PORTVERSION=	1.9.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	High-level audio API
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool
 WANT_WX=	yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread"
 CPPFLAGS+=	-I${LOCALBASE}/include/speex -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-
-CFLAGS_aarch64=	-fPIC
 
 PORTDOCS=	changelog.txt cvs.txt dependencies.txt faq.txt glossary.txt \
 		license.txt overview.txt readme.txt release-howto.txt \
 		tutorial.txt
 
 OPTIONS_DEFINE=		DUMB CDAUDIO VORBIS SPEEX DOCS
 OPTIONS_DEFAULT=	DUMB CDAUDIO VORBIS SPEEX
 
 DUMB_DESC=	DUMB support
 CDAUDIO_DESC=	libcdaudio support
 
 # since dumb is a static lib and it depends on ogg, we should
 # link audiere with ogg as well
 DUMB_IMPLIES=	VORBIS
 
 DUMB_BUILD_DEPENDS=	${LOCALBASE}/lib/libdumb.a:audio/dumb
 CDAUDIO_LIB_DEPENDS=	libcdaudio.so:audio/libcdaudio
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 
 post-patch:
 # could be an option, but build is broken with recent FLAC
 	@${REINPLACE_CMD} -e '/AC_CHECK_LIB/ s|FLAC|no_&|; \
 		s|wx_config|no_&|' \
 		${WRKSRC}/configure.in
 
 post-patch-DUMB-off:
 	@${REINPLACE_CMD} -e '/AC_CHECK_LIB/ s|dumb|no_&|' \
 		${WRKSRC}/configure.in
 
 post-patch-CDAUDIO-off:
 	@${REINPLACE_CMD} -e '/AC_CHECK_LIB/ s|cdaudio|no_&|' \
 		${WRKSRC}/configure.in
 
 post-patch-VORBIS-off:
 	@${REINPLACE_CMD} -e '/AC_CHECK_HEADER/ s|vorbis|no_&|' \
 		${WRKSRC}/configure.in
 
 post-patch-SPEEX-off:
 	@${REINPLACE_CMD} -e '/AC_CHECK_HEADER/ s|speex|no_&|' \
 		${WRKSRC}/configure.in
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudiere.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/audio/dumb/Makefile
===================================================================
--- head/audio/dumb/Makefile	(revision 434056)
+++ head/audio/dumb/Makefile	(revision 434057)
@@ -1,39 +1,38 @@
 # Created by: Andreas Kohn <andreas@syndrom23.de>
 # $FreeBSD$
 
 PORTNAME=	dumb
 PORTVERSION=	0.9.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	IT, XM, S3M, and MOD player library
 
 USES=		gmake
 
 OPTIONS_DEFINE=	ALLEGRO
 OPTIONS_SUB=	yes
 ALLEGRO_DESC=	Enable allegro support
 
 ALLEGRO_LIB_DEPENDS=	liballeg.so:devel/allegro
 ALLEGRO_MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`" \
 			LINK_ALLEGRO="`allegro-config --libs` -lm"
 ALLEGRO_CONFLICTS=	dumb-[0-9]*
 ALLEGRO_MAKE_ARGS_OFF=	_PORT_ALLEGRO_CFLAGS=
 ALLEGRO_CONFLICTS_OFF=	dumb-allegro-[0-9]*
 
-CFLAGS_amd64=	-fPIC
-CFLAGS_ia64=	-fPIC
-CFLAGS_sparc64=	-fPIC
+# libdumb.a is linked into libaudiere.so from audio/audiere.
+CFLAGS+=	-fPIC
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|_INSTALL_PATH := |&$${DESTDIR}|' ${WRKSRC}/Makefile
 
 do-configure:
 	@${ECHO_CMD} 'include make/unix.inc' > ${WRKSRC}/make/config.txt
 	@${ECHO_CMD} 'ALL_TARGETS := core core-examples core-headers' >> ${WRKSRC}/make/config.txt
 do-configure-ALLEGRO-on:
 	@${ECHO_CMD} 'ALL_TARGETS += allegro allegro-examples allegro-headers' >> ${WRKSRC}/make/config.txt
 
 .include <bsd.port.mk>