diff options
Diffstat (limited to 'deskutils')
-rw-r--r-- | deskutils/Makefile | 1 | ||||
-rw-r--r-- | deskutils/kcharselect/Makefile | 39 | ||||
-rw-r--r-- | deskutils/kcharselect/distinfo | 4 | ||||
-rw-r--r-- | deskutils/kcharselect/files/patch-ark-kerfuffle-cliiterface.cpp | 35 | ||||
-rw-r--r-- | deskutils/kcharselect/files/patch-kcalc-kcalc.ui | 99 | ||||
-rw-r--r-- | deskutils/kcharselect/pkg-descr | 5 | ||||
-rw-r--r-- | deskutils/kcharselect/pkg-plist | 27 | ||||
-rw-r--r-- | deskutils/kdepimlibs4/Makefile | 35 | ||||
-rw-r--r-- | deskutils/kdepimlibs4/distinfo | 4 | ||||
-rw-r--r-- | deskutils/kdepimlibs4/files/patch-CMakeLists.txt | 6 | ||||
-rw-r--r-- | deskutils/kdepimlibs4/pkg-plist | 5 | ||||
-rw-r--r-- | deskutils/kdeplasma-addons/Makefile | 45 | ||||
-rw-r--r-- | deskutils/kdeplasma-addons/distinfo | 4 | ||||
-rw-r--r-- | deskutils/kdeplasma-addons/files/patch-CMakeLists.txt | 9 | ||||
-rw-r--r-- | deskutils/kdeplasma-addons/pkg-plist | 51 | ||||
-rw-r--r-- | deskutils/kruler/Makefile | 28 | ||||
-rw-r--r-- | deskutils/kruler/distinfo | 2 | ||||
-rw-r--r-- | deskutils/kruler/pkg-descr | 9 | ||||
-rw-r--r-- | deskutils/kruler/pkg-plist | 27 |
19 files changed, 214 insertions, 221 deletions
diff --git a/deskutils/Makefile b/deskutils/Makefile index ab79522761f0..ca3ad5d9ba0f 100644 --- a/deskutils/Makefile +++ b/deskutils/Makefile @@ -147,6 +147,7 @@ SUBDIR += kooldock SUBDIR += krefty SUBDIR += krss + SUBDIR += kruler SUBDIR += ksmoothdock SUBDIR += ksshaskpass SUBDIR += ktagebuch diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index e4026f85cf9f..bf11844a7c90 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -6,52 +6,61 @@ PORTNAME= kdeutils PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= Utilities for the KDE4 integrated X11 Desktop +COMMENT= Collection of utilities for KDE 4 LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ - qca.2:${PORTSDIR}/devel/qca + qimageblitz.4:${PORTSDIR}/x11/qimageblitz + RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg LATEST_LINK= ${PORTNAME}4 -USE_BZIP2= yes -USE_QT_VER= 4 -USE_PYTHON= 2.5+ KDE4_BUILDENV= yes USE_KDE4= kdeprefix kdehier automoc4 sharedmime \ - kdelibs pimlibs workspace kdebase -QT_COMPONENTS= network gui porting xml \ + kdelibs pimlibs workspace baseapps +USE_PYTHON= 2.5+ +USE_QT_VER= 4 +QT_COMPONENTS= dbus gui network script xml xmlpatterns \ qmake_build moc_build rcc_build uic_build +USE_XORG= x11 xrender xtst +USE_BZIP2= yes +CMAKE_ARGS+= -DBUILD_filelight:BOOL=FALSE \ + -DBUILD_printer-applet:BOOL=FALSE MAKE_JOBS_SAFE= yes MAN1= ark.1 -# Disable printer-applet, it comes with print/kdeutils4-printer-applet. -CMAKE_ARGS+= -DBUILD_printer-applet=OFF - -OPTIONS= 7ZIP "Support for 7-Zip archives in Ark" off \ +OPTIONS= FILELIGHT "Install Filelight file system viewer" on \ + LIRC "Support for IR remote controls" off \ PRINTER_APPLET "Install printer system tray utility" off \ + 7ZIP "Support for 7-Zip archives in Ark" off \ RAR "Support for RAR archives in Ark" off \ ZIP "Support for ZIP archives in Ark" off .include <bsd.port.options.mk> -.ifdef(WITH_7ZIP) -RUN_DEPENDS+= 7z:${PORTSDIR}/archivers/p7zip +.ifndef(WITHOUT_FILELIGHT) +RUN_DEPENDS+= ${KDE4_PREFIX}/bin/filelight:${PORTSDIR}/sysutils/filelight-kde4 +.endif + +.ifdef(WITH_LIRC) +RUN_DEPENDS+= lircd:${PORTSDIR}/comms/lirc .endif .ifdef(WITH_PRINTER_APPLET) RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet .endif +.ifdef(WITH_7ZIP) +RUN_DEPENDS+= 7z:${PORTSDIR}/archivers/p7zip +.endif + .ifdef(WITH_ZIP) RUN_DEPENDS+= unzip>0:${PORTSDIR}/archivers/unzip \ zip:${PORTSDIR}/archivers/zip diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo index 7998ee370781..1d6bc1f3ed86 100644 --- a/deskutils/kcharselect/distinfo +++ b/deskutils/kcharselect/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdeutils-4.6.5.tar.bz2) = 03de4b7728301414c8e704ba5c8650d8ded053747268ad47c901880fc1bf0b29 -SIZE (KDE/kdeutils-4.6.5.tar.bz2) = 3699961 +SHA256 (KDE/kdeutils-4.7.2.tar.bz2) = cdea138fc4556b4f6de5e63ee7ccbcb3485a780f372e699c0cb9fd6d65e02f96 +SIZE (KDE/kdeutils-4.7.2.tar.bz2) = 3800427 diff --git a/deskutils/kcharselect/files/patch-ark-kerfuffle-cliiterface.cpp b/deskutils/kcharselect/files/patch-ark-kerfuffle-cliiterface.cpp deleted file mode 100644 index f2298e0f4493..000000000000 --- a/deskutils/kcharselect/files/patch-ark-kerfuffle-cliiterface.cpp +++ /dev/null @@ -1,35 +0,0 @@ -SVN commit 1240907 by rkcosta: - -cliinterface: Do not assume a process does not exist in runProcess(). - -The Q_ASSERT(!m_process) in the beginning of runProcess() was wrong, as when -one is adding files to an archive (or creating an archive) processFinished() -calls list(), which in turn calls runProcess() as well, thus making the assert -fail. - -The best thing to do is just wait for the existing process to finish before -launching the new one. - -Backport of r1240907, in case the 4.6 ever gets packaged again. - -CCBUG: 277393 - -http://websvn.kde.org/?view=revision&revision=1240908 --- ark/kerfuffle/cliinterface.cpp 2011/06/01 20:35:06 1234597 -+++ ark/kerfuffle/cliinterface.cpp 2011/07/11 03:23:39 1240908 -@@ -325,10 +325,13 @@ - return false; - } - -- Q_ASSERT(!m_process); -- - kDebug() << "Executing" << programPath << arguments; - -+ if (m_process) { -+ m_process->waitForFinished(); -+ delete m_process; -+ } -+ - #ifdef Q_OS_WIN - m_process = new KProcess(); - #else diff --git a/deskutils/kcharselect/files/patch-kcalc-kcalc.ui b/deskutils/kcharselect/files/patch-kcalc-kcalc.ui deleted file mode 100644 index b5f94af5bfec..000000000000 --- a/deskutils/kcharselect/files/patch-kcalc-kcalc.ui +++ /dev/null @@ -1,99 +0,0 @@ -SVN commit 1240130 by teran: - -rolling back change made by r1235446, it broke keybindings entirely. - -BUG: 277020 - -http://websvn.kde.org/?view=revision&revision=1240130 ---- kcalc/kcalc.ui 2011/06/05 18:25:18 1235446 -+++ kcalc/kcalc.ui 2011/07/06 18:27:58 1240130 -@@ -616,7 +616,7 @@ - <string>7</string> - </property> - <property name="shortcut"> -- <string notr="true">7</string> -+ <string>7</string> - </property> - </widget> - </item> -@@ -632,7 +632,7 @@ - <string>8</string> - </property> - <property name="shortcut"> -- <string notr="true">8</string> -+ <string>8</string> - </property> - </widget> - </item> -@@ -648,7 +648,7 @@ - <string>9</string> - </property> - <property name="shortcut"> -- <string notr="true">9</string> -+ <string>9</string> - </property> - </widget> - </item> -@@ -680,7 +680,7 @@ - <string>4</string> - </property> - <property name="shortcut"> -- <string notr="true">4</string> -+ <string>4</string> - </property> - </widget> - </item> -@@ -696,7 +696,7 @@ - <string>5</string> - </property> - <property name="shortcut"> -- <string notr="true">5</string> -+ <string>5</string> - </property> - </widget> - </item> -@@ -712,7 +712,7 @@ - <string>6</string> - </property> - <property name="shortcut"> -- <string notr="true">6</string> -+ <string>6</string> - </property> - </widget> - </item> -@@ -728,7 +728,7 @@ - <string>1</string> - </property> - <property name="shortcut"> -- <string notr="true">1</string> -+ <string>1</string> - </property> - </widget> - </item> -@@ -744,7 +744,7 @@ - <string>2</string> - </property> - <property name="shortcut"> -- <string notr="true">2</string> -+ <string>2</string> - </property> - </widget> - </item> -@@ -760,7 +760,7 @@ - <string>3</string> - </property> - <property name="shortcut"> -- <string notr="true">3</string> -+ <string>3</string> - </property> - </widget> - </item> -@@ -786,7 +786,7 @@ - <string>0</string> - </property> - <property name="shortcut"> -- <string notr="true">0</string> -+ <string>0</string> - </property> - </widget> - </item> diff --git a/deskutils/kcharselect/pkg-descr b/deskutils/kcharselect/pkg-descr index 90ae45773bea..e1be153978a1 100644 --- a/deskutils/kcharselect/pkg-descr +++ b/deskutils/kcharselect/pkg-descr @@ -1 +1,4 @@ -KDE provides an integrated X11 based environment, much like CDE. +The KDE utilities are a compilation of various desktop utilities, +developed in the KDE module kdeutils. + +WWW: http://utils.kde.org diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist index 5d7d0ab4213d..075e9e1e6330 100644 --- a/deskutils/kcharselect/pkg-plist +++ b/deskutils/kcharselect/pkg-plist @@ -1,5 +1,4 @@ bin/ark -bin/filelight bin/kcalc bin/kcharselect bin/kdf @@ -12,7 +11,6 @@ bin/kwikdisk bin/superkaramba bin/sweeper lib/kde4/arkpart.so -lib/kde4/filelightpart.so lib/kde4/kcm_kdf.so lib/kde4/kcm_kwallet.so lib/kde4/kcm_remotecontrol.so @@ -24,6 +22,7 @@ lib/kde4/kerfuffle_libarchive.so lib/kde4/kerfuffle_libbz2.so lib/kde4/kerfuffle_libgz.so lib/kde4/kerfuffle_libxz.so +lib/kde4/kremotecontrol_lirc.so lib/kde4/libextracthere.so lib/kde4/plasma_engine_kremoteconrol.so lib/kde4/plasma_package_superkaramba.so @@ -41,7 +40,6 @@ lib/libsuperkaramba.so.5.0.1 share/applications/kde4/KCharSelect.desktop share/applications/kde4/KFloppy.desktop share/applications/kde4/ark.desktop -share/applications/kde4/filelight.desktop share/applications/kde4/kcalc.desktop share/applications/kde4/kdf.desktop share/applications/kde4/kgpg.desktop @@ -54,8 +52,6 @@ share/applications/kde4/superkaramba.desktop share/applications/kde4/sweeper.desktop share/apps/ark/ark_part.rc share/apps/ark/arkui.rc -share/apps/filelight/filelightui.rc -share/apps/filelightpart/filelightpartui.rc share/apps/kcalc/kcalcui.rc share/apps/kcalc/scienceconstants.xml share/apps/kcharselect/kcharselectui.rc @@ -119,7 +115,6 @@ share/autostart/kgpg.desktop share/config.kcfg/ark.kcfg share/config.kcfg/kcalc.kcfg share/config.kcfg/kgpg.kcfg -share/config/filelightrc share/config/superkaramba.knsrc share/dbus-1/interfaces/org.kde.kgpg.Key.xml share/dbus-1/interfaces/org.kde.superkaramba.xml @@ -129,13 +124,6 @@ share/doc/HTML/en/ark/common share/doc/HTML/en/ark/index.cache.bz2 share/doc/HTML/en/ark/index.docbook share/doc/HTML/en/ark/man-ark.1.docbook -share/doc/HTML/en/filelight/common -share/doc/HTML/en/filelight/config_appear.png -share/doc/HTML/en/filelight/config_scan.png -share/doc/HTML/en/filelight/index.cache.bz2 -share/doc/HTML/en/filelight/index.docbook -share/doc/HTML/en/filelight/radial_map.png -share/doc/HTML/en/filelight/radial_map_context_menu.png share/doc/HTML/en/kcalc/commands.docbook share/doc/HTML/en/kcalc/common share/doc/HTML/en/kcalc/index.cache.bz2 @@ -211,7 +199,6 @@ share/icons/hicolor/128x128/apps/kwalletmanager2.png share/icons/hicolor/128x128/apps/kwikdisk.png share/icons/hicolor/128x128/apps/superkaramba.png share/icons/hicolor/128x128/devices/infrared-remote.png -share/icons/hicolor/16x16/apps/filelight.png share/icons/hicolor/16x16/apps/kdf.png share/icons/hicolor/16x16/apps/kfloppy.png share/icons/hicolor/16x16/apps/kgpg.png @@ -223,7 +210,6 @@ share/icons/hicolor/16x16/apps/superkaramba.png share/icons/hicolor/16x16/devices/infrared-remote.png share/icons/hicolor/22x22/actions/krcd_flash.png share/icons/hicolor/22x22/actions/krcd_off.png -share/icons/hicolor/22x22/apps/filelight.png share/icons/hicolor/22x22/apps/kdf.png share/icons/hicolor/22x22/apps/kfloppy.png share/icons/hicolor/22x22/apps/kgpg.png @@ -232,8 +218,6 @@ share/icons/hicolor/22x22/apps/kwalletmanager.png share/icons/hicolor/22x22/apps/kwikdisk.png share/icons/hicolor/22x22/apps/superkaramba.png share/icons/hicolor/22x22/devices/infrared-remote.png -share/icons/hicolor/32x32/actions/view_filelight.png -share/icons/hicolor/32x32/apps/filelight.png share/icons/hicolor/32x32/apps/kdf.png share/icons/hicolor/32x32/apps/kfloppy.png share/icons/hicolor/32x32/apps/kgpg.png @@ -244,7 +228,6 @@ share/icons/hicolor/32x32/apps/kwikdisk.png share/icons/hicolor/32x32/apps/superkaramba.png share/icons/hicolor/32x32/devices/infrared-remote.png share/icons/hicolor/42x42/devices/infrared-remote.png -share/icons/hicolor/48x48/apps/filelight.png share/icons/hicolor/48x48/apps/kdf.png share/icons/hicolor/48x48/apps/kfloppy.png share/icons/hicolor/48x48/apps/kgpg.png @@ -254,7 +237,6 @@ share/icons/hicolor/48x48/apps/kwalletmanager2.png share/icons/hicolor/48x48/apps/kwikdisk.png share/icons/hicolor/48x48/apps/superkaramba.png share/icons/hicolor/48x48/devices/infrared-remote.png -share/icons/hicolor/64x64/apps/filelight.png share/icons/hicolor/64x64/apps/kdf.png share/icons/hicolor/64x64/apps/kfloppy.png share/icons/hicolor/64x64/apps/kwalletmanager.png @@ -278,7 +260,6 @@ share/kde4/services/ServiceMenus/encryptfolder.desktop share/kde4/services/ServiceMenus/viewdecrypted.desktop share/kde4/services/ark_dndextract.desktop share/kde4/services/ark_part.desktop -share/kde4/services/filelightpart.desktop share/kde4/services/kcm_remotecontrol.desktop share/kde4/services/kcmdf.desktop share/kde4/services/kded/kremotecontroldaemon.desktop @@ -290,12 +271,15 @@ share/kde4/services/kerfuffle_libarchive_readonly.desktop share/kde4/services/kerfuffle_libbz2.desktop share/kde4/services/kerfuffle_libgz.desktop share/kde4/services/kerfuffle_libxz.desktop +share/kde4/services/kremotecontrolbackends/kremotecontrol_lirc.desktop share/kde4/services/kwalletconfig.desktop share/kde4/services/kwalletmanager_show.desktop share/kde4/services/plasma-engine-kremotecontrol.desktop share/kde4/services/plasma-package-superkaramba.desktop share/kde4/services/plasma-scriptengine-superkaramba.desktop share/kde4/servicetypes/kerfufflePlugin.desktop +share/kde4/servicetypes/kremotecontrolmanager.desktop +@dirrm share/kde4/services/kremotecontrolbackends @dirrmtry share/icons/oxygen/42x42/devices @dirrmtry share/icons/oxygen/42x42 @dirrmtry share/icons/hicolor/8x8/devices @@ -312,7 +296,6 @@ share/kde4/servicetypes/kerfufflePlugin.desktop @dirrm share/doc/HTML/en/kcontrol/blockdevices @dirrm share/doc/HTML/en/kcharselect @dirrm share/doc/HTML/en/kcalc -@dirrm share/doc/HTML/en/filelight @dirrm share/doc/HTML/en/ark @dirrm share/apps/sweeper @dirrm share/apps/superkaramba @@ -344,6 +327,4 @@ share/kde4/servicetypes/kerfufflePlugin.desktop @dirrm share/apps/kgpg @dirrm share/apps/kdf @dirrm share/apps/kcalc -@dirrm share/apps/filelightpart -@dirrm share/apps/filelight @dirrm share/apps/ark diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile index ec1f0f8db28e..ae12a0c8a8d2 100644 --- a/deskutils/kdepimlibs4/Makefile +++ b/deskutils/kdepimlibs4/Makefile @@ -6,7 +6,6 @@ PORTNAME= kdepimlibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -15,24 +14,28 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Libraries for KDE-PIM applications -LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ - sasl2:${PORTSDIR}/security/cyrus-sasl2 \ - boost_thread:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \ + sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \ + boost_thread.4:${PORTSDIR}/devel/boost-libs \ ical.44:${PORTSDIR}/devel/libical \ - uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid + uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \ + prison.0:${PORTSDIR}/graphics/prison \ + soprano.4:${PORTSDIR}/textproc/soprano + +BUILD_DEPENDS= ${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies \ + xsltproc:${PORTSDIR}/textproc/libxslt + +RUN_DEPENDS= ${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies -USE_KDE4= kdelibs akonadi kdeprefix kdehier automoc4 -KDE4_BUILDENV= yes USE_BZIP2= yes +USE_KDE4= kdelibs akonadi kdeprefix kdehier automoc4 sharedmime +KDE4_BUILDENV= yes +USE_OPENLDAP= yes USE_QT_VER= 4 -QT_COMPONENTS= corelib opengl dbus qt3support \ - designer network svg qtestlib help \ +QT_COMPONENTS= dbus designer gui network sql xml \ qmake_build moc_build rcc_build uic_build -USE_OPENLDAP= yes MAKE_JOBS_SAFE= yes -.include <bsd.port.pre.mk> - .if exists(${LOCALBASE}/lib/libgpgme-pth.so) PLIST_SUB+= WITH_PTH='' .else @@ -46,5 +49,11 @@ post-patch: ${PATCH_WRKSRC}/cmake/modules/FindAkonadi.cmake ${REINPLACE_CMD} -e 's|%%KDE4_PREFIX%%|${KDE4_PREFIX}|g' \ ${PATCH_WRKSRC}/cmake/modules/FindQGpgme.cmake + # Prevent updating MIME during build. + ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \ + ${PATCH_WRKSRC}/CMakeLists.txt + +post-install: + @-update-mime-database ${KDE4_PREFIX}/share/mime -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo index 5c514afd781f..c2683bce6d76 100644 --- a/deskutils/kdepimlibs4/distinfo +++ b/deskutils/kdepimlibs4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdepimlibs-4.6.5.tar.bz2) = f2033feac905a6bcd64060653e8d0d2f8ac28ba8039562ec1b2fad7c708a4477 -SIZE (KDE/kdepimlibs-4.6.5.tar.bz2) = 3201672 +SHA256 (KDE/kdepimlibs-4.7.2.tar.bz2) = 82791f00cc13aa5bbf3b69bd67029e6c040e63a16e10fb77dfec5ffbee57d204 +SIZE (KDE/kdepimlibs-4.7.2.tar.bz2) = 3232573 diff --git a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt index 671fd488cc8c..a5bcbed0a1ea 100644 --- a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt +++ b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt @@ -1,9 +1,9 @@ ---- ./CMakeLists.txt.orig 2010-06-06 12:01:57.000000000 -0400 -+++ ./CMakeLists.txt 2010-06-06 12:02:08.000000000 -0400 +--- ./CMakeLists.txt.orig 2011-07-20 08:36:16.000000000 +1100 ++++ ./CMakeLists.txt 2011-08-09 00:34:17.959934057 +1100 @@ -81,7 +81,7 @@ if (NOT KDEPIM_ONLY_KLEO) #FindAkonadi.cmake is only there for compatibility reasons, but we don't want to use that. - set(Akonadi_MIN_VERSION "1.4.81") + set(Akonadi_MIN_VERSION "1.5.52") - find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET NO_MODULE) + find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET) macro_log_feature(Akonadi_FOUND "Akonadi server libraries" "Access to PIM storage and services" "http://pim.kde.org/akonadi" TRUE "${Akonadi_MIN_VERSION}" "") diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist index c4b7ddcd4990..fc5d2d0dc5a3 100644 --- a/deskutils/kdepimlibs4/pkg-plist +++ b/deskutils/kdepimlibs4/pkg-plist @@ -1204,7 +1204,6 @@ share/kde4/services/kresources/kabc/file.desktop share/kde4/services/kresources/kabc/ldapkio.desktop share/kde4/services/kresources/kabc/net.desktop share/kde4/services/kresources/kabc_manager.desktop -share/kde4/services/kresources/kcal/local.desktop share/kde4/services/kresources/kcal/localdir.desktop share/kde4/services/kresources/kcal_manager.desktop share/kde4/services/ldap.protocol @@ -1224,7 +1223,7 @@ share/kde4/servicetypes/kresources_plugin.desktop share/mime/application/x-vnd.kde.contactgroup.xml share/mime/packages/kdepimlibs-mime.xml @dirrm share/kde4/services/akonadi/contact -@dirrm share/kde4/services/akonadi +@dirrmtry share/kde4/services/akonadi @dirrm share/doc/HTML/en/kioslave/smtp @dirrm share/doc/HTML/en/kioslave/sieve @dirrm share/doc/HTML/en/kioslave/pop3 @@ -1301,3 +1300,5 @@ share/mime/packages/kdepimlibs-mime.xml @dirrm include/KDE/Akonadi/KCal @dirrm include/KDE/Akonadi/Contact @dirrm include/KDE/Akonadi +@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile index 32d8f8805810..efb0162e790a 100644 --- a/deskutils/kdeplasma-addons/Makefile +++ b/deskutils/kdeplasma-addons/Makefile @@ -15,43 +15,52 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Extra plasmoids for KDE4 -BUILD_DEPENDS= eigen>=2.0.b3:${PORTSDIR}/math/eigen2 -LIB_DEPENDS= kexiv2:${PORTSDIR}/graphics/kdegraphics4 \ +LIB_DEPENDS= kexiv2.10:${PORTSDIR}/graphics/libkexiv2-kde4 \ qalculate.5:${PORTSDIR}/math/libqalculate \ qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \ - marblewidget.11:${PORTSDIR}/astro/marble + soprano.4:${PORTSDIR}/textproc/soprano \ + attica.0:${PORTSDIR}/x11-toolkits/attica \ + qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ + qca.2:${PORTSDIR}/devel/qca + +BUILD_DEPENDS= eigen>=2.0.b3:${PORTSDIR}/math/eigen2 -USE_KDE4= kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime -KDE4_BUILDENV= yes USE_BZIP2= yes +USE_KDE4= kdehier kdelibs kdeprefix pimlibs workspace \ + akonadi sharedmime automoc4 +KDE4_BUILDENV= yes USE_QT_VER= 4 -QT_COMPONENTS= corelib opengl dbus qt3support webkit \ - designer network svg qtestlib xml \ +QT_COMPONENTS= dbus gui network opengl script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build - +USE_XORG= x11 xrender xtst MAKE_JOBS_SAFE= yes -OPTIONS= SCIM "Enable SCIM method input dialog" off +OPTIONS= MARBLE "Support for desktop globe wallpaper" on \ + SCIM "Enable SCIM method input dialog" off .include <bsd.port.options.mk> -.if defined(WITHOUT_SCIM) -PLIST_SUB+= SCIM="@comment " +.ifndef(WITHOUT_MARBLE) +LIB_DEPENDS+= marblewidget.12:${PORTSDIR}/astro/marble +PLIST_SUB+= MARBLE="" .else +CMAKE_ARGS+= -DWITH_Marble:BOOL=FALSE +PLIST_SUB+= MARBLE="@comment " +.endif + +.ifdef(WITH_SCIM) LIB_DEPENDS+= scim-1.0.10:${PORTSDIR}/textproc/scim PLIST_SUB+= SCIM="" +.else +CMAKE_ARGS+= -DWITH_SCIM:BOOL=FALSE +PLIST_SUB+= SCIM="@comment " .endif post-patch: ${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \ ${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt - -.if defined(WITHOUT_SCIM) - ${REINPLACE_CMD} -e '/add_subdirectory(kimpanel)/d' \ - ${WRKSRC}/applets/CMakeLists.txt -.endif - #respect prefix, don't update mime when installing - ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \ + # Respect prefix, don't update MIME when installing. + ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \ ${WRKSRC}/applets/lancelot/parts/CMakeLists.txt post-install: diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo index bdbdf1610f3b..33af8e5328d3 100644 --- a/deskutils/kdeplasma-addons/distinfo +++ b/deskutils/kdeplasma-addons/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdeplasma-addons-4.6.5.tar.bz2) = 0852f3444706c518fc242d174a614ff7d54b1826c3e5f884b10fbc7fb0755925 -SIZE (KDE/kdeplasma-addons-4.6.5.tar.bz2) = 1936845 +SHA256 (KDE/kdeplasma-addons-4.7.2.tar.bz2) = 71956a99c943728696ba52bd7d0e165ae1d28f940da8c8676d79fdf18e1ec931 +SIZE (KDE/kdeplasma-addons-4.7.2.tar.bz2) = 1973434 diff --git a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt index 82a7ae93bac2..230221c017d4 100644 --- a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt +++ b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- ./CMakeLists.txt.orig 2009-04-06 07:00:39.000000000 +1100 -+++ ./CMakeLists.txt 2009-06-26 11:00:58.000000000 +1100 -@@ -26,16 +26,20 @@ +--- ./CMakeLists.txt.orig 2011-05-21 07:37:49.000000000 +1100 ++++ ./CMakeLists.txt 2011-08-15 14:56:28.177306481 +1100 +@@ -36,17 +36,21 @@ endif (DEPEND_PACKAGE_Marble) macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe" "http://marble.kde.org" FALSE "" "RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.") @@ -9,8 +9,9 @@ -endif (NEPOMUK_FOUND) - add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) + add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) -include_directories (${KDE4_INCLUDES} -+INCLUDE_DIRECTORIES (${QT_QTGUI_INCLUDE_DIR} ++include_directories (${QT_QTGUI_INCLUDE_DIR} + ${QT_QTCORE_INCLUDE_DIR} + ${QT_QTXML_INCLUDE_DIR} + ${PHONON_INCLUDE_DIR} diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons/pkg-plist index 3db327283360..c162fb73e499 100644 --- a/deskutils/kdeplasma-addons/pkg-plist +++ b/deskutils/kdeplasma-addons/pkg-plist @@ -179,7 +179,7 @@ lib/kde4/plasma_potd_wcpotdprovider.so lib/kde4/plasma_runner_datetime.so lib/kde4/plasma_runner_events.so lib/kde4/plasma_wallpaper_mandelbrot.so -lib/kde4/plasma_wallpaper_marble.so +%%MARBLE%%lib/kde4/plasma_wallpaper_marble.so lib/kde4/plasma_wallpaper_pattern.so lib/kde4/plasma_wallpaper_virus.so lib/kde4/plasma_wallpaper_weather.so @@ -211,6 +211,19 @@ share/apps/bball/bounce.ogg share/apps/bball/football.svgz share/apps/cmake/modules/FindLancelot-Datamodels.cmake share/apps/cmake/modules/FindLancelot.cmake +share/apps/desktoptheme/Androbit/lancelot/action-list-view-headers.svgz +share/apps/desktoptheme/Androbit/lancelot/category-triangle.svgz +share/apps/desktoptheme/Androbit/lancelot/inner-background.svgz +share/apps/desktoptheme/Androbit/lancelot/lancelot-context-extender.svgz +share/apps/desktoptheme/Androbit/lancelot/lancelot-context.svgz +share/apps/desktoptheme/Androbit/lancelot/passageway-view-buttons-extender.svgz +share/apps/desktoptheme/Androbit/lancelot/passageway-view-buttons.svgz +share/apps/desktoptheme/Androbit/lancelot/passageway-view-inactivebuttons.svgz +share/apps/desktoptheme/Androbit/lancelot/passageway-view-spacer.svgz +share/apps/desktoptheme/Androbit/lancelot/section-buttons.svgz +share/apps/desktoptheme/Androbit/lancelot/system-buttons-extender.svgz +share/apps/desktoptheme/Androbit/lancelot/system-buttons.svgz +share/apps/desktoptheme/Androbit/lancelot/theme.config share/apps/desktoptheme/Aya/lancelot/action-list-view-headers.svgz share/apps/desktoptheme/Aya/lancelot/category-triangle.svgz share/apps/desktoptheme/Aya/lancelot/inner-background.svgz @@ -222,6 +235,32 @@ share/apps/desktoptheme/Aya/lancelot/section-buttons.svgz share/apps/desktoptheme/Aya/lancelot/system-buttons-extender.svgz share/apps/desktoptheme/Aya/lancelot/system-buttons.svgz share/apps/desktoptheme/Aya/lancelot/theme.config +share/apps/desktoptheme/Produkt/lancelot/action-list-view-headers.svgz +share/apps/desktoptheme/Produkt/lancelot/category-triangle.svgz +share/apps/desktoptheme/Produkt/lancelot/inner-background.svgz +share/apps/desktoptheme/Produkt/lancelot/lancelot-context-extender.svgz +share/apps/desktoptheme/Produkt/lancelot/lancelot-context.svgz +share/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons-extender.svgz +share/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons.svgz +share/apps/desktoptheme/Produkt/lancelot/passageway-view-inactivebuttons.svgz +share/apps/desktoptheme/Produkt/lancelot/passageway-view-spacer.svgz +share/apps/desktoptheme/Produkt/lancelot/section-buttons.svgz +share/apps/desktoptheme/Produkt/lancelot/system-buttons-extender.svgz +share/apps/desktoptheme/Produkt/lancelot/system-buttons.svgz +share/apps/desktoptheme/Produkt/lancelot/theme.config +share/apps/desktoptheme/Tibanna/lancelot/action-list-view-drop-indicator.svgz +share/apps/desktoptheme/Tibanna/lancelot/action-list-view-headers.svgz +share/apps/desktoptheme/Tibanna/lancelot/category-triangle.svgz +share/apps/desktoptheme/Tibanna/lancelot/extender-button-icon.svgz +share/apps/desktoptheme/Tibanna/lancelot/inner-background.svgz +share/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons-extender.svgz +share/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons.svgz +share/apps/desktoptheme/Tibanna/lancelot/passageway-view-inactivebuttons.svgz +share/apps/desktoptheme/Tibanna/lancelot/passageway-view-spacer.svgz +share/apps/desktoptheme/Tibanna/lancelot/section-buttons.svgz +share/apps/desktoptheme/Tibanna/lancelot/system-buttons-extender.svgz +share/apps/desktoptheme/Tibanna/lancelot/system-buttons.svgz +share/apps/desktoptheme/Tibanna/lancelot/theme.config share/apps/desktoptheme/default/bubblemon/bubble.svg share/apps/desktoptheme/default/fifteenPuzzle/blanksquare.svg share/apps/desktoptheme/default/lancelot/action-list-view-drop-indicator.svgz @@ -249,6 +288,7 @@ share/apps/desktoptheme/default/widgets/eyes.svg share/apps/desktoptheme/default/widgets/luna.svgz share/apps/desktoptheme/default/widgets/microblog.svgz share/apps/desktoptheme/default/widgets/notes.svgz +share/apps/desktoptheme/default/widgets/nowplaying/nocover.svgz share/apps/desktoptheme/default/widgets/previewer-16.svgz share/apps/desktoptheme/default/widgets/previewer-22.svgz share/apps/desktoptheme/default/widgets/timer.svgz @@ -479,7 +519,7 @@ share/kde4/services/plasma-runner-techbase.desktop share/kde4/services/plasma-runner-wikipedia.desktop share/kde4/services/plasma-runner-wikitravel.desktop share/kde4/services/plasma-wallpaper-mandelbrot.desktop -share/kde4/services/plasma-wallpaper-marble.desktop +%%MARBLE%%share/kde4/services/plasma-wallpaper-marble.desktop share/kde4/services/plasma-wallpaper-pattern.desktop share/kde4/services/plasma-wallpaper-virus.desktop share/kde4/services/plasma-wallpaper-weather.desktop @@ -503,6 +543,7 @@ share/mime/packages/lancelotpart-mime.xml @dirrmtry share/apps/desktoptheme/slim-glow @dirrm share/apps/desktoptheme/oxygen/lancelot @dirrmtry share/apps/desktoptheme/oxygen +@dirrm share/apps/desktoptheme/default/widgets/nowplaying @dirrm share/apps/desktoptheme/default/weatherstation @dirrm share/apps/desktoptheme/default/weather @dirrm share/apps/desktoptheme/default/stylesheets @@ -510,9 +551,15 @@ share/mime/packages/lancelotpart-mime.xml @dirrm share/apps/desktoptheme/default/lancelot @dirrm share/apps/desktoptheme/default/fifteenPuzzle @dirrm share/apps/desktoptheme/default/bubblemon +@dirrm share/apps/desktoptheme/Tibanna/lancelot +@dirrmtry share/apps/desktoptheme/Tibanna +@dirrm share/apps/desktoptheme/Produkt/lancelot +@dirrmtry share/apps/desktoptheme/Produkt @dirrmtry share/apps/desktoptheme/Clean-Bend @dirrm share/apps/desktoptheme/Aya/lancelot @dirrmtry share/apps/desktoptheme/Aya +@dirrm share/apps/desktoptheme/Androbit/lancelot +@dirrmtry share/apps/desktoptheme/Androbit @dirrmtry share/apps/cmake/modules @dirrmtry share/apps/cmake @dirrm share/apps/bball diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile new file mode 100644 index 000000000000..1dacda6da0d0 --- /dev/null +++ b/deskutils/kruler/Makefile @@ -0,0 +1,28 @@ +# New ports collection makefile for: kruler +# Date created: 5 September 2011 +# Whom: Alberto Villa <avilla@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= kruler +PORTVERSION= ${KDE4_VERSION} +CATEGORIES= deskutils kde +MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src +DIST_SUBDIR= KDE + +MAINTAINER= kde@FreeBSD.org +COMMENT= KDE 4 screen ruler + +CONFLICTS= kdegraphics-4.[0-6].* + +USE_KDE4= kdehier kdelibs kdeprefix automoc4 +KDE4_BUILDENV= yes +USE_QT_VER= 4 +QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build +USE_XORG= x11 +USE_BZIP2= yes +MAKE_JOBS_SAFE= yes + +.include <bsd.port.mk> diff --git a/deskutils/kruler/distinfo b/deskutils/kruler/distinfo new file mode 100644 index 000000000000..f5070d6014db --- /dev/null +++ b/deskutils/kruler/distinfo @@ -0,0 +1,2 @@ +SHA256 (KDE/kruler-4.7.2.tar.bz2) = 3c5a0bb613d032683d7495dc4bbc73c67e2f3b5d2c93e3e41498ad6f16b867bd +SIZE (KDE/kruler-4.7.2.tar.bz2) = 139998 diff --git a/deskutils/kruler/pkg-descr b/deskutils/kruler/pkg-descr new file mode 100644 index 000000000000..7956c46d094b --- /dev/null +++ b/deskutils/kruler/pkg-descr @@ -0,0 +1,9 @@ +KRuler displays on screen a ruler measuring pixels. + +FEATURES +- Integrated color picker. +- Change the length of the ruler. +- Change the orientation of the ruler. +- Change the color, transparency and font of the ruler. + +WWW: http://www.kde.org/applications/graphics/kruler diff --git a/deskutils/kruler/pkg-plist b/deskutils/kruler/pkg-plist new file mode 100644 index 000000000000..3030a00abd09 --- /dev/null +++ b/deskutils/kruler/pkg-plist @@ -0,0 +1,27 @@ +bin/kruler +share/applications/kde4/kruler.desktop +share/apps/kruler/kruler.notifyrc +share/apps/kruler/sounds/move.wav +share/doc/HTML/en/kruler/common +share/doc/HTML/en/kruler/index.cache.bz2 +share/doc/HTML/en/kruler/index.docbook +share/doc/HTML/en/kruler/kruler-settings.png +share/doc/HTML/en/kruler/kruler.png +share/icons/hicolor/128x128/apps/kruler.png +share/icons/hicolor/16x16/actions/kruler-east.png +share/icons/hicolor/16x16/actions/kruler-north.png +share/icons/hicolor/16x16/actions/kruler-south.png +share/icons/hicolor/16x16/actions/kruler-west.png +share/icons/hicolor/16x16/apps/kruler.png +share/icons/hicolor/22x22/actions/kruler-east.png +share/icons/hicolor/22x22/actions/kruler-north.png +share/icons/hicolor/22x22/actions/kruler-south.png +share/icons/hicolor/22x22/actions/kruler-west.png +share/icons/hicolor/22x22/apps/kruler.png +share/icons/hicolor/32x32/apps/kruler.png +share/icons/hicolor/48x48/apps/kruler.png +share/icons/hicolor/64x64/apps/kruler.png +share/icons/hicolor/scalable/apps/kruler.svgz +@dirrm share/doc/HTML/en/kruler +@dirrm share/apps/kruler/sounds +@dirrm share/apps/kruler |