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) --- Mk/bsd.port.mk | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'Mk/bsd.port.mk') diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4a1b18ee67ba..bca063cc3535 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -170,10 +170,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # target. # USE_X_PREFIX - Says that the port installs in ${X11BASE}. Implies USE_XLIB. # USE_XLIB - Says that the port uses X libraries. -# USE_QT - Says that the port uses version 1 of the qt toolkit. -# Implies USE_NEWGCC. -# USE_QT2 - Says that the port uses version 2 of the qt toolkit. -# Implies USE_NEWGCC. # USE_MOTIF - Says that the port uses the Motif toolkit. Implies USE_XPM. # # Dependency checking. Use these if your port requires another port @@ -764,16 +760,6 @@ MANCOMPRESSED?= yes MANCOMPRESSED?= no .endif -.if defined(USE_QT) -LIB_DEPENDS+= qt.3:${PORTSDIR}/x11-toolkits/qt145 -USE_NEWGCC= yes -.endif - -.if defined(USE_QT2) -LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 -USE_NEWGCC= yes -.endif - .if defined(USE_BZIP2) BUILD_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 .endif @@ -904,6 +890,10 @@ LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86-4-libraries .endif .endif +.if defined(USE_QT) || defined(USE_QT2) || defined(USE_QT_VER) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER) +.include "${PORTSDIR}/Mk/bsd.kde.mk" +.endif + .include "${PORTSDIR}/Mk/bsd.gnome.mk" .if exists(${PORTSDIR}/../Makefile.inc) -- cgit v1.2.3