summaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2003-07-29 04:26:22 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2003-07-29 04:26:22 +0000
commitac4ef3820bce26f3bbb3fb8b1baaeae42b7028ca (patch)
treee774043ee6ff3c3d53fd74afbfa1a6efb14d22e3 /deskutils
parentUse better ../ & control vulnerability fix (diff)
Update KDE to the latest official release, KDE 3.1.3
Official KDE 3.1.3 announcement: http://www.kde.org/announcements/announce-3.1.3.php (may not work until a few hours after this commit - we jumped the gun a little in order to have the update in place at the time the security notifications for KDE 3.1.2 will be released together with the announcement of KDE 3.1.3). Changelog from 3.1.2 to 3.1.3 release: http://www.kde.org/announcements/changelogs/changelog3_1_2to3_1_3.php Thanks and credits need to go to the whole KDE-FreeBSD team, as well as everyone on kde@freebsd.org for providing feedback, reporting bugs and just using the KDE ports. Approved by: will (real mentor asleep)
Notes
Notes: svn path=/head/; revision=85806
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/kcharselect/Makefile4
-rw-r--r--deskutils/kcharselect/distinfo2
-rw-r--r--deskutils/kcharselect/files/plist.klaptop4
-rw-r--r--deskutils/kcharselect/files/plist.klaptop.rm2
-rw-r--r--deskutils/kdepim3/Makefile8
-rw-r--r--deskutils/kdepim3/distinfo2
-rw-r--r--deskutils/kdepim3/files/patch-libkpimexchange-core-exchangeaccount.cpp11
-rw-r--r--deskutils/kdepim3/pkg-plist1
-rw-r--r--deskutils/kdepim4/Makefile8
-rw-r--r--deskutils/kdepim4/distinfo2
-rw-r--r--deskutils/kdepim4/files/patch-libkpimexchange-core-exchangeaccount.cpp11
-rw-r--r--deskutils/kdepim4/pkg-plist1
-rw-r--r--deskutils/kdepim44/Makefile8
-rw-r--r--deskutils/kdepim44/distinfo2
-rw-r--r--deskutils/kdepim44/files/patch-libkpimexchange-core-exchangeaccount.cpp11
-rw-r--r--deskutils/kdepim44/pkg-plist1
16 files changed, 71 insertions, 7 deletions
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index a2cdd777537f..5e1bc54866db 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -58,4 +58,8 @@ post-patch:
.endif
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
+pre-configure::
+ ${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
+
.include <bsd.port.post.mk>
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index b21b9d66641b..a42d2cff854a 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
+MD5 (KDE/kdeutils-3.1.3.tar.bz2) = 21f3fa1d110a8cf8cb1a140745f90211
diff --git a/deskutils/kcharselect/files/plist.klaptop b/deskutils/kcharselect/files/plist.klaptop
index 00f1bfdbc5c9..13c6fff6b0a9 100644
--- a/deskutils/kcharselect/files/plist.klaptop
+++ b/deskutils/kcharselect/files/plist.klaptop
@@ -9,6 +9,10 @@ share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_power.png
share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
share/icons/crystalsvg/128x128/apps/laptop_battery.png
share/icons/crystalsvg/16x16/apps/klaptopdaemon.png
diff --git a/deskutils/kcharselect/files/plist.klaptop.rm b/deskutils/kcharselect/files/plist.klaptop.rm
index 34ce14d82234..312e3fb50138 100644
--- a/deskutils/kcharselect/files/plist.klaptop.rm
+++ b/deskutils/kcharselect/files/plist.klaptop.rm
@@ -1,5 +1,7 @@
@dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
@dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/22x22
@dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions
@dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16
@dirrm share/apps/klaptopdaemon/icons/crystalsvg
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 23d452c453e4..3f3f9cf6d6b6 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -24,9 +24,15 @@ USE_BZIP2= yes
USE_BISON= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
INSTALLS_SHLIB= yes
LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-configure::
+ ${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index d9dc0e0289b1..b3cfff29bad2 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdepim-3.1.2.tar.bz2) = 37253cbba0fcf1201f6b24d3e8efa943 \ No newline at end of file
+MD5 (KDE/kdepim-3.1.3.tar.bz2) = 7a556df5e5ae4c00c8bea4cd8f9c1f3e
diff --git a/deskutils/kdepim3/files/patch-libkpimexchange-core-exchangeaccount.cpp b/deskutils/kdepim3/files/patch-libkpimexchange-core-exchangeaccount.cpp
new file mode 100644
index 000000000000..92223a7c826a
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-libkpimexchange-core-exchangeaccount.cpp
@@ -0,0 +1,11 @@
+--- libkpimexchange/core/exchangeaccount.cpp.old Mon Jul 21 16:59:08 2003
++++ libkpimexchange/core/exchangeaccount.cpp Mon Jul 21 16:59:29 2003
+@@ -255,7 +255,7 @@
+ return result;
+ }
+
+-static QString ExchangeAccount::tryMailbox( const QString& _url, const QString& user, const QString& password ) {
++QString ExchangeAccount::tryMailbox( const QString& _url, const QString& user, const QString& password ) {
+ KURL url = KURL( _url );
+ url.setUser( user );
+ url.setPass( password );
diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist
index 745bcef77837..5a1f8ee2d9a7 100644
--- a/deskutils/kdepim3/pkg-plist
+++ b/deskutils/kdepim3/pkg-plist
@@ -116,6 +116,7 @@ share/applnk/Utilities/kpilot.desktop
share/applnk/Utilities/kpilotdaemon.desktop
share/apps/kaddressbook/csv-templates/kaddressbook.desktop
share/apps/kaddressbook/csv-templates/outlook2000.desktop
+share/apps/kaddressbook/csv-templates/outlookxp.desktop
share/apps/kaddressbook/icons/crystalsvg/16x16/actions/ldap_lookup.png
share/apps/kaddressbook/icons/crystalsvg/16x16/actions/smallcal.png
share/apps/kaddressbook/icons/crystalsvg/32x32/actions/gohome.png
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 23d452c453e4..3f3f9cf6d6b6 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -24,9 +24,15 @@ USE_BZIP2= yes
USE_BISON= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
INSTALLS_SHLIB= yes
LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-configure::
+ ${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index d9dc0e0289b1..b3cfff29bad2 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdepim-3.1.2.tar.bz2) = 37253cbba0fcf1201f6b24d3e8efa943 \ No newline at end of file
+MD5 (KDE/kdepim-3.1.3.tar.bz2) = 7a556df5e5ae4c00c8bea4cd8f9c1f3e
diff --git a/deskutils/kdepim4/files/patch-libkpimexchange-core-exchangeaccount.cpp b/deskutils/kdepim4/files/patch-libkpimexchange-core-exchangeaccount.cpp
new file mode 100644
index 000000000000..92223a7c826a
--- /dev/null
+++ b/deskutils/kdepim4/files/patch-libkpimexchange-core-exchangeaccount.cpp
@@ -0,0 +1,11 @@
+--- libkpimexchange/core/exchangeaccount.cpp.old Mon Jul 21 16:59:08 2003
++++ libkpimexchange/core/exchangeaccount.cpp Mon Jul 21 16:59:29 2003
+@@ -255,7 +255,7 @@
+ return result;
+ }
+
+-static QString ExchangeAccount::tryMailbox( const QString& _url, const QString& user, const QString& password ) {
++QString ExchangeAccount::tryMailbox( const QString& _url, const QString& user, const QString& password ) {
+ KURL url = KURL( _url );
+ url.setUser( user );
+ url.setPass( password );
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 745bcef77837..5a1f8ee2d9a7 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -116,6 +116,7 @@ share/applnk/Utilities/kpilot.desktop
share/applnk/Utilities/kpilotdaemon.desktop
share/apps/kaddressbook/csv-templates/kaddressbook.desktop
share/apps/kaddressbook/csv-templates/outlook2000.desktop
+share/apps/kaddressbook/csv-templates/outlookxp.desktop
share/apps/kaddressbook/icons/crystalsvg/16x16/actions/ldap_lookup.png
share/apps/kaddressbook/icons/crystalsvg/16x16/actions/smallcal.png
share/apps/kaddressbook/icons/crystalsvg/32x32/actions/gohome.png
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 23d452c453e4..3f3f9cf6d6b6 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -24,9 +24,15 @@ USE_BZIP2= yes
USE_BISON= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
INSTALLS_SHLIB= yes
LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-configure::
+ ${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index d9dc0e0289b1..b3cfff29bad2 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdepim-3.1.2.tar.bz2) = 37253cbba0fcf1201f6b24d3e8efa943 \ No newline at end of file
+MD5 (KDE/kdepim-3.1.3.tar.bz2) = 7a556df5e5ae4c00c8bea4cd8f9c1f3e
diff --git a/deskutils/kdepim44/files/patch-libkpimexchange-core-exchangeaccount.cpp b/deskutils/kdepim44/files/patch-libkpimexchange-core-exchangeaccount.cpp
new file mode 100644
index 000000000000..92223a7c826a
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-libkpimexchange-core-exchangeaccount.cpp
@@ -0,0 +1,11 @@
+--- libkpimexchange/core/exchangeaccount.cpp.old Mon Jul 21 16:59:08 2003
++++ libkpimexchange/core/exchangeaccount.cpp Mon Jul 21 16:59:29 2003
+@@ -255,7 +255,7 @@
+ return result;
+ }
+
+-static QString ExchangeAccount::tryMailbox( const QString& _url, const QString& user, const QString& password ) {
++QString ExchangeAccount::tryMailbox( const QString& _url, const QString& user, const QString& password ) {
+ KURL url = KURL( _url );
+ url.setUser( user );
+ url.setPass( password );
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index 745bcef77837..5a1f8ee2d9a7 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -116,6 +116,7 @@ share/applnk/Utilities/kpilot.desktop
share/applnk/Utilities/kpilotdaemon.desktop
share/apps/kaddressbook/csv-templates/kaddressbook.desktop
share/apps/kaddressbook/csv-templates/outlook2000.desktop
+share/apps/kaddressbook/csv-templates/outlookxp.desktop
share/apps/kaddressbook/icons/crystalsvg/16x16/actions/ldap_lookup.png
share/apps/kaddressbook/icons/crystalsvg/16x16/actions/smallcal.png
share/apps/kaddressbook/icons/crystalsvg/32x32/actions/gohome.png
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 20:01:54 +0000