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) --- x11/kdebase11/Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'x11/kdebase11') diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile index 56031f46e8d9..1b92a29fd446 100644 --- a/x11/kdebase11/Makefile +++ b/x11/kdebase11/Makefile @@ -26,7 +26,7 @@ NO_LATEST_LINK= yes USE_XLIB= yes USE_XPM= yes USE_BZIP2= yes -USE_QT= yes +USE_QT_VER= 1 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-qt-includes=${QTDIR}/include/X11/qt \ @@ -40,12 +40,6 @@ CONFIGURE_ENV= CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \ MAKE_ENV= RM=${RM} CFLAGS+= "-I$(PREFIX)/include" -.if defined(PREFIX) -QTDIR?= ${PREFIX} -.else -QTDIR?= ${X11BASE} -.endif - pre-patch: @${CP} ${FILESDIR}/ja.kimap ${WRKSRC}/kikbd/maps -- cgit v1.2.3