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/kde4-runtime/Makefile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'x11/kde4-runtime/Makefile') diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 7c8cd7cade08..0145e4410a7f 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -6,36 +6,27 @@ # PORTNAME= kdebase -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -USE_QT2= yes +USE_KDELIBS_VER=2 SOMAJOR= 4 SOMINOR= 0 -MOC?= ${X11BASE}/bin/moc2 USE_XPM= yes USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes pre-configure: -- cgit v1.2.3