diff options
| author | tcberner <tcberner@FreeBSD.org> | 2016-12-19 06:06:50 +0800 |
|---|---|---|
| committer | tcberner <tcberner@FreeBSD.org> | 2016-12-19 06:06:50 +0800 |
| commit | 647a5f1fed1f7a099f3702900a4d62a8b2fefd25 (patch) | |
| tree | beb2058e74a1288b8c4fcb53c1257a42f692389c | |
| parent | 2dd19834f46456d79186fe9902b497425eaf641d (diff) | |
| download | freebsd-ports-gnome-647a5f1fed1f7a099f3702900a4d62a8b2fefd25.tar.gz freebsd-ports-gnome-647a5f1fed1f7a099f3702900a4d62a8b2fefd25.tar.zst freebsd-ports-gnome-647a5f1fed1f7a099f3702900a4d62a8b2fefd25.zip | |
Get rid of QT_PREFIX in favour of PREFIX.
QT_PREFIX was a remnant of a bygone time.
Reviewed by: rakuco
Approved by: rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D8825
33 files changed, 68 insertions, 72 deletions
@@ -10,6 +10,11 @@ in the release notes and/or placed into UPDATING. 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 diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 5e7d434d7077..8d09bf03df78 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -29,8 +29,6 @@ _QT_SUPPORTED?= 4 5 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 @@ IGNORE?= can't be installed: bsd.qt.mk may only be included via USE_QT[${_QT_SU .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 @@ QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo # 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 @@ PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" 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 @@ qt-post-install: @${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*} diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile index 4980a10ebbc5..858e23ccb6e0 100644 --- a/astro/xglobe/Makefile +++ b/astro/xglobe/Makefile @@ -12,7 +12,6 @@ COMMENT= Displays a view of the Earth (like xearth) with a rendered photo map USES= gmake USE_QT4= corelib gui qt3support moc_build -MAKE_ENV= QT_PREFIX=${QT_PREFIX} do-install: @${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/astro/xglobe/files/patch-Makefile b/astro/xglobe/files/patch-Makefile index e1d88a8e4bc2..e6b53ee18640 100644 --- a/astro/xglobe/files/patch-Makefile +++ b/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 - + diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index 3b547f175375..0888c582ad3b 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -29,7 +29,7 @@ USES= scons iconv 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= * diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile index 60f2ccdb1868..cc149aeee8ed 100644 --- a/cad/klayout/Makefile +++ b/cad/klayout/Makefile @@ -35,7 +35,7 @@ do-build: 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} diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist index 5cdf23569225..68e4ed46c11e 100644 --- a/databases/akonadi/pkg-plist +++ b/databases/akonadi/pkg-plist @@ -41,4 +41,4 @@ share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml 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 diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile index db85c8b7b18f..75ad2c8b09d7 100644 --- a/deskutils/recoll/Makefile +++ b/deskutils/recoll/Makefile @@ -57,7 +57,7 @@ QT4_USE= qt4=moc_build,qmake_build,rcc_build,uic_build \ 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 diff --git a/devel/ace/Makefile b/devel/ace/Makefile index 4273a256aef5..5f51ec0daa7c 100644 --- a/devel/ace/Makefile +++ b/devel/ace/Makefile @@ -46,7 +46,7 @@ FLTK_DESC= FLTK GUI toolkit 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 diff --git a/devel/qconf/Makefile b/devel/qconf/Makefile index fed4f40323dd..aaab87f896b1 100644 --- a/devel/qconf/Makefile +++ b/devel/qconf/Makefile @@ -20,7 +20,7 @@ MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}" CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir=${DATADIR:S,/qconf,,} \ - --qtdir=${QT_PREFIX} \ + --qtdir=${PREFIX} \ --verbose .include <bsd.port.mk> diff --git a/devel/qt4-qmlviewer/Makefile b/devel/qt4-qmlviewer/Makefile index 51da99a264fe..d327d34de530 100644 --- a/devel/qt4-qmlviewer/Makefile +++ b/devel/qt4-qmlviewer/Makefile @@ -22,7 +22,7 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ # 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 diff --git a/devel/qt5-core/pkg-plist b/devel/qt5-core/pkg-plist index 05a52488a67a..dd2235bb0640 100644 --- a/devel/qt5-core/pkg-plist +++ b/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 diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile index f8677bcf328b..68376a0935b1 100644 --- a/devel/subcommander2/Makefile +++ b/devel/subcommander2/Makefile @@ -27,7 +27,7 @@ QT_NONSTANDARD= yes 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} diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index a4f41c4f7e4e..3b4a45e2dd12 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -174,7 +174,7 @@ JAVA_VARS= JAVA_BUILD=yes 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 diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile index 6cef39e47533..f207cdc37d4f 100644 --- a/editors/libreoffice4/Makefile +++ b/editors/libreoffice4/Makefile @@ -267,7 +267,7 @@ KDE4_USES= kde:4 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}" diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile index a1deb2345f9c..b8ac4a14435e 100644 --- a/editors/texmacs/Makefile +++ b/editors/texmacs/Makefile @@ -54,7 +54,7 @@ PDF_IMPLIES= FREETYPE GHOSTSCRIPT 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="" diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile index 9179d15582e5..57bcd588f595 100644 --- a/emulators/qmc2/Makefile +++ b/emulators/qmc2/Makefile @@ -26,7 +26,7 @@ USE_QT4= corelib declarative gui moc_build \ 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" \ diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile index 5c1b70fdddf5..b2f068c5edd8 100644 --- a/graphics/fracplanet/Makefile +++ b/graphics/fracplanet/Makefile @@ -26,7 +26,7 @@ USE_GL= glu 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 diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile index e5eedf3cf56a..f343932967f1 100644 --- a/graphics/meshviewer/Makefile +++ b/graphics/meshviewer/Makefile @@ -22,7 +22,7 @@ USE_QT4= corelib gui opengl moc_build 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}" diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile index 4e6aa7a81c10..821fa292ed65 100644 --- a/graphics/qt4-pixeltool/Makefile +++ b/graphics/qt4-pixeltool/Makefile @@ -21,7 +21,7 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ # 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 diff --git a/graphics/qt5-pixeltool/Makefile b/graphics/qt5-pixeltool/Makefile index 0932416f1af3..545c33ad193a 100644 --- a/graphics/qt5-pixeltool/Makefile +++ b/graphics/qt5-pixeltool/Makefile @@ -14,7 +14,7 @@ USES= qmake # 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 diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile index a5c03790f5fd..16a5c26306bc 100644 --- a/misc/qt4-qtdemo/Makefile +++ b/misc/qt4-qtdemo/Makefile @@ -26,7 +26,7 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ # 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 diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile index 1e4cf1682d60..72e55ff32988 100644 --- a/multimedia/mythtv-frontend/Makefile +++ b/multimedia/mythtv-frontend/Makefile @@ -41,12 +41,12 @@ DESTDIRNAME= INSTALL_ROOT 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 diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index 7d83b0a823d4..50cce249547f 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -47,12 +47,12 @@ DESTDIRNAME= INSTALL_ROOT 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 diff --git a/multimedia/phonon-vlc/pkg-plist b/multimedia/phonon-vlc/pkg-plist index eb8ba21ec9c3..387892e64d68 100644 --- a/multimedia/phonon-vlc/pkg-plist +++ b/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 diff --git a/multimedia/phonon-xine/pkg-plist b/multimedia/phonon-xine/pkg-plist index 3de492a14873..993e74cc259b 100644 --- a/multimedia/phonon-xine/pkg-plist +++ b/multimedia/phonon-xine/pkg-plist @@ -7,4 +7,4 @@ share/icons/oxygen/48x48/apps/phonon-xine.png 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 diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist index 6a7150c6611a..e55e0bf86996 100644 --- a/multimedia/phonon/pkg-plist +++ b/multimedia/phonon/pkg-plist @@ -157,6 +157,8 @@ include/phonon/videowidgetinterface.h 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/libphonon.so.%%SHLIB_VER%% 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 @@ share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml %%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 diff --git a/science/silo/Makefile b/science/silo/Makefile index 467b75c835c0..6e45c8d66de4 100644 --- a/science/silo/Makefile +++ b/science/silo/Makefile @@ -37,7 +37,7 @@ PYTHON_USES= python:2 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 diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile index f8c14e2e8bde..fab7b57d60cd 100644 --- a/security/fwbuilder/Makefile +++ b/security/fwbuilder/Makefile @@ -45,7 +45,7 @@ USE_QT4= corelib \ uic_build \ xml -QTDIR?= ${QT_PREFIX} +QTDIR?= ${PREFIX} USE_OPENSSL= yes USES= autoreconf:build gmake libtool diff --git a/security/kqoauth/pkg-plist b/security/kqoauth/pkg-plist index cf4ca0d1eff4..23b514443fba 100644 --- a/security/kqoauth/pkg-plist +++ b/security/kqoauth/pkg-plist @@ -9,5 +9,5 @@ lib/libkqoauth.so 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 diff --git a/security/xca/Makefile b/security/xca/Makefile index 291fb36e63c1..877bd8f54cb6 100644 --- a/security/xca/Makefile +++ b/security/xca/Makefile @@ -18,7 +18,7 @@ USES= desktop-file-utils gmake localbase pkgconfig \ 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 diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile index e42955f5c4ad..cab5971a70bc 100644 --- a/x11-toolkits/qt5-declarative/Makefile +++ b/x11-toolkits/qt5-declarative/Makefile @@ -19,7 +19,7 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} # 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 diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile index 747b81dda076..0d75978600fe 100644 --- a/x11-toolkits/soqt/Makefile +++ b/x11-toolkits/soqt/Makefile @@ -21,7 +21,7 @@ USE_QT4= corelib opengl moc_build 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 |