From aaab7a0a164fbca17abbc1318ff3ab2be33b0b1d Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Thu, 2 Aug 2007 22:41:00 +0000 Subject: -Use _build/_run in QT_COMPONENTS. -USE_GCC=4.2+ on amd64 --- audio/last.fm/Makefile | 14 +++++++++++--- audio/last.fm/files/patch-configure | 6 +++--- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'audio/last.fm') diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile index 082acf535637..c4a0ebb23f0a 100644 --- a/audio/last.fm/Makefile +++ b/audio/last.fm/Makefile @@ -19,16 +19,24 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-install pkg-deinstall USE_BZIP2= yes USE_QT_VER= 4 -QT_COMPONENTS= gui imageformats moc network qmake rcc sql uic xml +QT_COMPONENTS= gui imageformats_run moc_build network qmake_build rcc sql \ + uic_build xml HAS_CONFIGURE= yes CONFIGURE_ENV+= X11BASE=${X11BASE} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +.include + +.if ${OSVERSION} < 700042 && ${ARCH} == "amd64" +USE_GCC=4.2+ +.endif + post-build: cd ${WRKSRC}/src/output/RtAudio && \ - ${QMAKE} -spec freebsd-g++ && make + ${QMAKE} -spec freebsd-g++ "QMAKE_CXX=${CXX}" "QMAKE_LINK=${CXX}" \ + "QMAKE_LINK_SHLIB=${CXX}" && make ${REINPLACE_CMD} -e 's|`dirname $$0`|${DATADIR}|g' \ ${WRKSRC}/bin/last.fm @@ -44,4 +52,4 @@ post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif -.include +.include diff --git a/audio/last.fm/files/patch-configure b/audio/last.fm/files/patch-configure index d2985b2ff643..59c31d6fee07 100644 --- a/audio/last.fm/files/patch-configure +++ b/audio/last.fm/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Mon Feb 5 23:02:40 2007 -+++ configure Mon Feb 5 23:03:29 2007 +--- configure.orig 2007-07-05 18:41:23.000000000 +0200 ++++ configure 2007-08-03 00:10:40.000000000 +0200 @@ -1,10 +1,10 @@ -#!/bin/bash +#!/bin/sh @@ -27,7 +27,7 @@ echo "Generating Makefiles..." -qmake -config release -after "CONFIG-=debug" -+qmake-qt4 -config release -after "CONFIG-=debug" "INCLUDEPATH+=${X11BASE}/include" "QMAKE_CXXFLAGS+=-fPIC" ++qmake-qt4 -config release -after "CONFIG-=debug" "INCLUDEPATH+=${X11BASE}/include" "QMAKE_CXXFLAGS+=-fPIC" "QMAKE_CXX=${CXX}" "QMAKE_LINK=${CXX}" "QMAKE_LINK_SHLIB=${CXX}" echo echo "Good, your configure is finished. Now type 'make'" -- cgit v1.2.3