diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 5c5fc98c1dd..1d5a400ecd2 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,7 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2002/12/29 19:29:56 fgsch Exp $
+# $OpenBSD: Makefile,v 1.9 2005/12/23 16:12:24 espie Exp $
 
 COMMENT=	"multi-platform cd player development library"
 DISTNAME=	libcdaudio-0.99.6
+PKGNAME=	${DISTNAME}p0
+SHARED_LIBS=	cdaudio	1.0
+MODGNU_SHARED_LIBS=	cdaudio	''
 CATEGORIES=	audio
 
 HOMEPAGE=	http://libcdaudio.sourceforge.net/
@@ -15,6 +18,7 @@ PERMIT_DISTFILES_FTP=   Yes
 
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=libcdaudio/}
 
+USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static
diff --git a/audio/libcdaudio/pkg/PFRAG.shared b/audio/libcdaudio/pkg/PFRAG.shared
index ff3b8e0a96b..6ac2423715b 100644
--- a/audio/libcdaudio/pkg/PFRAG.shared
+++ b/audio/libcdaudio/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/06 14:37:27 espie Exp $
-@lib lib/libcdaudio.so.1.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/23 16:12:24 espie Exp $
+@lib lib/libcdaudio.so.${LIBcdaudio_VERSION}
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index f3a7e29391c..a4fd999a4ef 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -1,8 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2004/11/21 17:51:46 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2005/12/23 16:12:24 espie Exp $
 
 COMMENT=		"utility for Rio mp3 players"
 
 DISTNAME=		rioutil-1.4.4
+PKGNAME=		${DISTNAME}p0
+SHARED_LIBS=		rioutil	5.1
+MODGNU_SHARED_LIBS=	rioutil	''
 CATEGORIES=		audio
 
 HOMEPAGE=		http://rioutil.sf.net
@@ -20,6 +23,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rioutil/}
 
 LIB_DEPENDS=		usb.7.0::devel/libusb
 
+USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-libusb
 CONFIGURE_ENV=		CPPFLAGS=-I${LOCALBASE}/include \
diff --git a/audio/rioutil/pkg/PFRAG.shared b/audio/rioutil/pkg/PFRAG.shared
index dc033e142d1..0233ed6ed0d 100644
--- a/audio/rioutil/pkg/PFRAG.shared
+++ b/audio/rioutil/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/09 15:34:08 espie Exp $
-@lib lib/librioutil.so.5.1
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/23 16:12:24 espie Exp $
+@lib lib/librioutil.so.${LIBrioutil_VERSION}
diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index ed88a559d3f..a4d786af26b 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/04/15 02:21:31 jolan Exp $
+# $OpenBSD: Makefile,v 1.2 2005/12/23 16:12:24 espie Exp $
 
 COMMENT=	"integer-only, fully Ogg Vorbis compliant decoder library"
 DISTNAME=	tremor-20050411
+SHARED_LIBS=	vorbisidec	1.2
+MODGNU_SHARED_LIBS=	vorbisidec	''
 CATEGORIES=	audio
 MASTER_SITES=	http://www.itee.uq.edu.au/~dlg/OpenBSD/
 
diff --git a/audio/tremor/pkg/PFRAG.shared b/audio/tremor/pkg/PFRAG.shared
index ab1debf3037..dd25b66ec4a 100644
--- a/audio/tremor/pkg/PFRAG.shared
+++ b/audio/tremor/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/04/15 02:21:31 jolan Exp $
-@lib lib/libvorbisidec.so.1.2
+@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/23 16:12:24 espie Exp $
+@lib lib/libvorbisidec.so.${LIBvorbisidec_VERSION}