Page MenuHomeFreeBSD
Files F153347054

D8378.id22068.diff
No OneTemporary
Actions

D8378.id22068.diff
View Options

Index: Mk/bsd.qt.mk
===================================================================
--- Mk/bsd.qt.mk
+++ Mk/bsd.qt.mk
@@ -33,28 +33,28 @@
_QT_RELNAME= qt${_QT_VERSION:R:R}
_QT_VERSION= # empty
-.for ver in ${_QT_SUPPORTED}
-. if defined(USE_QT${ver})
-. if empty(_QT_VERSION)
+. for ver in ${_QT_SUPPORTED}
+. if defined(USE_QT${ver})
+. if empty(_QT_VERSION)
_QT_VERSION= ${QT${ver}_VERSION}
-. else
+. else
# Reject different USE_QT*.
IGNORE?= can't be installed: different Qt versions specified via USE_QT[${_QT_SUPPORTED:S/ //g}] #'
-. endif
-. endif
-.endfor
+. endif
+. endif
+. endfor
-.if empty(_QT_VERSION)
+. if empty(_QT_VERSION)
# The file was included without USE_QT*.
IGNORE?= can't be installed: bsd.qt.mk may only be included via USE_QT[${_QT_SUPPORTED:S/ //g}] #'
-.endif
+. endif
-.if defined(QT_DIST)
+. if defined(QT_DIST)
QT_NONSTANDARD= yes
-. if ! ${.MAKEFLAGS:MPREFIX=*}
+. if ! ${.MAKEFLAGS:MPREFIX=*}
PREFIX= ${QT_PREFIX}
-. endif
+. endif
MASTER_SITES= ${MASTER_SITE_QT}
# Useless, as it must be defined before including bsd.port.pre.mk (at least
@@ -64,18 +64,18 @@
LICENSE?= LGPL21
-. if !exists(${PKGDIR}/pkg-descr)
+. if !exists(${PKGDIR}/pkg-descr)
DESCR?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/pkg-descr
-. endif
+. endif
# Stage support.
DESTDIRNAME= INSTALL_ROOT
-. if ${_QT_VERSION:M4*}
+. if ${_QT_VERSION:M4*}
MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/
DISTNAME= qt-everywhere-opensource-src-${_QT_VERSION}
DIST_SUBDIR= KDE
-. else
+. else
MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
DISTNAME= ${QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},}
DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},}
@@ -92,18 +92,18 @@
# better not to fix what is not explicitly broken there.
LDFLAGS+= -Wl,--as-needed
-. if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \
+. if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \
defined(DISABLE_SIZE) && defined(NO_CHECKSUM)
# Ensure that the "makesum" target (with its inner "fetch" one) uses
# devel/qt*/distinfo for every port.
-. if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME}
+. if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME}
QT_DIST= 3d base canvas3d connectivity declarative graphicaleffects imageformats \
location multimedia quickcontrols quickcontrols2 script sensors serialbus serialport svg tools \
translations webchannel websockets x11extras xmlpatterns
-. endif
-. endif
+. endif
+. endif
-. if ${QT_DIST} == "base" && ${PORTNAME} != "qmake"
+. if ${QT_DIST} == "base" && ${PORTNAME} != "qmake"
# Qt configure requires pkg-config to detect dependencies.
USES+= pkgconfig
@@ -111,14 +111,14 @@
# script) can find the mkspecs we create ourselves in devel/qmake5.
CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}"
MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"
-. endif
+. endif
# -nomake is only used by qtbase's configure script.
# Other ports from other Qt modules will automatically build examples and
# tests if the directories exist because of mkspecs/features/qt_parts.prf.
EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \
${DISTNAME:S,$,/tests,:S,^,--exclude ,}
-. endif # ! ${_QT_VERSION:M4*}
+. endif # ! ${_QT_VERSION:M4*}
CONFIGURE_ENV+= MAKE="${MAKE:T}"
@@ -136,26 +136,26 @@
-translationdir ${PREFIX}/${QT_L10NDIR_REL} \
-sysconfdir ${PREFIX}/${QT_ETCDIR_REL}
-. if ${_QT_VERSION:M4*}
+. if ${_QT_VERSION:M4*}
CONFIGURE_ARGS+=-fast \
-system-libjpeg -system-libpng \
-system-libmng -system-libtiff -system-zlib \
-no-phonon-backend \
-examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/examples \
-demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos
-. else
+. else
CONFIGURE_ARGS+=-nomake examples -nomake tests \
-archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \
-libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \
-qmldir ${PREFIX}/${QT_QMLDIR_REL} \
-examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \
-testsdir ${PREFIX}/${QT_TESTDIR_REL}
-. if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2)
+. if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2)
CONFIGURE_ARGS+=-no-sse2
-. endif
-. endif
+. endif
+. endif
-. if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
+. if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
WITH_DEBUG= yes
STRIP= # It's done prior to bsd.qt.mk inclusion.
CONFIGURE_ARGS+=-debug -separate-debug-info
@@ -163,63 +163,63 @@
QMAKE_ARGS+= QT_CONFIG+="debug separate_debug_info" \
QT_CONFIG-="release"
PLIST_SUB+= DEBUG=""
-. else
+. else
CONFIGURE_ARGS+=-release -no-separate-debug-info
QMAKE_ARGS+= QT_CONFIG+="release" \
QT_CONFIG-="debug separate_debug_info"
PLIST_SUB+= DEBUG="@comment "
-. endif
+. endif
-. if defined(WANT_QT_VERBOSE_CONFIGURE)
+. if defined(WANT_QT_VERBOSE_CONFIGURE)
CONFIGURE_ARGS+=-verbose
-. endif
+. endif
-. if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
-. if ${_QT_VERSION:M4*}
+. if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
+. if ${_QT_VERSION:M4*}
_EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h
-. else
+. else
_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h
-. endif
+. endif
EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \
${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5}
-. endif
+. endif
# Override settings installed in qconfig.h and *.pri files. The flags will be
# installed along with the port, but have to be passed as arguments while
# building the port itself. Flags prefixed with "-" (e.g., "-CUPS" and "-cups")
# are needed to disable some features.
-. if !defined(${QT_MODNAME}) || empty(${QT_MODNAME})
+. if !defined(${QT_MODNAME}) || empty(${QT_MODNAME})
# Used for both qconfig-*.h and qt_config_*.pri; it can't be empty.
QT_MODNAME= ${PORTNAME}
-. endif
+. endif
QT_DEFINES?= # For qconfig.h flags (without "QT_" prefix).
QT_CONFIG?= # For *.pri files QT_CONFIG flags.
-. if ${QT_DEFINES}
+. if ${QT_DEFINES}
QMAKE_ARGS+= DEFINES+="${QT_DEFINES:O:u:C/^([^-])/QT_\1/:C/^-/QT_NO_/:O}"
-. if ${QT_DEFINES:N-*}
+. if ${QT_DEFINES:N-*}
# Use a script to cleanup qconfig-modules.h (see qt-post-install).
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-. endif
-. endif
-. if ${QT_CONFIG:N-*}
+. endif
+. endif
+. if ${QT_CONFIG:N-*}
QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*:O:u}"
-. endif
-. if ${QT_CONFIG:M-*}
+. endif
+. if ${QT_CONFIG:M-*}
QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
-. endif
+. endif
PLIST_SUB+= SHORTVER=${DISTVERSION:R} \
FULLVER=${DISTVERSION:C/-.*//}
-.endif # defined(QT_DIST)
+. endif # defined(QT_DIST)
-.if ${_QT_VERSION:M4*}
+. if ${_QT_VERSION:M4*}
QT_BINDIR_REL?= bin
QT_LIBDIR_REL?= lib/${_QT_RELNAME}
QT_PLUGINDIR_REL?= ${QT_LIBDIR_REL}/plugins
QT_IMPORTDIR_REL?= ${QT_LIBDIR_REL}/imports
-.endif
+. endif
# A wrapper (qtchooser) is used to invoke binaries.
QT_BINDIR_REL?= ${QT_ARCHDIR_REL}/bin
@@ -238,17 +238,17 @@
QT_TESTDIR_REL?=${QT_DATADIR_REL}/tests
# Not customizable.
-.if ${_QT_VERSION:M4*}
+. if ${_QT_VERSION:M4*}
QT_MKSPECDIR_REL= ${QT_DATADIR_REL}/mkspecs
_QT_LIBVER= # empty
_QT_BINSUFX= -${_QT_RELNAME}
-.else
+. else
QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs
_QT_LIBVER= ${_QT_VERSION:R:R}
_QT_BINSUFX= # empty
-.endif
+. endif
LRELEASE?= ${QT_BINDIR}/lrelease${_QT_BINSUFX}
LUPDATE?= ${QT_BINDIR}/lupdate${_QT_BINSUFX}
@@ -271,11 +271,18 @@
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
+. 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)
@@ -283,7 +290,7 @@
Qt_Post_Include= bsd.qt.mk
-.if !defined(QT_NONSTANDARD)
+. if !defined(QT_NONSTANDARD)
CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
QMAKESPEC="${QMAKESPEC}"
@@ -291,7 +298,7 @@
--with-qt-libraries=${QT_LIBDIR} \
--with-extra-includes=${LOCALBASE}/include \
--with-extra-libs=${LOCALBASE}/lib
-.endif # !defined(QT_NONSTANDARD)
+. endif # !defined(QT_NONSTANDARD)
_USE_QT_ALL= assistant clucene dbus declarative designer doc gui help \
imageformats l10n linguist linguisttools multimedia \
@@ -521,20 +528,20 @@
sql-pgsql_PATH= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so
-.if ${_QT_VERSION:M4*}
+. if ${_QT_VERSION:M4*}
sql-sqlite2_PORT= databases/${_QT_RELNAME}-sqlite-plugin
-.endif
+. endif
sql-sqlite3_PATH= ${QT_PLUGINDIR}/sqldrivers/libqsqlite.so
-.for db in ibase mysql odbc pgsql sqlite2 sqlite3 tds
-.if ${_QT_VERSION:M4*}
+. for db in ibase mysql odbc pgsql sqlite2 sqlite3 tds
+. if ${_QT_VERSION:M4*}
sql-${db}_PORT?= databases/${_QT_RELNAME}-${db}-plugin
-.else
+. else
sql-${db}_PORT?= databases/${_QT_RELNAME}-sqldrivers-${db}
-.endif
+. endif
sql-${db}_PATH?= ${QT_PLUGINDIR}/sqldrivers/libqsql${db:C/^sql//}.so
-.endfor
+. endfor
svg_PORT= graphics/${_QT_RELNAME}-svg
svg_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Svg.so
@@ -579,51 +586,51 @@
xmlpatterns-tool_PATH= ${QT_BINDIR}/xmlpatterns
_USE_QT_ALL+= ${_USE_QT${_QT_VERSION:R:R}_ONLY}
-.for comp in ${_USE_QT_ALL}
+. for comp in ${_USE_QT_ALL}
${comp}_BUILD_DEPENDS?= ${${comp}_PATH}:${${comp}_PORT}
${comp}_RUN_DEPENDS?= ${${comp}_PATH}:${${comp}_PORT}
${comp}_build_BUILD_DEPENDS?= ${${comp}_BUILD_DEPENDS}
${comp}_run_RUN_DEPENDS?= ${${comp}_RUN_DEPENDS}
_USE_QT_ALL_SUFFIXED+= ${comp} ${comp}_build ${comp}_run
-.endfor
+. endfor
_USE_QT= ${USE_QT${_QT_VERSION:R:R}}
-.for comp in ${_USE_QT:O:u}
-. if ${_USE_QT_ALL_SUFFIXED:M${comp}}
+. for comp in ${_USE_QT:O:u}
+. if ${_USE_QT_ALL_SUFFIXED:M${comp}}
BUILD_DEPENDS+= ${${comp}_BUILD_DEPENDS}
RUN_DEPENDS+= ${${comp}_RUN_DEPENDS}
-. else
+. else
IGNORE?= can't be installed: unknown USE_QT${_QT_VERSION:R:R} component '${comp}' #'
-. endif
-.endfor
+. endif
+. endfor
-.if defined(QT_DIST) && ! ${_QT_VERSION:M4*}
-. if ${QT_DIST} == "base"
+. if defined(QT_DIST) && ! ${_QT_VERSION:M4*}
+. if ${QT_DIST} == "base"
# qtbase requires some tools to be symlinked to the build directory.
_QT_TOOLS= # empty
-. if ${PORTNAME} != "qmake"
+. if ${PORTNAME} != "qmake"
_QT_TOOLS+= ${QMAKE}
-. endif
-. if ${PORTNAME} != "buildtools"
+. endif
+. if ${PORTNAME} != "buildtools"
_QT_TOOLS+= ${MOC} ${RCC}
-. endif
-. if ${PORTNAME} != "qdoc"
+. endif
+. if ${PORTNAME} != "qdoc"
_QT_TOOLS+= qdoc
-. endif
-. if ${PORTNAME} != "dbus"
+. endif
+. if ${PORTNAME} != "dbus"
_QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp
-. endif
-. if ${PORTNAME} != "widgets"
+. endif
+. if ${PORTNAME} != "widgets"
_QT_TOOLS+= ${UIC}
-. endif
+. endif
pre-configure: qtbase-pre-configure
qtbase-pre-configure:
-. for tool in ${_QT_TOOLS}
+. for tool in ${_QT_TOOLS}
@${TEST} -e ${QT_BINDIR}/${tool:T} && \
${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \
${TRUE}
-. endfor
+. endfor
# Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out
# certain paths from pkg-config calls (see the explanation in
@@ -635,12 +642,12 @@
${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \
${WRKSRC}/configure
-. if ${PORTNAME} != "qmake"
+. if ${PORTNAME} != "qmake"
_QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake
post-configure: qmake-configure
-. endif
-. endif # ${QT_DIST} == "base"
+. endif
+. endif # ${QT_DIST} == "base"
pre-configure: qt5-pre-configure
qt5-pre-configure:
@@ -671,7 +678,7 @@
post-install: qt-post-install
qt-post-install:
-. if ${QT_DEFINES:N-*}
+. if ${QT_DEFINES:N-*}
# We can't use SUB_FILES with a shared pkg-deinstall.in.
# We need it to be a script instead of a group of @unexecs, otherwise
# qconfig-modules.h cleanup will be run in pre-deinstall stage, which is
@@ -683,7 +690,7 @@
@${MKDIR} ${STAGEDIR}${QT_INCDIR}/QtCore/modules
@${ECHO_CMD} -n \
> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
-. for def in ${QT_DEFINES:N-*:O:u:C/=.*$//}
+. for def in ${QT_DEFINES:N-*:O:u:C/=.*$//}
@${ECHO_CMD} "#if !defined(QT_${def}) && !defined(QT_NO_${def})" \
>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
${ECHO_CMD} "# define QT_${def}" \
@@ -692,19 +699,19 @@
>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
@${ECHO_CMD} \
>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
-. endfor
+. endfor
@${ECHO_CMD} "${QT_PREFIX}/${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \
>> ${TMPPLIST}
@${ECHO_CMD} "@exec echo '#include <QtCore/modules/qconfig-${QT_MODNAME}.h>' >> ${QT_PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" \
>> ${TMPPLIST}
-. endif # ${QT_DEFINES:N-*}
-. if ${QT_CONFIG:N-*}
+. endif # ${QT_DEFINES:N-*}
+. if ${QT_CONFIG:N-*}
@${MKDIR} ${STAGEDIR}${QT_MKSPECDIR}/modules
${ECHO_CMD} "QT_CONFIG += ${QT_CONFIG:N-*:O:u}" \
> ${STAGEDIR}${QT_MKSPECDIR}/modules/qt_config_${QT_MODNAME}.pri
@${ECHO_CMD} "${QT_PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \
>> ${TMPPLIST}
-. endif # ${QT_CONFIG:N-*}
-.endif # defined(QT_DIST) && ! ${_QT_VERSION:M4*}
+. endif # ${QT_CONFIG:N-*}
+. endif # defined(QT_DIST) && ! ${_QT_VERSION:M4*}
.endif # defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
Index: cad/qelectrotech/pkg-plist
===================================================================
--- cad/qelectrotech/pkg-plist
+++ cad/qelectrotech/pkg-plist
@@ -684,11 +684,11 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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
Index: devel/qscintilla2-qt5/pkg-plist
===================================================================
--- devel/qscintilla2-qt5/pkg-plist
+++ devel/qscintilla2-qt5/pkg-plist
@@ -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
Index: devel/qscintilla2/pkg-plist
===================================================================
--- devel/qscintilla2/pkg-plist
+++ devel/qscintilla2/pkg-plist
@@ -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
Index: devel/qt4-libqtassistantclient/pkg-plist
===================================================================
--- devel/qt4-libqtassistantclient/pkg-plist
+++ devel/qt4-libqtassistantclient/pkg-plist
@@ -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
Index: graphics/gle-graphics/pkg-plist
===================================================================
--- graphics/gle-graphics/pkg-plist
+++ graphics/gle-graphics/pkg-plist
@@ -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
Index: math/vtk6/pkg-plist
===================================================================
--- math/vtk6/pkg-plist
+++ math/vtk6/pkg-plist
@@ -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
Index: multimedia/gstreamer-qt4/pkg-plist
===================================================================
--- multimedia/gstreamer-qt4/pkg-plist
+++ multimedia/gstreamer-qt4/pkg-plist
@@ -123,8 +123,8 @@
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
Index: multimedia/phonon/pkg-plist
===================================================================
--- multimedia/phonon/pkg-plist
+++ multimedia/phonon/pkg-plist
@@ -186,8 +186,8 @@
%%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
Index: multimedia/qt4-mobility/pkg-plist
===================================================================
--- multimedia/qt4-mobility/pkg-plist
+++ multimedia/qt4-mobility/pkg-plist
@@ -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
Index: sysutils/qzeitgeist/pkg-plist
===================================================================
--- sysutils/qzeitgeist/pkg-plist
+++ sysutils/qzeitgeist/pkg-plist
@@ -29,6 +29,6 @@
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
Index: x11-themes/qt5-style-plugins/pkg-plist
===================================================================
--- x11-themes/qt5-style-plugins/pkg-plist
+++ x11-themes/qt5-style-plugins/pkg-plist
@@ -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

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 3:12 PM (8 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31917335
Default Alt Text
D8378.id22068.diff (34 KB)

Event Timeline