Update to KDE 3.2.0

Important changes: ================== - Kmail and knode have been moved from kdenetwork to kdepim. This means you will have to install kdepim if you want to continue using kmail or knode. This is to ease integration with korganizer, in the new 'Kontact' application. - The arabic translations for KDE and KOffice have been moved from misc to the arabic category. - There is a new module called kdeaccessibility in the accessibility category. It contains a few utilities for disabled users like a magnification lens and a text-to-speech frontend. - In KDM, you need to select the 'CUSTOM' session profile in order to have your .xsession executed. This is particularly important if you're using the aegypten tools (http://freebsd.kde.org/howtos/aegypten-kmail.php). - We have started making more parts of the ports optional. In kdepim, both Kandy and KPilot can be turned off with ports-knobs. This process will continue in the 3.2 series.
truenas · Feb 5, 2004 · 38a92d4 · 38a92d4
1 parent baa573c
commit 38a92d4
Show file tree

Hide file tree

Showing 934 changed files with 59,142 additions and 15,019 deletions.
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
@@ -105,15 +105,15 @@ QTCPPFLAGS+=		-D_GETOPT_H		# added to work around broken getopt.h #inc
 .if !defined (QT_NONSTANDARD)
 CONFIGURE_ARGS+=--with-extra-libs="${LOCALBASE}/lib" \
 				--with-extra-includes="${LOCALBASE}/include"
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
 				QTDIR="${QT_CVS_PREFIX}" KDEDIR="${KDE_CVS_PREFIX}"
 .endif
 
 .elif ${USE_QT_VER} == 3
 
 # Yeah, it's namespace pollution, but this is really the best place for this
 # stuff. Arts does NOT use it anymore.
-KDE_VERSION=		3.1.4
+KDE_VERSION=		3.2.0
 KDE_ORIGVER=	${KDE_VERSION}
 KDE_PREFIX?=	${LOCALBASE}
 
@@ -133,8 +133,9 @@ QTCFGLIBS+=		-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \
 .if !defined(QT_NONSTANDARD)
 CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
 				--with-qt-libraries=${QT_PREFIX}/lib \
-				--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+				--with-extra-libs=${LOCALBASE}/lib \
+				--with-extra-includes=${LOCALBASE}/include
+CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
 .endif # !defined(QT_NONSTANDARD)
 
 .else # QT2
@@ -154,7 +155,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 				--with-qt-libraries=${X11BASE}/lib \
 				--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
-				CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+				CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
 .endif # !defined(QT_NONSTANDARD)
 
 .endif # USE_QT_VER == ???

diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
@@ -105,15 +105,15 @@ QTCPPFLAGS+=		-D_GETOPT_H		# added to work around broken getopt.h #inc
 .if !defined (QT_NONSTANDARD)
 CONFIGURE_ARGS+=--with-extra-libs="${LOCALBASE}/lib" \
 				--with-extra-includes="${LOCALBASE}/include"
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
 				QTDIR="${QT_CVS_PREFIX}" KDEDIR="${KDE_CVS_PREFIX}"
 .endif
 
 .elif ${USE_QT_VER} == 3
 
 # Yeah, it's namespace pollution, but this is really the best place for this
 # stuff. Arts does NOT use it anymore.
-KDE_VERSION=		3.1.4
+KDE_VERSION=		3.2.0
 KDE_ORIGVER=	${KDE_VERSION}
 KDE_PREFIX?=	${LOCALBASE}
 
@@ -133,8 +133,9 @@ QTCFGLIBS+=		-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \
 .if !defined(QT_NONSTANDARD)
 CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
 				--with-qt-libraries=${QT_PREFIX}/lib \
-				--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+				--with-extra-libs=${LOCALBASE}/lib \
+				--with-extra-includes=${LOCALBASE}/include
+CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
 .endif # !defined(QT_NONSTANDARD)
 
 .else # QT2
@@ -154,7 +155,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 				--with-qt-libraries=${X11BASE}/lib \
 				--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
-				CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+				CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
 .endif # !defined(QT_NONSTANDARD)
 
 .endif # USE_QT_VER == ???

diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -18,8 +18,6 @@ COMMENT=	Accessibility applications for KDE
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
-IGNORE=		This port will turn active with the release of KDE 3.2
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes

diff --git a/accessibility/kdeaccessibility/Makefile b/accessibility/kdeaccessibility/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -18,8 +18,6 @@ COMMENT=	Accessibility applications for KDE
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
-IGNORE=		This port will turn active with the release of KDE 3.2
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes

diff --git a/accessibility/kdeaccessibility4/Makefile b/accessibility/kdeaccessibility4/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -18,8 +18,6 @@ COMMENT=	Accessibility applications for KDE
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
-IGNORE=		This port will turn active with the release of KDE 3.2
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes

diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -18,8 +18,6 @@ COMMENT=	Accessibility applications for KDE
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
-IGNORE=		This port will turn active with the release of KDE 3.2
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes

diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -18,8 +18,6 @@ COMMENT=	Accessibility applications for KDE
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
-IGNORE=		This port will turn active with the release of KDE 3.2
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes

diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -18,8 +18,6 @@ COMMENT=	Accessibility applications for KDE
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
-IGNORE=		This port will turn active with the release of KDE 3.2
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes

diff --git a/arabic/kde3-i18n/Makefile b/arabic/kde3-i18n/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	kde-i18n
-PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+# PORTVERSION=	${KDE_VERSION}
+PORTVERSION=	3.1.5
 CATEGORIES?=	arabic kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -17,9 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
+BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
+
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes

diff --git a/arabic/kde3-i18n/distinfo b/arabic/kde3-i18n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.4.tar.bz2) = bcbc85fe96ab972378609064acaa497b
+MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.5.tar.bz2) = 9ba695a0105ba3a601f3e82cacce242f
diff --git a/arabic/kde3-i18n/pkg-plist b/arabic/kde3-i18n/pkg-plist
@@ -206,7 +206,6 @@ share/locale/ar/LC_MESSAGES/kfile_xbm.mo
 share/locale/ar/LC_MESSAGES/kfindpart.mo
 share/locale/ar/LC_MESSAGES/kfloppy.mo
 share/locale/ar/LC_MESSAGES/kfmclient.mo
-share/locale/ar/LC_MESSAGES/kfmexec.mo
 share/locale/ar/LC_MESSAGES/kfontviewpart.mo
 share/locale/ar/LC_MESSAGES/kfouleggs.mo
 share/locale/ar/LC_MESSAGES/kgantt.mo
@@ -238,6 +237,7 @@ share/locale/ar/LC_MESSAGES/kio_sftp.mo
 share/locale/ar/LC_MESSAGES/kio_smb.mo
 share/locale/ar/LC_MESSAGES/kio_smbro.mo
 share/locale/ar/LC_MESSAGES/kio_smtp.mo
+share/locale/ar/LC_MESSAGES/kioexec.mo
 share/locale/ar/LC_MESSAGES/kit.mo
 share/locale/ar/LC_MESSAGES/kiten.mo
 share/locale/ar/LC_MESSAGES/kjobviewer.mo

diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	kde-i18n
-PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+# PORTVERSION=	${KDE_VERSION}
+PORTVERSION=	3.1.5
 CATEGORIES?=	arabic kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -17,9 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
+BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
+
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes

diff --git a/arabic/kde4-l10n/distinfo b/arabic/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.4.tar.bz2) = bcbc85fe96ab972378609064acaa497b
+MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.5.tar.bz2) = 9ba695a0105ba3a601f3e82cacce242f
diff --git a/arabic/kde4-l10n/pkg-plist b/arabic/kde4-l10n/pkg-plist
@@ -206,7 +206,6 @@ share/locale/ar/LC_MESSAGES/kfile_xbm.mo
 share/locale/ar/LC_MESSAGES/kfindpart.mo
 share/locale/ar/LC_MESSAGES/kfloppy.mo
 share/locale/ar/LC_MESSAGES/kfmclient.mo
-share/locale/ar/LC_MESSAGES/kfmexec.mo
 share/locale/ar/LC_MESSAGES/kfontviewpart.mo
 share/locale/ar/LC_MESSAGES/kfouleggs.mo
 share/locale/ar/LC_MESSAGES/kgantt.mo
@@ -238,6 +237,7 @@ share/locale/ar/LC_MESSAGES/kio_sftp.mo
 share/locale/ar/LC_MESSAGES/kio_smb.mo
 share/locale/ar/LC_MESSAGES/kio_smbro.mo
 share/locale/ar/LC_MESSAGES/kio_smtp.mo
+share/locale/ar/LC_MESSAGES/kioexec.mo
 share/locale/ar/LC_MESSAGES/kit.mo
 share/locale/ar/LC_MESSAGES/kiten.mo
 share/locale/ar/LC_MESSAGES/kjobviewer.mo

diff --git a/arabic/koffice-i18n/Makefile b/arabic/koffice-i18n/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
-PORTREVISION=	1
 CATEGORIES?=	arabic kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +15,12 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
+IGNORE=		Needs update from vendor.
+
+BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
 
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes

diff --git a/arabic/koffice-i18n/distinfo b/arabic/koffice-i18n/distinfo
@@ -1 +0,0 @@
-MD5 (KDE/kde-i18n/koffice-i18n-ar-1.2.1.tar.bz2) = ad35001fce03b5d895d284cbc7109555

diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER?=	kde@FreeBSD.org
@@ -24,14 +24,18 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
+DO_NOT_COMPILE+=kmilo kdepasswd
+CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+
+CONFLICTS=	kgpg-*
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 #klaptop needs APM, which is i386 only 
 .if ${MACHINE_ARCH} != "i386"
 WITHOUT_KLAPTOP	=yes
-.endif 
+.endif # ${MACHINE_ARCH} == "alpha"
 
 .if defined(WITHOUT_KLAPTOP)
 DO_NOT_COMPILE+=klaptopdaemon
@@ -52,11 +56,6 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500107
-post-patch:
-	${REINPLACE_CMD} -e 's,selectdevs,devstat_selectdevs,' ${WRKSRC}/configure
-.endif
-
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
 .include <bsd.port.post.mk>
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo
@@ -1,3 +1 @@
-MD5 (KDE/kdeutils-3.1.4.tar.bz2) = 98da1b32714e38208a3cc21efc77f627
-MD5 (KDE/kdeutils-2003092201-configure.tar.bz2) = 45fbd8e67d28e07c47ed06833c380d19
-MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
+MD5 (KDE/kdeutils-3.2.0.tar.bz2) = 988480b534c1fab9003f624edb87e7a7
diff --git a/archivers/ark/files/patch-ksimcpu.cpp b/archivers/ark/files/patch-ksimcpu.cpp
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.4.tar.bz2) = bcbc85fe96ab972378609064acaa497b
		MD5 (KDE/kde-i18n/kde-i18n-ar-3.1.5.tar.bz2) = 9ba695a0105ba3a601f3e82cacce242f
Original file line number	Diff line number	Diff line change
		@@ -1 +0,0 @@
		MD5 (KDE/kde-i18n/koffice-i18n-ar-1.2.1.tar.bz2) = ad35001fce03b5d895d284cbc7109555