svn commit: r334045 - in head: Mk accessibility/qt4-accessible audio/musescore chinese/qt4-codecs-cn chinese/qt4-codecs-tw databases/akonadi databases/qt4-ibase-plugin databases/qt4-mysql-plugin da...

Sun Nov 17 02:12:33 UTC 2013

Author: avilla
Date: Sun Nov 17 02:12:25 2013
New Revision: 334045
URL: http://svnweb.freebsd.org/changeset/ports/334045

Log:
  - Replace QT_.*_REL with QT_.* in PLIST_SUB.
  - Adapt plists.
  
  With hat on:	kde

Modified:
  head/Mk/bsd.qt.mk
  head/accessibility/qt4-accessible/pkg-plist   (contents, props changed)
  head/audio/musescore/pkg-plist
  head/chinese/qt4-codecs-cn/pkg-plist   (contents, props changed)
  head/chinese/qt4-codecs-tw/pkg-plist   (contents, props changed)
  head/databases/akonadi/pkg-plist
  head/databases/qt4-ibase-plugin/pkg-plist   (contents, props changed)
  head/databases/qt4-mysql-plugin/pkg-plist   (contents, props changed)
  head/databases/qt4-odbc-plugin/pkg-plist   (contents, props changed)
  head/databases/qt4-pgsql-plugin/pkg-plist   (contents, props changed)
  head/databases/qt4-sqlite-plugin/pkg-plist   (contents, props changed)
  head/databases/qt4-sqlite3-plugin/pkg-plist   (contents, props changed)
  head/devel/py-qt4-designerplugin/pkg-plist   (contents, props changed)
  head/devel/qscintilla2-designerplugin/pkg-plist   (contents, props changed)
  head/devel/qscintilla2/pkg-plist
  head/devel/qt4-corelib/pkg-plist   (contents, props changed)
  head/devel/qt4-designer/pkg-plist   (contents, props changed)
  head/devel/qtscriptgenerator/pkg-plist   (contents, props changed)
  head/graphics/qt4-iconengines/pkg-plist   (contents, props changed)
  head/graphics/qt4-imageformats/pkg-plist   (contents, props changed)
  head/japanese/qt4-codecs-jp/pkg-plist   (contents, props changed)
  head/korean/qt4-codecs-kr/pkg-plist   (contents, props changed)
  head/misc/qt4-qtdemo/pkg-plist
  head/multimedia/gstreamer-qt4/pkg-plist
  head/multimedia/phonon-gstreamer/pkg-plist   (contents, props changed)
  head/multimedia/phonon-vlc/pkg-plist   (contents, props changed)
  head/multimedia/phonon-xine/pkg-plist   (contents, props changed)
  head/multimedia/phonon/pkg-plist
  head/net-im/qxmpp/pkg-plist   (contents, props changed)
  head/security/qca-cyrus-sasl/pkg-plist   (contents, props changed)
  head/security/qca-gnupg/pkg-plist   (contents, props changed)
  head/security/qca-ossl/pkg-plist   (contents, props changed)
  head/sysutils/qzeitgeist/pkg-plist   (contents, props changed)
  head/x11-toolkits/qwt5-designerplugin/pkg-plist   (contents, props changed)
  head/x11/qt4-graphicssystems-opengl/pkg-plist   (contents, props changed)
  head/x11/qt4-inputmethods/pkg-plist   (contents, props changed)

Modified: head/Mk/bsd.qt.mk
==============================================================================

--- head/Mk/bsd.qt.mk	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/Mk/bsd.qt.mk	Sun Nov 17 02:12:25 2013	(r334045)
@@ -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}

Modified: head/accessibility/qt4-accessible/pkg-plist
==============================================================================
--- head/accessibility/qt4-accessible/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/accessibility/qt4-accessible/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -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
- at dirrm %%QT_PLUGINDIR_REL%%/accessible
- at 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
+ at dirrm %%QT_PLUGINDIR%%/accessible
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/audio/musescore/pkg-plist
==============================================================================
--- head/audio/musescore/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/audio/musescore/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -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

Modified: head/chinese/qt4-codecs-cn/pkg-plist
==============================================================================
--- head/chinese/qt4-codecs-cn/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/chinese/qt4-codecs-cn/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/codecs/libqcncodecs.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqcncodecs.so.debug
- at dirrmtry %%QT_PLUGINDIR_REL%%/codecs
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/codecs/libqcncodecs.so
+%%DEBUG%%%%QT_PLUGINDIR%%/codecs/libqcncodecs.so.debug
+ at dirrmtry %%QT_PLUGINDIR%%/codecs
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/chinese/qt4-codecs-tw/pkg-plist
==============================================================================
--- head/chinese/qt4-codecs-tw/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/chinese/qt4-codecs-tw/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/codecs/libqtwcodecs.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqtwcodecs.so.debug
- at dirrmtry %%QT_PLUGINDIR_REL%%/codecs
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/codecs/libqtwcodecs.so
+%%DEBUG%%%%QT_PLUGINDIR%%/codecs/libqtwcodecs.so.debug
+ at dirrmtry %%QT_PLUGINDIR%%/codecs
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/databases/akonadi/pkg-plist
==============================================================================
--- head/databases/akonadi/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/databases/akonadi/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -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

Modified: head/databases/qt4-ibase-plugin/pkg-plist
==============================================================================
--- head/databases/qt4-ibase-plugin/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/databases/qt4-ibase-plugin/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so
+ at dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/databases/qt4-mysql-plugin/pkg-plist
==============================================================================
--- head/databases/qt4-mysql-plugin/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/databases/qt4-mysql-plugin/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so
+ at dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/databases/qt4-odbc-plugin/pkg-plist
==============================================================================
--- head/databases/qt4-odbc-plugin/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/databases/qt4-odbc-plugin/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so
+ at dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/databases/qt4-pgsql-plugin/pkg-plist
==============================================================================
--- head/databases/qt4-pgsql-plugin/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/databases/qt4-pgsql-plugin/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libqsql%%DB%%.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libqsql%%DB%%.so
+ at dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/databases/qt4-sqlite-plugin/pkg-plist
==============================================================================
--- head/databases/qt4-sqlite-plugin/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/databases/qt4-sqlite-plugin/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libq%%DB%%.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libq%%DB%%.so
+ at dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/databases/qt4-sqlite3-plugin/pkg-plist
==============================================================================
--- head/databases/qt4-sqlite3-plugin/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/databases/qt4-sqlite3-plugin/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/sqldrivers/libq%%DB%%.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/sqldrivers
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/sqldrivers/libq%%DB%%.so
+ at dirrmtry %%QT_PLUGINDIR%%/sqldrivers
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/devel/py-qt4-designerplugin/pkg-plist
==============================================================================
--- head/devel/py-qt4-designerplugin/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/devel/py-qt4-designerplugin/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1 +1 @@
-%%QT_PLUGINDIR_REL%%/designer/libpyqt4.so
+%%QT_PLUGINDIR%%/designer/libpyqt4.so

Modified: head/devel/qscintilla2-designerplugin/pkg-plist
==============================================================================
--- head/devel/qscintilla2-designerplugin/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/devel/qscintilla2-designerplugin/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/designer/libqscintillaplugin.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/designer
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/designer/libqscintillaplugin.so
+ at dirrmtry %%QT_PLUGINDIR%%/designer
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/devel/qscintilla2/pkg-plist
==============================================================================
--- head/devel/qscintilla2/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/devel/qscintilla2/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -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
- at dirrmtry %%QT_LIBDIR_REL%%
- at dirrm %%QT_INCDIR_REL%%/Qsci
- at dirrmtry %%QT_INCDIR_REL%%
+ at dirrmtry %%QT_LIBDIR%%
+ at dirrm %%QT_INCDIR%%/Qsci
+ at dirrmtry %%QT_INCDIR%%

Modified: head/devel/qt4-corelib/pkg-plist
==============================================================================
--- head/devel/qt4-corelib/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/devel/qt4-corelib/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -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
- at dirrmtry %%QT_PLUGINDIR_REL%%
+ at dirrmtry %%QT_PLUGINDIR%%
 @dirrmtry lib/qt4
 @dirrm include/qt4/QtCore
 @dirrmtry include/qt4/Qt

Modified: head/devel/qt4-designer/pkg-plist
==============================================================================
--- head/devel/qt4-designer/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/devel/qt4-designer/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -96,20 +96,20 @@ lib/qt4/libQtDesignerComponents.so.%%SHL
 %%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
- at dirrmtry %%QT_PLUGINDIR_REL%%/designer
- at dirrmtry %%QT_PLUGINDIR_REL%%
+ at dirrmtry %%QT_PLUGINDIR%%/designer
+ at dirrmtry %%QT_PLUGINDIR%%
 @dirrmtry lib/qt4
 @dirrm include/qt4/QtUiTools
 @dirrm include/qt4/QtDesigner

Modified: head/devel/qtscriptgenerator/pkg-plist
==============================================================================
--- head/devel/qtscriptgenerator/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/devel/qtscriptgenerator/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -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
- at dirrm %%QT_PLUGINDIR_REL%%/script
- at 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
+ at dirrm %%QT_PLUGINDIR%%/script
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/graphics/qt4-iconengines/pkg-plist
==============================================================================
--- head/graphics/qt4-iconengines/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/graphics/qt4-iconengines/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/iconengines/libqsvgicon.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/iconengines/libqsvgicon.so.debug
- at dirrmtry %%QT_PLUGINDIR_REL%%/iconengines
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/iconengines/libqsvgicon.so
+%%DEBUG%%%%QT_PLUGINDIR%%/iconengines/libqsvgicon.so.debug
+ at dirrmtry %%QT_PLUGINDIR%%/iconengines
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/graphics/qt4-imageformats/pkg-plist
==============================================================================
--- head/graphics/qt4-imageformats/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/graphics/qt4-imageformats/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -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
- at dirrm %%QT_PLUGINDIR_REL%%/imageformats
- at 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
+ at dirrm %%QT_PLUGINDIR%%/imageformats
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/japanese/qt4-codecs-jp/pkg-plist
==============================================================================
--- head/japanese/qt4-codecs-jp/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/japanese/qt4-codecs-jp/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/codecs/libqjpcodecs.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqjpcodecs.so.debug
- at dirrmtry %%QT_PLUGINDIR_REL%%/codecs
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/codecs/libqjpcodecs.so
+%%DEBUG%%%%QT_PLUGINDIR%%/codecs/libqjpcodecs.so.debug
+ at dirrmtry %%QT_PLUGINDIR%%/codecs
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/korean/qt4-codecs-kr/pkg-plist
==============================================================================
--- head/korean/qt4-codecs-kr/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/korean/qt4-codecs-kr/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/codecs/libqkrcodecs.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/codecs/libqkrcodecs.so.debug
- at dirrmtry %%QT_PLUGINDIR_REL%%/codecs
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/codecs/libqkrcodecs.so
+%%DEBUG%%%%QT_PLUGINDIR%%/codecs/libqkrcodecs.so.debug
+ at dirrmtry %%QT_PLUGINDIR%%/codecs
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/misc/qt4-qtdemo/pkg-plist
==============================================================================
--- head/misc/qt4-qtdemo/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/misc/qt4-qtdemo/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -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/
 @dirrm share/examples/qt4/demos/affine
 @dirrm share/examples/qt4/demos
 @dirrm share/examples/qt4
- at dirrmtry %%QT_PLUGINDIR_REL%%/designer
- at dirrmtry %%QT_PLUGINDIR_REL%%
+ at dirrmtry %%QT_PLUGINDIR%%/designer
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/multimedia/gstreamer-qt4/pkg-plist
==============================================================================
--- head/multimedia/gstreamer-qt4/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/multimedia/gstreamer-qt4/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -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
- at dirrm %%QT_LIBDIR_REL%%/imports/QtGStreamer
- at dirrmtry %%QT_LIBDIR_REL%%/imports
+ at dirrm %%QT_LIBDIR%%/imports/QtGStreamer
+ at dirrmtry %%QT_LIBDIR%%/imports
 @dirrm lib/QtGStreamer
 @dirrm include/QtGStreamer/QGst/Ui
 @dirrm include/QtGStreamer/QGst/Utils

Modified: head/multimedia/phonon-gstreamer/pkg-plist
==============================================================================
--- head/multimedia/phonon-gstreamer/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/multimedia/phonon-gstreamer/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -9,6 +9,6 @@ share/kde4/services/phononbackends/gstre
 @dirrmtry share/kde4/services/phononbackends
 @dirrmtry lib/kde4/plugins/phonon_backend
 @cwd %%QT_PREFIX%%
-%%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_gstreamer.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/phonon_backend/libphonon_gstreamer.so
+ at dirrmtry %%QT_PLUGINDIR%%/phonon_backend
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/multimedia/phonon-vlc/pkg-plist
==============================================================================
--- head/multimedia/phonon-vlc/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/multimedia/phonon-vlc/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -3,6 +3,6 @@ share/kde4/services/phononbackends/vlc.d
 @dirrmtry share/kde4/services/phononbackends
 @dirrmtry lib/kde4/plugins/phonon_backend
 @cwd %%QT_PREFIX%%
-%%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_vlc.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/phonon_backend/libphonon_vlc.so
+ at dirrmtry %%QT_PLUGINDIR%%/phonon_backend
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/multimedia/phonon-xine/pkg-plist
==============================================================================
--- head/multimedia/phonon-xine/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/multimedia/phonon-xine/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -10,6 +10,6 @@ share/kde4/services/phononbackends/xine.
 @dirrmtry share/kde4/services/phononbackends
 @dirrmtry lib/kde4/plugins/phonon_backend
 @cwd %%QT_PREFIX%%
-%%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_xine.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/phonon_backend/libphonon_xine.so
+ at dirrmtry %%QT_PLUGINDIR%%/phonon_backend
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/multimedia/phonon/pkg-plist
==============================================================================
--- head/multimedia/phonon/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/multimedia/phonon/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -188,13 +188,13 @@ share/dbus-1/interfaces/org.kde.Phonon.A
 @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
- at dirrmtry %%QT_LIBDIR_REL%%
- at dirrmtry %%QT_INCDIR_REL%%
+ at dirrmtry %%QT_LIBDIR%%
+ at dirrmtry %%QT_INCDIR%%

Modified: head/net-im/qxmpp/pkg-plist
==============================================================================
--- head/net-im/qxmpp/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/net-im/qxmpp/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -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

Modified: head/security/qca-cyrus-sasl/pkg-plist
==============================================================================
--- head/security/qca-cyrus-sasl/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/security/qca-cyrus-sasl/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/crypto/libqca-cyrus-sasl.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/crypto/libqca-cyrus-sasl.so.debug
- at dirrmtry %%QT_PLUGINDIR_REL%%/crypto
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/crypto/libqca-cyrus-sasl.so
+%%DEBUG%%%%QT_PLUGINDIR%%/crypto/libqca-cyrus-sasl.so.debug
+ at dirrmtry %%QT_PLUGINDIR%%/crypto
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/security/qca-gnupg/pkg-plist
==============================================================================
--- head/security/qca-gnupg/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/security/qca-gnupg/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/crypto/libqca-gnupg.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/crypto/libqca-gnupg.so.debug
- at dirrmtry %%QT_PLUGINDIR_REL%%/crypto
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/crypto/libqca-gnupg.so
+%%DEBUG%%%%QT_PLUGINDIR%%/crypto/libqca-gnupg.so.debug
+ at dirrmtry %%QT_PLUGINDIR%%/crypto
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/security/qca-ossl/pkg-plist
==============================================================================
--- head/security/qca-ossl/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/security/qca-ossl/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/crypto/libqca-ossl.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/crypto/libqca-ossl.so.debug
- at dirrmtry %%QT_PLUGINDIR_REL%%/crypto
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/crypto/libqca-ossl.so
+%%DEBUG%%%%QT_PLUGINDIR%%/crypto/libqca-ossl.so.debug
+ at dirrmtry %%QT_PLUGINDIR%%/crypto
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/sysutils/qzeitgeist/pkg-plist
==============================================================================
--- head/sysutils/qzeitgeist/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/sysutils/qzeitgeist/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -29,13 +29,13 @@ lib/cmake/QZeitgeist/QZeitgeistExport.cm
 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
- at dirrm %%QT_LIBDIR_REL%%/imports/org/gnome/zeitgeist
- at dirrm %%QT_LIBDIR_REL%%/imports/org/gnome
- at dirrmtry %%QT_LIBDIR_REL%%/imports/org
- at dirrmtry %%QT_LIBDIR_REL%%/imports
+ at dirrm %%QT_LIBDIR%%/imports/org/gnome/zeitgeist
+ at dirrm %%QT_LIBDIR%%/imports/org/gnome
+ at dirrmtry %%QT_LIBDIR%%/imports/org
+ at dirrmtry %%QT_LIBDIR%%/imports
 @dirrm lib/cmake/QZeitgeist
 @dirrmtry lib/cmake
 @dirrm include/QZeitgeist/DataModel

Modified: head/x11-toolkits/qwt5-designerplugin/pkg-plist
==============================================================================
--- head/x11-toolkits/qwt5-designerplugin/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/x11-toolkits/qwt5-designerplugin/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,3 +1,3 @@
-%%QT_PLUGINDIR_REL%%/designer/libqwt_designer_plugin.so
- at dirrmtry %%QT_PLUGINDIR_REL%%/designer
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/designer/libqwt_designer_plugin.so
+ at dirrmtry %%QT_PLUGINDIR%%/designer
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/x11/qt4-graphicssystems-opengl/pkg-plist
==============================================================================
--- head/x11/qt4-graphicssystems-opengl/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/x11/qt4-graphicssystems-opengl/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/graphicssystems/libqglgraphicssystem.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/graphicssystems/libqglgraphicssystem.so.debug
- at dirrmtry %%QT_PLUGINDIR_REL%%/graphicssystems
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/graphicssystems/libqglgraphicssystem.so
+%%DEBUG%%%%QT_PLUGINDIR%%/graphicssystems/libqglgraphicssystem.so.debug
+ at dirrmtry %%QT_PLUGINDIR%%/graphicssystems
+ at dirrmtry %%QT_PLUGINDIR%%

Modified: head/x11/qt4-inputmethods/pkg-plist
==============================================================================
--- head/x11/qt4-inputmethods/pkg-plist	Sun Nov 17 02:00:30 2013	(r334044)
+++ head/x11/qt4-inputmethods/pkg-plist	Sun Nov 17 02:12:25 2013	(r334045)
@@ -1,4 +1,4 @@
-%%QT_PLUGINDIR_REL%%/inputmethods/libqimsw-multi.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/inputmethods/libqimsw-multi.so.debug
- at dirrm %%QT_PLUGINDIR_REL%%/inputmethods
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/inputmethods/libqimsw-multi.so
+%%DEBUG%%%%QT_PLUGINDIR%%/inputmethods/libqimsw-multi.so.debug
+ at dirrm %%QT_PLUGINDIR%%/inputmethods
+ at dirrmtry %%QT_PLUGINDIR%%
