aboutsummaryrefslogtreecommitdiffstats
path: root/x11-clocks
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2001-04-03 16:14:43 +0800
committerwill <will@FreeBSD.org>2001-04-03 16:14:43 +0800
commite282c995211fa7d389e4d3b437d0ff892d4d929b (patch)
treec8e1217a1b00314713ec60f3c0d07c11dc242116 /x11-clocks
parenta4c43b9975be01621916750b073e7125e629feba (diff)
downloadfreebsd-ports-gnome-e282c995211fa7d389e4d3b437d0ff892d4d929b.tar.gz
freebsd-ports-gnome-e282c995211fa7d389e4d3b437d0ff892d4d929b.tar.zst
freebsd-ports-gnome-e282c995211fa7d389e4d3b437d0ff892d4d929b.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 'x11-clocks')
-rw-r--r--x11-clocks/kdetoys2/Makefile14
-rw-r--r--x11-clocks/kdetoys2/distinfo2
-rw-r--r--x11-clocks/kdetoys3/Makefile14
-rw-r--r--x11-clocks/kdetoys3/distinfo2
-rw-r--r--x11-clocks/kdetoys4/Makefile14
-rw-r--r--x11-clocks/kdetoys4/distinfo2
6 files changed, 12 insertions, 36 deletions
diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile
index 911a1ef20521..70a7c34b556c 100644
--- a/x11-clocks/kdetoys2/Makefile
+++ b/x11-clocks/kdetoys2/Makefile
@@ -6,26 +6,18 @@
#
PORTNAME= kdetoys
-PORTVERSION= 2.1
+PORTVERSION= 2.1.1
CATEGORIES= x11-clocks 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
+USE_KDELIBS_VER=2
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
USE_AUTOCONF= yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
- --with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib \
- --with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse \
- CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
- LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys2/distinfo b/x11-clocks/kdetoys2/distinfo
index c2f11fff9b47..ee2d90a95106 100644
--- a/x11-clocks/kdetoys2/distinfo
+++ b/x11-clocks/kdetoys2/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-2.1.tar.bz2) = fa4a8e6a77cd0c37ab0ff58de2c34627
+MD5 (kdetoys-2.1.1.tar.bz2) = 1c8cb34292137ff612de5c8e8114f425
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index 911a1ef20521..70a7c34b556c 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -6,26 +6,18 @@
#
PORTNAME= kdetoys
-PORTVERSION= 2.1
+PORTVERSION= 2.1.1
CATEGORIES= x11-clocks 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
+USE_KDELIBS_VER=2
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
USE_AUTOCONF= yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
- --with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib \
- --with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse \
- CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
- LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo
index c2f11fff9b47..ee2d90a95106 100644
--- a/x11-clocks/kdetoys3/distinfo
+++ b/x11-clocks/kdetoys3/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-2.1.tar.bz2) = fa4a8e6a77cd0c37ab0ff58de2c34627
+MD5 (kdetoys-2.1.1.tar.bz2) = 1c8cb34292137ff612de5c8e8114f425
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index 911a1ef20521..70a7c34b556c 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -6,26 +6,18 @@
#
PORTNAME= kdetoys
-PORTVERSION= 2.1
+PORTVERSION= 2.1.1
CATEGORIES= x11-clocks 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
+USE_KDELIBS_VER=2
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
USE_AUTOCONF= yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
- --with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib \
- --with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse \
- CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
- LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index c2f11fff9b47..ee2d90a95106 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-2.1.tar.bz2) = fa4a8e6a77cd0c37ab0ff58de2c34627
+MD5 (kdetoys-2.1.1.tar.bz2) = 1c8cb34292137ff612de5c8e8114f425