Index: head/audio/last.fm/Makefile
===================================================================
--- head/audio/last.fm/Makefile	(revision 196993)
+++ head/audio/last.fm/Makefile	(revision 196994)
@@ -1,47 +1,55 @@
 # New ports collection makefile for:   last.fm
 # Date created:        February 5th, 2007
 # Whom:                Michael Nottebrock <lofi@freebsd.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	last.fm
 PORTVERSION=	1.3.1.0
 CATEGORIES=	audio net
 MASTER_SITES=	http://static.last.fm/client/Linux/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	lofi@FreeBSD.org
 COMMENT=	Official last.fm radio player
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 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 <bsd.port.pre.mk>
+
+.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
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/last.fm ${PREFIX}/bin/last.fm
 	${MKDIR} ${PREFIX}/share/services
 	${INSTALL_DATA} ${FILESDIR}/lastfm.protocol ${PREFIX}/share/services
 	${MKDIR} ${DATADIR}
 	${CP} -Rp ${WRKSRC}/bin/* ${DATADIR}/
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Property changes on: head/audio/last.fm/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/audio/last.fm/files/patch-configure
===================================================================
--- head/audio/last.fm/files/patch-configure	(revision 196993)
+++ head/audio/last.fm/files/patch-configure	(revision 196994)
@@ -1,33 +1,33 @@
---- 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
  
  echo -e '\E[0;34m'"\033[1mLast.fm-1.1.3 Configure\033[0m"
  
  echo "Checking for qmake..."
  
 -qmake -v &> /dev/null
 +qmake-qt4 -v &> /dev/null
  if [[ $? = 127 ]]; then
  	      ################################################################################
  	echo
 @@ -19,7 +19,7 @@
  # QMake version 2.01a
  # Using Qt version 4.2.2 in /opt/qt/4.2.2/lib
  
 -qmake -v | grep '^Using Qt version 4.2' --color=never &> /dev/null
 +qmake-qt4 -v | grep '^Using Qt version 4.2' --color=never &> /dev/null
  
  if [[ $? > 0 ]]; then
  	      ################################################################################
 @@ -40,7 +40,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'"

Property changes on: head/audio/last.fm/files/patch-configure
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property