From dbba8af6447e625aae93ec45e619acbecb4ab189 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Tue, 3 Apr 2001 08:14:43 +0000 Subject: Overhaul QT/KDE support: - bsd.port.mk update to use bsd.kde.mk for USE_{QT,KDE}* - Cleanup corresponding ports for bsd.kde.mk update. - Fix bsd.kde.mk: use correct kdelibs dependency, put qt at the bottom, introduce QT_NONSTANDARD variable for nonstandard configure setup. - Update KDE2 to 2.1.1. Two patches included in x11/kdelibs2 to fix the proxy authentication that was broken for 2.1.1. Remove old patches. - Potentially fix kdelibs build for alpha. - Fix qt-designer 2.3.0 build. - Ruby stuff left alone since it looks like black magic to me. Should still work w/ compat shims for older USE_QT[,2] style. Some others were also left alone for the same reason. Reviewed by: portmgr, ports (bsd.kde.mk+bsd.port.mk) Submitted by: David Faure (proxy auth patches) Alex Zepeda (old patches removal) --- audio/xsidplay/Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'audio/xsidplay') diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index f3456bece2c9..c0fbeac02050 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -18,16 +18,11 @@ LIB_DEPENDS= sidplay.1:${PORTSDIR}/audio/libsidplay WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_QT2= yes +USE_QT_VER= 2 USE_GMAKE= yes USE_LIBTOOL= yes -CONFIGURE_ENV= MOC="${X11BASE}/bin/moc2" -CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-sidplay-inc=${LOCALBASE}/include \ - --with-sidplay-lib=${LOCALBASE}/lib \ - --with-x-includes=${X11BASE}/include \ - --with-x-libraries=${X11BASE}/lib +CONFIGURE_ARGS+=--with-sidplay-inc=${LOCALBASE}/include \ + --with-sidplay-lib=${LOCALBASE}/lib CFLAGS+= ${PTHREAD_CFLAGS} -- cgit v1.2.3