Index: head/CHANGES
===================================================================
--- head/CHANGES
+++ head/CHANGES
@@ -10,6 +10,11 @@
 
 All ports committers are allowed to commit to this file.
 
+20161218:
+AUTHOR: tcberner@FreeBSD.org
+
+  QT_PREFIX has been dropped, in favour of using PREFIX directly.
+
 20160911:
 AUTHOR: amdmi3@FreeBSD.org
 
Index: head/Mk/bsd.qt.mk
===================================================================
--- head/Mk/bsd.qt.mk
+++ head/Mk/bsd.qt.mk
@@ -29,8 +29,6 @@
 QT4_VERSION?=	4.8.7
 QT5_VERSION?=	5.6.2
 
-QT_PREFIX?=		${LOCALBASE}
-
 _QT_RELNAME=	qt${_QT_VERSION:R:R}
 _QT_VERSION=	# empty
 .for ver in ${_QT_SUPPORTED}
@@ -52,10 +50,6 @@
 .if defined(QT_DIST)
 QT_NONSTANDARD=	yes
 
-. if ! ${.MAKEFLAGS:MPREFIX=*}
-PREFIX=			${QT_PREFIX}
-. endif
-
 MASTER_SITES=	${MASTER_SITE_QT}
 # Useless, as it must be defined before including bsd.port.pre.mk (at least
 # because of bsd.options.mk).
@@ -269,16 +263,14 @@
 # Import QMAKE_ENV and QMAKE_ARGS definitions.
 USES+=			qmake:_env
 
-PLIST_SUB+=		QT_PREFIX="${QT_PREFIX}"
-
 .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}
+QT_${dir}DIR=	${PREFIX}/${QT_${dir}DIR_REL}
 PLIST_SUB+=		QT_${dir}DIR="${QT_${dir}DIR_REL}"
 .endfor
 
 .for dir in BIN LIB
-QT_${dir}DIR=        ${QT_PREFIX}/${QT_${dir}DIR_REL}
+QT_${dir}DIR=        ${PREFIX}/${QT_${dir}DIR_REL}
 .  if defined(QT_DIST)
 PLIST_SUB+=                QT_${dir}DIR="${QT_${dir}DIR_REL}"
 .  endif
@@ -291,7 +283,7 @@
 Qt_Post_Include=	bsd.qt.mk
 
 .if !defined(QT_NONSTANDARD)
-CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
+CONFIGURE_ENV+=	QTDIR="${PREFIX}" QMAKE="${QMAKE}" \
 				MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
 				QMAKESPEC="${QMAKESPEC}"
 CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
@@ -722,16 +714,16 @@
 	@${ECHO_CMD} \
 		>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
 .  endfor
-	@${ECHO_CMD} "${QT_PREFIX}/${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \
+	@${ECHO_CMD} "${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" \
+	@${ECHO_CMD} "@exec echo '#include <QtCore/modules/qconfig-${QT_MODNAME}.h>' >> ${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" \
 		>> ${TMPPLIST}
 . 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" \
+	@${ECHO_CMD} "${PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \
 		>> ${TMPPLIST}
 . endif # ${QT_CONFIG:N-*}
 .endif # defined(QT_DIST) && ! ${_QT_VERSION:M4*}
Index: head/astro/xglobe/Makefile
===================================================================
--- head/astro/xglobe/Makefile
+++ head/astro/xglobe/Makefile
@@ -12,7 +12,6 @@
 
 USES=		gmake
 USE_QT4=	corelib gui qt3support moc_build
-MAKE_ENV=	QT_PREFIX=${QT_PREFIX}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
Index: head/astro/xglobe/files/patch-Makefile
===================================================================
--- head/astro/xglobe/files/patch-Makefile
+++ head/astro/xglobe/files/patch-Makefile
@@ -1,51 +1,51 @@
 --- Makefile.orig	1999-07-19 12:56:27 UTC
 +++ Makefile
 @@ -4,43 +4,44 @@
- 
+
  ####### Installation directory
- 
+
 -XGLOBE_DIR     = /usr/local
 -XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
 +XGLOBE_DIR     = $(PREFIX)
 +XGLOBE_LIB_DIR = $(XGLOBE_DIR)/share/xglobe
  XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin
- 
+
  ####### Library directories - you may need to modify these
- 
+
 -X11_INCLUDE_DIR = /usr/X11R6/include
 -QT_INCLUDE_DIR  = $(QTDIR)/include
 +X11_INCLUDE_DIR = $(LOCALBASE)/include
-+QT_INCLUDE_DIR  = $(QT_PREFIX)/include/qt4
- 
++QT_INCLUDE_DIR  = $(PREFIX)/include/qt4
+
 -QT_LIB_DIR      = $(QTDIR)/lib
 -X11_LIB_DIR     = /usr/X11R6/lib
-+QT_LIB_DIR      = $(QT_PREFIX)/lib/qt4
++QT_LIB_DIR      = $(PREFIX)/lib/qt4
 +X11_LIB_DIR     = $(LOCALBASE)/lib
- 
- 
+
+
  ####### Compiler and tools
- 
+
 -CPP     = g++
 -LINK    = g++
 -MOC     = moc
 +CXX    ?= c++
-+CPP     = ${CXX} 
-+LINK    = ${CXX} 
++CPP     = ${CXX}
++LINK    = ${CXX}
 +MOC     = moc-qt4
  INSTALL = install
- 
+
  ####### compile and link options
- 
+
 -CFLAGS       = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO) -O2 -Wall
 +CFLAGS       += -DQT3_SUPPORT $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO)
- 
+
  LFLAGS       =
- 
+
 -INCLUDE_DIRS = -I$(QT_INCLUDE_DIR) -I$(X11_INCLUDE_DIR)
 +INCLUDE_DIRS = -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/Qt -I$(QT_INCLUDE_DIR)/QtGui -I$(X11_INCLUDE_DIR)
- 
+
  LIB_DIRS     = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR)
- 
+
 -LIBS         = -lX11 -lqt -lm
 +LIBS         = -lX11 -lQtCore -lQt3Support -lQtGui  -lm -pthread
  # If you want to use the QImageIO lib (to support jpg and png maps) use the
@@ -56,6 +56,6 @@
  # If the linker complains about unresolved references try this:
 -#LIBS         = -lX11 -lqt -lm -lqimgio -lpng -lz -ljpeg
 +#LIBS         = -lX11 -lqt1 -lm -lqimgio -lpng -lz -ljpeg
- 
+
  ####### Target
- 
+
Index: head/audio/mixxx/Makefile
===================================================================
--- head/audio/mixxx/Makefile
+++ head/audio/mixxx/Makefile
@@ -29,7 +29,7 @@
 USE_QT4=	corelib gui network opengl script sql svg xml \
 		linguisttools_build moc_build qmake_build rcc_build uic_build
 USE_GL=		glu
-MAKE_ARGS=	qtdir="${QT_PREFIX}" optimize=0
+MAKE_ARGS=	qtdir="${PREFIX}" optimize=0
 LATE_INSTALL_ARGS=	--install-sandbox=${STAGEDIR}
 
 PORTDATA=	*
Index: head/cad/klayout/Makefile
===================================================================
--- head/cad/klayout/Makefile
+++ head/cad/klayout/Makefile
@@ -35,7 +35,7 @@
 		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
 		_MAKE_JOBS="${_MAKE_JOBS}" LOCALBASE="${LOCALBASE}" \
 		${SH} build.sh -platform ${PLATFORMKEYWORD} \
-		-qtbin ${QT_PREFIX}/bin \
+		-qtbin ${PREFIX}/bin \
 		-qtinc ${QT_INCDIR} \
 		-qtlib ${QT_LIBDIR} \
 		-python ${PYTHON_CMD}
Index: head/databases/akonadi/pkg-plist
===================================================================
--- head/databases/akonadi/pkg-plist
+++ head/databases/akonadi/pkg-plist
@@ -41,4 +41,4 @@
 share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml
 share/dbus-1/services/org.freedesktop.Akonadi.Control.service
 share/mime/packages/akonadi-mime.xml
-%%SQLITE%%%%QT_PREFIX%%/%%QT_PLUGINDIR%%/sqldrivers/libqsqlite3.so
+%%SQLITE%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlite3.so
Index: head/deskutils/recoll/Makefile
===================================================================
--- head/deskutils/recoll/Makefile
+++ head/deskutils/recoll/Makefile
@@ -57,7 +57,7 @@
 			qt4=corelib,gui,xml,webkit
 QT4_CONFIGURE_ENABLE=	qtgui
 QT4_CONFIGURE_ENV=	QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \
-			QTDIR="${QT_PREFIX}"
+			QTDIR="${PREFIX}"
 QT4_VARS=		QT_NONSTANDARD=yes
 SOUND_RUN_DEPENDS=	mutagen-pony:audio/py-mutagen \
 			pykaraoke:audio/py-karaoke
Index: head/devel/ace/Makefile
===================================================================
--- head/devel/ace/Makefile
+++ head/devel/ace/Makefile
@@ -46,7 +46,7 @@
 FLTK_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 FLTK_MAKE_ENV=		fl=1
 QT4_USE=		QT4=corelib,gui,moc_build
-QT4_MAKE_ENV=		qt=1 qt4=1 QTDIR="${QT_PREFIX}"
+QT4_MAKE_ENV=		qt=1 qt4=1 QTDIR="${PREFIX}"
 QT4_CPPFLAGS=		-I${QT_INCDIR}
 QT4_LDFLAGS=		-L${QT_LIBDIR}
 SSL_USE=		OPENSSL=yes
Index: head/devel/qconf/Makefile
===================================================================
--- head/devel/qconf/Makefile
+++ head/devel/qconf/Makefile
@@ -20,7 +20,7 @@
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--datadir=${DATADIR:S,/qconf,,} \
-		--qtdir=${QT_PREFIX} \
+		--qtdir=${PREFIX} \
 		--verbose
 
 .include <bsd.port.mk>
Index: head/devel/qt4-qmlviewer/Makefile
===================================================================
--- head/devel/qt4-qmlviewer/Makefile
+++ head/devel/qt4-qmlviewer/Makefile
@@ -22,7 +22,7 @@
 
 # qtlogo.png is installed by qt4-gui
 DESKTOP_ENTRIES="Qt 4 QML viewer" "" \
-		"${QT_PREFIX}/share/pixmaps/qtlogo.png" \
+		"${PREFIX}/share/pixmaps/qtlogo.png" \
 		"${PREFIX}/${QT_BINDIR_REL}/qmlviewer" \
 		"Development;Qt;" true
 
Index: head/devel/qt5-core/pkg-plist
===================================================================
--- head/devel/qt5-core/pkg-plist
+++ head/devel/qt5-core/pkg-plist
@@ -678,4 +678,4 @@
 %%QT_MKSPECDIR%%/modules/qt_lib_core_private.pri
 libdata/pkgconfig/Qt5Core.pc
 @comment Ensure that a (even empty) qconfig-modules.h exists.
-@exec touch %%QT_PREFIX%%/%%QT_INCDIR%%/QtCore/qconfig-modules.h
+@exec touch %%QT_INCDIR%%/QtCore/qconfig-modules.h
Index: head/devel/subcommander2/Makefile
===================================================================
--- head/devel/subcommander2/Makefile
+++ head/devel/subcommander2/Makefile
@@ -27,7 +27,7 @@
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE}/include \
-		--with-subversion=${LOCALBASE} --with-qt=${QT_PREFIX} \
+		--with-subversion=${LOCALBASE} --with-qt=${PREFIX} \
 		--with-apr=${LOCALBASE}/bin/apr-1-config \
 		--with-apr-util=${LOCALBASE}/bin/apu-1-config \
 		--with-openssl=${OPENSSLBASE}
Index: head/editors/libreoffice/Makefile
===================================================================
--- head/editors/libreoffice/Makefile
+++ head/editors/libreoffice/Makefile
@@ -174,7 +174,7 @@
 
 KDE4_CONFIGURE_ENABLE=	kde4
 KDE4_CONFIGURE_ENV=	KDE4DIR="${KDE_PREFIX}" \
-			QT4DIR="${QT_PREFIX}" \
+			QT4DIR="${PREFIX}" \
 			QT4INC="${QT_INCDIR}" \
 			QT4LIB="${QT_LIBDIR}"
 KDE4_USES=	kde:4
Index: head/editors/libreoffice4/Makefile
===================================================================
--- head/editors/libreoffice4/Makefile
+++ head/editors/libreoffice4/Makefile
@@ -267,7 +267,7 @@
 KDE4_USE=	KDE=kdelibs QT4=moc_build,qmake_build
 KDE4_CONFIGURE_ENABLE=	kde4
 KDE4_CONFIGURE_ENV=	KDE4DIR="${KDE_PREFIX}" \
-			QT4DIR="${QT_PREFIX}" \
+			QT4DIR="${PREFIX}" \
 			QT4INC="${QT_INCDIR}" \
 			QT4LIB="${QT_LIBDIR}"
 
Index: head/editors/texmacs/Makefile
===================================================================
--- head/editors/texmacs/Makefile
+++ head/editors/texmacs/Makefile
@@ -54,7 +54,7 @@
 QT4_USE=		qt4=accessible,corelib,gui,imageformats \
 			qt4=moc_build,qmake_build,rcc_build,uic_build
 QT4_USE_OFF=		xorg=xext
-QT4_CONFIGURE_ON=	--with-qt=${QT_PREFIX} --enable-qtpipes
+QT4_CONFIGURE_ON=	--with-qt=${PREFIX} --enable-qtpipes
 QT4_CONFIGURE_OFF=	--disable-qt
 QT4_VARS=		QT_PLUGINS_LIST="accessible imageformats"
 QT4_VARS_OFF=		QT_PLUGINS_LIST=""
Index: head/emulators/qmc2/Makefile
===================================================================
--- head/emulators/qmc2/Makefile
+++ head/emulators/qmc2/Makefile
@@ -26,7 +26,7 @@
 USE_SDL=	sdl
 
 CXXFLAGS+=	-I${LOCALBASE}/include/SDL/
-MAKE_ARGS=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
+MAKE_ARGS=	QTDIR="${PREFIX}" QMAKE="${QMAKE}" \
 		SYSCONFDIR="${PREFIX}/etc" ARCH="${OPSYS}" \
 		CC_FLAGS="${CFLAGS} -DUSE_FILE32API" \
 		CXX_FLAGS="${CXXFLAGS} -DUSE_FILE32API" \
Index: head/graphics/fracplanet/Makefile
===================================================================
--- head/graphics/fracplanet/Makefile
+++ head/graphics/fracplanet/Makefile
@@ -26,7 +26,7 @@
 USE_QT4=	corelib moc_build qmake_build gui opengl
 QT_NONSTANDARD=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
+CONFIGURE_ENV=	QTDIR="${PREFIX}"
 CONFIGURE_ARGS=	-spec ${QMAKESPEC}
 
 CXXFLAGS+=	-include ${WRKSRC}/precompiled.h
Index: head/graphics/meshviewer/Makefile
===================================================================
--- head/graphics/meshviewer/Makefile
+++ head/graphics/meshviewer/Makefile
@@ -22,7 +22,7 @@
 CXXFLAGS+=	-I. -Imesh -Imathvector \
 		`pkg-config --cflags QtOpenGL glu`
 LDFLAGS+=	-lpthread `pkg-config --libs QtOpenGL glu`
-MAKE_ARGS=	QTDIR="${QT_PREFIX}" CC="${CXX}" MOC="${MOC}" \
+MAKE_ARGS=	QTDIR="${PREFIX}" CC="${CXX}" MOC="${MOC}" \
 		CXXFLAGS="${CXXFLAGS}" \
 		LIBPATH="" LIBS_QT4="${LDFLAGS}"
 
Index: head/graphics/qt4-pixeltool/Makefile
===================================================================
--- head/graphics/qt4-pixeltool/Makefile
+++ head/graphics/qt4-pixeltool/Makefile
@@ -21,7 +21,7 @@
 
 # qtlogo.png is installed by qt4-gui
 DESKTOP_ENTRIES="Qt 4 PixelTool" "" \
-		"${QT_PREFIX}/share/pixmaps/qtlogo.png" \
+		"${PREFIX}/share/pixmaps/qtlogo.png" \
 		"${PREFIX}/${QT_BINDIR_REL}/pixeltool" \
 		"Graphics;Qt;" true
 
Index: head/graphics/qt5-pixeltool/Makefile
===================================================================
--- head/graphics/qt5-pixeltool/Makefile
+++ head/graphics/qt5-pixeltool/Makefile
@@ -14,7 +14,7 @@
 
 # qt5logo.png is installed by qt5-widgets.
 DESKTOP_ENTRIES="Qt 5 PixelTool" "" \
-		"${QT_PREFIX}/share/pixmaps/qt5logo.png" \
+		"${PREFIX}/share/pixmaps/qt5logo.png" \
 		"${PREFIX}/${QT_BINDIR_REL}/pixeltool" \
 		"Graphics;Qt;" true
 
Index: head/misc/qt4-qtdemo/Makefile
===================================================================
--- head/misc/qt4-qtdemo/Makefile
+++ head/misc/qt4-qtdemo/Makefile
@@ -26,7 +26,7 @@
 
 # qtlogo.png is installed by qt4-gui
 DESKTOP_ENTRIES="Qt 4 Examples and Demos" "" \
-		"${QT_PREFIX}/share/pixmaps/qtlogo.png" \
+		"${PREFIX}/share/pixmaps/qtlogo.png" \
 		"${PREFIX}/${QT_BINDIR_REL}/qtdemo" \
 		"Development;Qt;" true
 
Index: head/multimedia/mythtv-frontend/Makefile
===================================================================
--- head/multimedia/mythtv-frontend/Makefile
+++ head/multimedia/mythtv-frontend/Makefile
@@ -41,12 +41,12 @@
 
 DATADIR=	${PREFIX}/share/mythtv
 
-MAKE_ENV=	QTDIR="${QT_PREFIX}" \
+MAKE_ENV=	QTDIR="${PREFIX}" \
 		QMAKESPEC="${QMAKESPEC}"
 
 CPPFLAGS+=	${QTCPPFLAGS}
 CONFIGURE_ENV+=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
-		QTDIR="${QT_PREFIX}" \
+		QTDIR="${PREFIX}" \
 		PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
 LDFLAGS+=	-L${LOCALBASE}/lib
 
Index: head/multimedia/mythtv/Makefile
===================================================================
--- head/multimedia/mythtv/Makefile
+++ head/multimedia/mythtv/Makefile
@@ -47,12 +47,12 @@
 USERS=		mythtv
 GROUPS=		mythtv
 
-MAKE_ENV=	QTDIR="${QT_PREFIX}" \
+MAKE_ENV=	QTDIR="${PREFIX}" \
 		QMAKESPEC="${QMAKESPEC}"
 
 CPPFLAGS+=	${QTCPPFLAGS}
 CONFIGURE_ENV+=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
-		QTDIR="${QT_PREFIX}"
+		QTDIR="${PREFIX}"
 CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
 LDFLAGS+=	-L${LOCALBASE}/lib
 
Index: head/multimedia/phonon-vlc/pkg-plist
===================================================================
--- head/multimedia/phonon-vlc/pkg-plist
+++ head/multimedia/phonon-vlc/pkg-plist
@@ -1,3 +1,3 @@
 lib/kde4/plugins/phonon_backend/phonon_vlc.so
 share/kde4/services/phononbackends/vlc.desktop
-%%QT_PREFIX%%/%%QT_PLUGINDIR%%/phonon_backend/libphonon_vlc.so
+%%QT_PLUGINDIR%%/phonon_backend/libphonon_vlc.so
Index: head/multimedia/phonon-xine/pkg-plist
===================================================================
--- head/multimedia/phonon-xine/pkg-plist
+++ head/multimedia/phonon-xine/pkg-plist
@@ -7,4 +7,4 @@
 share/icons/oxygen/64x64/apps/phonon-xine.png
 share/icons/oxygen/scalable/apps/phonon-xine.svgz
 share/kde4/services/phononbackends/xine.desktop
-%%QT_PREFIX%%/%%QT_PLUGINDIR%%/phonon_backend/libphonon_xine.so
+%%QT_PLUGINDIR%%/phonon_backend/libphonon_xine.so
Index: head/multimedia/phonon/pkg-plist
===================================================================
--- head/multimedia/phonon/pkg-plist
+++ head/multimedia/phonon/pkg-plist
@@ -157,6 +157,8 @@
 include/phonon/volumefadereffect.h
 include/phonon/volumefaderinterface.h
 include/phonon/volumeslider.h
+%%QT_INCDIR%%/Phonon
+%%QT_INCDIR%%/phonon
 lib/cmake/phonon/PhononConfig.cmake
 lib/cmake/phonon/PhononConfigVersion.cmake
 lib/cmake/phonon/PhononExperimentalConfig.cmake
@@ -171,6 +173,10 @@
 lib/libphononexperimental.so
 lib/libphononexperimental.so.4
 lib/libphononexperimental.so.%%SHLIB_VER%%
+lib/qt4/libphonon.so
+lib/qt4/libphonon.so.4
+lib/qt4/libphononexperimental.so
+lib/qt4/libphononexperimental.so.4
 libdata/pkgconfig/phonon.pc
 share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %%DATADIR%%/buildsystem/COPYING-CMAKE-SCRIPTS
@@ -184,10 +190,4 @@
 %%DATADIR%%/buildsystem/PhononQt4.cmake
 %%DATADIR%%/buildsystem/PhononQt5.cmake
 %%DATADIR%%/buildsystem/cmake_uninstall.cmake.in
-%%QT_PREFIX%%/%%QT_INCDIR%%/Phonon
-%%QT_PREFIX%%/%%QT_INCDIR%%/phonon
-%%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
+%%QT_MKSPECDIR%%/modules/qt_phonon.pri
Index: head/science/silo/Makefile
===================================================================
--- head/science/silo/Makefile
+++ head/science/silo/Makefile
@@ -37,7 +37,7 @@
 
 QT4_USE=			XORG=ice,sm,x11,xext,xi,xmu,xt \
 				QT4=corelib,gui,linguisttools_build,moc_build,uic_build
-QT4_CONFIGURE_ON=		--with-Qt-dir=${QT_PREFIX} \
+QT4_CONFIGURE_ON=		--with-Qt-dir=${PREFIX} \
 				--with-Qt-lib="QtGui -lQtCore"
 QT4_CONFIGURE_ENABLE=		silex
 QT4_VARS=			QT_NONSTANDARD=yes
Index: head/security/fwbuilder/Makefile
===================================================================
--- head/security/fwbuilder/Makefile
+++ head/security/fwbuilder/Makefile
@@ -45,7 +45,7 @@
 		uic_build \
 		xml
 
-QTDIR?=		${QT_PREFIX}
+QTDIR?=		${PREFIX}
 
 USE_OPENSSL=	yes
 USES=		autoreconf:build gmake libtool
Index: head/security/kqoauth/pkg-plist
===================================================================
--- head/security/kqoauth/pkg-plist
+++ head/security/kqoauth/pkg-plist
@@ -9,5 +9,5 @@
 lib/libkqoauth.so.0
 lib/libkqoauth.so.0.97
 lib/libkqoauth.so.0.97.0
-%%QT_PREFIX%%/%%QT_MKSPECDIR%%/features/kqoauth.prf
+%%QT_MKSPECDIR%%/features/kqoauth.prf
 libdata/pkgconfig/kqoauth.pc
Index: head/security/xca/Makefile
===================================================================
--- head/security/xca/Makefile
+++ head/security/xca/Makefile
@@ -18,7 +18,7 @@
 		shared-mime-info ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLDIR} \
-		--with-qt=${QT_PREFIX}
+		--with-qt=${PREFIX}
 MAKE_ARGS=	DOCTOOL="${TRUE}"
 DESTDIRNAME=	destdir
 
Index: head/x11-toolkits/qt5-declarative/Makefile
===================================================================
--- head/x11-toolkits/qt5-declarative/Makefile
+++ head/x11-toolkits/qt5-declarative/Makefile
@@ -19,7 +19,7 @@
 
 # qt5logo.png is installed by qt5-widgets.
 DESKTOP_ENTRIES="Qt 5 QML viewer" "" \
-		"${QT_PREFIX}/share/pixmaps/qt5logo.png" \
+		"${PREFIX}/share/pixmaps/qt5logo.png" \
 		"${PREFIX}/${QT_BINDIR_REL}/qmlviewer" \
 		"Development;Qt;" true
 
Index: head/x11-toolkits/soqt/Makefile
===================================================================
--- head/x11-toolkits/soqt/Makefile
+++ head/x11-toolkits/soqt/Makefile
@@ -21,7 +21,7 @@
 QT_NONSTANDARD=	yes
 USE_GL=		gl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	QTDIR="${QT_PREFIX}" MOC="${MOC}"
+CONFIGURE_ENV=	QTDIR="${PREFIX}" MOC="${MOC}"
 CONFIGURE_ARGS=	--with-pthread=yes --with-coin=${LOCALBASE} \
 		--with-qt=${QT_LIBDIR} \
 		--enable-debug=no