On second thought, forget about libphonon; there is one in multimedia.

3 files changed, 7 insertions, 7 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index ea957dc4431..67dcb1dfb5c 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.54 2011/01/12 07:07:06 adam Exp $
+# $NetBSD: Makefile,v 1.55 2011/01/12 14:40:42 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	C++ X GUI toolkit
 
 # XXX this is to test what really gets installed when 'do-install' is disabled
@@ -70,7 +70,7 @@ do-install:
 		${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers
 .endfor
 	cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST
-.for lib in Qt3Support QtCore QtDeclarative QtGui QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns jscore phonon
+.for lib in Qt3Support QtCore QtDeclarative QtGui QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns jscore
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
 		${DESTDIR}${QTPREFIX}/lib/
 	sed	-e "s:${WRKSRC}:${QTPREFIX}:g" \
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index 60e97d7a793..acc1de3e2fb 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2011/01/12 07:07:06 adam Exp $
+# $NetBSD: Makefile.common,v 1.25 2011/01/12 14:40:42 adam Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -26,6 +26,8 @@ USE_TOOLS+=		gmake
 
 QTPREFIX=		${PREFIX}/qt4
 
+# libphonon is available in multimedia/phonon
+CONFIGURE_ARGS+=	-no-phonon
 CONFIGURE_ARGS+=	-no-phonon-backend
 CONFIGURE_ARGS+=	-optimized-qmake
 CONFIGURE_ARGS+=	-prefix "${QTPREFIX}"
diff --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST
index b901233437a..f7d0dfd3471 100644
--- a/x11/qt4-libs/PLIST
+++ b/x11/qt4-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2011/01/12 07:07:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2011/01/12 14:40:42 adam Exp $
 lib/pkgconfig/Qt3Support.pc
 lib/pkgconfig/QtCore.pc
 lib/pkgconfig/QtDeclarative.pc
@@ -15,7 +15,6 @@ lib/pkgconfig/QtWebKit.pc
 lib/pkgconfig/QtXml.pc
 lib/pkgconfig/QtXmlPatterns.pc
 lib/pkgconfig/jscore.pc
-lib/pkgconfig/phonon.pc
 qt4/bin/moc
 qt4/bin/rcc
 qt4/bin/uic
@@ -40,7 +39,6 @@ qt4/lib/libQtWebKit.la
 qt4/lib/libQtXml.la
 qt4/lib/libQtXmlPatterns.la
 qt4/lib/libjscore.la
-qt4/lib/libphonon.la
 qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
 qt4/plugins/accessible/libqtaccessiblewidgets.la
 qt4/plugins/bearer/libqgenericbearer.la