aboutsummaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2009-03-09 00:55:48 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2009-03-09 00:55:48 +0000
commit4ac1397e9e6ce3f8a6ea7d461ece9db212fc9483 (patch)
tree9940a6f7cc2c390c9651e0ced0de687fa53b0764 /deskutils
parentcc4b09fcc1b7aa6d9ea7bf5c49c796475ca734a8 (diff)
downloadports-4ac1397e9e6ce3f8a6ea7d461ece9db212fc9483.tar.gz
ports-4ac1397e9e6ce3f8a6ea7d461ece9db212fc9483.zip
Notes
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/kcharselect/distinfo6
-rw-r--r--deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--deskutils/kdepim4/Makefile1
-rw-r--r--deskutils/kdepim4/distinfo6
-rw-r--r--deskutils/kdepim4/files/patch-kmail_kmcommands.cpp15
-rw-r--r--deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc10
-rw-r--r--deskutils/kdepim4/pkg-plist2
-rw-r--r--deskutils/kdepim44/Makefile1
-rw-r--r--deskutils/kdepim44/distinfo6
-rw-r--r--deskutils/kdepim44/files/patch-kmail_kmcommands.cpp15
-rw-r--r--deskutils/kdepim44/files/patch-kpilot_conduits_todo-todoconduit.cc10
-rw-r--r--deskutils/kdepim44/pkg-plist2
-rw-r--r--deskutils/kdepimlibs4/distinfo6
-rw-r--r--deskutils/kdepimlibs4/files/patch-CMakeLists.txt11
-rw-r--r--deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake11
-rw-r--r--deskutils/kdepimlibs4/pkg-plist12
-rw-r--r--deskutils/kdeplasma-addons/distinfo6
17 files changed, 67 insertions, 73 deletions
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 5bf5f73fd46e..cd8792021961 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.2.0.tar.bz2) = f0ca24c7d3e5bb0ab55bf6b26fc6224e
-SHA256 (KDE/kdeutils-4.2.0.tar.bz2) = 1b811b5ea12641aa4003dcc97ea19570418e83a909866f78c08a358a1e1a1cfd
-SIZE (KDE/kdeutils-4.2.0.tar.bz2) = 2234345
+MD5 (KDE/kdeutils-4.2.1.tar.bz2) = ed3397244a64530c108e76d6767c07d0
+SHA256 (KDE/kdeutils-4.2.1.tar.bz2) = a8225e4a430bade4106c2bcd5c1b6f5f2cd3c6e68c2a89bfc90aabc277271d77
+SIZE (KDE/kdeutils-4.2.1.tar.bz2) = 2239659
diff --git a/deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
new file mode 100644
index 000000000000..6f6752537061
--- /dev/null
+++ b/deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
@@ -0,0 +1,20 @@
+--- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
++++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
+@@ -567,7 +567,7 @@
+ }
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ if (!creatingNewFile) {
+ archive_read_finish( arch_reader );
+@@ -700,7 +700,7 @@
+ archive_entry_clear( entry );
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ archive_read_finish( arch_reader );
+
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 44b9f38ba756..e7b240153c85 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 45abad85ea51..e5ea2fdb2eef 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.2.0.tar.bz2) = a80631de21930b2544c86722138aaa6c
-SHA256 (KDE/kdepim-4.2.0.tar.bz2) = 20f4f22bc9284cefd9c196ba7636c68992c615a976050f43169dd108ebd63788
-SIZE (KDE/kdepim-4.2.0.tar.bz2) = 13549914
+MD5 (KDE/kdepim-4.2.1.tar.bz2) = 2ebc3730aaee53f494e8e6abd26029bd
+SHA256 (KDE/kdepim-4.2.1.tar.bz2) = 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c
+SIZE (KDE/kdepim-4.2.1.tar.bz2) = 13562215
diff --git a/deskutils/kdepim4/files/patch-kmail_kmcommands.cpp b/deskutils/kdepim4/files/patch-kmail_kmcommands.cpp
deleted file mode 100644
index 60247094e79a..000000000000
--- a/deskutils/kdepim4/files/patch-kmail_kmcommands.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../kmail/kmcommands.cpp 2009/02/16 19:10:32 927080
-+++ ../kmail/kmcommands.cpp 2009/02/16 19:12:30 927081
-@@ -2320,8 +2320,10 @@
- mUrl.pathOrUrl() ), QString(), KGuiItem(i18n("Execute")), KStandardGuiItem::cancel() ) != KMessageBox::Yes)
- return Canceled;
- }
-- if ( !KMail::Util::handleUrlOnMac( mUrl.pathOrUrl() ) )
-- (void) new KRun( mUrl, mMainWidget );
-+ if ( !KMail::Util::handleUrlOnMac( mUrl.pathOrUrl() ) ) {
-+ KRun *runner = new KRun( mUrl, mMainWidget ); // will delete itself
-+ runner->setRunExecutables( false );
-+ }
- }
- else
- return Failed;
diff --git a/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc b/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc
deleted file mode 100644
index 2ccddb36fd90..000000000000
--- a/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../kpilot/conduits/todo/todoconduit.cc 2009/01/24 05:11:42 915906
-+++ ../kpilot/conduits/todo/todoconduit.cc 2009/01/24 05:19:21 915907
-@@ -68,6 +68,7 @@
-
- TodoSettings::self()->readConfig();
- d->fCollectionId = TodoSettings::akonadiCollection();
-+ d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
- }
-
- bool TodoConduit::initDataProxies()
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index b68e8a57a049..ac6cd14462c9 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -532,6 +532,7 @@ share/apps/kalarm/kalarmui.rc
share/apps/kconf_update/kalarm-1.2.1-general.pl
share/apps/kconf_update/kalarm-1.9.5-defaults.pl
share/apps/kconf_update/kalarm-2.0.2-general.pl
+share/apps/kconf_update/kalarm-2.1.5-general.pl
share/apps/kconf_update/kalarm-version.pl
share/apps/kconf_update/kalarm.upd
share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
@@ -795,6 +796,7 @@ share/apps/libkholidays/holiday_quebec
share/apps/libkholidays/holiday_ro
share/apps/libkholidays/holiday_ru
share/apps/libkholidays/holiday_se
+share/apps/libkholidays/holiday_sk
share/apps/libkholidays/holiday_si
share/apps/libkholidays/holiday_th
share/apps/libkholidays/holiday_ua
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 44b9f38ba756..e7b240153c85 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index 45abad85ea51..e5ea2fdb2eef 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.2.0.tar.bz2) = a80631de21930b2544c86722138aaa6c
-SHA256 (KDE/kdepim-4.2.0.tar.bz2) = 20f4f22bc9284cefd9c196ba7636c68992c615a976050f43169dd108ebd63788
-SIZE (KDE/kdepim-4.2.0.tar.bz2) = 13549914
+MD5 (KDE/kdepim-4.2.1.tar.bz2) = 2ebc3730aaee53f494e8e6abd26029bd
+SHA256 (KDE/kdepim-4.2.1.tar.bz2) = 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c
+SIZE (KDE/kdepim-4.2.1.tar.bz2) = 13562215
diff --git a/deskutils/kdepim44/files/patch-kmail_kmcommands.cpp b/deskutils/kdepim44/files/patch-kmail_kmcommands.cpp
deleted file mode 100644
index 60247094e79a..000000000000
--- a/deskutils/kdepim44/files/patch-kmail_kmcommands.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../kmail/kmcommands.cpp 2009/02/16 19:10:32 927080
-+++ ../kmail/kmcommands.cpp 2009/02/16 19:12:30 927081
-@@ -2320,8 +2320,10 @@
- mUrl.pathOrUrl() ), QString(), KGuiItem(i18n("Execute")), KStandardGuiItem::cancel() ) != KMessageBox::Yes)
- return Canceled;
- }
-- if ( !KMail::Util::handleUrlOnMac( mUrl.pathOrUrl() ) )
-- (void) new KRun( mUrl, mMainWidget );
-+ if ( !KMail::Util::handleUrlOnMac( mUrl.pathOrUrl() ) ) {
-+ KRun *runner = new KRun( mUrl, mMainWidget ); // will delete itself
-+ runner->setRunExecutables( false );
-+ }
- }
- else
- return Failed;
diff --git a/deskutils/kdepim44/files/patch-kpilot_conduits_todo-todoconduit.cc b/deskutils/kdepim44/files/patch-kpilot_conduits_todo-todoconduit.cc
deleted file mode 100644
index 2ccddb36fd90..000000000000
--- a/deskutils/kdepim44/files/patch-kpilot_conduits_todo-todoconduit.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../kpilot/conduits/todo/todoconduit.cc 2009/01/24 05:11:42 915906
-+++ ../kpilot/conduits/todo/todoconduit.cc 2009/01/24 05:19:21 915907
-@@ -68,6 +68,7 @@
-
- TodoSettings::self()->readConfig();
- d->fCollectionId = TodoSettings::akonadiCollection();
-+ d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
- }
-
- bool TodoConduit::initDataProxies()
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index b68e8a57a049..ac6cd14462c9 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -532,6 +532,7 @@ share/apps/kalarm/kalarmui.rc
share/apps/kconf_update/kalarm-1.2.1-general.pl
share/apps/kconf_update/kalarm-1.9.5-defaults.pl
share/apps/kconf_update/kalarm-2.0.2-general.pl
+share/apps/kconf_update/kalarm-2.1.5-general.pl
share/apps/kconf_update/kalarm-version.pl
share/apps/kconf_update/kalarm.upd
share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
@@ -795,6 +796,7 @@ share/apps/libkholidays/holiday_quebec
share/apps/libkholidays/holiday_ro
share/apps/libkholidays/holiday_ru
share/apps/libkholidays/holiday_se
+share/apps/libkholidays/holiday_sk
share/apps/libkholidays/holiday_si
share/apps/libkholidays/holiday_th
share/apps/libkholidays/holiday_ua
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 978a0c7565b7..757adc44b3f0 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepimlibs-4.2.0.tar.bz2) = 8a91677e2dca7d4db26b33c78e239e5e
-SHA256 (KDE/kdepimlibs-4.2.0.tar.bz2) = e6a6c5c1eb69141a6925b182e94704cda37ef48eb488bb71dc224bc00583b254
-SIZE (KDE/kdepimlibs-4.2.0.tar.bz2) = 1589202
+MD5 (KDE/kdepimlibs-4.2.1.tar.bz2) = 5f220939f33c38992f419d5dfc6874df
+SHA256 (KDE/kdepimlibs-4.2.1.tar.bz2) = bc5dd2ce77608beea061ca6c243a33fa53b02c386672a684da3864bf761a2042
+SIZE (KDE/kdepimlibs-4.2.1.tar.bz2) = 1592673
diff --git a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..312ff0638d1d
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ../CMakeLists.txt.orig 2009-02-26 17:15:42.000000000 +0300
++++ ../CMakeLists.txt 2009-03-07 09:57:33.000000000 +0300
+@@ -127,7 +127,7 @@
+ macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KdepimLibsConfigVersion.cmake
+ ${KDEPIMLIBS_VERSION_MAJOR} ${KDEPIMLIBS_VERSION_MINOR} ${KDEPIMLIBS_VERSION_PATCH})
+
+-set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs-${KDEPIMLIBS_VERSION}/cmake)
++set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs/cmake)
+ # places where find_package() looks for FooConfig.cmake files:
+ # CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in
+ # lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR
diff --git a/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
new file mode 100644
index 000000000000..efbbb2725999
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
@@ -0,0 +1,11 @@
+--- ../cmake/modules/FindLibical.cmake.orgi 2009-02-27 17:59:51.000000000 +0100
++++ ../cmake/modules/FindLibical.cmake 2009-02-27 18:00:20.000000000 +0100
+@@ -52,7 +52,7 @@
+
+ if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
+ set(FIND_LIBICAL_VERSION_SOURCE
+- "#include <libical/ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n")
++ "#include <ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n")
+ set(FIND_LIBICAL_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLIBICAL.cxx)
+ file(WRITE "${FIND_LIBICAL_VERSION_SOURCE_FILE}" "${FIND_LIBICAL_VERSION_SOURCE}")
+
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index faa899b0ccd5..5a5c45511002 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -333,10 +333,10 @@ include/syndication/specificitem.h
include/syndication/specificitemvisitor.h
include/syndication/syndication.h
include/syndication/tools.h
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KDEPimLibsLibraryTargetsWithPrefix-%%KDE4_BUILD_TYPE%%.cmake
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KDEPimLibsLibraryTargetsWithPrefix.cmake
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KdepimLibsConfig.cmake
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KdepimLibsConfigVersion.cmake
+lib/KdepimLibs/cmake/KDEPimLibsLibraryTargetsWithPrefix-%%KDE4_BUILD_TYPE%%.cmake
+lib/KdepimLibs/cmake/KDEPimLibsLibraryTargetsWithPrefix.cmake
+lib/KdepimLibs/cmake/KdepimLibsConfig.cmake
+lib/KdepimLibs/cmake/KdepimLibsConfigVersion.cmake
lib/gpgmepp/GpgmeppConfig.cmake
lib/gpgmepp/GpgmeppLibraryDepends.cmake
lib/kde4/kabc_directory.so
@@ -483,8 +483,8 @@ share/kde4/servicetypes/kresources_plugin.desktop
@dirrm share/doc/HTML/en/kcontrol/kresources
@dirrm share/apps/akonadi-kde
@dirrm lib/gpgmepp
-@dirrm lib/KdepimLibs-%%KDE4_VERSION%%/cmake
-@dirrm lib/KdepimLibs-%%KDE4_VERSION%%
+@dirrm lib/KdepimLibs/cmake
+@dirrm lib/KdepimLibs
@dirrm include/syndication/rss2
@dirrm include/syndication/rdf
@dirrm include/syndication/atom
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index 674febf9ef31..8069f9b8a12e 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeplasma-addons-4.2.0.tar.bz2) = d98f805f4c9b7af7278067f9e544b2ec
-SHA256 (KDE/kdeplasma-addons-4.2.0.tar.bz2) = 8c2d917788873521d0379a060a2b049d1eec4917e9b7c1cb90a632c0bb392d6b
-SIZE (KDE/kdeplasma-addons-4.2.0.tar.bz2) = 4269323
+MD5 (KDE/kdeplasma-addons-4.2.1.tar.bz2) = 55219414d52924cb22ea2953cd2ae78b
+SHA256 (KDE/kdeplasma-addons-4.2.1.tar.bz2) = aeb3764533e9e10759ffef0969c6e566c22622695db8fca58dc72e7d9faea329
+SIZE (KDE/kdeplasma-addons-4.2.1.tar.bz2) = 4273190
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 01:32:05 +0000