Index: Makefile
===================================================================
--- Makefile	(revision 428887)
+++ Makefile	(working copy)
@@ -12,6 +12,10 @@
 
 LICENSE=	LGPL21
 
+MULTI_PACKAGES=	lib
+COMMENT_sndio=	Sndio output plugin for mpg123 player
+COMMENT_lib=	mpg123 runtime library
+
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		tar:bzip2 gmake libtool localbase pathfix
@@ -19,17 +23,18 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-optimization=0 \
-		--with-module-suffix=.so
+		--with-module-suffix=.so \
+		--with-default-audio=oss
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	SNDIO
+OPTIONS_DEFAULT=	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_CONFIGURE_ON=	--with-audio=sndio,oss
+SNDIO_CONFIGURE_OFF=	--with-audio=oss
+SNDIO_PACKAGE=	sndio
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 
 .include <bsd.port.pre.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 428887)
+++ pkg-plist	(working copy)
@@ -2,19 +2,19 @@
 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.3
-lib/libout123.so
-lib/libout123.so.0
-lib/libout123.so.0.1.4
+@pkg{lib} include/fmt123.h
+@pkg{lib} include/mpg123.h
+@pkg{lib} include/out123.h
+@pkg{lib} lib/libmpg123.so
+@pkg{lib} lib/libmpg123.so.0
+@pkg{lib} lib/libmpg123.so.0.42.3
+@pkg{lib} lib/libout123.so
+@pkg{lib} lib/libout123.so.0
+@pkg{lib} 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
+%%SNDIO%%@pkg(sndio) lib/mpg123/output_sndio.so
+@pkg{lib} libdata/pkgconfig/libmpg123.pc
+@pkg{lib} libdata/pkgconfig/libout123.pc
 man/man1/out123.1.gz
 man/man1/mpg123.1.gz