aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
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-toolkits
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-toolkits')
-rw-r--r--x11-toolkits/py-kde/Makefile2
-rw-r--r--x11-toolkits/py-qt/Makefile4
2 files changed, 2 insertions, 4 deletions
diff --git a/x11-toolkits/py-kde/Makefile b/x11-toolkits/py-kde/Makefile
index 27685a7145f4..fa71a7ba3a86 100644
--- a/x11-toolkits/py-kde/Makefile
+++ b/x11-toolkits/py-kde/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= adsharma@sharmas.dhs.org
BUILD_DEPENDS= ${LOCALBASE}/lib/python1.5/qt.py:${PORTSDIR}/x11-toolkits/py-qt
USE_LIBTOOL= yes
-USE_QT= yes
+USE_QT_VER= 1
USE_GMAKE= yes
CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/X11/qt
diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index c56b33992e6b..97b08cd169fd 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -14,14 +14,12 @@ MAINTAINER= adsharma@sharmas.dhs.org
LIB_DEPENDS= sip.4:${PORTSDIR}/devel/sip
-USE_QT2= yes
+USE_QT_VER= 2
USE_PYTHON= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
CONFIGURE_ENV= LDFLAGS=-lgcc \
SIP_MOC="${X11BASE}/bin/moc2"
-CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib
pre-patch:
@find ${WRKSRC} -name Makefile.in | \