diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-02-13 00:16:29 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-02-13 00:16:29 +0000 |
| commit | 5ca9a6aed07a4279fce6cf50ec0b17a0c704d358 (patch) | |
| tree | 98af802b3322b4a54225135638e2882425155007 /audio | |
| parent | - Update to 0.39 (diff) | |
- Remove QTDIR from CONFIGURE_ENV, it's in there already thanks to framework
Submitted by: rafan
Tested on: pointyhat
Notes
Notes:
svn path=/head/; revision=185058
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/dream/Makefile | 3 | ||||
| -rw-r--r-- | audio/ermixer/Makefile | 1 | ||||
| -rw-r--r-- | audio/hydrogen/Makefile | 4 | ||||
| -rw-r--r-- | audio/lmms/Makefile | 2 | ||||
| -rw-r--r-- | audio/mixxx/Makefile | 4 | ||||
| -rw-r--r-- | audio/qjackctl/Makefile | 4 |
6 files changed, 8 insertions, 10 deletions
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> |