diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index aaa2b964ae9..486585d6aa7 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.16 2005/12/23 06:29:38 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.17 2005/12/23 15:03:05 espie Exp $
 
 COMMENT=	"CDDA reading utility with extra data verification features"
 
 DISTNAME=	cdparanoia-III-alpha9.8
 PKGNAME=	cdparanoia-3.a9.8p0
 CATEGORIES=	audio
+SHARED_LIBS=	cdda_interface	0.0 \
+		cdda_paranoia	0.0
 
 HOMEPAGE=	http://www.xiph.org/paranoia/
 
@@ -21,6 +23,9 @@ EXTRACT_SUFX=	.src.tgz
 CONFIGURE_STYLE=	autoconf autoheader
 AUTOCONF_VERSION=	2.52
 CONFIGURE_ENV=		GCC=${CC}
+MAKE_FLAGS=	LIBcdda_interface_VERSION=${LIBcdda_interface_VERSION} \
+		LIBcdda_paranoia_VERSION=${LIBcdda_paranoia_VERSION}
+FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}
 
 NO_REGRESS=		Yes
 
diff --git a/audio/cdparanoia/patches/patch-Makefile_in b/audio/cdparanoia/patches/patch-Makefile_in
index 855d332da54..d66c0b92726 100644
--- a/audio/cdparanoia/patches/patch-Makefile_in
+++ b/audio/cdparanoia/patches/patch-Makefile_in
@@ -1,14 +1,14 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2003/06/22 19:13:40 pvalchev Exp $
---- Makefile.in.orig	Tue Mar 27 15:46:58 2001
-+++ Makefile.in	Fri Jun 13 01:17:13 2003
+$OpenBSD: patch-Makefile_in,v 1.7 2005/12/23 15:03:06 espie Exp $
+--- Makefile.in.orig	Wed Mar 28 00:46:58 2001
++++ Makefile.in	Fri Dec 23 15:40:44 2005
 @@ -23,33 +23,33 @@ BINDIR=@bindir@
  MANDIR=@mandir@
  INCLUDEDIR=@includedir@
  LIBDIR=@libdir@
 -PWD = $(shell pwd)
 +PWD != pwd
-+MAJOR=0
-+MINOR=0
++LIBcdda_interface_VERSION=0.0
++LIBcdda_paranoia_VERSION=0.0
  
  OFILES = main.o report.o header.o buffering_write.o
  
@@ -26,7 +26,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2003/06/22 19:13:40 pvalchev Exp $
 -	LIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so
 -endif
 +SHLIBS = -lcdda_interface -lcdda_paranoia -lm
-+SHLIBDEP = interface/libcdda_interface.so.$(MAJOR).$(MINOR) paranoia/libcdda_paranoia.so.$(MAJOR).$(MINOR)
++SHLIBDEP = interface/libcdda_interface.so.$(LIBcdda_interface_VERSION) paranoia/libcdda_paranoia.so.$(LIBcdda_paranoia_VERSION)
  
  
 -all: 	
@@ -85,10 +85,10 @@ $OpenBSD: patch-Makefile_in,v 1.6 2003/06/22 19:13:40 pvalchev Exp $
 +	$(INSTALL) -d -m 0755 $(DESTDIR)$(INCLUDEDIR)
 +	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR)
 +	$(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.$(LIBcdda_paranoia_VERSION) $(DESTDIR)$(LIBDIR)
 +	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR)
 +	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.$(LIBcdda_interface_VERSION) $(DESTDIR)$(LIBDIR)
 +	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR)
 +	$(INSTALL) -m 0644 $(srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR)
 +
diff --git a/audio/cdparanoia/patches/patch-interface_Makefile_in b/audio/cdparanoia/patches/patch-interface_Makefile_in
index 438e5734d3b..888eedd523b 100644
--- a/audio/cdparanoia/patches/patch-interface_Makefile_in
+++ b/audio/cdparanoia/patches/patch-interface_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-interface_Makefile_in,v 1.2 2001/08/23 16:23:22 espie Exp $
+$OpenBSD: patch-interface_Makefile_in,v 1.3 2005/12/23 15:03:06 espie Exp $
 --- interface/Makefile.in.orig	Tue Dec 14 05:27:59 1999
-+++ interface/Makefile.in	Thu Aug 23 17:50:33 2001
++++ interface/Makefile.in	Fri Dec 23 15:41:36 2005
 @@ -21,8 +21,6 @@ CPPFLAGS+=-D_REENTRANT
  OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o\
  	scsi_interface.o smallft.o toc.o test_interface.o
@@ -10,22 +10,21 @@ $OpenBSD: patch-interface_Makefile_in,v 1.2 2001/08/23 16:23:22 espie Exp $
  all: lib slib
  
  debug: 
-@@ -31,10 +29,12 @@ debug: 
+@@ -31,10 +29,11 @@ debug: 
  lib:	
  	$(MAKE) libcdda_interface.a CFLAGS="$(OPT)" 
  
-+MAJOR=0
-+MINOR=0
++LIBcdda_interface_VERSION=	0.0
 +
  slib:	
  	$(MAKE) lessmessy
 -	$(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" 
 -	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
-+	$(MAKE) libcdda_interface.so.$(MAJOR).$(MINOR) VERSION=$(VERSION) CFLAGS="$(OPT) -fpic" 
++	$(MAKE) libcdda_interface.so.$(LIBcdda_interface_VERSION) VERSION=$(VERSION) CFLAGS="$(OPT) -fpic" 
  
  test:	
  	$(MAKE) libcdda_interface.a CFLAGS="$(DEBUG)"
-@@ -45,10 +45,8 @@ libcdda_interface.a: 	$(OFILES)	
+@@ -45,10 +44,8 @@ libcdda_interface.a: 	$(OFILES)	
  	$(AR) -r libcdda_interface.a $(OFILES)
  	$(RANLIB) libcdda_interface.a
  
@@ -33,8 +32,8 @@ $OpenBSD: patch-interface_Makefile_in,v 1.2 2001/08/23 16:23:22 espie Exp $
 -	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES)
 -	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
 -	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
-+libcdda_interface.so.$(MAJOR).$(MINOR): 	$(OFILES)	
-+	$(CC) -fpic -shared -o libcdda_interface.so.$(MAJOR).$(MINOR) $(OFILES)
++libcdda_interface.so.$(LIBcdda_interface_VERSION): 	$(OFILES)	
++	$(CC) -fpic -shared -o $@ $(OFILES)
  
  .c.o:
  	$(CC) $(CFLAGS) -c $<
diff --git a/audio/cdparanoia/patches/patch-paranoia_Makefile_in b/audio/cdparanoia/patches/patch-paranoia_Makefile_in
index c768a71ab15..8ebcb9c4397 100644
--- a/audio/cdparanoia/patches/patch-paranoia_Makefile_in
+++ b/audio/cdparanoia/patches/patch-paranoia_Makefile_in
@@ -1,28 +1,27 @@
-$OpenBSD: patch-paranoia_Makefile_in,v 1.4 2005/12/23 06:31:31 jakemsr Exp $
---- paranoia/Makefile.in.orig	Mon Dec 13 20:28:04 1999
-+++ paranoia/Makefile.in	Thu Dec 22 22:30:04 2005
-@@ -22,8 +22,10 @@ OFILES = paranoia.o p_block.o overlap.o 
+$OpenBSD: patch-paranoia_Makefile_in,v 1.5 2005/12/23 15:03:06 espie Exp $
+--- paranoia/Makefile.in.orig	Tue Dec 14 05:28:04 1999
++++ paranoia/Makefile.in	Fri Dec 23 15:42:25 2005
+@@ -22,8 +22,9 @@ OFILES = paranoia.o p_block.o overlap.o 
  #TFILES = isort.t gap.t p_block.t paranoia.t
  
  LIBS = ../interface/libcdda_interface.a -lm
 -export VERSION
  
-+MAJOR=0
-+MINOR=0
++LIBcdda_paranoia_VERSION=0.0
 +
  all: lib slib
  
  debug: 
-@@ -34,7 +36,7 @@ lib:	
+@@ -34,7 +35,7 @@ lib:	
  
  slib:	
  	$(MAKE) lessmessy
 -	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" 
-+	$(MAKE) libcdda_paranoia.so.$(MAJOR).$(MINOR) VERSION=$(VERSION) CFLAGS="$(OPT) -fpic" 
++	$(MAKE) libcdda_paranoia.so.$(LIBcdda_paranoia_VERSION) VERSION=$(VERSION) CFLAGS="$(OPT) -fpic" 
  
  #test:	$(TFILES)
  #
-@@ -43,10 +45,8 @@ libcdda_paranoia.a: 	$(OFILES)	
+@@ -43,10 +44,8 @@ libcdda_paranoia.a: 	$(OFILES)	
  	$(AR) -r libcdda_paranoia.a $(OFILES)
  	$(RANLIB) libcdda_paranoia.a
  
@@ -30,8 +29,8 @@ $OpenBSD: patch-paranoia_Makefile_in,v 1.4 2005/12/23 06:31:31 jakemsr Exp $
 -	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES)
 -	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
 -	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
-+libcdda_paranoia.so.$(MAJOR).$(MINOR): 	$(OFILES)	
-+	$(CC) -fpic -shared -o libcdda_paranoia.so.$(MAJOR).$(MINOR) $(OFILES)
++libcdda_paranoia.so.$(LIBcdda_paranoia_VERSION): 	$(OFILES)	
++	$(CC) -fpic -shared -o $@ $(OFILES)
  
  .c.o:
  	$(CC) $(CFLAGS) -c $<
diff --git a/audio/cdparanoia/pkg/PFRAG.shared b/audio/cdparanoia/pkg/PFRAG.shared
index a96f1859511..e5818fb72fd 100644
--- a/audio/cdparanoia/pkg/PFRAG.shared
+++ b/audio/cdparanoia/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/09 11:09:10 espie Exp $
-@lib lib/libcdda_interface.so.0.0
-@lib lib/libcdda_paranoia.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/23 15:03:06 espie Exp $
+@lib lib/libcdda_interface.so.${LIBcdda_interface_VERSION}
+@lib lib/libcdda_paranoia.so.${LIBcdda_paranoia_VERSION}
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index 2be36ce645a..b46a509182e 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -1,10 +1,13 @@
-# $OpenBSD: Makefile,v 1.8 2004/11/21 17:51:45 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2005/12/23 15:03:06 espie Exp $
 
 COMMENT=		"library for manipulating ID3v1 and ID3v2 tags"
 
 VERSION=		3.8
 DISTNAME=		id3lib-${VERSION}.3
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=     	audio
+SHARED_LIBS=		id3	3.8
+MODGNU_SHARED_LIBS=	id3	'-export-dynamic'
 
 HOMEPAGE=		http://id3lib.sourceforge.net/
 
@@ -21,5 +24,6 @@ USE_GMAKE=		Yes
 NO_REGRESS=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		${CONFIGURE_SHARED}
+USE_LIBTOOL=		Yes
 
 .include <bsd.port.mk>
diff --git a/audio/id3lib/pkg/PFRAG.shared b/audio/id3lib/pkg/PFRAG.shared
index dced91a6e45..d9982bc4aac 100644
--- a/audio/id3lib/pkg/PFRAG.shared
+++ b/audio/id3lib/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2004/08/09 11:50:26 espie Exp $
-@lib lib/libid3.so.3.8
+@comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/23 15:03:07 espie Exp $
+@lib lib/libid3.so.${LIBid3_VERSION}
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 5973937c32f..59ac6c0a1c7 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,13 +1,15 @@
-# $OpenBSD: Makefile,v 1.25 2005/03/23 21:02:30 alek Exp $
+# $OpenBSD: Makefile,v 1.26 2005/12/23 15:03:07 espie Exp $
 
 COMMENT=	"lame ain't an MP3 encoder"
 
 VERSION=	3.96.1
 
 DISTNAME=	lame-${VERSION}
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lame/}
+SHARED_LIBS=	mp3lame	0.1
+MODGNU_SHARED_LIBS=	mp3lame	'-no-undefined'
 
 HOMEPAGE=	http://www.mp3dev.org/
 
@@ -28,7 +30,8 @@ FLAVOR?=
 
 CONFIGURE_ARGS+=	--enable-mp3rtp
 MAKE_FLAGS=	pkghtmldir=${TRUEPREFIX}/share/doc/lame
-FAKE_FLAGS=	${MAKE_FLAGS}
+FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}
+USE_LIBTOOL=	Yes
 
 # XXX gcc3/nasm issue
 .if (${MACHINE_ARCH} == "i386") && (${CC} != "egcc")
diff --git a/audio/lame/pkg/PFRAG.shared b/audio/lame/pkg/PFRAG.shared
index e98a1410cc7..f4ff41ec1dd 100644
--- a/audio/lame/pkg/PFRAG.shared
+++ b/audio/lame/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/09 11:09:10 espie Exp $
-@lib lib/libmp3lame.so.0.1
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/23 15:03:07 espie Exp $
+@lib lib/libmp3lame.so.${LIBmp3lame_VERSION}
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index a57374ebe53..b0a0564cb5c 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -1,4 +1,4 @@
-#$OpenBSD: Makefile,v 1.8 2004/11/21 17:51:45 espie Exp $
+#$OpenBSD: Makefile,v 1.9 2005/12/23 15:03:07 espie Exp $
 
 CATEGORIES=	audio
 
@@ -7,6 +7,8 @@ DISTNAME=	a52dec-0.7.4
 PKGNAME=	liba52-0.7.4p0
 MASTER_SITES=	http://liba52.sourceforge.net/files/
 HOMEPAGE=	http://liba52.sourceforge.net/
+SHARED_LIBS=	a52	0.0
+MAKE_FLAGS=	liba52_la_LDFLAGS='-no-undefined -version-info ${LIBa52_VERSION:S/./:/}:0'
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
 
diff --git a/audio/liba52/pkg/PFRAG.shared b/audio/liba52/pkg/PFRAG.shared
index a9cd4d520bd..0f9cee84260 100644
--- a/audio/liba52/pkg/PFRAG.shared
+++ b/audio/liba52/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/06 14:37:27 espie Exp $
-@lib lib/liba52.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/23 15:03:08 espie Exp $
+@lib lib/liba52.so.${LIBa52_VERSION}
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index df5dc1938f7..7f63677edc2 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2005/10/18 23:24:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.29 2005/12/23 15:03:08 espie Exp $
 
 COMMENT=	"portable audio output library"
 COMMENT-arts=	"aRts module for portable audio output library"
@@ -11,6 +11,8 @@ PKGNAME-arts=	libao-arts-${VERSION}p1
 PKGNAME-esd=	libao-esd-${VERSION}p1
 CATEGORIES=    	audio
 HOMEPAGE=	http://www.xiph.org/ao/
+SHARED_LIBS=	ao	3.2
+MODGNU_SHARED_LIBS=	ao	''
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
diff --git a/audio/libao/pkg/PFRAG.shared b/audio/libao/pkg/PFRAG.shared
index 068efa7b91c..8c5ab5e196f 100644
--- a/audio/libao/pkg/PFRAG.shared
+++ b/audio/libao/pkg/PFRAG.shared
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PFRAG.shared,v 1.10 2004/08/09 15:58:46 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.11 2005/12/23 15:03:08 espie Exp $
 lib/ao/
 lib/ao/plugins-2/
 @comment lib/ao/plugins-2/libsun.a
 @comment lib/ao/plugins-2/libsun.la
 lib/ao/plugins-2/libsun.so
-@lib lib/libao.so.3.2
+@lib lib/libao.so.${LIBao_VERSION}
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 14e99420b41..878f750f2db 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2005/10/18 23:24:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2005/12/23 15:03:08 espie Exp $
 
 COMMENT=	"high-quality MPEG audio decoder"
 
@@ -6,6 +6,8 @@ DISTNAME=	libmad-0.15.1b
 PKGNAME=	${DISTNAME}p1
 CATEGORIES=	audio
 HOMEPAGE=	http://www.underbit.com/products/mad/
+SHARED_LIBS=	mad	2.1
+MODGNU_SHARED_LIBS=	mad	''
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
diff --git a/audio/libmad/pkg/PFRAG.shared b/audio/libmad/pkg/PFRAG.shared
index 195d01d6973..11fee162c72 100644
--- a/audio/libmad/pkg/PFRAG.shared
+++ b/audio/libmad/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/06 14:37:27 espie Exp $
-@lib lib/libmad.so.2.1
+@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/23 15:03:08 espie Exp $
+@lib lib/libmad.so.${LIBmad_VERSION}
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 66c282b303a..f76b0bc4917 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.17 2005/12/03 21:14:22 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2005/12/23 15:03:09 espie Exp $
 
 COMMENT=	"Ogg bitstream library"
 
 DISTNAME=	libogg-1.1.3
 CATEGORIES=    	audio
 HOMEPAGE=	http://www.xiph.org/ogg/
+SHARED_LIBS=	ogg	5.3
+MODGNU_SHARED_LIBS=	ogg	'-no-undefined'
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
diff --git a/audio/libogg/pkg/PFRAG.shared b/audio/libogg/pkg/PFRAG.shared
index beeed5779a6..9400ebc972d 100644
--- a/audio/libogg/pkg/PFRAG.shared
+++ b/audio/libogg/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.9 2005/12/03 21:14:22 naddy Exp $
-@lib lib/libogg.so.5.3
+@comment $OpenBSD: PFRAG.shared,v 1.10 2005/12/23 15:03:09 espie Exp $
+@lib lib/libogg.so.${LIBogg_VERSION}
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index a49e49f864c..9a0d66a7721 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -1,10 +1,13 @@
-# $OpenBSD: Makefile,v 1.3 2002/09/14 20:09:31 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2005/12/23 15:03:09 espie Exp $
 
 COMMENT=	"C64 music player and SID chip emulator library"
 
 DISTNAME=	libsidplay-1.36.57
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	audio
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
+SHARED_LIBS=	sidplay	1.3
+MODGNU_SHARED_LIBS=	sidplay	''
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
@@ -19,6 +22,7 @@ EXTRACT_SUFX=	.tgz
 
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/scripts
 
+USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		${CONFIGURE_SHARED}
 .if ${MACHINE_ARCH} == "i386"
diff --git a/audio/libsidplay/pkg/PFRAG.shared b/audio/libsidplay/pkg/PFRAG.shared
index 03295278297..4b86dcd5fed 100644
--- a/audio/libsidplay/pkg/PFRAG.shared
+++ b/audio/libsidplay/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/06 14:37:27 espie Exp $
-@lib lib/libsidplay.so.1.3
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/23 15:03:09 espie Exp $
+@lib lib/libsidplay.so.${LIBsidplay_VERSION}
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 5122771cdc5..232f1b28804 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2005/10/18 23:24:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2005/12/23 15:03:09 espie Exp $
 
 COMMENT=	"library to handle various audio file formats"
 
@@ -6,6 +6,8 @@ DISTNAME=	libsndfile-1.0.11
 PKGNAME=	${DISTNAME}p0
 CATEGORIES=	audio
 HOMEPAGE=	http://www.mega-nerd.com/libsndfile/
+SHARED_LIBS=	sndfile	1.11
+MODGNU_SHARED_LIBS=	sndfile	''
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
diff --git a/audio/libsndfile/pkg/PFRAG.shared b/audio/libsndfile/pkg/PFRAG.shared
index 440fb6eb00e..80c3f030727 100644
--- a/audio/libsndfile/pkg/PFRAG.shared
+++ b/audio/libsndfile/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2005/05/23 23:49:28 naddy Exp $
-@lib lib/libsndfile.so.1.11
+@comment $OpenBSD: PFRAG.shared,v 1.7 2005/12/23 15:03:09 espie Exp $
+@lib lib/libsndfile.so.${LIBsndfile_VERSION}
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 84e5971e147..d67a77e67e2 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,10 +1,16 @@
-# $OpenBSD: Makefile,v 1.19 2005/12/03 21:15:51 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2005/12/23 15:03:09 espie Exp $
 
 COMMENT=	"audio compression codec library"
 
 DISTNAME=	libvorbis-1.1.2
 CATEGORIES=    	audio
 HOMEPAGE=	http://www.xiph.org/ogg/vorbis/
+SHARED_LIBS=	vorbis		5.1 \
+		vorbisenc	2.2 \
+		vorbisfile	4.1
+MODGNU_SHARED_LIBS=	vorbis 		'-no-undefined' \
+			vorbisenc	'-no-undefined' \
+			vorbisfile	'-no-undefined'
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
diff --git a/audio/libvorbis/pkg/PFRAG.shared b/audio/libvorbis/pkg/PFRAG.shared
index 6a01aad317d..06977f3c3f5 100644
--- a/audio/libvorbis/pkg/PFRAG.shared
+++ b/audio/libvorbis/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.9 2005/12/03 21:15:51 naddy Exp $
-@lib lib/libvorbis.so.5.1
-@lib lib/libvorbisenc.so.2.2
-@lib lib/libvorbisfile.so.4.1
+@comment $OpenBSD: PFRAG.shared,v 1.10 2005/12/23 15:03:09 espie Exp $
+@lib lib/libvorbis.so.${LIBvorbis_VERSION}
+@lib lib/libvorbisenc.so.${LIBvorbisenc_VERSION}
+@lib lib/libvorbisfile.so.${LIBvorbisfile_VERSION}
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index f7d06dd271e..60b9d22f869 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -1,10 +1,14 @@
-# $OpenBSD: Makefile,v 1.3 2005/11/18 16:46:30 jolan Exp $
+# $OpenBSD: Makefile,v 1.4 2005/12/23 15:03:09 espie Exp $
 
 COMMENT=	"managing meta-data of audio formats"
 DISTNAME=	taglib-1.4
 PKGNAME=	${DISTNAME}p0
 CATEGORIES=	audio devel
 MASTER_SITES=	http://ktown.kde.org/~wheeler/files/src/
+SHARED_LIBS=	tag	5.0 \
+		tag_c	0.0
+MODGNU_SHARED_LIBS=	tag	'-no-undefined'	\
+			tag_c	'-no-undefined'
 
 HOMEPAGE= 	http://ktown.kde.org/~wheeler/taglib.html
 
diff --git a/audio/taglib/pkg/PFRAG.shared b/audio/taglib/pkg/PFRAG.shared
index 9681f437668..8d3f7f814e7 100644
--- a/audio/taglib/pkg/PFRAG.shared
+++ b/audio/taglib/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2005/09/07 01:27:55 espie Exp $
-@lib lib/libtag.so.5.0
-@lib lib/libtag_c.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/23 15:03:09 espie Exp $
+@lib lib/libtag.so.${LIBtag_VERSION}
+@lib lib/libtag_c.so.${LIBtag_c_VERSION}