svn commit: r427356 - in head: Mk cad/qelectrotech devel/liblxqt devel/libqtxdg devel/qscintilla2 devel/qscintilla2-qt5 devel/qt4-libqtassistantclient graphics/gle-graphics math/vtk6 multimedia/dvb...
Tobias C. Berner
tcberner at FreeBSD.org
Tue Nov 29 06:20:43 UTC 2016
Author: tcberner
Date: Tue Nov 29 06:20:40 2016
New Revision: 427356
URL: https://svnweb.freebsd.org/changeset/ports/427356
Log:
Stop exporting QT_BINDIR and QT_LIBDIR to PLIST_SUB.
As at the moment QT_BINDIR and QT_LIBDIR are 'bin' respectively 'lib' depending
on the Qt version these subs ended up at many wrong places in plists.
So only export it if QT_DIST is set.
PR: 210227
Reviewed by: mat, rakuco
Approved by: portmgr (mat), rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D8378
Modified:
head/Mk/bsd.qt.mk
head/cad/qelectrotech/pkg-plist
head/devel/liblxqt/pkg-plist
head/devel/libqtxdg/pkg-plist
head/devel/qscintilla2-qt5/pkg-plist
head/devel/qscintilla2/pkg-plist
head/devel/qt4-libqtassistantclient/pkg-plist
head/graphics/gle-graphics/pkg-plist
head/math/vtk6/pkg-plist
head/multimedia/dvbcut/pkg-plist
head/multimedia/gstreamer-qt4/pkg-plist
head/multimedia/phonon/pkg-plist
head/multimedia/qt4-mobility/pkg-plist
head/net-p2p/bitcoin/Makefile
head/net-p2p/litecoin/Makefile
head/sysutils/bareos-traymonitor/pkg-plist
head/sysutils/qzeitgeist/pkg-plist
head/x11-themes/qt5-style-plugins/pkg-plist
Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk Tue Nov 29 05:53:14 2016 (r427355)
+++ head/Mk/bsd.qt.mk Tue Nov 29 06:20:40 2016 (r427356)
@@ -271,12 +271,19 @@ USES+= qmake:_env
PLIST_SUB+= QT_PREFIX="${QT_PREFIX}"
-.for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
+.for dir in INC ARCH PLUGIN LIBEXEC IMPORT \
QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC
QT_${dir}DIR= ${QT_PREFIX}/${QT_${dir}DIR_REL}
PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
.endfor
+.for dir in BIN LIB
+QT_${dir}DIR= ${QT_PREFIX}/${QT_${dir}DIR_REL}
+. if defined(QT_DIST)
+PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
+. endif
+.endfor
+
.endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
Modified: head/cad/qelectrotech/pkg-plist
==============================================================================
--- head/cad/qelectrotech/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/cad/qelectrotech/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -684,11 +684,11 @@ share/mimelnk/application/x-qet-titleblo
%%DATADIR%%/elements/10_electric/10_allpole/395_electronics&semiconductors/qet_directory
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/appareil_ferme_cle_prisonniere.elmt
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/appareil_ouvert_cle_prisonniere.elmt
-%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_absente_pene_rentree_manoeuvre_%%QT_LIBDIR%%re.elmt
+%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_absente_pene_rentree_manoeuvre_libre.elmt
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_absente_pene_sorti.elmt
-%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_%%QT_LIBDIR%%re_pene_rentree_manoeuvre_%%QT_LIBDIR%%re.elmt
-%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_%%QT_LIBDIR%%re_pene_sorti.elmt
-%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_prisioniere_pene_rentree_manoeuvre_%%QT_LIBDIR%%re.elmt
+%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_libre_pene_rentree_manoeuvre_libre.elmt
+%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_libre_pene_sorti.elmt
+%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_prisioniere_pene_rentree_manoeuvre_libre.elmt
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/cle_prisionniere_pene_rentree_manoeuvre_bloquee.elmt
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/contacteur_crm.elmt
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/contacteur_f_crm.elmt
@@ -716,7 +716,7 @@ share/mimelnk/application/x-qet-titleblo
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/ligne_triphase.elmt
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/ligne_triphase_2.elmt
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/qet_directory
-%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/serrure_cle_tjs_%%QT_LIBDIR%%re.elmt
+%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/serrure_cle_tjs_libre.elmt
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/serrure_cle_tjs_prisionniere.elmt
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/signal_capacitif.elmt
%%DATADIR%%/elements/10_electric/10_allpole/450_high_voltage/transf_cm.elmt
@@ -1682,7 +1682,7 @@ share/mimelnk/application/x-qet-titleblo
%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta301.elmt
%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta302.elmt
%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta401.elmt
-%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xenta%%QT_LIBDIR%%.elmt
+%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/90_TAC_Xenta/regulateurs/tac-xentalib.elmt
%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/99_assembly_plan/gv2me.elmt
%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/99_assembly_plan/lc1d.elmt
%%DATADIR%%/elements/10_electric/20_manufacturers_articles/schneider_electric/99_assembly_plan/lc1k.elmt
@@ -2404,7 +2404,7 @@ share/mimelnk/application/x-qet-titleblo
%%DATADIR%%/elements/20_logic/40_flowchart/souspgm03.elmt
%%DATADIR%%/elements/20_logic/40_flowchart/sur_page.elmt
%%DATADIR%%/elements/20_logic/qet_directory
-%%DATADIR%%/elements/30_hydraulic/21_tanks/bache_a_l_air_%%QT_LIBDIR%%re.elmt
+%%DATADIR%%/elements/30_hydraulic/21_tanks/bache_a_l_air_libre.elmt
%%DATADIR%%/elements/30_hydraulic/21_tanks/bache_pressurisee.elmt
%%DATADIR%%/elements/30_hydraulic/21_tanks/qet_directory
%%DATADIR%%/elements/30_hydraulic/31_control_valves/01_single_parts/11_actuation/bouton.elmt
@@ -2811,7 +2811,7 @@ share/mimelnk/application/x-qet-titleblo
%%DATADIR%%/elements/60_energy/11_water/schemas/grupo-seg-termo.elmt
%%DATADIR%%/elements/60_energy/11_water/schemas/intercambiador.elmt
%%DATADIR%%/elements/60_energy/11_water/schemas/llave-acometida.elmt
-%%DATADIR%%/elements/60_energy/11_water/schemas/llave-equi%%QT_LIBDIR%%rado.elmt
+%%DATADIR%%/elements/60_energy/11_water/schemas/llave-equilibrado.elmt
%%DATADIR%%/elements/60_energy/11_water/schemas/llave-paso-regul.elmt
%%DATADIR%%/elements/60_energy/11_water/schemas/llave-vivienda.elmt
%%DATADIR%%/elements/60_energy/11_water/schemas/llavepaso.elmt
@@ -3094,8 +3094,8 @@ share/mimelnk/application/x-qet-titleblo
%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_01.elmt
%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_3v_a_secteur_01.elmt
%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_diferentielle.elmt
-%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equi%%QT_LIBDIR%%rage_debimetre_01.elmt
-%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equi%%QT_LIBDIR%%rage_ta_01.elmt
+%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equilibrage_debimetre_01.elmt
+%%DATADIR%%/elements/60_energy/31_solar_thermal/vanne/vanne_equilibrage_ta_01.elmt
%%DATADIR%%/elements/60_energy/qet_directory
%%DATADIR%%/examples/741.qet
%%DATADIR%%/examples/ArduinoLCD.qet
Modified: head/devel/liblxqt/pkg-plist
==============================================================================
--- head/devel/liblxqt/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/devel/liblxqt/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -31,9 +31,9 @@
%%LXQT_INCLUDEDIR%%/LXQt/lxqtsettings.h
%%LXQT_INCLUDEDIR%%/LXQt/lxqtsingleapplication.h
%%LXQT_INCLUDEDIR%%/LXQt/lxqttranslator.h
-%%QT_LIBDIR%%/liblxqt.so
-%%QT_LIBDIR%%/liblxqt.so.0
-%%QT_LIBDIR%%/liblxqt.so.%%VERSION%%
+lib/liblxqt.so
+lib/liblxqt.so.0
+lib/liblxqt.so.%%VERSION%%
libdata/pkgconfig/lxqt.pc
share/cmake/lxqt/find-modules/FindXdgUserDirs.cmake
share/cmake/lxqt/lxqt-config-version.cmake
Modified: head/devel/libqtxdg/pkg-plist
==============================================================================
--- head/devel/libqtxdg/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/devel/libqtxdg/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -19,12 +19,12 @@ include/qt5xdg/xdgmimetype.h
include/qt5xdg/xmlhelper.h
include/qt5xdgiconloader/%%VERSION%%/private/xdgiconloader/xdgiconloader_p.h
include/qt5xdgiconloader/xdgiconloader_export.h
-%%QT_LIBDIR%%/libQt5Xdg.so
-%%QT_LIBDIR%%/libQt5Xdg.so.2
-%%QT_LIBDIR%%/libQt5Xdg.so.%%VERSION%%
-%%QT_LIBDIR%%/libQt5XdgIconLoader.so
-%%QT_LIBDIR%%/libQt5XdgIconLoader.so.2
-%%QT_LIBDIR%%/libQt5XdgIconLoader.so.%%VERSION%%
+lib/libQt5Xdg.so
+lib/libQt5Xdg.so.2
+lib/libQt5Xdg.so.%%VERSION%%
+lib/libQt5XdgIconLoader.so
+lib/libQt5XdgIconLoader.so.2
+lib/libQt5XdgIconLoader.so.%%VERSION%%
libdata/pkgconfig/Qt5Xdg.pc
libdata/pkgconfig/Qt5XdgIconLoader.pc
share/cmake/qt5xdg/qt5xdg-config-version.cmake
Modified: head/devel/qscintilla2-qt5/pkg-plist
==============================================================================
--- head/devel/qscintilla2-qt5/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/devel/qscintilla2-qt5/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -48,10 +48,10 @@
%%QT_INCDIR%%/Qsci/qsciscintillabase.h
%%QT_INCDIR%%/Qsci/qscistyle.h
%%QT_INCDIR%%/Qsci/qscistyledtext.h
-%%QT_LIBDIR%%/libqscintilla2-qt5.so
-%%QT_LIBDIR%%/libqscintilla2-qt5.so.12
-%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0
-%%QT_LIBDIR%%/libqscintilla2-qt5.so.12.0.1
+lib/libqscintilla2-qt5.so
+lib/libqscintilla2-qt5.so.12
+lib/libqscintilla2-qt5.so.12.0
+lib/libqscintilla2-qt5.so.12.0.1
%%QT_MKSPECDIR%%/features/qscintilla2.prf
%%QT_DATADIR%%/qsci/api/python/Python-2.4.api
%%QT_DATADIR%%/qsci/api/python/Python-2.5.api
Modified: head/devel/qscintilla2/pkg-plist
==============================================================================
--- head/devel/qscintilla2/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/devel/qscintilla2/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -48,10 +48,10 @@
%%QT_INCDIR%%/Qsci/qsciscintillabase.h
%%QT_INCDIR%%/Qsci/qscistyle.h
%%QT_INCDIR%%/Qsci/qscistyledtext.h
-%%QT_LIBDIR%%/libqscintilla2.so
-%%QT_LIBDIR%%/libqscintilla2.so.12
-%%QT_LIBDIR%%/libqscintilla2.so.12.0
-%%QT_LIBDIR%%/libqscintilla2.so.12.0.1
+lib/qt4/libqscintilla2.so
+lib/qt4/libqscintilla2.so.12
+lib/qt4/libqscintilla2.so.12.0
+lib/qt4/libqscintilla2.so.12.0.1
%%QT_MKSPECDIR%%/features/qscintilla2.prf
share/qt4/qsci/api/python/Python-2.4.api
share/qt4/qsci/api/python/Python-2.5.api
Modified: head/devel/qt4-libqtassistantclient/pkg-plist
==============================================================================
--- head/devel/qt4-libqtassistantclient/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/devel/qt4-libqtassistantclient/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -2,10 +2,10 @@
%%QT_INCDIR%%/QtAssistant/QtAssistant
%%QT_INCDIR%%/QtAssistant/qassistantclient.h
%%QT_INCDIR%%/QtAssistant/qassistantclient_global.h
-%%QT_LIBDIR%%/libQtAssistantClient.prl
-%%QT_LIBDIR%%/libQtAssistantClient.so
-%%QT_LIBDIR%%/libQtAssistantClient.so.4
-%%QT_LIBDIR%%/libQtAssistantClient.so.4.6
-%%QT_LIBDIR%%/libQtAssistantClient.so.4.6.3
+lib/qt4/libQtAssistantClient.prl
+lib/qt4/libQtAssistantClient.so
+lib/qt4/libQtAssistantClient.so.4
+lib/qt4/libQtAssistantClient.so.4.6
+lib/qt4/libQtAssistantClient.so.4.6.3
libdata/pkgconfig/QtAssistantClient.pc
%%QT_MKSPECDIR%%/features/assistant.prf
Modified: head/graphics/gle-graphics/pkg-plist
==============================================================================
--- head/graphics/gle-graphics/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/graphics/gle-graphics/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -1,7 +1,7 @@
-%%QT_BINDIR%%/gle
-%%QT_BINDIR%%/glebtool
-%%QT_BINDIR%%/manip
-%%QT_BINDIR%%/qgle
+bin/gle
+bin/glebtool
+bin/manip
+bin/qgle
lib/libgle-graphics-4.2.4c.so
libdata/pkgconfig/gle-graphics.pc
man/man1/gle.1.gz
Modified: head/math/vtk6/pkg-plist
==============================================================================
--- head/math/vtk6/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/math/vtk6/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -825,7 +825,7 @@
%%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkGUISupportQtWebkit.cmake
%%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkRenderingQt.cmake
%%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkViewsQt.cmake
-%%SHARED%%%%DESIGNER%%%%QT_LIBDIR%%/plugins/designer/libQVTKWidgetPlugin-%%VER2%%.so
+%%SHARED%%%%DESIGNER%%lib/qt4/plugins/designer/libQVTKWidgetPlugin-%%VER2%%.so
%%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkFiltersParallelGeometryJava.so
%%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkFiltersParallelMPIJava.so
%%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkIOMPIImageJava.so
Modified: head/multimedia/dvbcut/pkg-plist
==============================================================================
--- head/multimedia/dvbcut/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/multimedia/dvbcut/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -1,4 +1,3 @@
- at comment %%QT_BINDIR%%/dvbcut
bin/dvbcut
share/applications/dvbcut.desktop
share/mime/packages/dvbcut.xml
Modified: head/multimedia/gstreamer-qt4/pkg-plist
==============================================================================
--- head/multimedia/gstreamer-qt4/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/multimedia/gstreamer-qt4/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -123,8 +123,8 @@ lib/libQtGStreamerUi-%%GST_VERSION%%.so.
lib/libQtGStreamerUtils-%%GST_VERSION%%.so
lib/libQtGStreamerUtils-%%GST_VERSION%%.so.0
lib/libQtGStreamerUtils-%%GST_VERSION%%.so.%%VERSION%%
-%%QT_LIBDIR%%/imports/QtGStreamer/libQtGStreamerQuick1.so
-%%QT_LIBDIR%%/imports/QtGStreamer/qmldir
+lib/qt4/imports/QtGStreamer/libQtGStreamerQuick1.so
+lib/qt4/imports/QtGStreamer/qmldir
libdata/pkgconfig/QtGLib-2.0.pc
libdata/pkgconfig/QtGStreamer-%%GST_VERSION%%.pc
libdata/pkgconfig/QtGStreamerUi-%%GST_VERSION%%.pc
Modified: head/multimedia/phonon/pkg-plist
==============================================================================
--- head/multimedia/phonon/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/multimedia/phonon/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -186,8 +186,8 @@ share/dbus-1/interfaces/org.kde.Phonon.A
%%DATADIR%%/buildsystem/cmake_uninstall.cmake.in
%%QT_PREFIX%%/%%QT_INCDIR%%/Phonon
%%QT_PREFIX%%/%%QT_INCDIR%%/phonon
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so.4
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so
-%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so.4
+%%QT_PREFIX%%/lib/qt4/libphonon.so
+%%QT_PREFIX%%/lib/qt4/libphonon.so.4
+%%QT_PREFIX%%/lib/qt4/libphononexperimental.so
+%%QT_PREFIX%%/lib/qt4/libphononexperimental.so.4
%%QT_PREFIX%%/%%QT_MKSPECDIR%%/modules/qt_phonon.pri
Modified: head/multimedia/qt4-mobility/pkg-plist
==============================================================================
--- head/multimedia/qt4-mobility/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/multimedia/qt4-mobility/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -5,14 +5,14 @@
%%BEARER%%%%QT_INCDIR%%/QtMobility/qlatin1constant.h
%%BEARER%%%%QT_INCDIR%%/QtMobility/qmalgorithms.h
%%BEARER%%%%QT_INCDIR%%/QtMobility/qmobilityglobal.h
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.prl
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1.2
-%%BEARER%%%%QT_LIBDIR%%/libQtBearer.so.1.2.2
+%%BEARER%%lib/qt4/libQtBearer.prl
+%%BEARER%%lib/qt4/libQtBearer.so
+%%BEARER%%lib/qt4/libQtBearer.so.1
+%%BEARER%%lib/qt4/libQtBearer.so.1.2
+%%BEARER%%lib/qt4/libQtBearer.so.1.2.2
%%BEARER%%%%QT_MKSPECDIR%%/features/mobility.prf
%%BEARER%%%%QT_MKSPECDIR%%/features/mobilityconfig.prf
-%%CONNECTIVITY%%%%QT_BINDIR%%/ndefhandlergen
+%%CONNECTIVITY%%bin/ndefhandlergen
%%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothAddress
%%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothDeviceDiscoveryAgent
%%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/QBluetoothDeviceInfo
@@ -75,11 +75,11 @@
%%CONNECTIVITY%%%%QT_INCDIR%%/QtConnectivity/qrfcommsocket.h
%%CONNECTIVITY%%%%QT_IMPORTDIR%%/QtMobility/connectivity/libdeclarative_connectivity.so
%%CONNECTIVITY%%%%QT_IMPORTDIR%%/QtMobility/connectivity/qmldir
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.prl
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1.2
-%%CONNECTIVITY%%%%QT_LIBDIR%%/libQtConnectivity.so.1.2.2
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.prl
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1.2
+%%CONNECTIVITY%%lib/qt4/libQtConnectivity.so.1.2.2
%%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContact
%%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContactAbstractRequest
%%CONTACTS%%%%QT_INCDIR%%/QtContacts/QContactAction
@@ -218,11 +218,11 @@
%%CONTACTS%%%%QT_INCDIR%%/QtContacts/qcontacturl.h
%%CONTACTS%%%%QT_INCDIR%%/QtContacts/qtcontacts.h
%%CONTACTS%%%%QT_INCDIR%%/QtContacts/qtcontactsglobal.h
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.prl
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1.2
-%%CONTACTS%%%%QT_LIBDIR%%/libQtContacts.so.1.2.2
+%%CONTACTS%%lib/qt4/libQtContacts.prl
+%%CONTACTS%%lib/qt4/libQtContacts.so
+%%CONTACTS%%lib/qt4/libQtContacts.so.1
+%%CONTACTS%%lib/qt4/libQtContacts.so.1.2
+%%CONTACTS%%lib/qt4/libQtContacts.so.1.2.2
%%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackActuator
%%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackEffect
%%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/QFeedbackFileEffect
@@ -236,11 +236,11 @@
%%FEEDBACK%%%%QT_INCDIR%%/QtFeedback/qfeedbackplugininterfaces.h
%%FEEDBACK%%%%QT_IMPORTDIR%%/QtMobility/feedback/libdeclarative_feedback.so
%%FEEDBACK%%%%QT_IMPORTDIR%%/QtMobility/feedback/qmldir
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.prl
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1.2
-%%FEEDBACK%%%%QT_LIBDIR%%/libQtFeedback.so.1.2.2
+%%FEEDBACK%%lib/qt4/libQtFeedback.prl
+%%FEEDBACK%%lib/qt4/libQtFeedback.so
+%%FEEDBACK%%lib/qt4/libQtFeedback.so.1
+%%FEEDBACK%%lib/qt4/libQtFeedback.so.1.2
+%%FEEDBACK%%lib/qt4/libQtFeedback.so.1.2.2
%%GALLERY%%%%QT_INCDIR%%/QtGallery/QAbstractGallery
%%GALLERY%%%%QT_INCDIR%%/QtGallery/QDocumentGallery
%%GALLERY%%%%QT_INCDIR%%/QtGallery/QGalleryAbstractRequest
@@ -270,11 +270,11 @@
%%GALLERY%%%%QT_INCDIR%%/QtGallery/qgallerytyperequest.h
%%GALLERY%%%%QT_IMPORTDIR%%/QtMobility/gallery/libdeclarative_gallery.so
%%GALLERY%%%%QT_IMPORTDIR%%/QtMobility/gallery/qmldir
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.prl
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1.2
-%%GALLERY%%%%QT_LIBDIR%%/libQtGallery.so.1.2.2
+%%GALLERY%%lib/qt4/libQtGallery.prl
+%%GALLERY%%lib/qt4/libQtGallery.so
+%%GALLERY%%lib/qt4/libQtGallery.so.1
+%%GALLERY%%lib/qt4/libQtGallery.so.1.2
+%%GALLERY%%lib/qt4/libQtGallery.so.1.2.2
%%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoAddress
%%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoAreaMonitor
%%LOCATION%%%%QT_INCDIR%%/QtLocation/QGeoBoundingArea
@@ -430,11 +430,11 @@
%%LOCATION%%%%QT_INCDIR%%/QtLocation/qnmeapositioninfosource.h
%%LOCATION%%%%QT_IMPORTDIR%%/QtMobility/location/libdeclarative_location.so
%%LOCATION%%%%QT_IMPORTDIR%%/QtMobility/location/qmldir
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.prl
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1.2
-%%LOCATION%%%%QT_LIBDIR%%/libQtLocation.so.1.2.2
+%%LOCATION%%lib/qt4/libQtLocation.prl
+%%LOCATION%%lib/qt4/libQtLocation.so
+%%LOCATION%%lib/qt4/libQtLocation.so.1
+%%LOCATION%%lib/qt4/libQtLocation.so.1.2
+%%LOCATION%%lib/qt4/libQtLocation.so.1.2.2
%%LOCATION%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_nokia.so
%%LOCATION%%%%QT_PLUGINDIR%%/landmarks/libqtlandmarks_sqlite.so
%%MULTIMEDIA%%%%QT_INCDIR%%/QtMultimediaKit/QAbstractAudioDeviceInfo
@@ -582,11 +582,11 @@
%%MULTIMEDIA%%%%QT_INCDIR%%/QtMultimediaKit/qvideowindowcontrol.h
%%MULTIMEDIA%%%%QT_IMPORTDIR%%/QtMultimediaKit/libdeclarative_multimedia.so
%%MULTIMEDIA%%%%QT_IMPORTDIR%%/QtMultimediaKit/qmldir
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.prl
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1.2
-%%MULTIMEDIA%%%%QT_LIBDIR%%/libQtMultimediaKit.so.1.2.2
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.prl
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1.2
+%%MULTIMEDIA%%lib/qt4/libQtMultimediaKit.so.1.2.2
%%MULTIMEDIA%%%%QT_PLUGINDIR%%/audio/libqtmedia_pulse.so
%%MULTIMEDIA%%%%QT_PLUGINDIR%%/mediaservice/libqgstengine.so
%%MULTIMEDIA%%%%QT_PLUGINDIR%%/mediaservice/libqtmedia_v4lengine.so
@@ -730,13 +730,13 @@
%%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qorganizertodotime.h
%%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qtorganizer.h
%%ORGANIZER%%%%QT_INCDIR%%/QtOrganizer/qtorganizerglobal.h
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.prl
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1.2
-%%ORGANIZER%%%%QT_LIBDIR%%/libQtOrganizer.so.1.2.2
-%%PUBLISHSUBSCRIBE%%%%QT_BINDIR%%/qcrmlgen
-%%PUBLISHSUBSCRIBE%%%%QT_BINDIR%%/vsexplorer
+%%ORGANIZER%%lib/qt4/libQtOrganizer.prl
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1.2
+%%ORGANIZER%%lib/qt4/libQtOrganizer.so.1.2.2
+%%PUBLISHSUBSCRIBE%%bin/qcrmlgen
+%%PUBLISHSUBSCRIBE%%bin/vsexplorer
%%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpace
%%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpacePublisher
%%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/QValueSpaceSubscriber
@@ -745,11 +745,11 @@
%%PUBLISHSUBSCRIBE%%%%QT_INCDIR%%/QtPublishSubscribe/qvaluespacesubscriber.h
%%PUBLISHSUBSCRIBE%%%%QT_IMPORTDIR%%/QtMobility/publishsubscribe/libdeclarative_publishsubscribe.so
%%PUBLISHSUBSCRIBE%%%%QT_IMPORTDIR%%/QtMobility/publishsubscribe/qmldir
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.prl
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1.2
-%%PUBLISHSUBSCRIBE%%%%QT_LIBDIR%%/libQtPublishSubscribe.so.1.2.2
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.prl
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1.2
+%%PUBLISHSUBSCRIBE%%lib/qt4/libQtPublishSubscribe.so.1.2.2
%%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporter
%%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporterDetailHandler
%%VERSIT%%%%QT_INCDIR%%/QtVersit/QVersitContactExporterDetailHandlerV2
@@ -774,11 +774,11 @@
%%VERSIT%%%%QT_INCDIR%%/QtVersit/qversitwriter.h
%%VERSIT%%%%QT_IMPORTDIR%%/QtMobility/contacts/libdeclarative_contacts.so
%%VERSIT%%%%QT_IMPORTDIR%%/QtMobility/contacts/qmldir
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.prl
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1.2
-%%VERSIT%%%%QT_LIBDIR%%/libQtVersit.so.1.2.2
+%%VERSIT%%lib/qt4/libQtVersit.prl
+%%VERSIT%%lib/qt4/libQtVersit.so
+%%VERSIT%%lib/qt4/libQtVersit.so.1
+%%VERSIT%%lib/qt4/libQtVersit.so.1.2
+%%VERSIT%%lib/qt4/libQtVersit.so.1.2.2
%%VERSIT%%%%QT_PLUGINDIR%%/versit/libqtversit_backuphandler.so
%%VERSIT%%%%QT_PLUGINDIR%%/versit/libqtversit_vcardpreserver.so
%%VERSITORGANIZER%%%%QT_INCDIR%%/QtVersitOrganizer/QVersitOrganizerExporter
@@ -794,9 +794,9 @@
%%VERSITORGANIZER%%%%QT_INCDIR%%/QtVersitOrganizer/qversittimezonehandler.h
%%VERSITORGANIZER%%%%QT_IMPORTDIR%%/QtMobility/organizer/libdeclarative_organizer.so
%%VERSITORGANIZER%%%%QT_IMPORTDIR%%/QtMobility/organizer/qmldir
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.prl
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1.2
-%%VERSITORGANIZER%%%%QT_LIBDIR%%/libQtVersitOrganizer.so.1.2.2
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.prl
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1.2
+%%VERSITORGANIZER%%lib/qt4/libQtVersitOrganizer.so.1.2.2
%%VERSITFEEDBACK%%%%QT_PLUGINDIR%%/feedback/libqtfeedback_mmk.so
Modified: head/net-p2p/bitcoin/Makefile
==============================================================================
--- head/net-p2p/bitcoin/Makefile Tue Nov 29 05:53:14 2016 (r427355)
+++ head/net-p2p/bitcoin/Makefile Tue Nov 29 06:20:40 2016 (r427356)
@@ -31,7 +31,7 @@ BUILD_DEPENDS+= protoc:devel/protobuf
LIB_DEPENDS+= libprotobuf.so:devel/protobuf
TESTS_USE= QT4=testlib
-TESTS_PLIST_FILES= %%QT_BINDIR%%/test_bitcoin-qt \
+TESTS_PLIST_FILES= bin/test_bitcoin-qt \
bin/test_bitcoin
.endif
Modified: head/net-p2p/litecoin/Makefile
==============================================================================
--- head/net-p2p/litecoin/Makefile Tue Nov 29 05:53:14 2016 (r427355)
+++ head/net-p2p/litecoin/Makefile Tue Nov 29 06:20:40 2016 (r427356)
@@ -37,7 +37,7 @@ LIB_DEPENDS+= libprotobuf.so:devel/proto
DBUS_USE= QT4=dbus
TESTS_USE= QT4=testlib
-TESTS_PLIST_FILES= %%QT_BINDIR%%/test_litecoin-qt
+TESTS_PLIST_FILES= bin/test_litecoin-qt
.endif
OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET
Modified: head/sysutils/bareos-traymonitor/pkg-plist
==============================================================================
--- head/sysutils/bareos-traymonitor/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/sysutils/bareos-traymonitor/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -4,4 +4,4 @@
@sample %%ETCDIR%%/tray-monitor.d/storage/StorageDaemon-local.conf.sample
share/applications/bareos-tray-monitor.desktop
share/pixmaps/bareos-tray-monitor.xpm
-%%QT_BINDIR%%/bareos-tray-monitor
+bin/bareos-tray-monitor
Modified: head/sysutils/qzeitgeist/pkg-plist
==============================================================================
--- head/sysutils/qzeitgeist/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/sysutils/qzeitgeist/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -29,6 +29,6 @@ lib/cmake/QZeitgeist/QZeitgeistExport.cm
lib/libqzeitgeist.so
lib/libqzeitgeist.so.0.8.0
lib/libqzeitgeist.so.1
-%%QT_LIBDIR%%/imports/org/gnome/zeitgeist/libQZeitgeistDeclarativePlugin.so
-%%QT_LIBDIR%%/imports/org/gnome/zeitgeist/qmldir
+lib/qt4/imports/org/gnome/zeitgeist/libQZeitgeistDeclarativePlugin.so
+lib/qt4/imports/org/gnome/zeitgeist/qmldir
libdata/pkgconfig/QZeitgeist.pc
Modified: head/x11-themes/qt5-style-plugins/pkg-plist
==============================================================================
--- head/x11-themes/qt5-style-plugins/pkg-plist Tue Nov 29 05:53:14 2016 (r427355)
+++ head/x11-themes/qt5-style-plugins/pkg-plist Tue Nov 29 06:20:40 2016 (r427356)
@@ -1,4 +1,4 @@
-%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5Widgets_.cmake
+lib/cmake/Qt5Widgets/Qt5Widgets_.cmake
%%QT_PLUGINDIR%%/styles/libqcleanlooksstyle.so
%%QT_PLUGINDIR%%/styles/libqmotifstyle.so
%%QT_PLUGINDIR%%/styles/libqplastiquestyle.so
More information about the svn-ports-all
mailing list