Index: head/audio/mpg123/Makefile
===================================================================
--- head/audio/mpg123/Makefile	(revision 421439)
+++ head/audio/mpg123/Makefile	(revision 421440)
@@ -1,50 +1,58 @@
 # Created by: Carey Jones <mcj@acquiesce.org>
 # $FreeBSD$
 
 PORTNAME=	mpg123
 PORTVERSION=	1.23.6
+PORTREVISION=	1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF \
 		http://www.mpg123.de/download/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Command-line player for MPEG Layer 1, 2, and 3 audio files
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
-USES=		tar:bzip2 gmake libtool pathfix
+USES=		tar:bzip2 gmake libtool localbase pathfix
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-optimization=0 \
-		--with-audio=oss \
-		--with-default-audio=oss \
 		--with-module-suffix=.so
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+
+INSTALL_TARGET=	install-strip
+
+OPTIONS_DEFINE=	SNDIO
+OPTIONS_SUB=	yes
+
+SNDIO_CONFIGURE_ON=	--with-audio=sndio,oss \
+			--with-default-audio=sndio
+SNDIO_CONFIGURE_OFF=	--with-audio=oss \
+			--with-default-audio=oss
+SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 .if ${MACHINE_CPU:M3dnow}
 WITH_CPU=	3dnow
 .elif ${MACHINE_CPU:Msse}
 WITH_CPU=	sse
 .elif ${MACHINE_CPU:Mi586}
 WITH_CPU=	i586
 .elif ${MACHINE_CPU:Mi486}
 WITH_CPU=	i486
 .endif
 .elif ${ARCH} == "amd64"
 WITH_CPU=	x86-64
 .elif ${ARCH} == "arm"
 WITH_CPU=	arm_nofpu
 .endif
 
 .if defined(WITH_CPU)
 CONFIGURE_ARGS+=	--with-cpu=${WITH_CPU}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/audio/mpg123/pkg-plist
===================================================================
--- head/audio/mpg123/pkg-plist	(revision 421439)
+++ head/audio/mpg123/pkg-plist	(revision 421440)
@@ -1,19 +1,20 @@
 bin/mpg123
 bin/mpg123-id3dump
 bin/mpg123-strip
 bin/out123
 include/fmt123.h
 include/mpg123.h
 include/out123.h
 lib/libmpg123.so
 lib/libmpg123.so.0
 lib/libmpg123.so.0.42.2
 lib/libout123.so
 lib/libout123.so.0
 lib/libout123.so.0.1.4
 lib/mpg123/output_dummy.so
 lib/mpg123/output_oss.so
+%%SNDIO%%lib/mpg123/output_sndio.so
 libdata/pkgconfig/libmpg123.pc
 libdata/pkgconfig/libout123.pc
 man/man1/out123.1.gz
 man/man1/mpg123.1.gz