aboutsummaryrefslogtreecommitdiffstats
path: root/x11/kdelibs4
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/kdelibs4
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/kdelibs4')
-rw-r--r--x11/kdelibs4/Makefile17
-rw-r--r--x11/kdelibs4/distinfo2
2 files changed, 8 insertions, 11 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 170ff7b40d45..405bf219d7b1 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kdelibs
-PORTVERSION= 2.1
+PORTVERSION= 2.1.1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
@@ -18,21 +18,17 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
mimelib.3:${PORTSDIR}/converters/kdesupport2
USE_OPENSSL= yes
-USE_QT2= yes
-MOC?= ${X11BASE}/bin/moc2
+USE_QT_VER= 2
SOMAJOR= 4
SOMINOR= 0
USE_BZIP2= yes
-USE_NEWGCC= 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= MOC="${MOC}" LIBQT="-lqt2" \
- CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
- LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
+.if ${MACHINE_ARCH} == "alpha"
+CFLAGS= -O0 ${KDE_CFLAGS}
+.endif
+
USE_GMAKE= yes
MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
PLIST_SUB+= LIBVER="${SOMAJOR}"
@@ -52,6 +48,7 @@ pre-fetch:
.endif
pre-configure:
+ ${PERL} -pi -e "s@-O2@-O0@g" ${WRKSRC}/configure
(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \
"s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \
s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g")
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 992af6f45bd7..be16692f3af0 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-2.1.tar.bz2) = d1795459c4bc8bedc4af67211275b050
+MD5 (kdelibs-2.1.1.tar.bz2) = 5904281e61ce2a8cb6d4007a8bdc99eb