Tue Aug 19 10:31:14 2014 UTC ()
When installing mkspecs using 'cp -R' specify what should happen
to symlinks by adding '-L'. (The default is undefined per POSIX.)
This way, SunOS and other opsys have the same PLIST and we don't have
to care that buildlink3 doesn't symlink symlinks.

Addresses
https://mail-index.netbsd.org/tech-pkg/2012/01/21/msg008411.html

Solution suggested by Niclas Rosenvik in private mail.

Bump PKGREVISION.


(wiz)
diff -r1.63 -r1.64 pkgsrc/x11/qt4-tools/Makefile
diff -r1.34 -r1.35 pkgsrc/x11/qt4-tools/PLIST
cvs diff -r1.63 -r1.64 pkgsrc/x11/qt4-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/Makefile 2014/02/12 23:18:55 1.63
+++ pkgsrc/x11/qt4-tools/Makefile 2014/08/19 10:31:14 1.64
@@ -1,50 +1,43 @@ @@ -1,50 +1,43 @@
1# $NetBSD: Makefile,v 1.63 2014/02/12 23:18:55 tron Exp $ 1# $NetBSD: Makefile,v 1.64 2014/08/19 10:31:14 wiz Exp $
2 2
3.include "../../x11/qt4-libs/Makefile.common" 3.include "../../x11/qt4-libs/Makefile.common"
4 4
5PKGNAME= qt4-tools-${QTVERSION} 5PKGNAME= qt4-tools-${QTVERSION}
6PKGREVISION= 1 6PKGREVISION= 2
7COMMENT= QT GUI (WYSIWYG) builder and other tools 7COMMENT= QT GUI (WYSIWYG) builder and other tools
8 8
9DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base 9DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
10 10
11CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib 11CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib
12CONFIGURE_ARGS+= -DQT_NO_DBUS 12CONFIGURE_ARGS+= -DQT_NO_DBUS
13 13
14# XXX this is to test what really gets installed when 'do-install' is disabled 14# XXX this is to test what really gets installed when 'do-install' is disabled
15INSTALL_DIRS+= tools 15INSTALL_DIRS+= tools
16 16
17BUILD_TARGET= sub-tools-bootstrap sub-tools 17BUILD_TARGET= sub-tools-bootstrap sub-tools
18 18
19BUILD_QT4= yes 19BUILD_QT4= yes
20UNLIMIT_RESOURCES= datasize 20UNLIMIT_RESOURCES= datasize
21 21
22INSTALLATION_DIRS= lib/pkgconfig 22INSTALLATION_DIRS= lib/pkgconfig
23INSTALLATION_DIRS+= ${QTPREFIX}/bin 23INSTALLATION_DIRS+= ${QTPREFIX}/bin
24INSTALLATION_DIRS+= ${QTPREFIX}/lib 24INSTALLATION_DIRS+= ${QTPREFIX}/lib
25INSTALLATION_DIRS+= ${QTPREFIX}/phrasebooks 25INSTALLATION_DIRS+= ${QTPREFIX}/phrasebooks
26INSTALLATION_DIRS+= ${QTPREFIX}/plugins/designer 26INSTALLATION_DIRS+= ${QTPREFIX}/plugins/designer
27INSTALLATION_DIRS+= ${QTPREFIX}/mkspecs 27INSTALLATION_DIRS+= ${QTPREFIX}/mkspecs
28INSTALLATION_DIRS+= ${QTPREFIX}/tools/qdoc3 28INSTALLATION_DIRS+= ${QTPREFIX}/tools/qdoc3
29INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 29INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
30 30
31PLIST_VARS+= notSunOS SunOS 
32.if ${OPSYS} == "SunOS" 
33PLIST.SunOS= yes 
34.else 
35PLIST.notSunOS= yes 
36.endif 
37 
38post-configure: 31post-configure:
39 ln -sf ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc 32 ln -sf ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc
40 ln -sf ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic 33 ln -sf ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic
41 ln -sf ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc 34 ln -sf ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc
42 35
43QTPROG_BIN= lconvert lrelease lupdate pixeltool qdoc3 qmake qt3to4 36QTPROG_BIN= lconvert lrelease lupdate pixeltool qdoc3 qmake qt3to4
44QTPROG_BIN+= qttracereplay xmlpatterns xmlpatternsvalidator 37QTPROG_BIN+= qttracereplay xmlpatterns xmlpatternsvalidator
45QTPROG_LT= qcollectiongenerator qhelpconverter qhelpgenerator 38QTPROG_LT= qcollectiongenerator qhelpconverter qhelpgenerator
46.if ${OPSYS} == "Darwin" 39.if ${OPSYS} == "Darwin"
47QTPROG_BIN+= QMLViewer macdeployqt 40QTPROG_BIN+= QMLViewer macdeployqt
48QTPROG_LT+= Assistant Designer Linguist 41QTPROG_LT+= Assistant Designer Linguist
49.else 42.else
50QTPROG_BIN+= qmlviewer qtconfig 43QTPROG_BIN+= qmlviewer qtconfig
@@ -69,19 +62,19 @@ do-install: @@ -69,19 +62,19 @@ do-install:
69 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${f}.la \ 62 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${f}.la \
70 ${DESTDIR}${QTPREFIX}/lib/ 63 ${DESTDIR}${QTPREFIX}/lib/
71 sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ 64 sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
72 ${WRKSRC}/lib/pkgconfig/${f}.pc > ${WRKDIR}/${f}.pc 65 ${WRKSRC}/lib/pkgconfig/${f}.pc > ${WRKDIR}/${f}.pc
73 ${INSTALL_DATA} ${WRKDIR}/${f}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ 66 ${INSTALL_DATA} ${WRKDIR}/${f}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
74.endfor 67.endfor
75.for f in qdeclarativeview qt3supportwidgets qwebview 68.for f in qdeclarativeview qt3supportwidgets qwebview
76 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 69 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
77 ${WRKSRC}/plugins/designer/lib${f}.la \ 70 ${WRKSRC}/plugins/designer/lib${f}.la \
78 ${DESTDIR}${QTPREFIX}/plugins/designer/ 71 ${DESTDIR}${QTPREFIX}/plugins/designer/
79.endfor 72.endfor
80 ${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \ 73 ${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \
81 ${DESTDIR}${QTPREFIX}/phrasebooks/ 74 ${DESTDIR}${QTPREFIX}/phrasebooks/
82 cp -R ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX} 75 cp -LR ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX}
83 76
84.include "../../converters/libiconv/buildlink3.mk" 77.include "../../converters/libiconv/buildlink3.mk"
85.include "../../security/openssl/buildlink3.mk" 78.include "../../security/openssl/buildlink3.mk"
86.include "../../x11/qt4-libs/buildlink3.mk" 79.include "../../x11/qt4-libs/buildlink3.mk"
87.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"
cvs diff -r1.34 -r1.35 pkgsrc/x11/qt4-tools/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/PLIST 2014/07/22 17:01:52 1.34
+++ pkgsrc/x11/qt4-tools/PLIST 2014/08/19 10:31:14 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.34 2014/07/22 17:01:52 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.35 2014/08/19 10:31:14 wiz 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
@@ -217,29 +217,28 @@ qt4/mkspecs/common/symbian/qplatformdefs @@ -217,29 +217,28 @@ qt4/mkspecs/common/symbian/qplatformdefs
217qt4/mkspecs/common/symbian/stl-off/new 217qt4/mkspecs/common/symbian/stl-off/new
218qt4/mkspecs/common/symbian/symbian-makefile.conf 218qt4/mkspecs/common/symbian/symbian-makefile.conf
219qt4/mkspecs/common/symbian/symbian-mmp.conf 219qt4/mkspecs/common/symbian/symbian-mmp.conf
220qt4/mkspecs/common/symbian/symbian.conf 220qt4/mkspecs/common/symbian/symbian.conf
221qt4/mkspecs/common/symbian/symbianincludes.h 221qt4/mkspecs/common/symbian/symbianincludes.h
222qt4/mkspecs/common/symbian/template.applite 222qt4/mkspecs/common/symbian/template.applite
223qt4/mkspecs/common/unix.conf 223qt4/mkspecs/common/unix.conf
224qt4/mkspecs/common/wince/qmake.conf 224qt4/mkspecs/common/wince/qmake.conf
225qt4/mkspecs/common/wince/qplatformdefs.h 225qt4/mkspecs/common/wince/qplatformdefs.h
226qt4/mkspecs/cygwin-g++/qmake.conf 226qt4/mkspecs/cygwin-g++/qmake.conf
227qt4/mkspecs/cygwin-g++/qplatformdefs.h 227qt4/mkspecs/cygwin-g++/qplatformdefs.h
228qt4/mkspecs/darwin-g++/qmake.conf 228qt4/mkspecs/darwin-g++/qmake.conf
229qt4/mkspecs/darwin-g++/qplatformdefs.h 229qt4/mkspecs/darwin-g++/qplatformdefs.h
230${PLIST.notSunOS}qt4/mkspecs/default 230qt4/mkspecs/default/qmake.conf
231${PLIST.SunOS}qt4/mkspecs/default/qmake.conf 231qt4/mkspecs/default/qplatformdefs.h
232${PLIST.SunOS}qt4/mkspecs/default/qplatformdefs.h 
233qt4/mkspecs/features/build_pass.prf 232qt4/mkspecs/features/build_pass.prf
234qt4/mkspecs/features/dbusadaptors.prf 233qt4/mkspecs/features/dbusadaptors.prf
235qt4/mkspecs/features/dbusinterfaces.prf 234qt4/mkspecs/features/dbusinterfaces.prf
236qt4/mkspecs/features/debug.prf 235qt4/mkspecs/features/debug.prf
237qt4/mkspecs/features/debug_and_release.prf 236qt4/mkspecs/features/debug_and_release.prf
238qt4/mkspecs/features/declarative_debug.prf 237qt4/mkspecs/features/declarative_debug.prf
239qt4/mkspecs/features/default_post.prf 238qt4/mkspecs/features/default_post.prf
240qt4/mkspecs/features/default_pre.prf 239qt4/mkspecs/features/default_pre.prf
241qt4/mkspecs/features/designer.prf 240qt4/mkspecs/features/designer.prf
242qt4/mkspecs/features/device_config.prf 241qt4/mkspecs/features/device_config.prf
243qt4/mkspecs/features/dll.prf 242qt4/mkspecs/features/dll.prf
244qt4/mkspecs/features/egl.prf 243qt4/mkspecs/features/egl.prf
245qt4/mkspecs/features/enable_backup.prf 244qt4/mkspecs/features/enable_backup.prf