diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/bouml/Makefile | 2 | ||||
| -rw-r--r-- | devel/doxygen/Makefile | 2 | ||||
| -rw-r--r-- | devel/esvn/Makefile | 4 | ||||
| -rw-r--r-- | devel/libchipcard-kde/Makefile | 1 | ||||
| -rw-r--r-- | devel/lincvs/Makefile | 2 | ||||
| -rw-r--r-- | devel/qca/Makefile | 4 | ||||
| -rw-r--r-- | devel/qsa/Makefile | 4 | ||||
| -rw-r--r-- | devel/qssl/Makefile | 2 |
8 files changed, 10 insertions, 11 deletions
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 |