diff options
84 files changed, 88 insertions, 103 deletions
diff --git a/astro/xglobe/files/patch-aa b/astro/xglobe/files/patch-aa index 941b80f4d3db..bfba5b89df9f 100644 --- a/astro/xglobe/files/patch-aa +++ b/astro/xglobe/files/patch-aa @@ -15,11 +15,11 @@ -X11_INCLUDE_DIR = /usr/X11R6/include -QT_INCLUDE_DIR = $(QTDIR)/include +X11_INCLUDE_DIR = $(X11BASE)/include -+QT_INCLUDE_DIR = $(X11BASE)/include/ ++QT_INCLUDE_DIR = $(QT_PREFIX)/include/ -QT_LIB_DIR = $(QTDIR)/lib -X11_LIB_DIR = /usr/X11R6/lib -+QT_LIB_DIR = $(X11BASE)/lib ++QT_LIB_DIR = $(QT_PREFIX)/lib +X11_LIB_DIR = $(X11BASE)/lib diff --git a/audio/dream/Makefile b/audio/dream/Makefile index 2ed971aa8f4f..fe02c14e384e 100644 --- a/audio/dream/Makefile +++ b/audio/dream/Makefile @@ -23,8 +23,7 @@ USE_QT_VER= 3 GNU_CONFIGURE= yes CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - QTDIR="${QT_PREFIX}" + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" PLIST_FILES= bin/drm diff --git a/audio/ermixer/Makefile b/audio/ermixer/Makefile index 0b0c076227f5..01be2f49eda7 100644 --- a/audio/ermixer/Makefile +++ b/audio/ermixer/Makefile @@ -21,7 +21,6 @@ COMMENT= A command-line, ncurses, and (optional) Qt-GUI OSS audio mixer .if !defined(WITHOUT_X11) USE_QT_VER= 3 CONFIGURE_ARGS+=--enable-qt -CONFIGURE_ENV+= QTDIR="${X11BASE}" .endif USE_PERL5_BUILD= yes diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile index ddbd44b09f33..a36b14e7ad1f 100644 --- a/audio/hydrogen/Makefile +++ b/audio/hydrogen/Makefile @@ -24,10 +24,10 @@ USE_QT_VER= 3 CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ - QTDIR="${X11BASE}" ac_qmake="${LOCALBASE}/bin/qmake" \ + ac_qmake="${LOCALBASE}/bin/qmake" \ ac_libraries="${LDFLAGS}" CONFIGURE_ARGS= --disable-alsa -MAKE_ENV= QTDIR="${X11BASE}" QMAKESPEC="freebsd-g++" +MAKE_ENV= QTDIR="${QT_PREFIX}" QMAKESPEC="freebsd-g++" PLIST= ${WRKDIR}/pkg-plist diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile index 340ddbca62c8..d6f57154a135 100644 --- a/audio/lmms/Makefile +++ b/audio/lmms/Makefile @@ -33,7 +33,7 @@ ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= -a CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" QTDIR="${QT_PREFIX}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --without-vst --without-stk MAN1= lmms.1 diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index d8324fa9866a..380d0d10eaee 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -32,9 +32,9 @@ CONFIGURE_WRKSRC= ${WRKSRC}/src BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/src -CONFIGURE_ENV= QTDIR="${X11BASE}" QMAKESPEC="freebsd-g++" +CONFIGURE_ENV= QMAKESPEC="freebsd-g++" CONFIGURE_ARGS= --prefix=${PREFIX} -MAKE_ENV= QTDIR="${X11BASE}" +MAKE_ENV= QTDIR="${QT_PREFIX}" .include <bsd.port.pre.mk> diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile index 08e50abdaf83..b13d276f9dbe 100644 --- a/audio/qjackctl/Makefile +++ b/audio/qjackctl/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack GNU_CONFIGURE= yes USE_GMAKE= yes USE_QT_VER= 3 -CONFIGURE_ARGS+= QTDIR="${X11BASE}" CXXFLAGS="${CFLAGS} -pthread" -MAKE_ENV= QTDIR="${X11BASE}" MAKE="${GMAKE}" \ +CONFIGURE_ARGS+= QTDIR="${QT_PREFIX}" CXXFLAGS="${CFLAGS} -pthread" +MAKE_ENV= QTDIR="${QT_PREFIX}" MAKE="${GMAKE}" \ QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++" .include <bsd.port.mk> diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 4446e5d37d35..f39932b97cb2 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1$/-1/}-community.src -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} USE_X_PREFIX= yes USE_QT_VER= 3 diff --git a/cad/qucs/Makefile b/cad/qucs/Makefile index 675f92c5292d..6f3fb363437c 100644 --- a/cad/qucs/Makefile +++ b/cad/qucs/Makefile @@ -18,7 +18,6 @@ USE_QT_VER= 3 USE_GNOME= gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= QTDIR="${X11BASE}" MAN1= qucs.1 qucsator.1 qucsattenuator.1 qucsconv.1 qucsdigi.1 \ qucsedit.1 qucsfilter.1 qucshelp.1 qucslib.1 qucstrans.1 diff --git a/comms/cutecom/Makefile b/comms/cutecom/Makefile index 4f370f9199d7..f78e8d342e54 100644 --- a/comms/cutecom/Makefile +++ b/comms/cutecom/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= lsz:${PORTSDIR}/comms/lrzsz USE_QT_VER= 3 USE_GMAKE= yes -MAKE_ENV+= QTDIR="${X11BASE}" +MAKE_ENV+= QTDIR="${QT_PREFIX}" do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \ diff --git a/comms/qfaxreader/Makefile b/comms/qfaxreader/Makefile index 08df2111ae25..d06e4fa7c6fc 100644 --- a/comms/qfaxreader/Makefile +++ b/comms/qfaxreader/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_QT_VER= 3 -CONFIGURE_ENV= QTDIR=${QT_PREFIX} PTHREAD_LIBS=${PTHREAD_LIBS} +CONFIGURE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --mandir=${MANPREFIX}/man MAN1= qfaxreader.1 diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile index 3be9e1ebcebe..9081df205e42 100644 --- a/comms/qsstv/Makefile +++ b/comms/qsstv/Makefile @@ -20,8 +20,8 @@ HAS_CONFIGURE= yes USE_GMAKE= yes USE_QT_VER= 3 CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -CONFIGURE_ARGS= --qtdir=${X11BASE} -MAKE_ARGS+= QTDIR=${X11BASE} \ +CONFIGURE_ARGS= --qtdir=${QT_PREFIX} +MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ DESTDIR="" TARGET="qsstv" DOCSDIR="${DOCSDIR}" diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile index f46cd4df08b3..017ce78af1f4 100644 --- a/databases/mysql-navigator/Makefile +++ b/databases/mysql-navigator/Makefile @@ -25,8 +25,7 @@ USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS+=--with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libraries=${LOCALBASE}/lib/mysql CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${X11BASE}" -MAKE_ENV+= MOC="${MOC}" QTDIR="${X11BASE}" +MAKE_ENV+= MOC="${MOC}" QTDIR="${QT_PREFIX}" post-patch: @${REINPLACE_CMD} 's#-O2#${CXXFLAGS}#g' ${WRKSRC}/configure diff --git a/databases/mysqlcc/Makefile b/databases/mysqlcc/Makefile index ecbfeedc1221..72c6fbbba4d5 100644 --- a/databases/mysqlcc/Makefile +++ b/databases/mysqlcc/Makefile @@ -23,7 +23,7 @@ IGNORE_WITH_MYSQL=323 GNU_CONFIGURE= yes USE_QT_VER= 3 -CONFIGURE_ARGS+= --with-qt=${X11BASE} +CONFIGURE_ARGS+= --with-qt=${QT_PREFIX} DOCS= Changelog.txt README.txt TODO.txt SHARE_DATA= error.wav warning.wav syntax.txt diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile index 79727fda076f..f93cf9070de5 100644 --- a/deskutils/cdcat/Makefile +++ b/deskutils/cdcat/Makefile @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/CdCat-${PORTVERSION}/src USE_BZIP2= yes USE_QT_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} USE_GMAKE= yes MAKE_ENV= QTDIR="${QTDIR}" MAKE="${GMAKE}" \ QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++" diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile index 70da217c8f70..7b02fb02043e 100644 --- a/deskutils/recoll/Makefile +++ b/deskutils/recoll/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= xapian.13:${PORTSDIR}/databases/xapian-core \ qt-mt.3:${PORTSDIR}/x11-toolkits/qt33 USE_QT_VER= 3 -CONFIGURE_ENV= QTDIR="${QT_PREFIX}" QMAKESPEC="freebsd-g++" +CONFIGURE_ENV= QMAKESPEC="freebsd-g++" MAKE_ENV= ${CONFIGURE_ENV} GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/devel/bouml/Makefile b/devel/bouml/Makefile index 76163f3936c1..8a97d247dec1 100644 --- a/devel/bouml/Makefile +++ b/devel/bouml/Makefile @@ -19,7 +19,7 @@ COMMENT= BOUML, a free UML 2 modeler BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake USE_QT_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} ALL_TARGET= compile MAKE_ENV= QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++" \ QTDIR="${QTDIR}" diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 18ee052c89de..539542f1bb98 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -52,7 +52,7 @@ THREADLIBS= ${PTHREAD_LIBS} CFLAGS+= ${PTHREAD_CFLAGS} # Need this in env for build -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} CONFIGURE_ENV+= QTDIR="${QTDIR}" CONFIGURE_ARGS+=--with-doxywizard PLIST_SUB+= HAVE_DOXYWIZARD="" diff --git a/devel/esvn/Makefile b/devel/esvn/Makefile index 22ce063b8d82..2097bfa17b37 100644 --- a/devel/esvn/Makefile +++ b/devel/esvn/Makefile @@ -30,8 +30,8 @@ USE_QT_VER= 3 USE_GMAKE= yes USE_X_PREFIX= yes CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -CONFIGURE_ARGS= --qtdir=${X11BASE} -MAKE_ARGS+= QTDIR=${X11BASE} \ +CONFIGURE_ARGS= --qtdir=${QT_PREFIX} +MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ .include <bsd.port.pre.mk> diff --git a/devel/libchipcard-kde/Makefile b/devel/libchipcard-kde/Makefile index 0a8479c8f301..4a805b0a18e8 100644 --- a/devel/libchipcard-kde/Makefile +++ b/devel/libchipcard-kde/Makefile @@ -23,7 +23,6 @@ CONFIGURE_TARGET= CONFIGURE_ARGS+= --with-distri=freebsd --with-kde3-prefix=${LOCALBASE}\ --with-applnk-dir=${PREFIX}/share/applnk/Utilities \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= QTDIR="${X11BASE}" USE_KDELIBS_VER= 3 .include <bsd.port.pre.mk> diff --git a/devel/lincvs/Makefile b/devel/lincvs/Makefile index 90913349b139..fbb4fccde66e 100644 --- a/devel/lincvs/Makefile +++ b/devel/lincvs/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_QT_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} MAKE_ENV+= QTDIR=${QTDIR} QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ ALL_TARGET= install diff --git a/devel/qca/Makefile b/devel/qca/Makefile index 968eb70206cc..eb9ce571c6ba 100644 --- a/devel/qca/Makefile +++ b/devel/qca/Makefile @@ -24,8 +24,8 @@ USE_X_PREFIX= yes USE_LDCONFIG= yes CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -CONFIGURE_ARGS= --qtdir=${X11BASE} -MAKE_ARGS+= QTDIR=${X11BASE} \ +CONFIGURE_ARGS= --qtdir=${QT_PREFIX} +MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ do-install: diff --git a/devel/qsa/Makefile b/devel/qsa/Makefile index affc740fb0de..e94f063dd6ba 100644 --- a/devel/qsa/Makefile +++ b/devel/qsa/Makefile @@ -24,8 +24,8 @@ HAS_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS=-prefix ${PREFIX} -CONFIGURE_ENV?= QTDIR=${X11BASE} QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ PATH=${WRKSRC}/bin:$$PATH -MAKE_ENV?= QTDIR=${X11BASE} \ +CONFIGURE_ENV?= QTDIR=${QT_PREFIX} QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ PATH=${WRKSRC}/bin:$$PATH +MAKE_ENV?= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ LD_LIBRARY_PATH=${WRKSRC}/qsa \ PATH=${WRKSRC}/bin:$$PATH diff --git a/devel/qssl/Makefile b/devel/qssl/Makefile index c34d193c453c..a423a8b3300b 100644 --- a/devel/qssl/Makefile +++ b/devel/qssl/Makefile @@ -22,7 +22,7 @@ USE_OPENSSL= yes USE_X_PREFIX= yes USE_BZIP2= yes INSTALLS_SHLIB= yes -MAKE_ARGS= QTDIR=${X11BASE} +MAKE_ARGS= QTDIR=${QT_PREFIX} PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" USE_QT_VER= 3 diff --git a/editors/MathPlanner/Makefile b/editors/MathPlanner/Makefile index 008c0e637fed..237201fe46e0 100644 --- a/editors/MathPlanner/Makefile +++ b/editors/MathPlanner/Makefile @@ -19,7 +19,6 @@ COMMENT= A mathematical design and publishing application USE_QT_VER= 3 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= QTDIR="${QT_PREFIX}" QTCPPFLAGS+= ${PTHREAD_CFLAGS} QTCFGLIBS+= ${PTHREAD_LIBS} diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile index f65825daed80..9c3f49e37393 100644 --- a/editors/lfhex/Makefile +++ b/editors/lfhex/Makefile @@ -19,7 +19,6 @@ USE_QT_VER= 3 USE_BISON= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= QTDIR="${QT_PREFIX}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-qt-moc=${MOC} diff --git a/editors/rospell/Makefile b/editors/rospell/Makefile index ac8c2642225b..6f0576216ba9 100644 --- a/editors/rospell/Makefile +++ b/editors/rospell/Makefile @@ -23,7 +23,7 @@ BROKEN= Segfault during build USE_XLIB= yes USE_QT_VER= 3 MAKE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} -CONFIGURE_ENV= QTDIR=${X11BASE} LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" +CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" MAKEFILE= BSDmakefile diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile index d8178a622622..43af87b40d1e 100644 --- a/emulators/pearpc/Makefile +++ b/emulators/pearpc/Makefile @@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --disable-fpo #.if defined(WITH_QT) #CONFIGURE_ARGS+= --enable-ui=qt #USE_QT_VER= 3 -#QTDIR?= ${X11BASE} +#QTDIR?= ${QT_PREFIX} #CONFIGURE_ENV+= QTDIR="${QTDIR}" #.else #CONFIGURE_ARGS+= --enable-ui=nogui diff --git a/finance/qtstalker/Makefile b/finance/qtstalker/Makefile index 1754df933510..2499b914c9bd 100644 --- a/finance/qtstalker/Makefile +++ b/finance/qtstalker/Makefile @@ -21,7 +21,6 @@ USE_QT_VER=3 INSTALLS_SHLIB= yes MAKE_ENV= QTDIR="${QT_PREFIX}" -CONFIGURE_ENV= QTDIR="${QT_PREFIX}" WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/games/blackjack/Makefile b/games/blackjack/Makefile index c6f3adcd7685..ee5be0a49881 100644 --- a/games/blackjack/Makefile +++ b/games/blackjack/Makefile @@ -19,7 +19,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_QT_VER= 3 MAKE_ENV= QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \ - QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" + QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" \ + QTDIR="${QT_PREFIX}" MAN1= blackjack.1 PLIST_FILES= bin/blackjack diff --git a/games/blackjack/files/patch-aa b/games/blackjack/files/patch-aa index c9c0d511bf4f..5c90a23b2842 100644 --- a/games/blackjack/files/patch-aa +++ b/games/blackjack/files/patch-aa @@ -28,7 +28,7 @@ insurance_window.o $(METAOBJS) -MOC=$(QTDIR)/bin/moc -+MOC=$(X11BASE)/bin/moc ++MOC=$(QTDIR)/bin/moc .SUFFIXES: .cpp diff --git a/games/q15/Makefile b/games/q15/Makefile index 5f5b95a0d215..ebb7363d8317 100644 --- a/games/q15/Makefile +++ b/games/q15/Makefile @@ -16,7 +16,8 @@ COMMENT= A Qt-based game fifteen USE_BZIP2= yes USE_QT_VER= 3 USE_X_PREFIX= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \ + QT_PREFIX="${QT_PREFIX}" PLIST_FILES= bin/q15 diff --git a/games/q15/files/patch-qt.FreeBSD.mk b/games/q15/files/patch-qt.FreeBSD.mk index df426ccdd13f..175a4224efe7 100644 --- a/games/q15/files/patch-qt.FreeBSD.mk +++ b/games/q15/files/patch-qt.FreeBSD.mk @@ -4,7 +4,7 @@ # $Id: qt.FreeBSD.mk,v 1.0 2004/11/05 10:22:11 denis Exp $ -QTDIR= /usr/X11R6 -+QTDIR= ${X11BASE} ++QTDIR= ${QT_PREFIX} MOC= ${QTDIR}/bin/moc LUPDATE= ${QTDIR}/bin/lupdate LRELEASE= ${QTDIR}/bin/lrelease diff --git a/games/qgo/Makefile b/games/qgo/Makefile index bf39f155c7f4..3e8fcf273702 100644 --- a/games/qgo/Makefile +++ b/games/qgo/Makefile @@ -19,7 +19,6 @@ USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= QTDIR="${QT_PREFIX}" CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \ AUTOMAKE="${TRUE}" diff --git a/games/qnetchess/Makefile b/games/qnetchess/Makefile index 7fa8073ed121..0c9bbe07b4b0 100644 --- a/games/qnetchess/Makefile +++ b/games/qnetchess/Makefile @@ -20,7 +20,7 @@ LOCALE_FILE= "${DATADIR}/${PORTNAME}_ru" USE_BZIP2= yes USE_QT_VER= 3 -MAKE_ARGS+= LOCALE_FILE="${LOCALE_FILE}" QTDIR="${X11BASE}" +MAKE_ARGS+= LOCALE_FILE="${LOCALE_FILE}" QTDIR="${QT_PREFIX}" PLIST_FILES= bin/QNetChess %%DATADIR%%/${PORTNAME}_ru.qm PLIST_DIRS= %%DATADIR%% diff --git a/graphics/amanith/Makefile b/graphics/amanith/Makefile index ec7023ac7bdb..9a4ac523f3af 100644 --- a/graphics/amanith/Makefile +++ b/graphics/amanith/Makefile @@ -29,7 +29,7 @@ USE_GMAKE= yes USE_DOS2UNIX= yes USE_LDCONFIG= yes -MAKE_ENV= QTDIR="${LOCALBASE}" \ +MAKE_ENV= QTDIR="${QT_PREFIX}" \ QMAKESPEC="${QMAKESPEC}" \ AMANITHDIR="${AMANITHDIR}" diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile index 5a276bc6c0fb..803367d4f2ee 100644 --- a/graphics/evolvotron/Makefile +++ b/graphics/evolvotron/Makefile @@ -22,7 +22,7 @@ USE_PYTHON= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -MAKE_ENV= QTDIR=${X11BASE} MOC=${MOC} +MAKE_ENV= QTDIR=${QT_PREFIX} MOC=${MOC} .include <bsd.port.pre.mk> diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile index 2d4b46593b83..9a548064f43f 100644 --- a/graphics/ipe/Makefile +++ b/graphics/ipe/Makefile @@ -37,7 +37,7 @@ USE_GCC= 3.4 BROKEN= Does not compile on 4.x .endif -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} QMAKE?= ${LOCALBASE}/bin/qmake pre-fetch: diff --git a/graphics/landscape/Makefile b/graphics/landscape/Makefile index 9f449a4d5490..d473c5731c88 100644 --- a/graphics/landscape/Makefile +++ b/graphics/landscape/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut PLIST_FILES= bin/landscape USE_KDELIBS_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} MAKE_ENV= QTDIR="${QTDIR}" pre-build: diff --git a/graphics/moth/Makefile b/graphics/moth/Makefile index 507b62192e97..2aa768cd3fd8 100644 --- a/graphics/moth/Makefile +++ b/graphics/moth/Makefile @@ -22,7 +22,7 @@ USE_QT_VER= 3 USE_GL= yes USE_X_PREFIX= yes MAKE_ARGS= CC="${CXX}" XLIBDIR="${X11BASE}/lib" MOC="${MOC}" \ - CFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" QTDIR="${X11BASE}" \ + CFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" QTDIR="${QT_PREFIX}" \ GLINCLUDEDIR="${X11BASE}/include" \ MOTH_INCLUDES="${WRKSRC_LIBMOTH}/include" \ MOTH_LIBRARIES="${WRKSRC_LIBMOTH}/lib" diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 20efa1417c6e..f2c8df61d140 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -70,7 +70,7 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/local/qt/include|${X11BASE}/include|; \ s|/usr/local/qt/lib|${X11BASE}/lib|' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|$$QTDIR|${X11BASE}|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|$$QTDIR|${QT_PREFIX}|' ${WRKSRC}/configure .endif post-install: diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 8db38b09180a..a4f54952f934 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -42,7 +42,7 @@ BROKEN= Does not build on FreeBSD versions prior to 5 .endif .if !defined (QTDIR) -QTDIR= ${X11BASE} +QTDIR= ${QT_PREFIX} .endif .if !defined (GRASS_INST_DIR) diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile index 58bab7cb2137..f971cc8705bf 100644 --- a/graphics/qglviewer/Makefile +++ b/graphics/qglviewer/Makefile @@ -20,7 +20,6 @@ USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= QTDIR="${X11BASE}" USE_LDCONFIG= yes QTCPPFLAGS+= ${PTHREAD_CFLAGS} diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile index 0d27ae35b2d8..12804cc80261 100644 --- a/graphics/view3ds/Makefile +++ b/graphics/view3ds/Makefile @@ -29,7 +29,6 @@ USE_X_PREFIX= yes USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= QTDIR="${QT_PREFIX}" MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/irc/eggcreator/Makefile b/irc/eggcreator/Makefile index f19dad2320d7..f47289ee5a84 100644 --- a/irc/eggcreator/Makefile +++ b/irc/eggcreator/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake WRKSRC= ${WRKDIR}/eggconfcreator USE_QT_VER= 3 MAKE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ - QTDIR=${X11BASE} + QTDIR=${QT_PREFIX} QMAKE= ${LOCALBASE}/bin/qmake PLIST_FILES= bin/egg diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index 562feddbca6f..4dbbb7d2fdac 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -25,7 +25,6 @@ USE_KDELIBS_VER=3 USE_GMAKE= yes CONFIGURE_TARGET= CONFIGURE_ARGS+= --mandir=${PREFIX}/man -CONFIGURE_ENV= QTDIR="${X11BASE}" PLIST_SUB= VER=${PORTVERSION} MAN1= kvirc.1 diff --git a/math/digitizer/Makefile b/math/digitizer/Makefile index 5571bbfe1290..ec0cd326688d 100644 --- a/math/digitizer/Makefile +++ b/math/digitizer/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= fftw3.4:${PORTSDIR}/math/fftw3 WRKSRC= ${WRKDIR}/${PORTNAME} USE_QT_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} MAKE_ENV= QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++" \ QTDIR="${QTDIR}" diff --git a/math/k3dsurf/Makefile b/math/k3dsurf/Makefile index 2540d50ad77d..eb97e77f9a3a 100644 --- a/math/k3dsurf/Makefile +++ b/math/k3dsurf/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake USE_GL= yes USE_QT_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} MAKE_ENV= QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++" \ QTDIR="${QTDIR}" diff --git a/math/qgfe/Makefile b/math/qgfe/Makefile index 7b1259f9b482..871a29f998f4 100644 --- a/math/qgfe/Makefile +++ b/math/qgfe/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot USE_BZIP2= yes USE_QT_VER= 3 -MAKE_ENV= QTDIR=${X11BASE} \ +MAKE_ENV= QTDIR=${QT_PREFIX} \ MOC=${MOC} PLIST_FILES= bin/qgfe diff --git a/math/qscanplot/Makefile b/math/qscanplot/Makefile index 41af7b3fd3c6..7ebb34b273f4 100644 --- a/math/qscanplot/Makefile +++ b/math/qscanplot/Makefile @@ -23,9 +23,8 @@ USE_PERL5_BUILD=yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-lm ${PTHREAD_LIBS}" \ - QTDIR=${X11BASE} \ LIBQT=-lqt-mt -MAKE_ENV= QTDIR=${X11BASE} +MAKE_ENV= QTDIR=${QT_PREFIX} post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ diff --git a/math/qwtplot3d-qt4/Makefile b/math/qwtplot3d-qt4/Makefile index 7818a0b11f24..525a1f5f4643 100644 --- a/math/qwtplot3d-qt4/Makefile +++ b/math/qwtplot3d-qt4/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake USE_QT_VER= 3 USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV= QTDIR=${X11BASE} \ +MAKE_ENV= QTDIR=${QT_PREFIX} \ MOC=${MOC} INSTALLS_SHLIB= yes diff --git a/math/qwtplot3d/Makefile b/math/qwtplot3d/Makefile index 7818a0b11f24..525a1f5f4643 100644 --- a/math/qwtplot3d/Makefile +++ b/math/qwtplot3d/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake USE_QT_VER= 3 USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV= QTDIR=${X11BASE} \ +MAKE_ENV= QTDIR=${QT_PREFIX} \ MOC=${MOC} INSTALLS_SHLIB= yes diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile index 3915fb01dce3..309dec60ec84 100644 --- a/math/xgfe/Makefile +++ b/math/xgfe/Makefile @@ -21,7 +21,7 @@ USE_QT_VER= 3 USE_X_PREFIX= yes MAKE_ENV+= DOCSDIR=$(DOCSDIR) PTHREAD_CFLAGS="$(PTHREAD_CFLAGS)" \ - PTHREAD_LIBS="$(PTHREAD_LIBS)" + PTHREAD_LIBS="$(PTHREAD_LIBS)" QT_PREFIX="${QT_PREFIX}" .if defined(NOPORTDOCS) MAKE_ENV+= NOPORTDOCS=$(NOPORTDOCS) .endif diff --git a/math/xgfe/files/patch-aa b/math/xgfe/files/patch-aa index dd2b7a94a91e..41d270410049 100644 --- a/math/xgfe/files/patch-aa +++ b/math/xgfe/files/patch-aa @@ -10,14 +10,14 @@ -LINK = gcc +#CC = gcc +CXXFLAGS += ${PTHREAD_CFLAGS} -+QTDIR = $(X11BASE) ++QTDIR = $(QT_PREFIX) +INCPATH = -I$(X11BASE)/include +LINK = $(CXX) LFLAGS = -LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11 -MOC = moc +LIBS = -L$(X11BASE)/lib -lqt-mt -lX11 ${PTHREAD_LIBS} -+MOC = ${X11BASE}/bin/moc ++MOC = ${QTDIR}/bin/moc ####### Files diff --git a/multimedia/jahshaka/Makefile b/multimedia/jahshaka/Makefile index b1d9a1fc8f7d..28e8e07a4ae3 100644 --- a/multimedia/jahshaka/Makefile +++ b/multimedia/jahshaka/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= aviplay.0:${PORTSDIR}/multimedia/avifile \ USE_GL= yes USE_X_PREFIX= yes USE_QT_VER= 3 -MAKE_ENV= QMAKESPEC=${QMAKESPEC} QTDIR=${X11BASE} +MAKE_ENV= QMAKESPEC=${QMAKESPEC} QTDIR=${QT_PREFIX} WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= README diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index 06c37b1c6b6d..d5c0a6387350 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -34,10 +34,9 @@ USE_BZIP2= yes USE_QT_VER= 3 USE_MYSQL= 51 GNU_CONFIGURE= yes -CONFIGURE_ENV= QTDIR="${LOCALBASE}" \ - QMAKESPEC="${QMAKESPEC}" \ +CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" \ CFLAGS="${CFLAGS}" -MAKE_ENV= QTDIR="${X11BASE}" QMAKESPEC="${QMAKESPEC}" +MAKE_ENV= QTDIR="${QT_PREFIX}" QMAKESPEC="${QMAKESPEC}" USE_RC_SUBR= mythbackend CONFIGURE_ARGS= --with-qt-dir=${LOCALBASE} diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile index 1a5173fdec72..a6b5726c746a 100644 --- a/net-im/psi/Makefile +++ b/net-im/psi/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${X11BASE} \ --with-qca-inc=${X11BASE}/include/plugins/qca \ --with-qca-lib=${X11BASE}/lib \ --disable-growl --disable-dnotify --disable-ghbnr -MAKE_ARGS+= QTDIR=${X11BASE} \ +MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ PORTDOCS= README ChangeLog diff --git a/net-p2p/dctc-gui-qt/Makefile b/net-p2p/dctc-gui-qt/Makefile index f9c43e9fdb92..e67f87ac8af7 100644 --- a/net-p2p/dctc-gui-qt/Makefile +++ b/net-p2p/dctc-gui-qt/Makefile @@ -21,8 +21,7 @@ RUN_DEPENDS= dctc:${PORTSDIR}/net-p2p/dctc USE_QT_VER= 3 GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - QTDIR="${X11BASE}" +CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" PLIST_FILES= bin/dc_qt OPTIONS= XINE "Enable support for video preview using libxine" off diff --git a/net-p2p/museek+/Makefile b/net-p2p/museek+/Makefile index 51d80d1e3bde..ab5a679d58c0 100644 --- a/net-p2p/museek+/Makefile +++ b/net-p2p/museek+/Makefile @@ -30,7 +30,7 @@ USE_PYTHON= yes USE_SCONS= yes USE_FAM= yes -SCONS_ARGS= QTDIR=${X11BASE} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes +SCONS_ARGS= QTDIR=${QT_PREFIX} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes DATADIR= share/museek MAN1= muscan.1 muscand.1 museekd.1 musetup.1 musetup-gtk.1 mulog.1 \ diff --git a/net-p2p/museekplus/Makefile b/net-p2p/museekplus/Makefile index 51d80d1e3bde..ab5a679d58c0 100644 --- a/net-p2p/museekplus/Makefile +++ b/net-p2p/museekplus/Makefile @@ -30,7 +30,7 @@ USE_PYTHON= yes USE_SCONS= yes USE_FAM= yes -SCONS_ARGS= QTDIR=${X11BASE} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes +SCONS_ARGS= QTDIR=${QT_PREFIX} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes DATADIR= share/museek MAN1= muscan.1 muscand.1 museekd.1 musetup.1 musetup-gtk.1 mulog.1 \ diff --git a/net/cphone/Makefile b/net/cphone/Makefile index 1228474ff47e..09b5f60c734b 100644 --- a/net/cphone/Makefile +++ b/net/cphone/Makefile @@ -22,7 +22,7 @@ USE_BISON= yes USE_QT_VER= 3 USE_GMAKE= yes ALL_TARGET= optshared -MAKE_ENV= QTDIR=${X11BASE} \ +MAKE_ENV= QTDIR=${QT_PREFIX} \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ SYSLIBDIR=${LOCALBASE}/lib diff --git a/net/kiax/Makefile b/net/kiax/Makefile index db7dedd826ac..56e3701a2707 100644 --- a/net/kiax/Makefile +++ b/net/kiax/Makefile @@ -23,10 +23,10 @@ GNU_CONFIGURE= yes USE_PERL5_BUILD= yes USE_QT_VER= 3 -CONFIGURE_ENV+= QTDIR=${X11BASE} \ +CONFIGURE_ENV+= \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ EXPR_COMPAT=yes -MAKE_ARGS+= QTDIR=${X11BASE} \ +MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ .include <bsd.port.pre.mk> diff --git a/net/kphone/Makefile b/net/kphone/Makefile index 67618d794340..be1820d0efa1 100644 --- a/net/kphone/Makefile +++ b/net/kphone/Makefile @@ -18,7 +18,7 @@ USE_QT_VER= 3 USE_OPENSSL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= QTDIR="${QT_PREFIX}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" +CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" post-patch: @${REINPLACE_CMD} -e "s|-O3||g ; \ diff --git a/net/pppload/Makefile b/net/pppload/Makefile index ca3f73daa218..4e283c829b2c 100644 --- a/net/pppload/Makefile +++ b/net/pppload/Makefile @@ -17,7 +17,7 @@ COMMENT= Display the current throughput of a network device in a window USE_QT_VER= 3 USE_GMAKE= yes -MAKE_ENV= QTDIR=${X11BASE} PTHREAD_LIBS=${PTHREAD_LIBS} +MAKE_ENV= QT_PREFIX="${QT_PREFIX}" PTHREAD_LIBS="${PTHREAD_LIBS}" MAN1= pppload.1 PLIST_FILES= bin/pppload diff --git a/net/pppload/files/patch-aa b/net/pppload/files/patch-aa index 8a1e24acf68a..63c5fd751434 100644 --- a/net/pppload/files/patch-aa +++ b/net/pppload/files/patch-aa @@ -5,7 +5,7 @@ ####### Directories -QTDIR = /usr/lib/qt -+QTDIR = ${X11BASE} ++QTDIR = ${QT_PREFIX} BASEDIR = $(QTDIR) INCDIR = $(BASEDIR)/include LIBDIR = $(BASEDIR)/lib diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile index 864a461f0a38..8c8de31b93a8 100644 --- a/net/twinkle/Makefile +++ b/net/twinkle/Makefile @@ -31,11 +31,11 @@ USE_XLIB= yes USE_AUTOTOOLS= libtool:15 USE_QT_VER= 3 -CONFIGURE_ARGS= --with-qt-dir=${LOCALBASE} QTDIR=${LOCALBASE} +CONFIGURE_ARGS= --with-qt-dir=${QT_PREFIX} QTDIR=${LOCALBASE} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" \ CFLAGS="${CFLAGS}" -MAKE_ENV= QTDIR=${X11BASE} +MAKE_ENV= QTDIR=${QT_PREFIX} QMAKESPEC?= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ diff --git a/print/kpdftool/Makefile b/print/kpdftool/Makefile index c64dc224f3b7..0cd5b05435c1 100644 --- a/print/kpdftool/Makefile +++ b/print/kpdftool/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick USE_GMAKE= yes USE_QT_VER= 3 CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -MAKE_ARGS+= QTDIR=${X11BASE} +MAKE_ARGS+= QTDIR=${QT_PREFIX} do-configure: cd ${WRKSRC}; \ diff --git a/print/mapagi/Makefile b/print/mapagi/Makefile index 43427e718feb..bcb49e94c9fc 100644 --- a/print/mapagi/Makefile +++ b/print/mapagi/Makefile @@ -20,9 +20,8 @@ USE_QT_VER= 3 USE_GMAKE= yes QMAKE?= ${LOCALBASE}/bin/qmake -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} -CONFIGURE_ENV+= QTDIR=${QTDIR} MAKE_ENV+= QTDIR=${QTDIR} DOC_FILES= COPYING ChangeLog INSTALL README TODO diff --git a/science/gsystem/Makefile b/science/gsystem/Makefile index 500632b47311..52fd605064bf 100644 --- a/science/gsystem/Makefile +++ b/science/gsystem/Makefile @@ -23,7 +23,7 @@ USE_KDELIBS_VER= 3 INSTALLS_SHLIB= yes -QTDIR= ${X11BASE} +QTDIR= ${QT_PREFIX} QMAKESPEC= freebsd-g++ .include <bsd.port.pre.mk> diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile index 5b48c538837b..c21cda6c3d4c 100644 --- a/security/fwbuilder-devel/Makefile +++ b/security/fwbuilder-devel/Makefile @@ -22,7 +22,7 @@ BUILD_VERSION= 21 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} USE_QT_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} USE_OPENSSL= yes USE_GETOPT_LONG= yes diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile index 5b48c538837b..c21cda6c3d4c 100644 --- a/security/fwbuilder/Makefile +++ b/security/fwbuilder/Makefile @@ -22,7 +22,7 @@ BUILD_VERSION= 21 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} USE_QT_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} USE_OPENSSL= yes USE_GETOPT_LONG= yes diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile index 5b48c538837b..c21cda6c3d4c 100644 --- a/security/fwbuilder2/Makefile +++ b/security/fwbuilder2/Makefile @@ -22,7 +22,7 @@ BUILD_VERSION= 21 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} USE_QT_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} USE_OPENSSL= yes USE_GETOPT_LONG= yes diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile index 40c001bc6a79..abe2262e55ed 100644 --- a/security/libfwbuilder-devel/Makefile +++ b/security/libfwbuilder-devel/Makefile @@ -22,7 +22,7 @@ BUILD_VERSION= 21 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} USE_QT_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} USE_OPENSSL= yes USE_GMAKE= yes diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile index 40c001bc6a79..abe2262e55ed 100644 --- a/security/libfwbuilder/Makefile +++ b/security/libfwbuilder/Makefile @@ -22,7 +22,7 @@ BUILD_VERSION= 21 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} USE_QT_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} USE_OPENSSL= yes USE_GMAKE= yes diff --git a/security/libfwbuilder2/Makefile b/security/libfwbuilder2/Makefile index 40c001bc6a79..abe2262e55ed 100644 --- a/security/libfwbuilder2/Makefile +++ b/security/libfwbuilder2/Makefile @@ -22,7 +22,7 @@ BUILD_VERSION= 21 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} USE_QT_VER= 3 -QTDIR?= ${X11BASE} +QTDIR?= ${QT_PREFIX} USE_OPENSSL= yes USE_GMAKE= yes diff --git a/security/mypasswordsafe/Makefile b/security/mypasswordsafe/Makefile index 4549b99dc4bb..938d9ec0df79 100644 --- a/security/mypasswordsafe/Makefile +++ b/security/mypasswordsafe/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake USE_GMAKE= yes USE_KDELIBS_VER=3 WRKSRC= ${WRKDIR}/${DISTNAME:S/.src//} -MAKE_ENV= QTDIR="${X11BASE}" \ +MAKE_ENV= QTDIR="${QT_PREFIX}" \ QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++" post-patch: diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile index 884d57c2ecff..eb5d17d41733 100644 --- a/security/qca-tls/Makefile +++ b/security/qca-tls/Makefile @@ -26,7 +26,7 @@ QT_NONSTANDARD= yes CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ CONFIGURE_ARGS= --qtdir=${X11BASE} \ --with-openssl-inc=${OPENSSLINC} --with-openssl-lib=${OPENSSLLIB} -MAKE_ARGS+= QTDIR=${X11BASE} \ +MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ PLIST_DIRS= lib/plugins/crypto diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile index db683b279335..cd37419cb665 100644 --- a/textproc/skim/Makefile +++ b/textproc/skim/Makefile @@ -27,8 +27,7 @@ USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ - PREFIX="${PREFIX}" \ - QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" + PREFIX="${PREFIX}" .include <bsd.port.pre.mk> diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile index b1c2e46be870..58fbab90be94 100644 --- a/textproc/xxdiff/Makefile +++ b/textproc/xxdiff/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_QT_VER= 3 -MAKE_ENV+= QTDIR=${X11BASE} +MAKE_ENV+= QTDIR=${QT_PREFIX} BUILD_WRKSRC= ${WRKSRC}/src DOCFILES= xxdiff-doc.html xxdiff-integration.html xxdiff-scripts.html xxdiff-secrets.html \ diff --git a/x11-clocks/bdesktopclock/Makefile b/x11-clocks/bdesktopclock/Makefile index c892bc528273..7406f5d8da32 100644 --- a/x11-clocks/bdesktopclock/Makefile +++ b/x11-clocks/bdesktopclock/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/BDesktopClock USE_X_PREFIX= yes USE_QT_VER= 3 -MAKE_ENV+= QTDIR=${X11BASE} \ +MAKE_ENV+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ PLIST_FILES= bin/BDesktopClock diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile index a3c4d82ac934..620b27b03efc 100644 --- a/x11-fm/krusader/Makefile +++ b/x11-fm/krusader/Makefile @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GETTEXT= yes -QTDIR?=${X11BASE}/bin +QTDIR?=${QT_PREFIX}/bin KDEDIR?=${LOCALBASE}/bin CONFIGURE_TARGET= CONFIGURE_ENV+=QTDIR=${QTDIR} KDEDIR=${KDEDIR} diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile index a3c4d82ac934..620b27b03efc 100644 --- a/x11-fm/krusader2/Makefile +++ b/x11-fm/krusader2/Makefile @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GETTEXT= yes -QTDIR?=${X11BASE}/bin +QTDIR?=${QT_PREFIX}/bin KDEDIR?=${LOCALBASE}/bin CONFIGURE_TARGET= CONFIGURE_ENV+=QTDIR=${QTDIR} KDEDIR=${KDEDIR} diff --git a/x11-themes/polymer/Makefile b/x11-themes/polymer/Makefile index 2471f9756b27..f53b111b4b74 100644 --- a/x11-themes/polymer/Makefile +++ b/x11-themes/polymer/Makefile @@ -23,7 +23,7 @@ USE_AUTOTOOLS= autoheader:259 USE_QT_VER= 3 INSTALLS_SHLIB= yes -MAKE_ARGS+= QTDIR=${X11BASE} \ +MAKE_ARGS+= QTDIR=${QT_PREFIX} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ QMAKE=${LOCALBASE}/bin/qmake CONFIGURE_ENV+= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/x11-toolkits/qscintilla/Makefile b/x11-toolkits/qscintilla/Makefile index bd8b571fa7f5..a1b1e8163b38 100644 --- a/x11-toolkits/qscintilla/Makefile +++ b/x11-toolkits/qscintilla/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake USE_X_PREFIX= yes USE_QT_VER= 3 -MAKE_ENV= QTDIR="${X11BASE}" +MAKE_ENV= QTDIR="${QT_PREFIX}" USE_LDCONFIG= yes OPTIONS= DESIGNER_PLUGIN "Install plugin for Qt Designer" on \ |