From 93b90c42e3b7f15cc9ca20b156ba5b397f96c225 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sat, 21 Nov 2020 18:18:34 +0000 Subject: [PATCH] Only define USE_LDCONFIG in devel/qt5-core All the qt5-ports share the same library directory. devel/qt5-core is dependet on by all others. So there is no need to add identical entries to libdata/ldconfig, and restart the ldconfig service on every pkg change of those ports. Reported by: bapt Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D27224 --- comms/qt5-connectivity/Makefile | 2 +- comms/qt5-sensors/Makefile | 2 +- comms/qt5-serialbus/Makefile | 2 +- comms/qt5-serialport/Makefile | 2 +- databases/qt5-sql/Makefile | 2 +- devel/qt5-buildtools/Makefile | 2 +- devel/qt5-concurrent/Makefile | 2 +- devel/qt5-dbus/Makefile | 2 +- devel/qt5-designer/Makefile | 2 +- devel/qt5-help/Makefile | 2 +- devel/qt5-location/Makefile | 2 +- devel/qt5-remoteobjects/Makefile | 2 +- devel/qt5-script/Makefile | 2 +- devel/qt5-scripttools/Makefile | 2 +- devel/qt5-scxml/Makefile | 2 +- devel/qt5-testlib/Makefile | 2 +- devel/qt5-uitools/Makefile | 2 +- graphics/qt5-3d/Makefile | 2 +- graphics/qt5-opengl/Makefile | 2 +- graphics/qt5-svg/Makefile | 2 +- graphics/qt5-wayland/Makefile | 2 +- multimedia/qt5-multimedia/Makefile | 2 +- net/qt5-network/Makefile | 2 +- net/qt5-networkauth/Makefile | 2 +- print/qt5-printsupport/Makefile | 2 +- textproc/qt5-xml/Makefile | 2 +- textproc/qt5-xmlpatterns/Makefile | 3 +-- www/qt5-webchannel/Makefile | 2 +- www/qt5-webengine/Makefile | 3 +-- www/qt5-webglplugin/Makefile | 2 +- www/qt5-websockets-qml/Makefile | 2 +- www/qt5-websockets/Makefile | 2 +- www/qt5-webview/Makefile | 2 +- x11-toolkits/qt5-datavis3d/Makefile | 2 +- x11-toolkits/qt5-declarative/Makefile | 3 +-- x11-toolkits/qt5-gamepad/Makefile | 3 +-- x11-toolkits/qt5-gui/Makefile | 3 +-- x11-toolkits/qt5-quick3d/Makefile | 2 +- x11-toolkits/qt5-quickcontrols/Makefile | 2 +- x11-toolkits/qt5-quickcontrols2/Makefile | 2 +- x11-toolkits/qt5-quicktimeline/Makefile | 2 +- x11-toolkits/qt5-virtualkeyboard/Makefile | 2 +- x11-toolkits/qt5-widgets/Makefile | 2 +- x11/qt5-x11extras/Makefile | 2 +- 44 files changed, 44 insertions(+), 49 deletions(-) diff --git a/comms/qt5-connectivity/Makefile b/comms/qt5-connectivity/Makefile index 95dad0a7d9aa..c367555173af 100644 --- a/comms/qt5-connectivity/Makefile +++ b/comms/qt5-connectivity/Makefile @@ -2,6 +2,7 @@ PORTNAME= connectivity DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt5- @@ -11,6 +12,5 @@ COMMENT= Qt connectivity (Bluetooth/NFC) module USES= compiler:c++11-lang qmake qt-dist:5,connectivity USE_QT= concurrent core declarative buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/comms/qt5-sensors/Makefile b/comms/qt5-sensors/Makefile index 556e740ec743..053f2c429e70 100644 --- a/comms/qt5-sensors/Makefile +++ b/comms/qt5-sensors/Makefile @@ -2,6 +2,7 @@ PORTNAME= sensors DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt5- @@ -11,6 +12,5 @@ COMMENT= Qt sensors module USES= compiler:c++11-lang qmake:norecursive qt-dist:5,sensors USE_QT= core declarative buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/comms/qt5-serialbus/Makefile b/comms/qt5-serialbus/Makefile index 0b7962796a7a..117b4eea2396 100644 --- a/comms/qt5-serialbus/Makefile +++ b/comms/qt5-serialbus/Makefile @@ -2,6 +2,7 @@ PORTNAME= serialbus DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt5- @@ -10,7 +11,6 @@ COMMENT= Qt functions to access industrial bus systems USES= compiler:c++11-lib qmake qt-dist:5,serialbus USE_QT= core network serialport buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_BINARIES= yes .include diff --git a/comms/qt5-serialport/Makefile b/comms/qt5-serialport/Makefile index 57d113647247..b023c386cedc 100644 --- a/comms/qt5-serialport/Makefile +++ b/comms/qt5-serialport/Makefile @@ -2,6 +2,7 @@ PORTNAME= serialport DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= comms PKGNAMEPREFIX= qt5- @@ -10,6 +11,5 @@ COMMENT= Qt functions to access serial ports USES= compiler:c++11-lang libtool qmake qt-dist:5,serialport USE_QT= core buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/databases/qt5-sql/Makefile b/databases/qt5-sql/Makefile index ae52f74ffee6..d9522aa77d70 100644 --- a/databases/qt5-sql/Makefile +++ b/databases/qt5-sql/Makefile @@ -2,6 +2,7 @@ PORTNAME= sql DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= qt5- @@ -12,7 +13,6 @@ USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff --git a/devel/qt5-buildtools/Makefile b/devel/qt5-buildtools/Makefile index 1a52fc412c0b..ea7fd82a860f 100644 --- a/devel/qt5-buildtools/Makefile +++ b/devel/qt5-buildtools/Makefile @@ -2,6 +2,7 @@ PORTNAME= buildtools DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -11,7 +12,6 @@ COMMENT= Qt build tools USES= compiler:c++11-lang libtool perl5 qmake:no_env qt-dist:5,base HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_BINARIES= yes BUILD_WRKSRC= ${WRKSRC}/src/tools/bootstrap diff --git a/devel/qt5-concurrent/Makefile b/devel/qt5-concurrent/Makefile index cc9b3a04fc51..099c9d81ea1a 100644 --- a/devel/qt5-concurrent/Makefile +++ b/devel/qt5-concurrent/Makefile @@ -2,6 +2,7 @@ PORTNAME= concurrent DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -12,7 +13,6 @@ USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff --git a/devel/qt5-dbus/Makefile b/devel/qt5-dbus/Makefile index a3dead557d91..f52fb123bd51 100644 --- a/devel/qt5-dbus/Makefile +++ b/devel/qt5-dbus/Makefile @@ -2,6 +2,7 @@ PORTNAME= dbus DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -14,7 +15,6 @@ USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff --git a/devel/qt5-designer/Makefile b/devel/qt5-designer/Makefile index 9cb92a8c9835..f9cdb36bffbe 100644 --- a/devel/qt5-designer/Makefile +++ b/devel/qt5-designer/Makefile @@ -2,6 +2,7 @@ PORTNAME= designer DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -11,7 +12,6 @@ COMMENT= Qt 5 graphical user interface designer USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= assistant_run core declarative gui network printsupport uiplugin \ widgets xml buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} DESKTOP_ENTRIES="Qt 5 Designer" "" \ "${PREFIX}/share/pixmaps/designer-qt5.png" \ diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile index 29518eebba58..2f449d8f5743 100644 --- a/devel/qt5-help/Makefile +++ b/devel/qt5-help/Makefile @@ -2,6 +2,7 @@ PORTNAME= help DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -11,7 +12,6 @@ COMMENT= Qt online help integration module USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core gui network sql widgets \ buildtools_build sql-sqlite3_run -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_BINARIES= yes diff --git a/devel/qt5-location/Makefile b/devel/qt5-location/Makefile index 4deabe000ac1..5f490cac2a8c 100644 --- a/devel/qt5-location/Makefile +++ b/devel/qt5-location/Makefile @@ -2,6 +2,7 @@ PORTNAME= location DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -12,6 +13,5 @@ USES= compiler:c++11-lang qmake:norecursive qt-dist:5,location USE_QT= concurrent core dbus declarative gui network serialport \ buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/devel/qt5-remoteobjects/Makefile b/devel/qt5-remoteobjects/Makefile index efbca1f1682a..61b3dab64674 100644 --- a/devel/qt5-remoteobjects/Makefile +++ b/devel/qt5-remoteobjects/Makefile @@ -2,6 +2,7 @@ PORTNAME= remoteobjects DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -12,7 +13,6 @@ USES= compiler:c++11-lang gl qmake qt-dist:5 USE_GL= gl USE_QT= core declarative network \ buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_BINARIES= yes diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile index fa519ba36781..4a1b1f421172 100644 --- a/devel/qt5-script/Makefile +++ b/devel/qt5-script/Makefile @@ -2,6 +2,7 @@ PORTNAME= script DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -13,7 +14,6 @@ USE_QT= core buildtools_build # Keep make(1) from descending into src/script/obj/ (qmake:outsource # doesn't work). MAKE_ENV= MAKEOBJDIR=. -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} post-patch: @${REINPLACE_CMD} -e '/scripttools/ d' \ diff --git a/devel/qt5-scripttools/Makefile b/devel/qt5-scripttools/Makefile index 057be36faf30..750044feb3e9 100644 --- a/devel/qt5-scripttools/Makefile +++ b/devel/qt5-scripttools/Makefile @@ -2,6 +2,7 @@ PORTNAME= scripttools DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -10,7 +11,6 @@ COMMENT= Qt Script additional components USES= compiler:c++11-lang qmake qt-dist:5,script USE_QT= core gui script widgets buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME} diff --git a/devel/qt5-scxml/Makefile b/devel/qt5-scxml/Makefile index 1551affa80cb..43ad5ff720a2 100644 --- a/devel/qt5-scxml/Makefile +++ b/devel/qt5-scxml/Makefile @@ -2,6 +2,7 @@ PORTNAME= scxml DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -10,7 +11,6 @@ COMMENT= Qt5 SXCML module USES= compiler:c++11-lang qmake qt-dist:5,scxml USE_QT= core declarative network buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_BINARIES= yes diff --git a/devel/qt5-testlib/Makefile b/devel/qt5-testlib/Makefile index 52a3d32e83a0..e8b2fcd7b022 100644 --- a/devel/qt5-testlib/Makefile +++ b/devel/qt5-testlib/Makefile @@ -2,6 +2,7 @@ PORTNAME= testlib DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -12,7 +13,6 @@ USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff --git a/devel/qt5-uitools/Makefile b/devel/qt5-uitools/Makefile index 7bca3c5cdc0a..5bd0e6e515ef 100644 --- a/devel/qt5-uitools/Makefile +++ b/devel/qt5-uitools/Makefile @@ -2,6 +2,7 @@ PORTNAME= uitools DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -10,7 +11,6 @@ COMMENT= Qt Designer UI forms support module USES= compiler:c++11-lang qmake qt-dist:5,tools USE_QT= core gui uiplugin widgets buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile index f9989f94f98c..b44f09907606 100644 --- a/graphics/qt5-3d/Makefile +++ b/graphics/qt5-3d/Makefile @@ -2,6 +2,7 @@ PORTNAME= 3d DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- @@ -13,7 +14,6 @@ LIB_DEPENDS= libassimp.so:multimedia/assimp USES= compiler:c++11-lang pkgconfig qmake:norecursive qt-dist:5,3d USE_QT= concurrent core declarative gui network buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_BINARIES= yes diff --git a/graphics/qt5-opengl/Makefile b/graphics/qt5-opengl/Makefile index be001a76ef30..dec7b76e427c 100644 --- a/graphics/qt5-opengl/Makefile +++ b/graphics/qt5-opengl/Makefile @@ -2,6 +2,7 @@ PORTNAME= opengl DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- @@ -12,7 +13,6 @@ USES= compiler:c++11-lang gl qmake:no_env qt-dist:5,base USE_GL= gl USE_QT= core gui widgets qmake_build buildtools_build HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff --git a/graphics/qt5-svg/Makefile b/graphics/qt5-svg/Makefile index b0a2e193dbeb..5eb0c1cce477 100644 --- a/graphics/qt5-svg/Makefile +++ b/graphics/qt5-svg/Makefile @@ -2,6 +2,7 @@ PORTNAME= svg DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- @@ -10,6 +11,5 @@ COMMENT= Qt SVG support module USES= compiler:c++11-lang qmake qt-dist:5,svg USE_QT= core gui widgets buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile index 8732a551d57f..ec4147da5959 100644 --- a/graphics/qt5-wayland/Makefile +++ b/graphics/qt5-wayland/Makefile @@ -2,6 +2,7 @@ PORTNAME= wayland DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- @@ -22,7 +23,6 @@ USE_QT= core dbus gui declarative \ buildtools_build qmake_build USE_XORG= x11 xcomposite -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_BINARIES= yes diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile index 9d9d6eccffa8..08840344375a 100644 --- a/multimedia/qt5-multimedia/Makefile +++ b/multimedia/qt5-multimedia/Makefile @@ -2,6 +2,7 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- @@ -17,7 +18,6 @@ USE_GNOME= glib20 USE_QT= core declarative gui network opengl widgets \ buildtools_build USE_XORG= x11 xext xv -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_CONFIG= xlib diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile index f13994cfbbb2..9e9a7b002230 100644 --- a/net/qt5-network/Makefile +++ b/net/qt5-network/Makefile @@ -2,6 +2,7 @@ PORTNAME= network DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= net PKGNAMEPREFIX= qt5- @@ -14,7 +15,6 @@ USES= compiler:c++11-lang qmake:no_env qt-dist:5,base ssl USE_QT= core buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff --git a/net/qt5-networkauth/Makefile b/net/qt5-networkauth/Makefile index 0624c150acde..9fca9c5e0837 100644 --- a/net/qt5-networkauth/Makefile +++ b/net/qt5-networkauth/Makefile @@ -2,6 +2,7 @@ PORTNAME= networkauth DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= net PKGNAMEPREFIX= qt5- @@ -11,6 +12,5 @@ COMMENT= Qt network auth module USES= compiler:c++11-lang qmake:no_env qt-dist:5 USE_QT= core network \ buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/print/qt5-printsupport/Makefile b/print/qt5-printsupport/Makefile index 6cd3c690753c..c08328113a82 100644 --- a/print/qt5-printsupport/Makefile +++ b/print/qt5-printsupport/Makefile @@ -2,6 +2,7 @@ PORTNAME= printsupport DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= print PKGNAMEPREFIX= qt5- @@ -11,7 +12,6 @@ COMMENT= Qt print support module USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core gui widgets qmake_build buildtools_build HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff --git a/textproc/qt5-xml/Makefile b/textproc/qt5-xml/Makefile index e5929d163a87..155b19559d21 100644 --- a/textproc/qt5-xml/Makefile +++ b/textproc/qt5-xml/Makefile @@ -2,6 +2,7 @@ PORTNAME= xml DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt5- @@ -12,7 +13,6 @@ USES= compiler:c++11-lang qmake:no_env qt-dist:5,base USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff --git a/textproc/qt5-xmlpatterns/Makefile b/textproc/qt5-xmlpatterns/Makefile index 5b61829bdf60..9376973aaf65 100644 --- a/textproc/qt5-xmlpatterns/Makefile +++ b/textproc/qt5-xmlpatterns/Makefile @@ -2,7 +2,7 @@ PORTNAME= xmlpatterns DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc PKGNAMEPREFIX= qt5- @@ -11,7 +11,6 @@ COMMENT= Qt support for XPath, XQuery, XSLT and XML Schema USES= compiler:c++11-lang qmake:norecursive qt-dist:5,xmlpatterns USE_QT= core declarative network buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_BINARIES= yes diff --git a/www/qt5-webchannel/Makefile b/www/qt5-webchannel/Makefile index 3c03268016da..8d6e1d128388 100644 --- a/www/qt5-webchannel/Makefile +++ b/www/qt5-webchannel/Makefile @@ -2,6 +2,7 @@ PORTNAME= webchannel DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -10,7 +11,6 @@ COMMENT= Qt 5 library for integration of C++/QML with HTML/js clients USES= compiler:c++11-lang qmake:norecursive qt-dist:5,webchannel USE_QT= buildtools_build core declarative -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} # The default EXTRACT_AFTER_ARGS value excludes examples/ from the extracted # tarball, which we need during the build. diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index 01c5e1b40967..3d185852bee8 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -18,7 +18,7 @@ PORTNAME= webengine DISTVERSION= ${QT5_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -84,7 +84,6 @@ USE_QT= core declarative gui location network printsupport \ USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xorgproto \ xrandr xrender xscrnsaver xtst -USE_LDCONFIG= ${QT_LIBDIR} QMAKE_CONFIGURE_ARGS= -proprietary-codecs -system-ffmpeg diff --git a/www/qt5-webglplugin/Makefile b/www/qt5-webglplugin/Makefile index f8f0b416c139..b6d680a5bd67 100644 --- a/www/qt5-webglplugin/Makefile +++ b/www/qt5-webglplugin/Makefile @@ -2,6 +2,7 @@ PORTNAME= webglplugin DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -16,6 +17,5 @@ USE_GL= gl USE_GNOME= glib20 USE_QT= core dbus declarative gui network webchannel websockets \ buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/www/qt5-websockets-qml/Makefile b/www/qt5-websockets-qml/Makefile index dc6bfdae1292..7ec6321d9c3b 100644 --- a/www/qt5-websockets-qml/Makefile +++ b/www/qt5-websockets-qml/Makefile @@ -2,6 +2,7 @@ PORTNAME= websockets-qml DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -10,6 +11,5 @@ COMMENT= Qt implementation of WebSocket protocol (QML bindings) USES= compiler:c++11-lang qmake qt-dist:5,websockets USE_QT= buildtools_build core declarative network websockets -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/www/qt5-websockets/Makefile b/www/qt5-websockets/Makefile index fa22ebcaec44..a198353d3ee6 100644 --- a/www/qt5-websockets/Makefile +++ b/www/qt5-websockets/Makefile @@ -2,6 +2,7 @@ PORTNAME= websockets DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -10,6 +11,5 @@ COMMENT= Qt implementation of WebSocket protocol USES= compiler:c++11-lang qmake:norecursive qt-dist:5,websockets USE_QT= buildtools_build core network -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/www/qt5-webview/Makefile b/www/qt5-webview/Makefile index f71efb56afd1..a77637da3d53 100644 --- a/www/qt5-webview/Makefile +++ b/www/qt5-webview/Makefile @@ -2,6 +2,7 @@ PORTNAME= webview DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -12,7 +13,6 @@ USES= compiler:c++11-lang gl qmake:norecursive qt-dist:5 USE_GL= gl USE_QT= core declarative gui location network webchannel \ buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/x11-toolkits/qt5-datavis3d/Makefile b/x11-toolkits/qt5-datavis3d/Makefile index 9a2ca789f6f4..049a4374bf5b 100644 --- a/x11-toolkits/qt5-datavis3d/Makefile +++ b/x11-toolkits/qt5-datavis3d/Makefile @@ -2,6 +2,7 @@ PORTNAME= datavis3d DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -11,6 +12,5 @@ COMMENT= Qt 5 3D data visualization module USE_QT= core declarative network gui widgets designer buildtools_build USES= compiler:c++11-lang qmake qt-dist:5,datavis3d -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile index 1036795dac21..bbb8ac5f1c65 100644 --- a/x11-toolkits/qt5-declarative/Makefile +++ b/x11-toolkits/qt5-declarative/Makefile @@ -2,7 +2,7 @@ PORTNAME= declarative DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -14,7 +14,6 @@ USES= compiler:c++11-lang gl python:build qmake:norecursive \ USE_GL= gl USE_QT= core gui network sql testlib \ widgets buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} CONFLICTS= qt5-declarative-render2d-* qt5-qml qt5-quick diff --git a/x11-toolkits/qt5-gamepad/Makefile b/x11-toolkits/qt5-gamepad/Makefile index a9c28dbe7f6b..469a55ae3c02 100644 --- a/x11-toolkits/qt5-gamepad/Makefile +++ b/x11-toolkits/qt5-gamepad/Makefile @@ -2,7 +2,7 @@ PORTNAME= gamepad DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -13,6 +13,5 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto USES= compiler:c++11-lang qmake:norecursive qt-dist:5,gamepad USE_QT= core declarative gui buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index 254fdaf4178c..6750d9d08c88 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -2,7 +2,7 @@ PORTNAME= gui DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- @@ -33,7 +33,6 @@ USES= compiler:c++11-lang gl gnome jpeg localbase \ qmake:no_env qt-dist:5,base USE_GL= egl gl USE_GNOME= glib20 -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_QT= core dbus network buildtools_build qmake_build QT_BINARIES= yes QT_CONFIG= accessibility accessibility-atspi-bridge dbus \ diff --git a/x11-toolkits/qt5-quick3d/Makefile b/x11-toolkits/qt5-quick3d/Makefile index 0b495eda65e0..76f934c6c6af 100644 --- a/x11-toolkits/qt5-quick3d/Makefile +++ b/x11-toolkits/qt5-quick3d/Makefile @@ -2,6 +2,7 @@ PORTNAME= quick3d DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -11,6 +12,5 @@ COMMENT= Set of controls for building complete interfaces in Qt Quick3D USES= compiler:c++11-lang qmake qt-dist:5 USE_QT= core declarative gui network opengl \ buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/x11-toolkits/qt5-quickcontrols/Makefile b/x11-toolkits/qt5-quickcontrols/Makefile index d2898e1f446a..d0e5af76c281 100644 --- a/x11-toolkits/qt5-quickcontrols/Makefile +++ b/x11-toolkits/qt5-quickcontrols/Makefile @@ -2,6 +2,7 @@ PORTNAME= quickcontrols DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -13,6 +14,5 @@ BROKEN_armv6= fails to install: pkg-static: Unable to access file ApplicationWi USES= compiler:c++11-lang qmake qt-dist:5,quickcontrols USE_QT= core declarative gui widgets \ buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/x11-toolkits/qt5-quickcontrols2/Makefile b/x11-toolkits/qt5-quickcontrols2/Makefile index 046a8c68a3c8..5ddf53159c07 100644 --- a/x11-toolkits/qt5-quickcontrols2/Makefile +++ b/x11-toolkits/qt5-quickcontrols2/Makefile @@ -2,6 +2,7 @@ PORTNAME= quickcontrols2 DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -14,6 +15,5 @@ USES= compiler:c++11-lang qmake:norecursive qt-dist:5 USE_QT= core declarative gui widgets \ buildtools_build QT_DIST= ${PORTNAME} -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/x11-toolkits/qt5-quicktimeline/Makefile b/x11-toolkits/qt5-quicktimeline/Makefile index e6922667c0b9..ae7257f4abbe 100644 --- a/x11-toolkits/qt5-quicktimeline/Makefile +++ b/x11-toolkits/qt5-quicktimeline/Makefile @@ -2,6 +2,7 @@ PORTNAME= quicktimeline DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -11,6 +12,5 @@ COMMENT= Set of controls for building complete interfaces in Qt Quick Timeline USES= compiler:c++11-lang qmake qt-dist:5 USE_QT= core declarative quickcontrols \ buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/x11-toolkits/qt5-virtualkeyboard/Makefile b/x11-toolkits/qt5-virtualkeyboard/Makefile index 10ce02bcadb7..d2deb16fde6a 100644 --- a/x11-toolkits/qt5-virtualkeyboard/Makefile +++ b/x11-toolkits/qt5-virtualkeyboard/Makefile @@ -2,6 +2,7 @@ PORTNAME= virtualkeyboard DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -13,7 +14,6 @@ LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell USES= compiler:c++11-lang pkgconfig qmake qt-dist:5,virtualkeyboard USE_QT= core declarative network gui widgets svg buildtools_build -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} # Disable the builtin layouts -- otherwise we need to pull in a lot of other # stuff. diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile index 68072dc3f794..886e111089b4 100644 --- a/x11-toolkits/qt5-widgets/Makefile +++ b/x11-toolkits/qt5-widgets/Makefile @@ -2,6 +2,7 @@ PORTNAME= widgets DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -12,7 +13,6 @@ USES= compiler:c++11-lang qmake:no_env qt-dist:5,base xorg USE_QT= core gui qmake_build buildtools_build USE_XORG= x11 HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff --git a/x11/qt5-x11extras/Makefile b/x11/qt5-x11extras/Makefile index 3534ee2a8666..82979292f9ce 100644 --- a/x11/qt5-x11extras/Makefile +++ b/x11/qt5-x11extras/Makefile @@ -2,6 +2,7 @@ PORTNAME= x11extras DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11 PKGNAMEPREFIX= qt5- @@ -10,6 +11,5 @@ COMMENT= Qt platform-specific features for X11-based systems USES= compiler:c++11-lang qmake qt-dist:5,x11extras perl5 USE_QT= core gui -USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include