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) --- converters/kdesupport11/Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'converters/kdesupport11/Makefile') diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile index c12cecd5ce2c..884a454155fd 100644 --- a/converters/kdesupport11/Makefile +++ b/converters/kdesupport11/Makefile @@ -18,19 +18,12 @@ MAINTAINER= will@FreeBSD.org USE_BZIP2= yes NO_LATEST_LINK= yes -USE_QT= yes +USE_QT_VER= 1 USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --without-libjpeg --without-libgif \ --without-libgdbm --without-libuulib \ --with-qt-includes=${QTDIR}/include/X11/qt -CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555" \ - QTDIR=${QTDIR} - -.if defined(PREFIX) -QTDIR?= ${PREFIX} -.else -QTDIR?= ${X11BASE} -.endif +CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555" .include -- cgit v1.2.3