KDE/FreeBSD team presents KDE SC 4.12.2 and KDE Workspace 4.11.6!

Among changes:
- Switch KDE4_PREFIX to ${LOCALBASE}
- Remove now needless misc/kde4-shared-mime-info port
- Add stage support
- Remove ancient CONFLICTS (KDE 4.9 and less) and LATEST_LINK
- Squeeze MASTER_SITES/MASTER_SITE_SUBDIR
- Convert LIB_DEPENDS to new style
- Use options helpers
- Drop support for FreeBSD 7.x
- Remove Qt/KDE 3 related workarounds
- Remove local patches and use upstream version scheme for libraries
- sysutils/kdeadmin4, net/kdenetwork4, devel/kdesdk4,
  and x11-clocks/kdetoys4 ports have been split.
- devel/kcachegrind is now a part of KDE SC [1]
- more logs in area51 repo...

New ports:
  devel/kde-dev-scripts:	KDE development scripts
  devel/kde-dev-utils:		KDE development utilities
  games/klickety:		Tetris themed solitaire
  games/picmi:			Single player logic-based puzzle game
  textproc/libkomparediff2:	Library to compare files and strings

The area51 repository features commits by Schaich Alonso, avilla, rakuco
and myself.

PR:		ports/186491
Exp-run:	by bdrewery
Approved by:	beat (former maintainer) [1]

5 files changed, 36 insertions, 101 deletions

diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 168103c9bc5a..036c55b37660 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -2,10 +2,8 @@
 
 PORTNAME=	kdeplasma-addons
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
-CATEGORIES=	deskutils kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES=	deskutils kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -16,7 +14,6 @@ LIB_DEPENDS=	libqalculate.so:${PORTSDIR}/math/libqalculate \
 		libqca.so:${PORTSDIR}/devel/qca \
 		libqoauth.so:${PORTSDIR}/net/qoauth \
 		libqjson.so:${PORTSDIR}/devel/qjson
-
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2
 
 CONFLICTS_INSTALL=	plasma-applet-icontasks-0.[89].*
@@ -30,45 +27,24 @@ USE_QT4=	corelib dbus declarative gui network script sql webkit \
 USE_XORG=	x11 xrender xtst
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	MARBLE SCIM # IBUS
+OPTIONS_DEFINE=	MARBLE SCIM IBUS
 OPTIONS_DEFAULT=	MARBLE
+OPTIONS_SUB=	yes
 
 MARBLE_DESC=	Support for desktop globe wallpaper
-IBUS_DESC=	Enable IBUS backend for input dialog
-SCIM_DESC=	Enable SCIM backend for input dialog
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+MARBLE_USE=	KDE4=marble
+MARBLE_CMAKE_OFF=	-DWITH_Marble=off
 
-.if ${PORT_OPTIONS:MMARBLE}
-USE_KDE4+=	marble
-PLIST_SUB+=	MARBLE=""
-.else
-CMAKE_ARGS+=	-DWITH_Marble:BOOL=FALSE
-PLIST_SUB+=	MARBLE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MIBUS}
-IGNORE=		requires ibus version 1.4.2 or greater
-LIB_DEPENDS+=	libibus-1.0.so:${PORTSDIR}/textproc/ibus
-PLIST_SUB+=	IBUS=""
-.else
-CMAKE_ARGS+=	-DBUILD_ibus=off
-PLIST_SUB+=	IBUS="@comment "
-.endif
+IBUS_DESC=	Enable IBUS backend for input dialog
+IBUS_LIB_DEPENDS=	libibus-1.0.so:${PORTSDIR}/textproc/ibus
+IBUS_CMAKE_OFF=	-DBUILD_ibus=off
 
-.if ${PORT_OPTIONS:MSCIM}
-LIB_DEPENDS+=	libscim-1.0.so:${PORTSDIR}/textproc/scim
-PLIST_SUB+=	SCIM=""
-.else
-CMAKE_ARGS+=	-DBUILD_scim=off
-PLIST_SUB+=	SCIM="@comment "
-.endif
+SCIM_DESC=	Enable SCIM backend for input dialog
+SCIM_LIB_DEPENDS=	libscim-1.0.so:${PORTSDIR}/textproc/scim
+SCIM_CMAKE_OFF=	-DBUILD_scim=off
 
 post-patch:
-	${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
-		${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
-	# Respect prefix, don't update MIME when installing.
+# Respect prefix, don't update MIME when installing.
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
 		${WRKSRC}/applets/lancelot/parts/CMakeLists.txt
 
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index 11397f633d3c..979ca0e024de 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdeplasma-addons-4.10.5.tar.xz) = f76fac6b5c2c67c63efc9eea58b829f07f998405ab5e74f4a489b2475e5d4943
-SIZE (KDE/4.10.5/kdeplasma-addons-4.10.5.tar.xz) = 1791872
+SHA256 (KDE/4.12.2/kdeplasma-addons-4.12.2.tar.xz) = 1d547d1a203f3e025241e1a57b2cf0a2239b2ed08ffb72700c1b28d0ce86dab8
+SIZE (KDE/4.12.2/kdeplasma-addons-4.12.2.tar.xz) = 1758332
diff --git a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
index 230221c017d4..8d8f6daf183c 100644
--- a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
+++ b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- ./CMakeLists.txt.orig	2011-05-21 07:37:49.000000000 +1100
-+++ ./CMakeLists.txt	2011-08-15 14:56:28.177306481 +1100
+--- CMakeLists.txt.orig	2013-08-14 12:32:08.088461763 +0000
++++ CMakeLists.txt	2013-08-14 12:33:12.856460461 +0000
 @@ -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.")
diff --git a/deskutils/kdeplasma-addons/files/qt3to4headers.txt b/deskutils/kdeplasma-addons/files/qt3to4headers.txt
deleted file mode 100644
index 75f06c344ce0..000000000000
--- a/deskutils/kdeplasma-addons/files/qt3to4headers.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-s/<q3dragobject.h>/<Q3DragObject>/g
-s/<q3frame.h>/<Q3Frame>/g
-s/<q3groupbox.h>/<Q3GroupBox>/g
-s/<q3hgroupbox.h>/<Q3HGroupBox>/g
-s/<q3listview.h>/<Q3ListView>/g
-s/<q3popupmenu.h>/<Q3PopupMenu>/g
-s/<q3process.h>/<Q3Process>/g
-s/<q3progressdialog.h>/<Q3ProgressDialog>/g
-s/<q3strlist.h>/<Q3StrList>/g
-s/<q3textview.h>/<Q3TextView>/g
-s/<q3vbox.h>/<Q3VBox>/g
-s/<q3vgroupbox.h>/<Q3VGroupBox>/g
-s/<qapplication.h>/<QApplication>/g
-s/<qbuttongroup.h>/<QButtonGroup>/g
-s/<qcheckbox.h>/<QCheckBox>/g
-s/<qcolor.h>/<QColor>/g
-s/<qcombobox.h>/<QComboBox>/g
-s/<qcursor.h>/<QCursor>/g
-s/<qdesktopwidget.h>/<QDesktopWidget>/g
-s/<qdir.h>/<QDir>/g
-s/<qevent.h>/<QEvent>/g
-s/<qfile.h>/<QFile>/g
-s/<qfileinfo.h>/<QFileInfo>/g
-s/<qfont.h>/<QFont>/g
-s/<qfontmetrics.h>/<QFontMetrics>/g
-s/<qgroupbox.h>/<QGroupBox>/g
-s/<qimage.h>/<QImage>/g
-s/<qlabel.h>/<QLabel>/g
-s/<qlayout.h>/<QLayout>/g
-s/<qlineedit.h>/<QLineEdit>/g
-s/<qmatrix.h>/<QMatrix>/g
-s/<qobject.h>/<QObject>/g
-s/<qpainter.h>/<QPainter>/g
-s/<qpalette.h>/<QPalette>/g
-s/<qpixmap.h>/<QPixmap>/g
-s/<qpointer.h>/<QPointer>/g
-s/<qpushbutton.h>/<QPushButton>/g
-s/<qradiobutton.h>/<QRadioButton>/g
-s/<qregexp.h>/<QRegExp>/g
-s/<qspinbox.h>/<QSpinBox>/g
-s/<qstring.h>/<QString>/g
-s/<qtextcodec.h>/<QTextCodec>/g
-s/<qtextstream.h>/<QTextStream>/g
-s/<qtimer.h>/<QTimer>/g
-s/<qtooltip.h>/<QToolTip>/g
-s/<qwidget.h>/<QWidget>/g
diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons/pkg-plist
index 126d29b18afb..42ab54255130 100644
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@@ -111,6 +111,7 @@ lib/kde4/krunner_konsolesessions.so
 lib/kde4/krunner_kopete.so
 lib/kde4/krunner_mediawiki.so
 lib/kde4/krunner_spellcheckrunner.so
+lib/kde4/krunner_translator.so
 lib/kde4/krunner_youtube.so
 %%IBUS%%lib/kde4/libexec/kimpanel-ibus-panel
 %%SCIM%%lib/kde4/libexec/kimpanel-scim-panel
@@ -178,6 +179,7 @@ lib/kde4/plasma_packagestructure_comic.so
 lib/kde4/plasma_potd_apodprovider.so
 lib/kde4/plasma_potd_epodprovider.so
 lib/kde4/plasma_potd_flickrprovider.so
+lib/kde4/plasma_potd_natgeoprovider.so
 lib/kde4/plasma_potd_oseiprovider.so
 lib/kde4/plasma_potd_wcpotdprovider.so
 lib/kde4/plasma_runner_datetime.so
@@ -196,8 +198,8 @@ lib/liblancelot.so
 lib/liblancelot.so.1.9.0
 lib/liblancelot.so.2
 lib/libplasma_groupingcontainment.so
-lib/libplasma_groupingcontainment.so.5
-lib/libplasma_groupingcontainment.so.5.0.1
+lib/libplasma_groupingcontainment.so.4
+lib/libplasma_groupingcontainment.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libplasmacomicprovidercore.so
 lib/libplasmacomicprovidercore.so.1
 lib/libplasmacomicprovidercore.so.1.0.0
@@ -205,11 +207,11 @@ lib/libplasmapotdprovidercore.so
 lib/libplasmapotdprovidercore.so.1
 lib/libplasmapotdprovidercore.so.1.0.0
 lib/libplasmaweather.so
-lib/libplasmaweather.so.5
-lib/libplasmaweather.so.5.0.1
+lib/libplasmaweather.so.4
+lib/libplasmaweather.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/librtm.so
-lib/librtm.so.5
-lib/librtm.so.5.0.1
+lib/librtm.so.4
+lib/librtm.so.%%KDE4_GENERIC_LIB_VERSION%%
 share/apps/bball/bball.svgz
 share/apps/bball/bounce.ogg
 share/apps/bball/football.svgz
@@ -362,7 +364,7 @@ share/apps/plasma/plasmoids/konsoleprofiles/contents/ui/konsoleprofiles.qml
 share/apps/plasma/plasmoids/konsoleprofiles/metadata.desktop
 share/apps/plasma/plasmoids/nowplaying/contents/code/service.js
 share/apps/plasma/plasmoids/nowplaying/contents/config/main.xml
-share/apps/plasma/plasmoids/nowplaying/contents/images/nocover.svgz
+share/apps/plasma/plasmoids/nowplaying/contents/theme/nowplaying/nocover.svgz
 share/apps/plasma/plasmoids/nowplaying/contents/ui/AlbumArt.qml
 share/apps/plasma/plasmoids/nowplaying/contents/ui/CompactLayout.qml
 share/apps/plasma/plasmoids/nowplaying/contents/ui/Controls.qml
@@ -452,7 +454,7 @@ share/icons/hicolor/128x128/apps/luna.png
 share/icons/hicolor/128x128/apps/plasmaapplet-shelf.png
 share/icons/hicolor/128x128/apps/previewer.png
 share/icons/hicolor/128x128/apps/qalculate-applet.png
-share/icons/hicolor/16x16/actions/youtube.png
+share/icons/hicolor/16x16/actions/krunner_youtube.png
 share/icons/hicolor/16x16/apps/bball.png
 share/icons/hicolor/16x16/apps/eyes.png
 share/icons/hicolor/16x16/apps/kdeobservatory.png
@@ -462,7 +464,7 @@ share/icons/hicolor/16x16/apps/lifegame.png
 share/icons/hicolor/16x16/apps/luna.png
 share/icons/hicolor/16x16/apps/plasmaapplet-shelf.png
 share/icons/hicolor/16x16/apps/previewer.png
-share/icons/hicolor/22x22/actions/youtube.png
+share/icons/hicolor/22x22/actions/krunner_youtube.png
 share/icons/hicolor/22x22/apps/eyes.png
 share/icons/hicolor/22x22/apps/kdeobservatory.png
 share/icons/hicolor/22x22/apps/lancelot-start.png
@@ -473,7 +475,7 @@ share/icons/hicolor/22x22/apps/plasmaapplet-shelf.png
 share/icons/hicolor/22x22/apps/previewer.png
 share/icons/hicolor/256x256/apps/eyes.png
 share/icons/hicolor/256x256/apps/lifegame.png
-share/icons/hicolor/32x32/actions/youtube.png
+share/icons/hicolor/32x32/actions/krunner_youtube.png
 share/icons/hicolor/32x32/apps/bball.png
 share/icons/hicolor/32x32/apps/kdeobservatory.png
 share/icons/hicolor/32x32/apps/lancelot-start.png
@@ -482,7 +484,7 @@ share/icons/hicolor/32x32/apps/lifegame.png
 share/icons/hicolor/32x32/apps/luna.png
 share/icons/hicolor/32x32/apps/plasmaapplet-shelf.png
 share/icons/hicolor/32x32/apps/previewer.png
-share/icons/hicolor/48x48/actions/youtube.png
+share/icons/hicolor/48x48/actions/krunner_youtube.png
 share/icons/hicolor/48x48/apps/bball.png
 share/icons/hicolor/48x48/apps/kdeobservatory.png
 share/icons/hicolor/48x48/apps/lancelot-start.png
@@ -492,7 +494,7 @@ share/icons/hicolor/48x48/apps/luna.png
 share/icons/hicolor/48x48/apps/plasmaapplet-shelf.png
 share/icons/hicolor/48x48/apps/previewer.png
 share/icons/hicolor/48x48/apps/qalculate-applet.png
-share/icons/hicolor/64x64/actions/youtube.png
+share/icons/hicolor/64x64/actions/krunner_youtube.png
 share/icons/hicolor/64x64/apps/bball.png
 share/icons/hicolor/64x64/apps/eyes.png
 share/icons/hicolor/64x64/apps/kdeobservatory.png
@@ -502,7 +504,7 @@ share/icons/hicolor/64x64/apps/lifegame.png
 share/icons/hicolor/64x64/apps/luna.png
 share/icons/hicolor/64x64/apps/plasmaapplet-shelf.png
 share/icons/hicolor/64x64/apps/previewer.png
-share/icons/hicolor/scalable/actions/youtube.svgz
+share/icons/hicolor/scalable/actions/krunner_youtube.svgz
 share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
 share/icons/hicolor/scalable/apps/bball.svgz
 share/icons/hicolor/scalable/apps/eyes.svgz
@@ -520,6 +522,7 @@ share/kde4/services/katesessions.desktop
 share/kde4/services/konquerorsessions.desktop
 share/kde4/services/konsolesessions.desktop
 share/kde4/services/lancelot.desktop
+share/kde4/services/natgeoprovider.desktop
 share/kde4/services/oseiprovider.desktop
 share/kde4/services/plasma-applet-bball.desktop
 share/kde4/services/plasma-applet-binaryclock.desktop
@@ -597,6 +600,7 @@ share/kde4/services/plasma-runner-kopete.desktop
 share/kde4/services/plasma-runner-spellchecker.desktop
 share/kde4/services/plasma-runner-spellchecker_config.desktop
 share/kde4/services/plasma-runner-techbase.desktop
+share/kde4/services/plasma-runner-translator.desktop
 share/kde4/services/plasma-runner-wikipedia.desktop
 share/kde4/services/plasma-runner-wikitravel.desktop
 share/kde4/services/plasma-runner-youtube.desktop
@@ -628,7 +632,8 @@ share/mime/packages/lancelotpart-mime.xml
 @dirrm share/apps/plasma/wallpapers/org.kde.animals
 @dirrm share/apps/plasma/wallpapers
 @dirrm share/apps/plasma/plasmoids/nowplaying/contents/ui
-@dirrm share/apps/plasma/plasmoids/nowplaying/contents/images
+@dirrm share/apps/plasma/plasmoids/nowplaying/contents/theme/nowplaying
+@dirrm share/apps/plasma/plasmoids/nowplaying/contents/theme
 @dirrm share/apps/plasma/plasmoids/nowplaying/contents/config
 @dirrm share/apps/plasma/plasmoids/nowplaying/contents/code
 @dirrm share/apps/plasma/plasmoids/nowplaying/contents