* Exceptions enabled

* Build and install XmlPatters
* MNG moved to qt4-mng

4 files changed, 20 insertions, 31 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 552e75b445f..3eee4513da3 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.40 2010/01/30 08:55:38 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2010/02/02 14:05:59 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	C++ X GUI toolkit
 
 # XXX this is to test what really gets installed when 'do-install' is disabled
 INSTALL_DIRS+=		src
 
 BUILD_TARGET=		sub-src
-INSTALL_TARGET=		install_flat_headers install_targ_headers install_class_headers
 
 PTHREAD_OPTS+=		require
 UNLIMIT_RESOURCES=	datasize
@@ -21,8 +20,10 @@ BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX}
 PLIST_SRC=		${WRKDIR}/PLIST ${PKGDIR}/PLIST
 
 # built as plugins
-CONFIGURE_ARGS+=	-no-sql-sqlite
+CONFIGURE_ARGS+=	-no-dbus
+CONFIGURE_ARGS+=	-no-libmng
 CONFIGURE_ARGS+=	-no-libtiff
+CONFIGURE_ARGS+=	-no-sql-sqlite
 
 INSTALLATION_DIRS=	lib/pkgconfig
 INSTALLATION_DIRS+=	${QTPREFIX}/bin
@@ -45,14 +46,14 @@ do-install:
 	    ${DESTDIR}${QTPREFIX}/bin
 .for incl in corelib gui multimedia network opengl qt3support script scripttools sql svg xml script testlib 3rdparty/webkit/WebCore
 	cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \
-		${MAKE_PROGRAM} ${INSTALL_TARGET}
+		${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 QtGui QtMultimedia QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript QtScriptTools QtTest QtWebKit
+.for lib in Qt3Support QtCore QtGui QtMultimedia QtNetwork QtOpenGL QtSql QtSvg QtXml QtXmlPatterns QtScript QtScriptTools QtTest QtWebKit
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
 		${DESTDIR}${QTPREFIX}/lib/
 	sed	-e "s:${WRKSRC}:${QTPREFIX}:g" \
-		-e "s:${QTPREFIX}/lib/lib\([A-Za-z3]*\)\.la:-l\1:g" \
+		-e "s:${QTPREFIX}/lib/lib\\([A-Za-z3]*\\)\\.la:-l\\1:g" \
 		${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc
 	${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
 .endfor
@@ -75,7 +76,7 @@ do-install:
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/plugins/iconengines/libqsvgicon.la \
 		${DESTDIR}/${QTPREFIX}/plugins/iconengines/
-.for plug in qgif qico qjpeg qmng qsvg
+.for plug in qgif qico qjpeg qsvg
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/plugins/imageformats/lib${plug}.la \
 		${DESTDIR}${QTPREFIX}/plugins/imageformats/
@@ -96,7 +97,6 @@ SUBST_SED.socklen=	-e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index c658b314c1e..a625571177b 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2010/01/29 18:19:09 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2010/02/02 14:05:59 adam Exp $
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-docs/Makefile
 
@@ -21,19 +21,12 @@ USE_TOOLS+=		gmake
 
 QTPREFIX=		${PREFIX}/qt4
 
-CONFIGURE_ARGS+=	-prefix "${QTPREFIX}" -shared -sm
-CONFIGURE_ARGS+=	-release
-CONFIGURE_ARGS+=	-system-libjpeg
-CONFIGURE_ARGS+=	-system-libmng
-CONFIGURE_ARGS+=	-system-libpng
-CONFIGURE_ARGS+=	-system-zlib
-CONFIGURE_ARGS+=	-qt-gif	# qt4 does not write compressed GIFs
-CONFIGURE_ARGS+=	${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//}
 CONFIGURE_ARGS+=	-arch ${MACHINE_ARCH}
-# current WebKit fails for missing pthread_getattr_np() in
-# src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp
-#CONFIGURE_ARGS+=	-no-webkit
+CONFIGURE_ARGS+=	-optimized-qmake
+CONFIGURE_ARGS+=	-prefix "${QTPREFIX}"
+CONFIGURE_ARGS+=	-qt-gif	# qt4 does not write compressed GIFs
 CONFIGURE_ARGS.SunOS+=	-no-xrender
+CONFIGURE_ARGS+=	${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//}
 OPSYSVARS+=		CONFIGURE_ARGS
 CONFIGURE_ARGS+=	< ${FILESDIR}/license-acceptance
 
@@ -47,10 +40,6 @@ SCRIPTS_ENV+=		HOME=${WRKDIR}
 
 .include "../../mk/compiler.mk"
 
-.if !empty(CC_VERSION:Mgcc*)
-CONFIGURE_ARGS+=	-no-g++-exceptions
-.endif
-
 .if ${OPSYS} == "SunOS"
 .  if !empty(CC_VERSION:Mgcc*)
 .    if ${ABI:U} == "64"
diff --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST
index 29512f2549e..b68ae0afee1 100644
--- a/x11/qt4-libs/PLIST
+++ b/x11/qt4-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2010/01/30 08:55:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2010/02/02 14:05:59 adam Exp $
 lib/pkgconfig/Qt3Support.pc
 lib/pkgconfig/QtCore.pc
 lib/pkgconfig/QtGui.pc
@@ -12,6 +12,7 @@ lib/pkgconfig/QtSvg.pc
 lib/pkgconfig/QtTest.pc
 lib/pkgconfig/QtWebKit.pc
 lib/pkgconfig/QtXml.pc
+lib/pkgconfig/QtXmlPatterns.pc
 qt4/bin/moc
 qt4/bin/rcc
 qt4/bin/uic
@@ -29,6 +30,7 @@ qt4/lib/libQtSvg.la
 qt4/lib/libQtTest.la
 qt4/lib/libQtWebKit.la
 qt4/lib/libQtXml.la
+qt4/lib/libQtXmlPatterns.la
 qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
 qt4/plugins/accessible/libqtaccessiblewidgets.la
 qt4/plugins/codecs/libqcncodecs.la
@@ -41,7 +43,6 @@ qt4/plugins/iconengines/libqsvgicon.la
 qt4/plugins/imageformats/libqgif.la
 qt4/plugins/imageformats/libqico.la
 qt4/plugins/imageformats/libqjpeg.la
-qt4/plugins/imageformats/libqmng.la
 qt4/plugins/imageformats/libqsvg.la
 qt4/plugins/inputmethods/libqimsw-multi.la
 qt4/q3porting.xml
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index 9babc23db7a..2c9b619676b 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.16 2010/01/29 18:19:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/02/02 14:05:59 adam Exp $
 
 BUILDLINK_TREE+=	qt4-libs
 
 .if !defined(QT4_LIBS_BUILDLINK3_MK)
 QT4_LIBS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.1.0
-BUILDLINK_ABI_DEPENDS.qt4-libs+=	qt4-libs>=4.5.3nb3
+BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.6.1nb2
+BUILDLINK_ABI_DEPENDS.qt4-libs+=	qt4-libs>=4.6.1nb2
 BUILDLINK_PKGSRCDIR.qt4-libs?=	../../x11/qt4-libs
 
 BUILDLINK_INCDIRS.qt4-libs+=	qt4/include
@@ -23,7 +23,6 @@ PTHREAD_OPTS+=	require
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"