Thu Jan 18 09:15:29 2018 UTC ()
qt5-qtbase: remove references to qt5-qtquick1 and qt5-sqlite3


(markd)
diff -r1.23 -r1.24 pkgsrc/x11/qt5-qtbase/Makefile.common
cvs diff -r1.23 -r1.24 pkgsrc/x11/qt5-qtbase/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile.common 2018/01/18 08:02:55 1.23
+++ pkgsrc/x11/qt5-qtbase/Makefile.common 2018/01/18 09:15:29 1.24
@@ -1,39 +1,37 @@ @@ -1,39 +1,37 @@
1# $NetBSD: Makefile.common,v 1.23 2018/01/18 08:02:55 adam Exp $ 1# $NetBSD: Makefile.common,v 1.24 2018/01/18 09:15:29 markd Exp $
2# used by x11/qt5-mysql/Makefile 2# used by x11/qt5-mysql/Makefile
3# used by x11/qt5-odbc/Makefile 3# used by x11/qt5-odbc/Makefile
4# used by x11/qt5-psql/Makefile 4# used by x11/qt5-psql/Makefile
5# used by x11/qt5-qtbase/Makefile 5# used by x11/qt5-qtbase/Makefile
6# used by x11/qt5-qtdeclarative/Makefile 6# used by x11/qt5-qtdeclarative/Makefile
7# used by x11/qt5-qtdoc/Makefile 7# used by x11/qt5-qtdoc/Makefile
8# used by x11/qt5-qtgraphicaleffects/Makefile 8# used by x11/qt5-qtgraphicaleffects/Makefile
9# used by x11/qt5-qtimageformats/Makefile 9# used by x11/qt5-qtimageformats/Makefile
10# used by x11/qt5-qtlocation/Makefile 10# used by x11/qt5-qtlocation/Makefile
11# used by x11/qt5-qtmacextras/Makefile 11# used by x11/qt5-qtmacextras/Makefile
12# used by x11/qt5-qtmultimedia/Makefile 12# used by x11/qt5-qtmultimedia/Makefile
13# used by x11/qt5-qtquick1/Makefile 
14# used by x11/qt5-qtquickcontrols/Makefile 13# used by x11/qt5-qtquickcontrols/Makefile
15# used by x11/qt5-qtscript/Makefile 14# used by x11/qt5-qtscript/Makefile
16# used by x11/qt5-qtsensors/Makefile 15# used by x11/qt5-qtsensors/Makefile
17# used by x11/qt5-qtserialport/Makefile 16# used by x11/qt5-qtserialport/Makefile
18# used by x11/qt5-qtsvg/Makefile 17# used by x11/qt5-qtsvg/Makefile
19# used by x11/qt5-qttools/Makefile 18# used by x11/qt5-qttools/Makefile
20# used by x11/qt5-qttranslations/Makefile 19# used by x11/qt5-qttranslations/Makefile
21# used by x11/qt5-qtwebchannel/Makefile 20# used by x11/qt5-qtwebchannel/Makefile
22# used by x11/qt5-qtwebkit/Makefile 21# used by x11/qt5-qtwebkit/Makefile
23# used by x11/qt5-qtwebsockets/Makefile 22# used by x11/qt5-qtwebsockets/Makefile
24# used by x11/qt5-qtx11extras/Makefile 23# used by x11/qt5-qtx11extras/Makefile
25# used by x11/qt5-qtxmlpatterns/Makefile 24# used by x11/qt5-qtxmlpatterns/Makefile
26# used by x11/qt5-sqlite3/Makefile 
27 25
28.include "../../x11/qt5/Makefile.common" 26.include "../../x11/qt5/Makefile.common"
29.include "options.mk" 27.include "options.mk"
30 28
31.include "../../mk/dlopen.buildlink3.mk" 29.include "../../mk/dlopen.buildlink3.mk"
32BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} 30BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
33 31
34USE_LANGUAGES= c c++11 32USE_LANGUAGES= c c++11
35USE_TOOLS+= gmake perl:build pkg-config 33USE_TOOLS+= gmake perl:build pkg-config
36 34
37# wcstof(3) etc. is used in C++ code. 35# wcstof(3) etc. is used in C++ code.
38CFLAGS.NetBSD+= -D_NETBSD_SOURCE 36CFLAGS.NetBSD+= -D_NETBSD_SOURCE
39 37
@@ -50,17 +48,17 @@ PLIST_VARS+= jit mac unix @@ -50,17 +48,17 @@ PLIST_VARS+= jit mac unix
50PLIST.mac= yes 48PLIST.mac= yes
51.else 49.else
52PLIST.unix= yes 50PLIST.unix= yes
53.endif 51.endif
54.if ${OPSYS} != "NetBSD" 52.if ${OPSYS} != "NetBSD"
55PLIST.jit= yes 53PLIST.jit= yes
56.endif 54.endif
57 55
58# avoid creating a .qt directory in the users home directory 56# avoid creating a .qt directory in the users home directory
59SCRIPTS_ENV+= HOME=${WRKDIR} 57SCRIPTS_ENV+= HOME=${WRKDIR}
60 58
61.if empty(PKGPATH:Mx11/qt5-qtbase) \ 59.if empty(PKGPATH:Mx11/qt5-qtbase) \
62 && empty(PKGPATH:Mx11/qt5-odbc) && empty(PKGPATH:Mx11/qt5-mysql) \ 60 && empty(PKGPATH:Mx11/qt5-odbc) && empty(PKGPATH:Mx11/qt5-mysql) \
63 && empty(PKGPATH:Mx11/qt5-psql) && empty(PKGPATH:Mx11/qt5-sqlite3) 61 && empty(PKGPATH:Mx11/qt5-psql)
64do-configure: 62do-configure:
65 cd ${WRKSRC} && ${QTPREFIX}/bin/qmake -o Makefile 63 cd ${WRKSRC} && ${QTPREFIX}/bin/qmake -o Makefile
66.endif 64.endif