diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/cphone/Makefile | 2 | ||||
-rw-r--r-- | net/kiax/Makefile | 4 | ||||
-rw-r--r-- | net/kphone/Makefile | 2 | ||||
-rw-r--r-- | net/pppload/Makefile | 2 | ||||
-rw-r--r-- | net/pppload/files/patch-aa | 2 | ||||
-rw-r--r-- | net/twinkle/Makefile | 4 |
6 files changed, 8 insertions, 8 deletions
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++ |