- Replace QT_.*_REL with QT_.* in PLIST_SUB.

- Adapt plists.

With hat on:	kde

36 files changed, 244 insertions, 244 deletions

diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index 8e2f810..2bef42f 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -95,9 +95,9 @@ QT_INCDIR_REL=	include/qt4
 QT_LIBDIR_REL=	lib/qt4
 QT_PLUGINDIR_REL=	lib/qt4/plugins
 
-PLIST_SUB+=	QT_INCDIR_REL=${QT_INCDIR_REL} \
-		QT_LIBDIR_REL=${QT_LIBDIR_REL} \
-		QT_PLUGINDIR_REL=${QT_PLUGINDIR_REL}
+PLIST_SUB+=	QT_INCDIR=${QT_INCDIR_REL} \
+		QT_LIBDIR=${QT_LIBDIR_REL} \
+		QT_PLUGINDIR=${QT_PLUGINDIR_REL}
 
 QT_PREFIX?=	${LOCALBASE}
 QT_INCDIR?=	${QT_PREFIX}/${QT_INCDIR_REL}
diff --git a/accessibility/qt4-accessible/pkg-plist b/accessibility/qt4-accessible/pkg-plist
index fd9cdd7..fcc5155 100644
--- a/accessibility/qt4-accessible/pkg-plist
+++ b/accessibility/qt4-accessible/pkg-plist
@@ -1,6 +1,6 @@
-%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblecompatwidgets.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblecompatwidgets.so.debug
-%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblewidgets.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblewidgets.so.debug
-@dirrm %%QT_PLUGINDIR_REL%%/accessible
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/accessible/libqtaccessiblecompatwidgets.so
+%%DEBUG%%%%QT_PLUGINDIR%%/accessible/libqtaccessiblecompatwidgets.so.debug
+%%QT_PLUGINDIR%%/accessible/libqtaccessiblewidgets.so
+%%DEBUG%%%%QT_PLUGINDIR%%/accessible/libqtaccessiblewidgets.so.debug
+@dirrm %%QT_PLUGINDIR%%/accessible
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/audio/musescore/pkg-plist b/audio/musescore/pkg-plist
index 1b77ffe..fad2c73 100644
--- a/audio/musescore/pkg-plist
+++ b/audio/musescore/pkg-plist
@@ -1,5 +1,5 @@
 bin/mscore
-%%QT_PLUGINDIR_REL%%/designer/libawlplugin.so
+%%QT_PLUGINDIR%%/designer/libawlplugin.so
 share/applications/mscore.desktop
 %%DATADIR%%/demos/All_Dudes.mscz
 %%DATADIR%%/demos/Estudio-No1-Tarrega.mscx
diff --git a/chinese/qt4-codecs-cn/pkg-plist b/chinese/qt4-codecs-cn/pkg-plist
index 23f1123..981d760 100644
--- a/chinese/qt4-codecs-cn/pkg-plist
+++ b/chinese/qt4-codecs-cn/pkg-plist
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/codecs/libqcncodecs.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqcncodecs.so.debug
-@dirrmtry %%QT_PLUGINDIR_REL%%/codecs
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/codecs/libqcncodecs.so
+%%DEBUG%%%%QT_PLUGINDIR%%/codecs/libqcncodecs.so.debug
+@dirrmtry %%QT_PLUGINDIR%%/codecs
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/chinese/qt4-codecs-tw/pkg-plist b/chinese/qt4-codecs-tw/pkg-plist
index fe04743..49079c8 100644
--- a/chinese/qt4-codecs-tw/pkg-plist
+++ b/chinese/qt4-codecs-tw/pkg-plist
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/codecs/libqtwcodecs.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqtwcodecs.so.debug
-@dirrmtry %%QT_PLUGINDIR_REL%%/codecs
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/codecs/libqtwcodecs.so
+%%DEBUG%%%%QT_PLUGINDIR%%/codecs/libqtwcodecs.so.debug
+@dirrmtry %%QT_PLUGINDIR%%/codecs
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist
index 0337565..20f8a5b 100644
--- a/databases/akonadi/pkg-plist
+++ b/databases/akonadi/pkg-plist
@@ -43,4 +43,4 @@ share/mime/packages/akonadi-mime.xml
 @dirrmtry include/akonadi/private
 @dirrmtry include/akonadi
 %%SQLITE%%@cwd %%QT_PREFIX%%
-%%SQLITE%%%%QT_PLUGINDIR_REL%%/sqldrivers/libqsqlite3.so
+%%SQLITE%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlite3.so
diff --git a/databases/qt4-ibase-plugin/pkg-plist b/databases/qt4-ibase-plugin/pkg-plist
index d0c1a75..8d9f660 100644
--- a/databases/qt4-ibase-plugin/pkg-plist
+++ b/databases/qt4-ibase-plugin/pkg-plist
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
-@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/databases/qt4-mysql-plugin/pkg-plist b/databases/qt4-mysql-plugin/pkg-plist
index d0c1a75..8d9f660 100644
--- a/databases/qt4-mysql-plugin/pkg-plist
+++ b/databases/qt4-mysql-plugin/pkg-plist
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
-@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/databases/qt4-odbc-plugin/pkg-plist b/databases/qt4-odbc-plugin/pkg-plist
index d0c1a75..8d9f660 100644
--- a/databases/qt4-odbc-plugin/pkg-plist
+++ b/databases/qt4-odbc-plugin/pkg-plist
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
-@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/databases/qt4-pgsql-plugin/pkg-plist b/databases/qt4-pgsql-plugin/pkg-plist
index d0c1a75..8d9f660 100644
--- a/databases/qt4-pgsql-plugin/pkg-plist
+++ b/databases/qt4-pgsql-plugin/pkg-plist
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
-@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/databases/qt4-sqlite-plugin/pkg-plist b/databases/qt4-sqlite-plugin/pkg-plist
index 8a857e2..5e5b2df 100644
--- a/databases/qt4-sqlite-plugin/pkg-plist
+++ b/databases/qt4-sqlite-plugin/pkg-plist
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libq%%DB%%.so
-@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libq%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/databases/qt4-sqlite3-plugin/pkg-plist b/databases/qt4-sqlite3-plugin/pkg-plist
index 8a857e2..5e5b2df 100644
--- a/databases/qt4-sqlite3-plugin/pkg-plist
+++ b/databases/qt4-sqlite3-plugin/pkg-plist
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libq%%DB%%.so
-@dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libq%%DB%%.so
+@dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/devel/py-qt4-designerplugin/pkg-plist b/devel/py-qt4-designerplugin/pkg-plist
index 4a9d7ad..2c0e5cc 100644
--- a/devel/py-qt4-designerplugin/pkg-plist
+++ b/devel/py-qt4-designerplugin/pkg-plist
@@ -1 +1 @@
-%%QT_PLUGINDIR_REL%%/designer/libpyqt4.so
+%%QT_PLUGINDIR%%/designer/libpyqt4.so
diff --git a/devel/qscintilla2-designerplugin/pkg-plist b/devel/qscintilla2-designerplugin/pkg-plist
index ab10d82..5b10f58 100644
--- a/devel/qscintilla2-designerplugin/pkg-plist
+++ b/devel/qscintilla2-designerplugin/pkg-plist
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/designer/libqscintillaplugin.so
-@dirrmtry %%QT_PLUGINDIR_REL%%/designer
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/designer/libqscintillaplugin.so
+@dirrmtry %%QT_PLUGINDIR%%/designer
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist
index 7f39cab..096c977 100644
--- a/devel/qscintilla2/pkg-plist
+++ b/devel/qscintilla2/pkg-plist
@@ -1,54 +1,54 @@
-%%QT_INCDIR_REL%%/Qsci/qsciabstractapis.h
-%%QT_INCDIR_REL%%/Qsci/qsciapis.h
-%%QT_INCDIR_REL%%/Qsci/qscicommand.h
-%%QT_INCDIR_REL%%/Qsci/qscicommandset.h
-%%QT_INCDIR_REL%%/Qsci/qscidocument.h
-%%QT_INCDIR_REL%%/Qsci/qsciglobal.h
-%%QT_INCDIR_REL%%/Qsci/qscilexer.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerbash.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerbatch.h
-%%QT_INCDIR_REL%%/Qsci/qscilexercmake.h
-%%QT_INCDIR_REL%%/Qsci/qscilexercpp.h
-%%QT_INCDIR_REL%%/Qsci/qscilexercsharp.h
-%%QT_INCDIR_REL%%/Qsci/qscilexercss.h
-%%QT_INCDIR_REL%%/Qsci/qscilexercustom.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerd.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerdiff.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerfortran.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerfortran77.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerhtml.h
-%%QT_INCDIR_REL%%/Qsci/qscilexeridl.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerjava.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerjavascript.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerlua.h
-%%QT_INCDIR_REL%%/Qsci/qscilexermakefile.h
-%%QT_INCDIR_REL%%/Qsci/qscilexermatlab.h
-%%QT_INCDIR_REL%%/Qsci/qscilexeroctave.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerpascal.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerperl.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerpostscript.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerpov.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerproperties.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerpython.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerruby.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerspice.h
-%%QT_INCDIR_REL%%/Qsci/qscilexersql.h
-%%QT_INCDIR_REL%%/Qsci/qscilexertcl.h
-%%QT_INCDIR_REL%%/Qsci/qscilexertex.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerverilog.h
-%%QT_INCDIR_REL%%/Qsci/qscilexervhdl.h
-%%QT_INCDIR_REL%%/Qsci/qscilexerxml.h
-%%QT_INCDIR_REL%%/Qsci/qscilexeryaml.h
-%%QT_INCDIR_REL%%/Qsci/qscimacro.h
-%%QT_INCDIR_REL%%/Qsci/qsciprinter.h
-%%QT_INCDIR_REL%%/Qsci/qsciscintilla.h
-%%QT_INCDIR_REL%%/Qsci/qsciscintillabase.h
-%%QT_INCDIR_REL%%/Qsci/qscistyle.h
-%%QT_INCDIR_REL%%/Qsci/qscistyledtext.h
-%%QT_LIBDIR_REL%%/libqscintilla2.so
-%%QT_LIBDIR_REL%%/libqscintilla2.so.9
-%%QT_LIBDIR_REL%%/libqscintilla2.so.9.0
-%%QT_LIBDIR_REL%%/libqscintilla2.so.9.0.2
+%%QT_INCDIR%%/Qsci/qsciabstractapis.h
+%%QT_INCDIR%%/Qsci/qsciapis.h
+%%QT_INCDIR%%/Qsci/qscicommand.h
+%%QT_INCDIR%%/Qsci/qscicommandset.h
+%%QT_INCDIR%%/Qsci/qscidocument.h
+%%QT_INCDIR%%/Qsci/qsciglobal.h
+%%QT_INCDIR%%/Qsci/qscilexer.h
+%%QT_INCDIR%%/Qsci/qscilexerbash.h
+%%QT_INCDIR%%/Qsci/qscilexerbatch.h
+%%QT_INCDIR%%/Qsci/qscilexercmake.h
+%%QT_INCDIR%%/Qsci/qscilexercpp.h
+%%QT_INCDIR%%/Qsci/qscilexercsharp.h
+%%QT_INCDIR%%/Qsci/qscilexercss.h
+%%QT_INCDIR%%/Qsci/qscilexercustom.h
+%%QT_INCDIR%%/Qsci/qscilexerd.h
+%%QT_INCDIR%%/Qsci/qscilexerdiff.h
+%%QT_INCDIR%%/Qsci/qscilexerfortran.h
+%%QT_INCDIR%%/Qsci/qscilexerfortran77.h
+%%QT_INCDIR%%/Qsci/qscilexerhtml.h
+%%QT_INCDIR%%/Qsci/qscilexeridl.h
+%%QT_INCDIR%%/Qsci/qscilexerjava.h
+%%QT_INCDIR%%/Qsci/qscilexerjavascript.h
+%%QT_INCDIR%%/Qsci/qscilexerlua.h
+%%QT_INCDIR%%/Qsci/qscilexermakefile.h
+%%QT_INCDIR%%/Qsci/qscilexermatlab.h
+%%QT_INCDIR%%/Qsci/qscilexeroctave.h
+%%QT_INCDIR%%/Qsci/qscilexerpascal.h
+%%QT_INCDIR%%/Qsci/qscilexerperl.h
+%%QT_INCDIR%%/Qsci/qscilexerpostscript.h
+%%QT_INCDIR%%/Qsci/qscilexerpov.h
+%%QT_INCDIR%%/Qsci/qscilexerproperties.h
+%%QT_INCDIR%%/Qsci/qscilexerpython.h
+%%QT_INCDIR%%/Qsci/qscilexerruby.h
+%%QT_INCDIR%%/Qsci/qscilexerspice.h
+%%QT_INCDIR%%/Qsci/qscilexersql.h
+%%QT_INCDIR%%/Qsci/qscilexertcl.h
+%%QT_INCDIR%%/Qsci/qscilexertex.h
+%%QT_INCDIR%%/Qsci/qscilexerverilog.h
+%%QT_INCDIR%%/Qsci/qscilexervhdl.h
+%%QT_INCDIR%%/Qsci/qscilexerxml.h
+%%QT_INCDIR%%/Qsci/qscilexeryaml.h
+%%QT_INCDIR%%/Qsci/qscimacro.h
+%%QT_INCDIR%%/Qsci/qsciprinter.h
+%%QT_INCDIR%%/Qsci/qsciscintilla.h
+%%QT_INCDIR%%/Qsci/qsciscintillabase.h
+%%QT_INCDIR%%/Qsci/qscistyle.h
+%%QT_INCDIR%%/Qsci/qscistyledtext.h
+%%QT_LIBDIR%%/libqscintilla2.so
+%%QT_LIBDIR%%/libqscintilla2.so.9
+%%QT_LIBDIR%%/libqscintilla2.so.9.0
+%%QT_LIBDIR%%/libqscintilla2.so.9.0.2
 share/qt4/qsci/api/python/Python-2.4.api
 share/qt4/qsci/api/python/Python-2.5.api
 share/qt4/qsci/api/python/Python-2.6.api
@@ -67,6 +67,6 @@ share/qt4/qsci/api/python/Python-3.3.api
 @dirrmtry share/qt4/qsci/api
 @dirrmtry share/qt4/qsci
 @dirrmtry share/qt4
-@dirrmtry %%QT_LIBDIR_REL%%
-@dirrm %%QT_INCDIR_REL%%/Qsci
-@dirrmtry %%QT_INCDIR_REL%%
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/Qsci
+@dirrmtry %%QT_INCDIR%%
diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist
index 8ad61dd..1d9f369 100644
--- a/devel/qt4-corelib/pkg-plist
+++ b/devel/qt4-corelib/pkg-plist
@@ -629,12 +629,12 @@ lib/qt4/libQtCore.so.4
 lib/qt4/libQtCore.so.%%SHLIB_SHVER%%
 lib/qt4/libQtCore.so.%%SHLIB_VER%%
 %%DEBUG%%lib/qt4/libQtCore.so.%%SHLIB_VER%%.debug
-%%QT_PLUGINDIR_REL%%/.keep_me
+%%QT_PLUGINDIR%%/.keep_me
 libdata/pkgconfig/QtCore.pc
 share/qt4/mkspecs/qconfig.pri
 @dirrmtry share/qt4/mkspecs
 @dirrmtry share/qt4
-@dirrmtry %%QT_PLUGINDIR_REL%%
+@dirrmtry %%QT_PLUGINDIR%%
 @dirrmtry lib/qt4
 @dirrm include/qt4/QtCore
 @dirrmtry include/qt4/Qt
diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist
index e51763c..ab64795 100644
--- a/devel/qt4-designer/pkg-plist
+++ b/devel/qt4-designer/pkg-plist
@@ -96,20 +96,20 @@ lib/qt4/libQtDesignerComponents.so.%%SHLIB_VER%%
 %%DEBUG%%lib/qt4/libQtDesignerComponents.so.%%SHLIB_VER%%.debug
 lib/qt4/libQtUiTools.a
 lib/qt4/libQtUiTools.prl
-%%QT_PLUGINDIR_REL%%/designer/libphononwidgets.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libphononwidgets.so.debug
-%%QT_PLUGINDIR_REL%%/designer/libqdeclarativeview.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqdeclarativeview.so.debug
-%%QT_PLUGINDIR_REL%%/designer/libqt3supportwidgets.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqt3supportwidgets.so.debug
-%%QT_PLUGINDIR_REL%%/designer/libqwebview.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqwebview.so.debug
+%%QT_PLUGINDIR%%/designer/libphononwidgets.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libphononwidgets.so.debug
+%%QT_PLUGINDIR%%/designer/libqdeclarativeview.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqdeclarativeview.so.debug
+%%QT_PLUGINDIR%%/designer/libqt3supportwidgets.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqt3supportwidgets.so.debug
+%%QT_PLUGINDIR%%/designer/libqwebview.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug
 libdata/pkgconfig/QtDesigner.pc
 libdata/pkgconfig/QtDesignerComponents.pc
 libdata/pkgconfig/QtUiTools.pc
 share/pixmaps/designer-qt4.png
-@dirrmtry %%QT_PLUGINDIR_REL%%/designer
-@dirrmtry %%QT_PLUGINDIR_REL%%
+@dirrmtry %%QT_PLUGINDIR%%/designer
+@dirrmtry %%QT_PLUGINDIR%%
 @dirrmtry lib/qt4
 @dirrm include/qt4/QtUiTools
 @dirrm include/qt4/QtDesigner
diff --git a/devel/qtscriptgenerator/pkg-plist b/devel/qtscriptgenerator/pkg-plist
index 41fbb13..29d055d 100644
--- a/devel/qtscriptgenerator/pkg-plist
+++ b/devel/qtscriptgenerator/pkg-plist
@@ -1,46 +1,46 @@
-%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so
-%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so.1
-%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so.1.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so.1.0.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so
-%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so.1
-%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so.1.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so.1.0.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so
-%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so.1
-%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so.1.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so.1.0.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so
-%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so.1
-%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so.1.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so.1.0.0
-%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so
-%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so.1
-%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so.1.0
-%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so.1.0.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so
-%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so.1
-%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so.1.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so.1.0.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so
-%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so.1
-%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so.1.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so.1.0.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so
-%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so.1
-%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so.1.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so.1.0.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so
-%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so.1
-%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so.1.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so.1.0.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so
-%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so.1
-%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so.1.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so.1.0.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so
-%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so.1
-%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so.1.0
-%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so.1.0.0
-@dirrm %%QT_PLUGINDIR_REL%%/script
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/script/libqtscript_core.so
+%%QT_PLUGINDIR%%/script/libqtscript_core.so.1
+%%QT_PLUGINDIR%%/script/libqtscript_core.so.1.0
+%%QT_PLUGINDIR%%/script/libqtscript_core.so.1.0.0
+%%QT_PLUGINDIR%%/script/libqtscript_gui.so
+%%QT_PLUGINDIR%%/script/libqtscript_gui.so.1
+%%QT_PLUGINDIR%%/script/libqtscript_gui.so.1.0
+%%QT_PLUGINDIR%%/script/libqtscript_gui.so.1.0.0
+%%QT_PLUGINDIR%%/script/libqtscript_network.so
+%%QT_PLUGINDIR%%/script/libqtscript_network.so.1
+%%QT_PLUGINDIR%%/script/libqtscript_network.so.1.0
+%%QT_PLUGINDIR%%/script/libqtscript_network.so.1.0.0
+%%QT_PLUGINDIR%%/script/libqtscript_opengl.so
+%%QT_PLUGINDIR%%/script/libqtscript_opengl.so.1
+%%QT_PLUGINDIR%%/script/libqtscript_opengl.so.1.0
+%%QT_PLUGINDIR%%/script/libqtscript_opengl.so.1.0.0
+%%PHONON%%%%QT_PLUGINDIR%%/script/libqtscript_phonon.so
+%%PHONON%%%%QT_PLUGINDIR%%/script/libqtscript_phonon.so.1
+%%PHONON%%%%QT_PLUGINDIR%%/script/libqtscript_phonon.so.1.0
+%%PHONON%%%%QT_PLUGINDIR%%/script/libqtscript_phonon.so.1.0.0
+%%QT_PLUGINDIR%%/script/libqtscript_sql.so
+%%QT_PLUGINDIR%%/script/libqtscript_sql.so.1
+%%QT_PLUGINDIR%%/script/libqtscript_sql.so.1.0
+%%QT_PLUGINDIR%%/script/libqtscript_sql.so.1.0.0
+%%QT_PLUGINDIR%%/script/libqtscript_svg.so
+%%QT_PLUGINDIR%%/script/libqtscript_svg.so.1
+%%QT_PLUGINDIR%%/script/libqtscript_svg.so.1.0
+%%QT_PLUGINDIR%%/script/libqtscript_svg.so.1.0.0
+%%QT_PLUGINDIR%%/script/libqtscript_uitools.so
+%%QT_PLUGINDIR%%/script/libqtscript_uitools.so.1
+%%QT_PLUGINDIR%%/script/libqtscript_uitools.so.1.0
+%%QT_PLUGINDIR%%/script/libqtscript_uitools.so.1.0.0
+%%QT_PLUGINDIR%%/script/libqtscript_webkit.so
+%%QT_PLUGINDIR%%/script/libqtscript_webkit.so.1
+%%QT_PLUGINDIR%%/script/libqtscript_webkit.so.1.0
+%%QT_PLUGINDIR%%/script/libqtscript_webkit.so.1.0.0
+%%QT_PLUGINDIR%%/script/libqtscript_xml.so
+%%QT_PLUGINDIR%%/script/libqtscript_xml.so.1
+%%QT_PLUGINDIR%%/script/libqtscript_xml.so.1.0
+%%QT_PLUGINDIR%%/script/libqtscript_xml.so.1.0.0
+%%QT_PLUGINDIR%%/script/libqtscript_xmlpatterns.so
+%%QT_PLUGINDIR%%/script/libqtscript_xmlpatterns.so.1
+%%QT_PLUGINDIR%%/script/libqtscript_xmlpatterns.so.1.0
+%%QT_PLUGINDIR%%/script/libqtscript_xmlpatterns.so.1.0.0
+@dirrm %%QT_PLUGINDIR%%/script
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/graphics/qt4-iconengines/pkg-plist b/graphics/qt4-iconengines/pkg-plist
index a4d1cee..be7c0e8 100644
--- a/graphics/qt4-iconengines/pkg-plist
+++ b/graphics/qt4-iconengines/pkg-plist
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/iconengines/libqsvgicon.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/iconengines/libqsvgicon.so.debug
-@dirrmtry %%QT_PLUGINDIR_REL%%/iconengines
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/iconengines/libqsvgicon.so
+%%DEBUG%%%%QT_PLUGINDIR%%/iconengines/libqsvgicon.so.debug
+@dirrmtry %%QT_PLUGINDIR%%/iconengines
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/graphics/qt4-imageformats/pkg-plist b/graphics/qt4-imageformats/pkg-plist
index 7c69c4b..9e0b8ec 100644
--- a/graphics/qt4-imageformats/pkg-plist
+++ b/graphics/qt4-imageformats/pkg-plist
@@ -1,16 +1,16 @@
-%%QT_PLUGINDIR_REL%%/imageformats/libqgif.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqgif.so.debug
-%%QT_PLUGINDIR_REL%%/imageformats/libqico.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqico.so.debug
-%%QT_PLUGINDIR_REL%%/imageformats/libqjpeg.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqjpeg.so.debug
-%%QT_PLUGINDIR_REL%%/imageformats/libqmng.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqmng.so.debug
-%%QT_PLUGINDIR_REL%%/imageformats/libqsvg.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqsvg.so.debug
-%%QT_PLUGINDIR_REL%%/imageformats/libqtga.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqtga.so.debug
-%%QT_PLUGINDIR_REL%%/imageformats/libqtiff.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/imageformats/libqtiff.so.debug
-@dirrm %%QT_PLUGINDIR_REL%%/imageformats
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/imageformats/libqgif.so
+%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqgif.so.debug
+%%QT_PLUGINDIR%%/imageformats/libqico.so
+%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqico.so.debug
+%%QT_PLUGINDIR%%/imageformats/libqjpeg.so
+%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqjpeg.so.debug
+%%QT_PLUGINDIR%%/imageformats/libqmng.so
+%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqmng.so.debug
+%%QT_PLUGINDIR%%/imageformats/libqsvg.so
+%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqsvg.so.debug
+%%QT_PLUGINDIR%%/imageformats/libqtga.so
+%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqtga.so.debug
+%%QT_PLUGINDIR%%/imageformats/libqtiff.so
+%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqtiff.so.debug
+@dirrm %%QT_PLUGINDIR%%/imageformats
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/japanese/qt4-codecs-jp/pkg-plist b/japanese/qt4-codecs-jp/pkg-plist
index 510d83a..884f346 100644
--- a/japanese/qt4-codecs-jp/pkg-plist
+++ b/japanese/qt4-codecs-jp/pkg-plist
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/codecs/libqjpcodecs.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqjpcodecs.so.debug
-@dirrmtry %%QT_PLUGINDIR_REL%%/codecs
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/codecs/libqjpcodecs.so
+%%DEBUG%%%%QT_PLUGINDIR%%/codecs/libqjpcodecs.so.debug
+@dirrmtry %%QT_PLUGINDIR%%/codecs
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/korean/qt4-codecs-kr/pkg-plist b/korean/qt4-codecs-kr/pkg-plist
index ee64e95..3807143 100644
--- a/korean/qt4-codecs-kr/pkg-plist
+++ b/korean/qt4-codecs-kr/pkg-plist
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/codecs/libqkrcodecs.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqkrcodecs.so.debug
-@dirrmtry %%QT_PLUGINDIR_REL%%/codecs
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/codecs/libqkrcodecs.so
+%%DEBUG%%%%QT_PLUGINDIR%%/codecs/libqkrcodecs.so.debug
+@dirrmtry %%QT_PLUGINDIR%%/codecs
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/misc/qt4-qtdemo/pkg-plist b/misc/qt4-qtdemo/pkg-plist
index e5bcaaa..f7d6fc8 100644
--- a/misc/qt4-qtdemo/pkg-plist
+++ b/misc/qt4-qtdemo/pkg-plist
@@ -1,15 +1,15 @@
 bin/qtdemo
 %%DEBUG%%bin/qtdemo.debug
-%%QT_PLUGINDIR_REL%%/designer/libarthurplugin.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libarthurplugin.so.debug
-%%QT_PLUGINDIR_REL%%/designer/libcontainerextension.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libcontainerextension.so.debug
-%%QT_PLUGINDIR_REL%%/designer/libcustomwidgetplugin.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libcustomwidgetplugin.so.debug
-%%QT_PLUGINDIR_REL%%/designer/libtaskmenuextension.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libtaskmenuextension.so.debug
-%%QT_PLUGINDIR_REL%%/designer/libworldtimeclockplugin.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libworldtimeclockplugin.so.debug
+%%QT_PLUGINDIR%%/designer/libarthurplugin.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libarthurplugin.so.debug
+%%QT_PLUGINDIR%%/designer/libcontainerextension.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libcontainerextension.so.debug
+%%QT_PLUGINDIR%%/designer/libcustomwidgetplugin.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libcustomwidgetplugin.so.debug
+%%QT_PLUGINDIR%%/designer/libtaskmenuextension.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libtaskmenuextension.so.debug
+%%QT_PLUGINDIR%%/designer/libworldtimeclockplugin.so
+%%DEBUG%%%%QT_PLUGINDIR%%/designer/libworldtimeclockplugin.so.debug
 share/examples/qt4/demos/README
 share/examples/qt4/demos/affine/affine
 %%DEBUG%%share/examples/qt4/demos/affine/affine.debug
@@ -4984,5 +4984,5 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro
 @dirrm share/examples/qt4/demos/affine
 @dirrm share/examples/qt4/demos
 @dirrm share/examples/qt4
-@dirrmtry %%QT_PLUGINDIR_REL%%/designer
-@dirrmtry %%QT_PLUGINDIR_REL%%
+@dirrmtry %%QT_PLUGINDIR%%/designer
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/multimedia/gstreamer-qt4/pkg-plist b/multimedia/gstreamer-qt4/pkg-plist
index 7777cd8..83a4d80 100644
--- a/multimedia/gstreamer-qt4/pkg-plist
+++ b/multimedia/gstreamer-qt4/pkg-plist
@@ -119,14 +119,14 @@ lib/libQtGStreamerUi-0.10.so.0.10.2
 lib/libQtGStreamerUtils-0.10.so
 lib/libQtGStreamerUtils-0.10.so.0
 lib/libQtGStreamerUtils-0.10.so.0.10.2
-%%QT_LIBDIR_REL%%/imports/QtGStreamer/libQtGStreamerQML.so
-%%QT_LIBDIR_REL%%/imports/QtGStreamer/qmldir
+%%QT_LIBDIR%%/imports/QtGStreamer/libQtGStreamerQML.so
+%%QT_LIBDIR%%/imports/QtGStreamer/qmldir
 libdata/pkgconfig/QtGLib-2.0.pc
 libdata/pkgconfig/QtGStreamer-0.10.pc
 libdata/pkgconfig/QtGStreamerUi-0.10.pc
 libdata/pkgconfig/QtGStreamerUtils-0.10.pc
-@dirrm %%QT_LIBDIR_REL%%/imports/QtGStreamer
-@dirrmtry %%QT_LIBDIR_REL%%/imports
+@dirrm %%QT_LIBDIR%%/imports/QtGStreamer
+@dirrmtry %%QT_LIBDIR%%/imports
 @dirrm lib/QtGStreamer
 @dirrm include/QtGStreamer/QGst/Ui
 @dirrm include/QtGStreamer/QGst/Utils
diff --git a/multimedia/phonon-gstreamer/pkg-plist b/multimedia/phonon-gstreamer/pkg-plist
index 4573b32..7a2dd32 100644
--- a/multimedia/phonon-gstreamer/pkg-plist
+++ b/multimedia/phonon-gstreamer/pkg-plist
@@ -9,6 +9,6 @@ share/kde4/services/phononbackends/gstreamer.desktop
 @dirrmtry share/kde4/services/phononbackends
 @dirrmtry lib/kde4/plugins/phonon_backend
 @cwd %%QT_PREFIX%%
-%%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_gstreamer.so
-@dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/phonon_backend/libphonon_gstreamer.so
+@dirrmtry %%QT_PLUGINDIR%%/phonon_backend
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/multimedia/phonon-vlc/pkg-plist b/multimedia/phonon-vlc/pkg-plist
index 58e577e..8ece7bb 100644
--- a/multimedia/phonon-vlc/pkg-plist
+++ b/multimedia/phonon-vlc/pkg-plist
@@ -3,6 +3,6 @@ share/kde4/services/phononbackends/vlc.desktop
 @dirrmtry share/kde4/services/phononbackends
 @dirrmtry lib/kde4/plugins/phonon_backend
 @cwd %%QT_PREFIX%%
-%%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_vlc.so
-@dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/phonon_backend/libphonon_vlc.so
+@dirrmtry %%QT_PLUGINDIR%%/phonon_backend
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/multimedia/phonon-xine/pkg-plist b/multimedia/phonon-xine/pkg-plist
index 1c5b116..b49d329 100644
--- a/multimedia/phonon-xine/pkg-plist
+++ b/multimedia/phonon-xine/pkg-plist
@@ -10,6 +10,6 @@ share/kde4/services/phononbackends/xine.desktop
 @dirrmtry share/kde4/services/phononbackends
 @dirrmtry lib/kde4/plugins/phonon_backend
 @cwd %%QT_PREFIX%%
-%%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_xine.so
-@dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/phonon_backend/libphonon_xine.so
+@dirrmtry %%QT_PLUGINDIR%%/phonon_backend
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist
index 95e0ba3..1c2cba0 100644
--- a/multimedia/phonon/pkg-plist
+++ b/multimedia/phonon/pkg-plist
@@ -188,13 +188,13 @@ share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 @dirrm include/KDE/Phonon/Experimental
 @dirrm include/KDE/Phonon
 @cwd %%QT_PREFIX%%
-%%QT_INCDIR_REL%%/Phonon
-%%QT_INCDIR_REL%%/phonon
-%%QT_LIBDIR_REL%%/libphonon.so
-%%QT_LIBDIR_REL%%/libphonon.so.4
-%%QT_LIBDIR_REL%%/libphononexperimental.so
-%%QT_LIBDIR_REL%%/libphononexperimental.so.4
+%%QT_INCDIR%%/Phonon
+%%QT_INCDIR%%/phonon
+%%QT_LIBDIR%%/libphonon.so
+%%QT_LIBDIR%%/libphonon.so.4
+%%QT_LIBDIR%%/libphononexperimental.so
+%%QT_LIBDIR%%/libphononexperimental.so.4
 share/qt4/mkspecs/modules/qt_phonon.pri
 @dirrmtry share/qt4/mkspecs/modules
-@dirrmtry %%QT_LIBDIR_REL%%
-@dirrmtry %%QT_INCDIR_REL%%
+@dirrmtry %%QT_LIBDIR%%
+@dirrmtry %%QT_INCDIR%%
diff --git a/net-im/qxmpp/pkg-plist b/net-im/qxmpp/pkg-plist
index efa9914..c0aaa8d 100644
--- a/net-im/qxmpp/pkg-plist
+++ b/net-im/qxmpp/pkg-plist
@@ -60,7 +60,7 @@ include/qxmpp/QXmppByteStreamIq.h
 include/qxmpp/QXmppBindIq.h
 include/qxmpp/QXmppArchiveManager.h
 include/qxmpp/QXmppArchiveIq.h
-%%QT_LIBDIR_REL%%/libqxmpp.a
+%%QT_LIBDIR%%/libqxmpp.a
 %%DOCSDIR%%/html/tabs.css
 %%DOCSDIR%%/html/tab_s.png
 %%DOCSDIR%%/html/tab_h.png
diff --git a/security/qca-cyrus-sasl/pkg-plist b/security/qca-cyrus-sasl/pkg-plist
index 249b7785..d9a31e2 100644
--- a/security/qca-cyrus-sasl/pkg-plist
+++ b/security/qca-cyrus-sasl/pkg-plist
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/crypto/libqca-cyrus-sasl.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/crypto/libqca-cyrus-sasl.so.debug
-@dirrmtry %%QT_PLUGINDIR_REL%%/crypto
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/crypto/libqca-cyrus-sasl.so
+%%DEBUG%%%%QT_PLUGINDIR%%/crypto/libqca-cyrus-sasl.so.debug
+@dirrmtry %%QT_PLUGINDIR%%/crypto
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/security/qca-gnupg/pkg-plist b/security/qca-gnupg/pkg-plist
index 0f8f5fd..2b89dbb 100644
--- a/security/qca-gnupg/pkg-plist
+++ b/security/qca-gnupg/pkg-plist
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/crypto/libqca-gnupg.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/crypto/libqca-gnupg.so.debug
-@dirrmtry %%QT_PLUGINDIR_REL%%/crypto
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/crypto/libqca-gnupg.so
+%%DEBUG%%%%QT_PLUGINDIR%%/crypto/libqca-gnupg.so.debug
+@dirrmtry %%QT_PLUGINDIR%%/crypto
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/security/qca-ossl/pkg-plist b/security/qca-ossl/pkg-plist
index edc9755..0d4d424 100644
--- a/security/qca-ossl/pkg-plist
+++ b/security/qca-ossl/pkg-plist
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/crypto/libqca-ossl.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/crypto/libqca-ossl.so.debug
-@dirrmtry %%QT_PLUGINDIR_REL%%/crypto
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/crypto/libqca-ossl.so
+%%DEBUG%%%%QT_PLUGINDIR%%/crypto/libqca-ossl.so.debug
+@dirrmtry %%QT_PLUGINDIR%%/crypto
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/sysutils/qzeitgeist/pkg-plist b/sysutils/qzeitgeist/pkg-plist
index d6e94e6..3373cb4 100644
--- a/sysutils/qzeitgeist/pkg-plist
+++ b/sysutils/qzeitgeist/pkg-plist
@@ -29,13 +29,13 @@ lib/cmake/QZeitgeist/QZeitgeistExport.cmake
 lib/libqzeitgeist.so
 lib/libqzeitgeist.so.0.8.0
 lib/libqzeitgeist.so.1
-%%QT_LIBDIR_REL%%/imports/org/gnome/zeitgeist/libQZeitgeistDeclarativePlugin.so
-%%QT_LIBDIR_REL%%/imports/org/gnome/zeitgeist/qmldir
+%%QT_LIBDIR%%/imports/org/gnome/zeitgeist/libQZeitgeistDeclarativePlugin.so
+%%QT_LIBDIR%%/imports/org/gnome/zeitgeist/qmldir
 libdata/pkgconfig/QZeitgeist.pc
-@dirrm %%QT_LIBDIR_REL%%/imports/org/gnome/zeitgeist
-@dirrm %%QT_LIBDIR_REL%%/imports/org/gnome
-@dirrmtry %%QT_LIBDIR_REL%%/imports/org
-@dirrmtry %%QT_LIBDIR_REL%%/imports
+@dirrm %%QT_LIBDIR%%/imports/org/gnome/zeitgeist
+@dirrm %%QT_LIBDIR%%/imports/org/gnome
+@dirrmtry %%QT_LIBDIR%%/imports/org
+@dirrmtry %%QT_LIBDIR%%/imports
 @dirrm lib/cmake/QZeitgeist
 @dirrmtry lib/cmake
 @dirrm include/QZeitgeist/DataModel
diff --git a/x11-toolkits/qwt5-designerplugin/pkg-plist b/x11-toolkits/qwt5-designerplugin/pkg-plist
index 14e3c7b..dd1ad88 100644
--- a/x11-toolkits/qwt5-designerplugin/pkg-plist
+++ b/x11-toolkits/qwt5-designerplugin/pkg-plist
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/designer/libqwt_designer_plugin.so
-@dirrmtry %%QT_PLUGINDIR_REL%%/designer
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/designer/libqwt_designer_plugin.so
+@dirrmtry %%QT_PLUGINDIR%%/designer
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/x11/qt4-graphicssystems-opengl/pkg-plist b/x11/qt4-graphicssystems-opengl/pkg-plist
index b62b955..a3358c1 100644
--- a/x11/qt4-graphicssystems-opengl/pkg-plist
+++ b/x11/qt4-graphicssystems-opengl/pkg-plist
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/graphicssystems/libqglgraphicssystem.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/graphicssystems/libqglgraphicssystem.so.debug
-@dirrmtry %%QT_PLUGINDIR_REL%%/graphicssystems
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/graphicssystems/libqglgraphicssystem.so
+%%DEBUG%%%%QT_PLUGINDIR%%/graphicssystems/libqglgraphicssystem.so.debug
+@dirrmtry %%QT_PLUGINDIR%%/graphicssystems
+@dirrmtry %%QT_PLUGINDIR%%
diff --git a/x11/qt4-inputmethods/pkg-plist b/x11/qt4-inputmethods/pkg-plist
index 3af1059..6238e3b 100644
--- a/x11/qt4-inputmethods/pkg-plist
+++ b/x11/qt4-inputmethods/pkg-plist
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/inputmethods/libqimsw-multi.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/inputmethods/libqimsw-multi.so.debug
-@dirrm %%QT_PLUGINDIR_REL%%/inputmethods
-@dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/inputmethods/libqimsw-multi.so
+%%DEBUG%%%%QT_PLUGINDIR%%/inputmethods/libqimsw-multi.so.debug
+@dirrm %%QT_PLUGINDIR%%/inputmethods
+@dirrmtry %%QT_PLUGINDIR%%