Index: Mk/bsd.qt.mk =================================================================== --- Mk/bsd.qt.mk +++ Mk/bsd.qt.mk @@ -270,7 +270,7 @@ .for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \ QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \ CMAKE QTCHOOSER -QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL} +QT_${dir}DIR= ${LOCALBASE}/${QT_${dir}DIR_REL} # Export all directories to the plist substituion for QT_DIST ports. # For the others, exclude QT_CMAKEDIR and QT_ETCDIR. . if (${dir:NCMAKE} && ${dir:NETC}) || defined(QT_DIST) Index: astro/xglobe/files/patch-Makefile =================================================================== --- astro/xglobe/files/patch-Makefile +++ astro/xglobe/files/patch-Makefile @@ -15,11 +15,11 @@ -X11_INCLUDE_DIR = /usr/X11R6/include -QT_INCLUDE_DIR = $(QTDIR)/include +X11_INCLUDE_DIR = $(LOCALBASE)/include -+QT_INCLUDE_DIR = $(PREFIX)/include/qt4 ++QT_INCLUDE_DIR = $(LOCALBASE)/include/qt4 -QT_LIB_DIR = $(QTDIR)/lib -X11_LIB_DIR = /usr/X11R6/lib -+QT_LIB_DIR = $(PREFIX)/lib/qt4 ++QT_LIB_DIR = $(LOCALBASE)/lib/qt4 +X11_LIB_DIR = $(LOCALBASE)/lib Index: audio/mixxx/Makefile =================================================================== --- audio/mixxx/Makefile +++ audio/mixxx/Makefile @@ -34,7 +34,7 @@ testlib xml xmlpatterns linguisttools_build moc_build \ qmake_build rcc_build uic_build USE_GL= gl glu -MAKE_ARGS= qtdir="${PREFIX}" install_root="${PREFIX}" \ +MAKE_ARGS= qtdir="${LOCALBASE}" install_root="${PREFIX}" \ build=release optimize=native LATE_INSTALL_ARGS= --install-sandbox=${STAGEDIR} Index: deskutils/recoll/Makefile =================================================================== --- deskutils/recoll/Makefile +++ deskutils/recoll/Makefile @@ -57,7 +57,7 @@ qt4=corelib,gui,xml,webkit QT4_CONFIGURE_ENABLE= qtgui QT4_CONFIGURE_ENV= QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \ - QTDIR="${PREFIX}" + QTDIR="${LOCALBASE}" QT4_VARS= QT_NONSTANDARD=yes SOUND_RUN_DEPENDS= mutagen-pony:audio/py-mutagen \ pykaraoke:audio/py-karaoke Index: devel/ace/Makefile =================================================================== --- devel/ace/Makefile +++ 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="${PREFIX}" +QT4_MAKE_ENV= qt=1 qt4=1 QTDIR="${LOCALBASE}" QT4_CPPFLAGS= -I${QT_INCDIR} QT4_LDFLAGS= -L${QT_LIBDIR} SSL_USE= OPENSSL=yes Index: devel/qconf/Makefile =================================================================== --- devel/qconf/Makefile +++ devel/qconf/Makefile @@ -20,7 +20,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir=${DATADIR:S,/qconf,,} \ - --qtdir=${PREFIX} \ + --qtdir=${LOCALBASE} \ --verbose .include Index: devel/subcommander2/Makefile =================================================================== --- devel/subcommander2/Makefile +++ devel/subcommander2/Makefile @@ -27,7 +27,7 @@ USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include \ - --with-subversion=${LOCALBASE} --with-qt=${PREFIX} \ + --with-subversion=${LOCALBASE} --with-qt=${LOCALBASE} \ --with-apr=${LOCALBASE}/bin/apr-1-config \ --with-apr-util=${LOCALBASE}/bin/apu-1-config \ --with-openssl=${OPENSSLBASE} Index: editors/libreoffice/Makefile =================================================================== --- editors/libreoffice/Makefile +++ editors/libreoffice/Makefile @@ -177,7 +177,7 @@ KDE4_CONFIGURE_ENABLE= kde4 KDE4_CONFIGURE_ENV= KDE4DIR="${KDE_PREFIX}" \ - QT4DIR="${PREFIX}" \ + QT4DIR="${LOCALBASE}" \ QT4INC="${QT_INCDIR}" \ QT4LIB="${QT_LIBDIR}" KDE4_USES= kde:4 Index: editors/libreoffice4/Makefile =================================================================== --- editors/libreoffice4/Makefile +++ editors/libreoffice4/Makefile @@ -270,7 +270,7 @@ KDE4_USE= KDE=kdelibs QT4=moc_build,qmake_build KDE4_CONFIGURE_ENABLE= kde4 KDE4_CONFIGURE_ENV= KDE4DIR="${KDE_PREFIX}" \ - QT4DIR="${PREFIX}" \ + QT4DIR="${LOCALBASE}" \ QT4INC="${QT_INCDIR}" \ QT4LIB="${QT_LIBDIR}" Index: editors/texmacs/Makefile =================================================================== --- editors/texmacs/Makefile +++ 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=${PREFIX} --enable-qtpipes +QT4_CONFIGURE_ON= --with-qt=${LOCALBASE} --enable-qtpipes QT4_CONFIGURE_OFF= --disable-qt QT4_VARS= QT_PLUGINS_LIST="accessible imageformats" QT4_VARS_OFF= QT_PLUGINS_LIST="" Index: emulators/qmc2/Makefile =================================================================== --- emulators/qmc2/Makefile +++ emulators/qmc2/Makefile @@ -26,7 +26,7 @@ USE_SDL= sdl CXXFLAGS+= -I${LOCALBASE}/include/SDL/ -MAKE_ARGS= QTDIR="${PREFIX}" QMAKE="${QMAKE}" \ +MAKE_ARGS= QTDIR="${LOCALBASE}" QMAKE="${QMAKE}" \ SYSCONFDIR="${PREFIX}/etc" ARCH="${OPSYS}" \ CC_FLAGS="${CFLAGS} -DUSE_FILE32API" \ CXX_FLAGS="${CXXFLAGS} -DUSE_FILE32API" \ Index: graphics/fracplanet/Makefile =================================================================== --- graphics/fracplanet/Makefile +++ 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="${PREFIX}" +CONFIGURE_ENV= QTDIR="${LOCALBASE}" CONFIGURE_ARGS= -spec ${QMAKESPEC} CXXFLAGS+= -include ${WRKSRC}/precompiled.h Index: graphics/meshviewer/Makefile =================================================================== --- graphics/meshviewer/Makefile +++ 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="${PREFIX}" CC="${CXX}" MOC="${MOC}" \ +MAKE_ARGS= QTDIR="${LOCALBASE}" CC="${CXX}" MOC="${MOC}" \ CXXFLAGS="${CXXFLAGS}" \ LIBPATH="" LIBS_QT4="${LDFLAGS}" Index: multimedia/mythtv-frontend/Makefile =================================================================== --- multimedia/mythtv-frontend/Makefile +++ multimedia/mythtv-frontend/Makefile @@ -41,12 +41,12 @@ DATADIR= ${PREFIX}/share/mythtv -MAKE_ENV= QTDIR="${PREFIX}" \ +MAKE_ENV= QTDIR="${LOCALBASE}" \ QMAKESPEC="${QMAKESPEC}" CPPFLAGS+= ${QTCPPFLAGS} CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \ - QTDIR="${PREFIX}" \ + QTDIR="${LOCALBASE}" \ PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig" LDFLAGS+= -L${LOCALBASE}/lib Index: multimedia/mythtv/Makefile =================================================================== --- multimedia/mythtv/Makefile +++ multimedia/mythtv/Makefile @@ -47,12 +47,12 @@ USERS= mythtv GROUPS= mythtv -MAKE_ENV= QTDIR="${PREFIX}" \ +MAKE_ENV= QTDIR="${LOCALBASE}" \ QMAKESPEC="${QMAKESPEC}" CPPFLAGS+= ${QTCPPFLAGS} CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \ - QTDIR="${PREFIX}" + QTDIR="${LOCALBASE}" CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig" LDFLAGS+= -L${LOCALBASE}/lib Index: security/fwbuilder/Makefile =================================================================== --- security/fwbuilder/Makefile +++ security/fwbuilder/Makefile @@ -45,7 +45,7 @@ uic_build \ xml -QTDIR?= ${PREFIX} +QTDIR?= ${LOCALBASE} USE_OPENSSL= yes USES= autoreconf:build gmake libtool Index: security/xca/Makefile =================================================================== --- security/xca/Makefile +++ security/xca/Makefile @@ -18,7 +18,7 @@ shared-mime-info ssl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl=${OPENSSLDIR} \ - --with-qt=${PREFIX} + --with-qt=${LOCALBASE} MAKE_ARGS= DOCTOOL="${TRUE}" DESTDIRNAME= destdir Index: x11-toolkits/soqt/Makefile =================================================================== --- x11-toolkits/soqt/Makefile +++ x11-toolkits/soqt/Makefile @@ -21,7 +21,7 @@ QT_NONSTANDARD= yes USE_GL= gl GNU_CONFIGURE= yes -CONFIGURE_ENV= QTDIR="${PREFIX}" MOC="${MOC}" +CONFIGURE_ENV= QTDIR="${LOCALBASE}" MOC="${MOC}" CONFIGURE_ARGS= --with-pthread=yes --with-coin=${LOCALBASE} \ --with-qt=${QT_LIBDIR} \ --enable-debug=no