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) --- editors/calligra/Makefile | 13 ++----------- editors/fine/Makefile | 3 +-- editors/koffice-kde3/Makefile | 13 ++----------- editors/koffice-kde4/Makefile | 13 ++----------- editors/koffice/Makefile | 13 ++----------- 5 files changed, 9 insertions(+), 46 deletions(-) (limited to 'editors') diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index cff182dcc4a5..f3ad94e24bb0 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/editors/fine/Makefile b/editors/fine/Makefile index 1f59a6eee76f..7321fbef4d53 100644 --- a/editors/fine/Makefile +++ b/editors/fine/Makefile @@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org -USE_NEWGCC= yes USE_GMAKE= yes -USE_QT2= yes +USE_QT_VER= 2 WRKSRC= ${WRKDIR}/fine .include diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index cff182dcc4a5..f3ad94e24bb0 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index cff182dcc4a5..f3ad94e24bb0 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile index cff182dcc4a5..f3ad94e24bb0 100644 --- a/editors/koffice/Makefile +++ b/editors/koffice/Makefile @@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes -USE_NEWGCC= yes INSTALLS_SHLIB= yes USE_AUTOCONF= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include -- cgit v1.2.3