diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index e97562b90e4..0279cb6b826 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2004/12/14 19:16:46 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2005/11/14 21:11:17 wilfried Exp $
 
 COMMENT=	"full-screen ncurses or GTK-based audio mixer"
 
 DISTNAME=	aumix-2.8
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	audio
 
 HOMEPAGE=	http://jpj.net/~trevor/aumix.html
@@ -33,13 +34,12 @@ CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+= --without-gtk
 .else
-BUILD_DEPENDS+=	:pkgconfig-*:devel/pkgconfig
+BUILD_DEPENDS+=	::devel/pkgconfig
 LIB_DEPENDS+=	gdk-x11-2.0.0.14,gdk_pixbuf-2.0.0.14,gtk-x11-2.0.0.14::x11/gtk+2
 USE_X11=	Yes
-WANTLIB+=	X11 Xext Xft Xinerama Xrender Xcursor
-WANTLIB+=	fontconfig freetype.13
+WANTLIB+=	X11 fontconfig freetype.13
 WANTLIB+=	glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0
-WANTLIB+=	pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 atk-1.0.0.0
+WANTLIB+=	atk-1.0.0.0 cairo pango-1.0.0.0 pangocairo-1.0.0.0 pangoft2-1.0.0.0
 .endif
 
 .if ${FLAVOR:L:Mno_curses} 
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 0adc89a484a..dc8e1347eaf 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2005/01/02 23:49:10 alek Exp $
+# $OpenBSD: Makefile,v 1.16 2005/11/14 21:11:42 wilfried Exp $
 
 COMMENT=	"generic playlist manager for UNIX"
 
 DISTNAME=	xhippo-3.3
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	audio
 
 HOMEPAGE=	http://www.gnu.org/software/xhippo/
@@ -14,14 +14,14 @@ PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
-WANTLIB=	X11 Xext Xft Xinerama Xrender fontconfig freetype \
-		c m z Xcursor \
-		atk-1.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
-		pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0
+WANTLIB=	X11 fontconfig freetype \
+		c m z \
+		atk-1.0.0.0 cairo glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
+		pango-1.0.0.0 pangocairo-1.0.0.0 pangoft2-1.0.0.0
 
 MASTER_SITES=	${MASTER_SITE_GNU:=xhippo/}
 
-BUILD_DEPENDS=	:pkgconfig-*:devel/pkgconfig
+BUILD_DEPENDS=	::devel/pkgconfig
 LIB_DEPENDS=	gdk_pixbuf-2.0.0.0,gdk-x11-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
 		id3tag.2::audio/libid3tag