Tue Feb 2 14:06:00 2010 UTC ()
* Exceptions enabled
* Build and install XmlPatters
* MNG moved to qt4-mng


(adam)
diff -r1.19 -r1.20 pkgsrc/x11/qt4/Makefile.common
diff -r1.40 -r1.41 pkgsrc/x11/qt4-libs/Makefile
diff -r1.18 -r1.19 pkgsrc/x11/qt4-libs/Makefile.common
diff -r1.13 -r1.14 pkgsrc/x11/qt4-libs/PLIST
diff -r1.16 -r1.17 pkgsrc/x11/qt4-libs/buildlink3.mk
diff -r1.29 -r1.30 pkgsrc/x11/qt4-tools/Makefile
cvs diff -r1.19 -r1.20 pkgsrc/x11/qt4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4/Makefile.common 2010/01/29 18:19:09 1.19
+++ pkgsrc/x11/qt4/Makefile.common 2010/02/02 14:05:59 1.20
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1# $NetBSD: Makefile.common,v 1.19 2010/01/29 18:19:09 adam Exp $ 1# $NetBSD: Makefile.common,v 1.20 2010/02/02 14:05:59 adam Exp $
2# used by x11/qt4-libs/Makefile.common 2# used by x11/qt4-libs/Makefile.common
3# used by x11/qt4-tools/Makefile 3# used by x11/qt4-tools/Makefile
4 4
5QTVERSION= 4.6.1 5QTVERSION= 4.6.1
6 6
7MAINTAINER?= pkgsrc-users@NetBSD.org 7MAINTAINER?= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://qt.nokia.com/ 8HOMEPAGE= http://qt.nokia.com/
 9
 10LICENSE= gnu-gpl-v3
cvs diff -r1.40 -r1.41 pkgsrc/x11/qt4-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile 2010/01/30 08:55:38 1.40
+++ pkgsrc/x11/qt4-libs/Makefile 2010/02/02 14:05:59 1.41
@@ -1,108 +1,108 @@ @@ -1,108 +1,108 @@
1# $NetBSD: Makefile,v 1.40 2010/01/30 08:55:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.41 2010/02/02 14:05:59 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-libs-${QTVERSION} 7PKGNAME= qt4-libs-${QTVERSION}
8PKGREVISION= 1 8PKGREVISION= 2
9COMMENT= C++ X GUI toolkit 9COMMENT= C++ X GUI toolkit
10 10
11# XXX this is to test what really gets installed when 'do-install' is disabled 11# XXX this is to test what really gets installed when 'do-install' is disabled
12INSTALL_DIRS+= src 12INSTALL_DIRS+= src
13 13
14BUILD_TARGET= sub-src 14BUILD_TARGET= sub-src
15INSTALL_TARGET= install_flat_headers install_targ_headers install_class_headers 
16 15
17PTHREAD_OPTS+= require 16PTHREAD_OPTS+= require
18UNLIMIT_RESOURCES= datasize 17UNLIMIT_RESOURCES= datasize
19BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX} 18BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX}
20 19
21PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST 20PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST
22 21
23# built as plugins 22# built as plugins
24CONFIGURE_ARGS+= -no-sql-sqlite 23CONFIGURE_ARGS+= -no-dbus
 24CONFIGURE_ARGS+= -no-libmng
25CONFIGURE_ARGS+= -no-libtiff 25CONFIGURE_ARGS+= -no-libtiff
 26CONFIGURE_ARGS+= -no-sql-sqlite
26 27
27INSTALLATION_DIRS= lib/pkgconfig 28INSTALLATION_DIRS= lib/pkgconfig
28INSTALLATION_DIRS+= ${QTPREFIX}/bin 29INSTALLATION_DIRS+= ${QTPREFIX}/bin
29INSTALLATION_DIRS+= ${QTPREFIX}/include 30INSTALLATION_DIRS+= ${QTPREFIX}/include
30INSTALLATION_DIRS+= ${QTPREFIX}/lib 31INSTALLATION_DIRS+= ${QTPREFIX}/lib
31INSTALLATION_DIRS+= ${QTPREFIX}/plugins/accessible 32INSTALLATION_DIRS+= ${QTPREFIX}/plugins/accessible
32INSTALLATION_DIRS+= ${QTPREFIX}/plugins/codecs 33INSTALLATION_DIRS+= ${QTPREFIX}/plugins/codecs
33INSTALLATION_DIRS+= ${QTPREFIX}/plugins/graphicssystems 34INSTALLATION_DIRS+= ${QTPREFIX}/plugins/graphicssystems
34INSTALLATION_DIRS+= ${QTPREFIX}/plugins/iconengines 35INSTALLATION_DIRS+= ${QTPREFIX}/plugins/iconengines
35INSTALLATION_DIRS+= ${QTPREFIX}/plugins/imageformats 36INSTALLATION_DIRS+= ${QTPREFIX}/plugins/imageformats
36INSTALLATION_DIRS+= ${QTPREFIX}/plugins/inputmethods 37INSTALLATION_DIRS+= ${QTPREFIX}/plugins/inputmethods
37 38
38INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 39INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
39 40
40do-install: 41do-install:
41.for prog in moc rcc uic 42.for prog in moc rcc uic
42 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ 43 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
43.endfor 44.endfor
44 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \ 45 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \
45 ${DESTDIR}${QTPREFIX}/bin 46 ${DESTDIR}${QTPREFIX}/bin
46.for incl in corelib gui multimedia network opengl qt3support script scripttools sql svg xml script testlib 3rdparty/webkit/WebCore 47.for incl in corelib gui multimedia network opengl qt3support script scripttools sql svg xml script testlib 3rdparty/webkit/WebCore
47 cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \ 48 cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \
48 ${MAKE_PROGRAM} ${INSTALL_TARGET} 49 ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers
49.endfor 50.endfor
50 cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST 51 cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST
51.for lib in Qt3Support QtCore QtGui QtMultimedia QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript QtScriptTools QtTest QtWebKit 52.for lib in Qt3Support QtCore QtGui QtMultimedia QtNetwork QtOpenGL QtSql QtSvg QtXml QtXmlPatterns QtScript QtScriptTools QtTest QtWebKit
52 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ 53 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
53 ${DESTDIR}${QTPREFIX}/lib/ 54 ${DESTDIR}${QTPREFIX}/lib/
54 sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ 55 sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
55 -e "s:${QTPREFIX}/lib/lib\([A-Za-z3]*\)\.la:-l\1:g" \ 56 -e "s:${QTPREFIX}/lib/lib\\([A-Za-z3]*\\)\\.la:-l\\1:g" \
56 ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc 57 ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc
57 ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ 58 ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
58.endfor 59.endfor
59 ${INSTALL_DATA} ${WRKSRC}/tools/porting/src/q3porting.xml ${DESTDIR}${QTPREFIX} 60 ${INSTALL_DATA} ${WRKSRC}/tools/porting/src/q3porting.xml ${DESTDIR}${QTPREFIX}
60.for plug in qtaccessiblecompatwidgets qtaccessiblewidgets 61.for plug in qtaccessiblecompatwidgets qtaccessiblewidgets
61 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 62 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
62 ${WRKSRC}/plugins/accessible/lib${plug}.la \ 63 ${WRKSRC}/plugins/accessible/lib${plug}.la \
63 ${DESTDIR}${QTPREFIX}/plugins/accessible/ 64 ${DESTDIR}${QTPREFIX}/plugins/accessible/
64.endfor 65.endfor
65.for codec in qcncodecs qjpcodecs qkrcodecs qtwcodecs 66.for codec in qcncodecs qjpcodecs qkrcodecs qtwcodecs
66 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 67 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
67 ${WRKSRC}/plugins/codecs/lib${codec}.la \ 68 ${WRKSRC}/plugins/codecs/lib${codec}.la \
68 ${DESTDIR}${QTPREFIX}/plugins/codecs/ 69 ${DESTDIR}${QTPREFIX}/plugins/codecs/
69.endfor 70.endfor
70.for gfxs in qglgraphicssystem qtracegraphicssystem 71.for gfxs in qglgraphicssystem qtracegraphicssystem
71 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 72 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
72 ${WRKSRC}/plugins/graphicssystems/lib${gfxs}.la \ 73 ${WRKSRC}/plugins/graphicssystems/lib${gfxs}.la \
73 ${DESTDIR}${QTPREFIX}/plugins/graphicssystems/ 74 ${DESTDIR}${QTPREFIX}/plugins/graphicssystems/
74.endfor 75.endfor
75 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 76 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
76 ${WRKSRC}/plugins/iconengines/libqsvgicon.la \ 77 ${WRKSRC}/plugins/iconengines/libqsvgicon.la \
77 ${DESTDIR}/${QTPREFIX}/plugins/iconengines/ 78 ${DESTDIR}/${QTPREFIX}/plugins/iconengines/
78.for plug in qgif qico qjpeg qmng qsvg 79.for plug in qgif qico qjpeg qsvg
79 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 80 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
80 ${WRKSRC}/plugins/imageformats/lib${plug}.la \ 81 ${WRKSRC}/plugins/imageformats/lib${plug}.la \
81 ${DESTDIR}${QTPREFIX}/plugins/imageformats/ 82 ${DESTDIR}${QTPREFIX}/plugins/imageformats/
82.endfor 83.endfor
83 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 84 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
84 ${WRKSRC}/plugins/inputmethods/libqimsw-multi.la \ 85 ${WRKSRC}/plugins/inputmethods/libqimsw-multi.la \
85 ${DESTDIR}/${QTPREFIX}/plugins/inputmethods/ 86 ${DESTDIR}/${QTPREFIX}/plugins/inputmethods/
86 87
87.if ${OPSYS} == "Darwin" && empty(MACHINE_PLATFORM:MDarwin-[567].*) 88.if ${OPSYS} == "Darwin" && empty(MACHINE_PLATFORM:MDarwin-[567].*)
88SUBST_CLASSES+= socklen 89SUBST_CLASSES+= socklen
89SUBST_MESSAGE.socklen= Correcting socklen_t. 90SUBST_MESSAGE.socklen= Correcting socklen_t.
90SUBST_STAGE.socklen= pre-configure 91SUBST_STAGE.socklen= pre-configure
91SUBST_FILES.socklen= mkspecs/darwin-g++/qplatformdefs.h 92SUBST_FILES.socklen= mkspecs/darwin-g++/qplatformdefs.h
92SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/' 93SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
93.endif 94.endif
94 95
95.include "../../fonts/fontconfig/buildlink3.mk" 96.include "../../fonts/fontconfig/buildlink3.mk"
96.include "../../graphics/freetype2/buildlink3.mk" 97.include "../../graphics/freetype2/buildlink3.mk"
97.include "../../graphics/jpeg/buildlink3.mk" 98.include "../../graphics/jpeg/buildlink3.mk"
98.include "../../graphics/glu/buildlink3.mk" 99.include "../../graphics/glu/buildlink3.mk"
99.include "../../graphics/mng/buildlink3.mk" 
100.include "../../graphics/png/buildlink3.mk" 100.include "../../graphics/png/buildlink3.mk"
101.include "../../x11/libSM/buildlink3.mk" 101.include "../../x11/libSM/buildlink3.mk"
102.include "../../x11/libXcursor/buildlink3.mk" 102.include "../../x11/libXcursor/buildlink3.mk"
103.include "../../x11/libXft/buildlink3.mk" 103.include "../../x11/libXft/buildlink3.mk"
104.include "../../x11/libXmu/buildlink3.mk" 104.include "../../x11/libXmu/buildlink3.mk"
105.include "../../x11/libXrandr/buildlink3.mk" 105.include "../../x11/libXrandr/buildlink3.mk"
106 106
107.include "../../mk/pthread.buildlink3.mk" 107.include "../../mk/pthread.buildlink3.mk"
108.include "../../mk/bsd.pkg.mk" 108.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/x11/qt4-libs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2010/01/29 18:19:09 1.18
+++ pkgsrc/x11/qt4-libs/Makefile.common 2010/02/02 14:05:59 1.19
@@ -1,66 +1,55 @@ @@ -1,66 +1,55 @@
1# $NetBSD: Makefile.common,v 1.18 2010/01/29 18:19:09 adam Exp $ 1# $NetBSD: Makefile.common,v 1.19 2010/02/02 14:05:59 adam Exp $
2# used by x11/qt4-libs/Makefile 2# used by x11/qt4-libs/Makefile
3# used by x11/qt4-docs/Makefile 3# used by x11/qt4-docs/Makefile
4 4
5DISTNAME= qt-everywhere-opensource-src-${QTVERSION} 5DISTNAME= qt-everywhere-opensource-src-${QTVERSION}
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= http://get.qtsoftware.com/qt/source/ \ 7MASTER_SITES= http://get.qtsoftware.com/qt/source/ \
8 ftp://ftp.qtsoftware.com/qt/source/ 8 ftp://ftp.qtsoftware.com/qt/source/
9#EXTRACT_SUFX= .tar.bz2 9#EXTRACT_SUFX= .tar.bz2
10 10
11.include "../../x11/qt4/Makefile.common" 11.include "../../x11/qt4/Makefile.common"
12 12
13DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo 13DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo
14FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files 14FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files
15PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches 15PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches
16 16
17HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_TOOLS+= gmake 20USE_TOOLS+= gmake
21 21
22QTPREFIX= ${PREFIX}/qt4 22QTPREFIX= ${PREFIX}/qt4
23 23
24CONFIGURE_ARGS+= -prefix "${QTPREFIX}" -shared -sm 
25CONFIGURE_ARGS+= -release 
26CONFIGURE_ARGS+= -system-libjpeg 
27CONFIGURE_ARGS+= -system-libmng 
28CONFIGURE_ARGS+= -system-libpng 
29CONFIGURE_ARGS+= -system-zlib 
30CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs 
31CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//} 
32CONFIGURE_ARGS+= -arch ${MACHINE_ARCH} 24CONFIGURE_ARGS+= -arch ${MACHINE_ARCH}
33# current WebKit fails for missing pthread_getattr_np() in 25CONFIGURE_ARGS+= -optimized-qmake
34# src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp 26CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
35#CONFIGURE_ARGS+= -no-webkit 27CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs
36CONFIGURE_ARGS.SunOS+= -no-xrender 28CONFIGURE_ARGS.SunOS+= -no-xrender
 29CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//}
37OPSYSVARS+= CONFIGURE_ARGS 30OPSYSVARS+= CONFIGURE_ARGS
38CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance 31CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance
39 32
40LIBQT?= -lQtCore -lQtGui 33LIBQT?= -lQtCore -lQtGui
41 34
42MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} 35MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
43MAKE_ENV+= QTDIR=${WRKSRC} 36MAKE_ENV+= QTDIR=${WRKSRC}
44 37
45# avoid creating a .qt directory in the users home directory 38# avoid creating a .qt directory in the users home directory
46SCRIPTS_ENV+= HOME=${WRKDIR} 39SCRIPTS_ENV+= HOME=${WRKDIR}
47 40
48.include "../../mk/compiler.mk" 41.include "../../mk/compiler.mk"
49 42
50.if !empty(CC_VERSION:Mgcc*) 
51CONFIGURE_ARGS+= -no-g++-exceptions 
52.endif 
53 
54.if ${OPSYS} == "SunOS" 43.if ${OPSYS} == "SunOS"
55. if !empty(CC_VERSION:Mgcc*) 44. if !empty(CC_VERSION:Mgcc*)
56. if ${ABI:U} == "64" 45. if ${ABI:U} == "64"
57CONFIGURE_ARGS+= -platform solaris-g++-64 46CONFIGURE_ARGS+= -platform solaris-g++-64
58. else 47. else
59CONFIGURE_ARGS+= -platform solaris-g++ 48CONFIGURE_ARGS+= -platform solaris-g++
60. endif 49. endif
61. else 50. else
62. if ${ABI:U} == "64" 51. if ${ABI:U} == "64"
63CONFIGURE_ARGS+= -platform solaris-cc-64 52CONFIGURE_ARGS+= -platform solaris-cc-64
64. else 53. else
65CONFIGURE_ARGS+= -platform solaris-cc 54CONFIGURE_ARGS+= -platform solaris-cc
66. endif 55. endif
cvs diff -r1.13 -r1.14 pkgsrc/x11/qt4-libs/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/PLIST 2010/01/30 08:55:38 1.13
+++ pkgsrc/x11/qt4-libs/PLIST 2010/02/02 14:05:59 1.14
@@ -1,47 +1,48 @@ @@ -1,47 +1,48 @@
1@comment $NetBSD: PLIST,v 1.13 2010/01/30 08:55:38 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.14 2010/02/02 14:05:59 adam Exp $
2lib/pkgconfig/Qt3Support.pc 2lib/pkgconfig/Qt3Support.pc
3lib/pkgconfig/QtCore.pc 3lib/pkgconfig/QtCore.pc
4lib/pkgconfig/QtGui.pc 4lib/pkgconfig/QtGui.pc
5lib/pkgconfig/QtMultimedia.pc 5lib/pkgconfig/QtMultimedia.pc
6lib/pkgconfig/QtNetwork.pc 6lib/pkgconfig/QtNetwork.pc
7lib/pkgconfig/QtOpenGL.pc 7lib/pkgconfig/QtOpenGL.pc
8lib/pkgconfig/QtScript.pc 8lib/pkgconfig/QtScript.pc
9lib/pkgconfig/QtScriptTools.pc 9lib/pkgconfig/QtScriptTools.pc
10lib/pkgconfig/QtSql.pc 10lib/pkgconfig/QtSql.pc
11lib/pkgconfig/QtSvg.pc 11lib/pkgconfig/QtSvg.pc
12lib/pkgconfig/QtTest.pc 12lib/pkgconfig/QtTest.pc
13lib/pkgconfig/QtWebKit.pc 13lib/pkgconfig/QtWebKit.pc
14lib/pkgconfig/QtXml.pc 14lib/pkgconfig/QtXml.pc
 15lib/pkgconfig/QtXmlPatterns.pc
15qt4/bin/moc 16qt4/bin/moc
16qt4/bin/rcc 17qt4/bin/rcc
17qt4/bin/uic 18qt4/bin/uic
18qt4/bin/uic3 19qt4/bin/uic3
19qt4/lib/libQt3Support.la 20qt4/lib/libQt3Support.la
20qt4/lib/libQtCore.la 21qt4/lib/libQtCore.la
21qt4/lib/libQtGui.la 22qt4/lib/libQtGui.la
22qt4/lib/libQtMultimedia.la 23qt4/lib/libQtMultimedia.la
23qt4/lib/libQtNetwork.la 24qt4/lib/libQtNetwork.la
24qt4/lib/libQtOpenGL.la 25qt4/lib/libQtOpenGL.la
25qt4/lib/libQtScript.la 26qt4/lib/libQtScript.la
26qt4/lib/libQtScriptTools.la 27qt4/lib/libQtScriptTools.la
27qt4/lib/libQtSql.la 28qt4/lib/libQtSql.la
28qt4/lib/libQtSvg.la 29qt4/lib/libQtSvg.la
29qt4/lib/libQtTest.la 30qt4/lib/libQtTest.la
30qt4/lib/libQtWebKit.la 31qt4/lib/libQtWebKit.la
31qt4/lib/libQtXml.la 32qt4/lib/libQtXml.la
 33qt4/lib/libQtXmlPatterns.la
32qt4/plugins/accessible/libqtaccessiblecompatwidgets.la 34qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
33qt4/plugins/accessible/libqtaccessiblewidgets.la 35qt4/plugins/accessible/libqtaccessiblewidgets.la
34qt4/plugins/codecs/libqcncodecs.la 36qt4/plugins/codecs/libqcncodecs.la
35qt4/plugins/codecs/libqjpcodecs.la 37qt4/plugins/codecs/libqjpcodecs.la
36qt4/plugins/codecs/libqkrcodecs.la 38qt4/plugins/codecs/libqkrcodecs.la
37qt4/plugins/codecs/libqtwcodecs.la 39qt4/plugins/codecs/libqtwcodecs.la
38qt4/plugins/graphicssystems/libqglgraphicssystem.la 40qt4/plugins/graphicssystems/libqglgraphicssystem.la
39qt4/plugins/graphicssystems/libqtracegraphicssystem.la 41qt4/plugins/graphicssystems/libqtracegraphicssystem.la
40qt4/plugins/iconengines/libqsvgicon.la 42qt4/plugins/iconengines/libqsvgicon.la
41qt4/plugins/imageformats/libqgif.la 43qt4/plugins/imageformats/libqgif.la
42qt4/plugins/imageformats/libqico.la 44qt4/plugins/imageformats/libqico.la
43qt4/plugins/imageformats/libqjpeg.la 45qt4/plugins/imageformats/libqjpeg.la
44qt4/plugins/imageformats/libqmng.la 
45qt4/plugins/imageformats/libqsvg.la 46qt4/plugins/imageformats/libqsvg.la
46qt4/plugins/inputmethods/libqimsw-multi.la 47qt4/plugins/inputmethods/libqimsw-multi.la
47qt4/q3porting.xml 48qt4/q3porting.xml
cvs diff -r1.16 -r1.17 pkgsrc/x11/qt4-libs/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/buildlink3.mk 2010/01/29 18:19:09 1.16
+++ pkgsrc/x11/qt4-libs/buildlink3.mk 2010/02/02 14:05:59 1.17
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1# $NetBSD: buildlink3.mk,v 1.16 2010/01/29 18:19:09 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.17 2010/02/02 14:05:59 adam Exp $
2 2
3BUILDLINK_TREE+= qt4-libs 3BUILDLINK_TREE+= qt4-libs
4 4
5.if !defined(QT4_LIBS_BUILDLINK3_MK) 5.if !defined(QT4_LIBS_BUILDLINK3_MK)
6QT4_LIBS_BUILDLINK3_MK:= 6QT4_LIBS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.1.0 8BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb2
9BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.5.3nb3 9BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb2
10BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs 10BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs
11 11
12BUILDLINK_INCDIRS.qt4-libs+= qt4/include 12BUILDLINK_INCDIRS.qt4-libs+= qt4/include
13BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib 13BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib
14 14
15QTDIR= ${BUILDLINK_PREFIX.qt4-libs}/qt4 15QTDIR= ${BUILDLINK_PREFIX.qt4-libs}/qt4
16BUILDLINK_PASSTHRU_DIRS+= ${QTDIR} 16BUILDLINK_PASSTHRU_DIRS+= ${QTDIR}
17 17
18PTHREAD_OPTS+= require 18PTHREAD_OPTS+= require
19 19
20.include "../../mk/bsd.fast.prefs.mk" 20.include "../../mk/bsd.fast.prefs.mk"
21 21
22.include "../../fonts/fontconfig/buildlink3.mk" 22.include "../../fonts/fontconfig/buildlink3.mk"
23.include "../../graphics/freetype2/buildlink3.mk" 23.include "../../graphics/freetype2/buildlink3.mk"
24.include "../../graphics/glu/buildlink3.mk" 24.include "../../graphics/glu/buildlink3.mk"
25.include "../../graphics/jpeg/buildlink3.mk" 25.include "../../graphics/jpeg/buildlink3.mk"
26.include "../../graphics/mng/buildlink3.mk" 
27.include "../../graphics/png/buildlink3.mk" 26.include "../../graphics/png/buildlink3.mk"
28.include "../../x11/libSM/buildlink3.mk" 27.include "../../x11/libSM/buildlink3.mk"
29.include "../../x11/libXcursor/buildlink3.mk" 28.include "../../x11/libXcursor/buildlink3.mk"
30.include "../../x11/libXft/buildlink3.mk" 29.include "../../x11/libXft/buildlink3.mk"
31.include "../../x11/libXmu/buildlink3.mk" 30.include "../../x11/libXmu/buildlink3.mk"
32.include "../../x11/libXrandr/buildlink3.mk" 31.include "../../x11/libXrandr/buildlink3.mk"
33.if ${X11_TYPE} == "modular" 32.if ${X11_TYPE} == "modular"
34.include "../../x11/libXinerama/buildlink3.mk" 33.include "../../x11/libXinerama/buildlink3.mk"
35.endif 34.endif
36.include "../../mk/pthread.buildlink3.mk" 35.include "../../mk/pthread.buildlink3.mk"
37 36
38pkgbase := qt4-libs 37pkgbase := qt4-libs
39.include "../../mk/pkg-build-options.mk" 38.include "../../mk/pkg-build-options.mk"
cvs diff -r1.29 -r1.30 pkgsrc/x11/qt4-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/Makefile 2010/01/29 18:19:09 1.29
+++ pkgsrc/x11/qt4-tools/Makefile 2010/02/02 14:06:00 1.30
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.29 2010/01/29 18:19:09 adam Exp $ 1# $NetBSD: Makefile,v 1.30 2010/02/02 14:06:00 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-tools-${QTVERSION} 7PKGNAME= qt4-tools-${QTVERSION}
 8PKGREVISION= 1
8COMMENT= QT GUI (WYSIWYG) builder and other tools 9COMMENT= QT GUI (WYSIWYG) builder and other tools
9 10
10DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base 11DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
11 12
12CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib 13CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib
13CONFIGURE_ARGS+= -DQT_NO_DBUS 14CONFIGURE_ARGS+= -DQT_NO_DBUS
14 15
15# XXX this is to test what really gets installed when 'do-install' is disabled 16# XXX this is to test what really gets installed when 'do-install' is disabled
16INSTALL_DIRS+= tools 17INSTALL_DIRS+= tools
17 18
18BUILD_TARGET= sub-tools-bootstrap sub-tools 19BUILD_TARGET= sub-tools-bootstrap sub-tools
19 20
20BUILD_QT4= yes 21BUILD_QT4= yes