diff options
author | Will Andrews <will@FreeBSD.org> | 2001-04-03 08:14:43 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2001-04-03 08:14:43 +0000 |
commit | dbba8af6447e625aae93ec45e619acbecb4ab189 (patch) | |
tree | d696a8c2d3e835a743132aa1f6a5cc0557d1c435 /deskutils | |
parent | 683eaaa4ff765b627c52f147501abfaec4449cce (diff) | |
download | freebsd-ports-dbba8af6447e625aae93ec45e619acbecb4ab189.zip |
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 <faure@kde.org> (proxy auth patches)
Alex Zepeda <garbanzo@kde.org> (old patches removal)
Diffstat (limited to 'deskutils')
-rw-r--r-- | deskutils/kcharselect/Makefile | 14 | ||||
-rw-r--r-- | deskutils/kcharselect/distinfo | 2 | ||||
-rw-r--r-- | deskutils/kdepim/Makefile | 11 | ||||
-rw-r--r-- | deskutils/kdepim3/Makefile | 11 | ||||
-rw-r--r-- | deskutils/kdepim4/Makefile | 11 | ||||
-rw-r--r-- | deskutils/kdepim44/Makefile | 11 | ||||
-rw-r--r-- | deskutils/korganizer/Makefile | 9 | ||||
-rw-r--r-- | deskutils/kproject/Makefile | 4 |
8 files changed, 10 insertions, 63 deletions
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index 1833fce21603..5e040d99442a 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -6,27 +6,17 @@ # PORTNAME= kdeutils -PORTVERSION= 2.1 +PORTVERSION= 2.1.1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 +USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ - --with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ - USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo index 8151479aa10b..f18435189a7a 100644 --- a/deskutils/kcharselect/distinfo +++ b/deskutils/kcharselect/distinfo @@ -1 +1 @@ -MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a +MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23 diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile index 77391cdace22..b4a66e40cfcc 100644 --- a/deskutils/kdepim/Makefile +++ b/deskutils/kdepim/Makefile @@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - +USE_KDELIBS_VER=2 USE_BISON= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ - MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile index 77391cdace22..b4a66e40cfcc 100644 --- a/deskutils/kdepim3/Makefile +++ b/deskutils/kdepim3/Makefile @@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - +USE_KDELIBS_VER=2 USE_BISON= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ - MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 77391cdace22..b4a66e40cfcc 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - +USE_KDELIBS_VER=2 USE_BISON= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ - MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index 77391cdace22..b4a66e40cfcc 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 - +USE_KDELIBS_VER=2 USE_BISON= yes -USE_QT2= yes -MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ - --with-qt-libraries=${X11BASE}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ - MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/deskutils/korganizer/Makefile b/deskutils/korganizer/Makefile index 8012ccee7dff..7ddf244c3811 100644 --- a/deskutils/korganizer/Makefile +++ b/deskutils/korganizer/Makefile @@ -11,20 +11,15 @@ CATEGORIES= deskutils kde MASTER_SITES= $(MASTER_SITE_KDE) MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2 -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 - +USE_KDELIBS_VER=1 USE_BZIP2= yes -USE_QT= yes HAS_CONFIGURE= yes USE_BISON= yes USE_GMAKE= yes -CONFIGURE_ARGS= "--prefix=$(PREFIX)" CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \ INSTALL_SCRIPT="install -c -m 555" pre-configure: - ${RM} -rf -- $(WRKSRC)/src/.deps $(WRKSRC)/config.cache + ${RM} -rf -- $(WRKSRC)/src/.deps $(WRKSRC)/config.cache .include <bsd.port.mk> diff --git a/deskutils/kproject/Makefile b/deskutils/kproject/Makefile index fffa6691d071..c26c67f38d46 100644 --- a/deskutils/kproject/Makefile +++ b/deskutils/kproject/Makefile @@ -13,10 +13,8 @@ MASTER_SITE_SUBDIR= unstable/apps/office EXTRACT_SUFX= .tgz BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool -LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - kdeui.3:${PORTSDIR}/x11/kdelibs11 -USE_QT= yes +USE_KDELIBS_VER=1 WRKSRC= ${WRKDIR}/kproject .include <bsd.port.mk> |