Wed Sep 14 18:12:57 2011 UTC ()
Fix build on SunOS.


(hans)
diff -r1.46 -r1.47 pkgsrc/x11/qt4-tools/Makefile
diff -r1.26 -r1.27 pkgsrc/x11/qt4-tools/PLIST
cvs diff -r1.46 -r1.47 pkgsrc/x11/qt4-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/Makefile 2011/09/04 15:42:52 1.46
+++ pkgsrc/x11/qt4-tools/Makefile 2011/09/14 18:12:57 1.47
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.46 2011/09/04 15:42:52 adam Exp $ 1# $NetBSD: Makefile,v 1.47 2011/09/14 18:12:57 hans 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}
8COMMENT= QT GUI (WYSIWYG) builder and other tools 8COMMENT= QT GUI (WYSIWYG) builder and other tools
9 9
10DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base 10DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
11 11
12CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib 12CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib
13CONFIGURE_ARGS+= -DQT_NO_DBUS 13CONFIGURE_ARGS+= -DQT_NO_DBUS
14 14
@@ -19,26 +19,33 @@ BUILD_TARGET= sub-tools-bootstrap sub-t @@ -19,26 +19,33 @@ BUILD_TARGET= sub-tools-bootstrap sub-t
19 19
20BUILD_QT4= yes 20BUILD_QT4= yes
21UNLIMIT_RESOURCES= datasize 21UNLIMIT_RESOURCES= datasize
22 22
23INSTALLATION_DIRS= lib/pkgconfig 23INSTALLATION_DIRS= lib/pkgconfig
24INSTALLATION_DIRS+= ${QTPREFIX}/bin 24INSTALLATION_DIRS+= ${QTPREFIX}/bin
25INSTALLATION_DIRS+= ${QTPREFIX}/lib 25INSTALLATION_DIRS+= ${QTPREFIX}/lib
26INSTALLATION_DIRS+= ${QTPREFIX}/phrasebooks 26INSTALLATION_DIRS+= ${QTPREFIX}/phrasebooks
27INSTALLATION_DIRS+= ${QTPREFIX}/plugins/designer 27INSTALLATION_DIRS+= ${QTPREFIX}/plugins/designer
28INSTALLATION_DIRS+= ${QTPREFIX}/mkspecs 28INSTALLATION_DIRS+= ${QTPREFIX}/mkspecs
29INSTALLATION_DIRS+= ${QTPREFIX}/tools/qdoc3 29INSTALLATION_DIRS+= ${QTPREFIX}/tools/qdoc3
30INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 30INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
31 31
 32PLIST_VARS+= notSunOS SunOS
 33.if ${OPSYS} == "SunOS"
 34PLIST.SunOS= yes
 35.else
 36PLIST.notSunOS= yes
 37.endif
 38
32post-configure: 39post-configure:
33 ln -sf ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc 40 ln -sf ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc
34 ln -sf ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic 41 ln -sf ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic
35 ln -sf ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc 42 ln -sf ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc
36 43
37QTPROG_BIN= lconvert lrelease lupdate pixeltool qdoc3 qmake qt3to4 44QTPROG_BIN= lconvert lrelease lupdate pixeltool qdoc3 qmake qt3to4
38QTPROG_BIN+= qttracereplay xmlpatterns xmlpatternsvalidator 45QTPROG_BIN+= qttracereplay xmlpatterns xmlpatternsvalidator
39QTPROG_LT= qcollectiongenerator qhelpconverter qhelpgenerator 46QTPROG_LT= qcollectiongenerator qhelpconverter qhelpgenerator
40.if ${OPSYS} == "Darwin" 47.if ${OPSYS} == "Darwin"
41QTPROG_BIN+= QMLViewer macdeployqt 48QTPROG_BIN+= QMLViewer macdeployqt
42QTPROG_LT+= Assistant Designer Linguist 49QTPROG_LT+= Assistant Designer Linguist
43.else 50.else
44QTPROG_BIN+= qmlviewer qtconfig 51QTPROG_BIN+= qmlviewer qtconfig
cvs diff -r1.26 -r1.27 pkgsrc/x11/qt4-tools/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/PLIST 2011/09/04 15:42:52 1.26
+++ pkgsrc/x11/qt4-tools/PLIST 2011/09/14 18:12:57 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.26 2011/09/04 15:42:52 adam Exp $ 1@comment $NetBSD: PLIST,v 1.27 2011/09/14 18:12:57 hans Exp $
2lib/pkgconfig/QtCLucene.pc 2lib/pkgconfig/QtCLucene.pc
3lib/pkgconfig/QtDesigner.pc 3lib/pkgconfig/QtDesigner.pc
4lib/pkgconfig/QtDesignerComponents.pc 4lib/pkgconfig/QtDesignerComponents.pc
5lib/pkgconfig/QtHelp.pc 5lib/pkgconfig/QtHelp.pc
6lib/pkgconfig/QtUiTools.pc 6lib/pkgconfig/QtUiTools.pc
7qt4/bin/assistant 7qt4/bin/assistant
8qt4/bin/designer 8qt4/bin/designer
9qt4/bin/lconvert 9qt4/bin/lconvert
10qt4/bin/linguist 10qt4/bin/linguist
11qt4/bin/lrelease 11qt4/bin/lrelease
12qt4/bin/lupdate 12qt4/bin/lupdate
13${PLIST.mac}qt4/bin/macdeployqt 13${PLIST.mac}qt4/bin/macdeployqt
14qt4/bin/pixeltool 14qt4/bin/pixeltool
@@ -185,27 +185,29 @@ qt4/mkspecs/common/symbian/qplatformdefs @@ -185,27 +185,29 @@ qt4/mkspecs/common/symbian/qplatformdefs
185qt4/mkspecs/common/symbian/stl-off/new 185qt4/mkspecs/common/symbian/stl-off/new
186qt4/mkspecs/common/symbian/symbian-makefile.conf 186qt4/mkspecs/common/symbian/symbian-makefile.conf
187qt4/mkspecs/common/symbian/symbian-mmp.conf 187qt4/mkspecs/common/symbian/symbian-mmp.conf
188qt4/mkspecs/common/symbian/symbian.conf 188qt4/mkspecs/common/symbian/symbian.conf
189qt4/mkspecs/common/symbian/symbianincludes.h 189qt4/mkspecs/common/symbian/symbianincludes.h
190qt4/mkspecs/common/symbian/template.applite 190qt4/mkspecs/common/symbian/template.applite
191qt4/mkspecs/common/unix.conf 191qt4/mkspecs/common/unix.conf
192qt4/mkspecs/common/wince/qmake.conf 192qt4/mkspecs/common/wince/qmake.conf
193qt4/mkspecs/common/wince/qplatformdefs.h 193qt4/mkspecs/common/wince/qplatformdefs.h
194qt4/mkspecs/cygwin-g++/qmake.conf 194qt4/mkspecs/cygwin-g++/qmake.conf
195qt4/mkspecs/cygwin-g++/qplatformdefs.h 195qt4/mkspecs/cygwin-g++/qplatformdefs.h
196qt4/mkspecs/darwin-g++/qmake.conf 196qt4/mkspecs/darwin-g++/qmake.conf
197qt4/mkspecs/darwin-g++/qplatformdefs.h 197qt4/mkspecs/darwin-g++/qplatformdefs.h
198qt4/mkspecs/default 198${PLIST.notSunOS}qt4/mkspecs/default
 199${PLIST.SunOS}qt4/mkspecs/default/qmake.conf
 200${PLIST.SunOS}qt4/mkspecs/default/qplatformdefs.h
199qt4/mkspecs/features/build_pass.prf 201qt4/mkspecs/features/build_pass.prf
200qt4/mkspecs/features/dbusadaptors.prf 202qt4/mkspecs/features/dbusadaptors.prf
201qt4/mkspecs/features/dbusinterfaces.prf 203qt4/mkspecs/features/dbusinterfaces.prf
202qt4/mkspecs/features/debug.prf 204qt4/mkspecs/features/debug.prf
203qt4/mkspecs/features/debug_and_release.prf 205qt4/mkspecs/features/debug_and_release.prf
204qt4/mkspecs/features/default_post.prf 206qt4/mkspecs/features/default_post.prf
205qt4/mkspecs/features/default_pre.prf 207qt4/mkspecs/features/default_pre.prf
206qt4/mkspecs/features/designer.prf 208qt4/mkspecs/features/designer.prf
207qt4/mkspecs/features/dll.prf 209qt4/mkspecs/features/dll.prf
208qt4/mkspecs/features/egl.prf 210qt4/mkspecs/features/egl.prf
209qt4/mkspecs/features/exclusive_builds.prf 211qt4/mkspecs/features/exclusive_builds.prf
210qt4/mkspecs/features/help.prf 212qt4/mkspecs/features/help.prf
211qt4/mkspecs/features/include_source_dir.prf 213qt4/mkspecs/features/include_source_dir.prf