KDE/FreeBSD team presents KDE SC 4.9.5 ports!

- kdebindings ports have been renamed to match upstream.
- kdemultimedia and kdenetwork have been split.
- New port games/pairs added.
- Trim Makefile header
- Convert to new option framework
- New USE_KDE4 components: libkcddb, libkcompactdisc
- Update:
	databases/akonadi to 1.9.0
	devel/grantlee to 0.3.0
	textproc/rasqal to 0.9.30
	textproc/redland-bindings to 1.0.16.1
	textproc/soprano to 2.9.0
	x11-toolkits/attica to 0.4.1

The area51 repository features commits by Schaich Alonso, avilla, dbn,
jhale, makc and rakuco.

Contributors:
- Oleg Sidorkin
- Tobias Berner
- Kurt Jaeger

1 files changed, 57 insertions, 52 deletions

diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 6d98888fea23..a2215dd65137 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -1,15 +1,11 @@
-# Created by: kde@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	kde-workspace
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
-MASTER_SITES=	${MASTER_SITE_KDE_kde} \
-		${MASTER_SITE_LOCAL} \
-		http://people.FreeBSD.org/~avilla/distfiles/
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src/:kde \
-			avilla/
+MASTER_SITES=	${MASTER_SITE_KDE:C@$@:kde@} \
+		LOCAL/avilla
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src/:kde
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:kde \
 		stripes-freebsd-1.0.tar.bz2
 DIST_SUBDIR=	KDE
@@ -18,22 +14,20 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus \
-		ck-connector.0:${PORTSDIR}/sysutils/consolekit \
-		pci.3:${PORTSDIR}/devel/libpci \
-		hal.1:${PORTSDIR}/sysutils/hal \
-		qalculate.5:${PORTSDIR}/math/libqalculate \
-		prison.0:${PORTSDIR}/graphics/prison \
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
+		ck-connector:${PORTSDIR}/sysutils/consolekit \
+		pci:${PORTSDIR}/devel/libpci \
+		hal:${PORTSDIR}/sysutils/hal \
+		qalculate:${PORTSDIR}/math/libqalculate \
+		prison:${PORTSDIR}/graphics/prison \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
-		dbusmenu-qt.2:${PORTSDIR}/devel/libdbusmenu-qt \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		freetype.9:${PORTSDIR}/print/freetype2 \
+		dbusmenu-qt:${PORTSDIR}/devel/libdbusmenu-qt \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		freetype:${PORTSDIR}/print/freetype2 \
 		png15:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		kactivities.6:${PORTSDIR}/x11/kactivities
-
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		kactivities:${PORTSDIR}/x11/kactivities
 BUILD_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
-
 RUN_DEPENDS=	${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		xprop:${PORTSDIR}/x11/xprop \
@@ -45,13 +39,12 @@ RUN_DEPENDS=	${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
 		setxkbmap:${PORTSDIR}/x11/setxkbmap \
 		${KDE4_PREFIX}/bin/ksysguardd:${PORTSDIR}/sysutils/ksysguardd \
 		${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:${PORTSDIR}/sysutils/polkit-kde \
-		${LOCALBASE}/etc/pam.d/kde:${PORTSDIR}/security/pam_kde
+		${KDE4_PREFIX}/lib/kde4/libexec/polkitkde1helper:${PORTSDIR}/sysutils/kcm-polkit-kde \
+		${LOCALBASE}/etc/pam.d/kde:${PORTSDIR}/security/pam_kde \
+		${KDE4_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:${PORTSDIR}/x11-themes/kde4-base-artwork
 
 CONFLICTS=	kdeaccessibility-4.[0-6].* kdebase-workspace-4.[0-6].*
 
-SUB_FILES=	pkg-message
-USE_RC_SUBR=	kdm4
-USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_GL=		glu
 USE_GNOME=	glib20
@@ -59,21 +52,18 @@ USE_ICONV=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix oxygen pimlibs \
 		akonadi automoc4 ontologies qimageblitz soprano strigi
 KDE4_BUILDENV=	yes
+USE_PKGCONFIG=	build
 USE_QT4=	dbus declarative gui network opengl phonon \
 		qt3support qtestlib script sql webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USE_XORG=	kbproto x11 xau xcomposite xcursor xdamage xdmcp xfixes \
 		xft xi xinerama xkbfile xrandr xrender xres xscrnsaver xtst
+USE_XZ=		yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
-USERS=		kdm
-GROUPS=		kdm
-
-MAN1=		plasmaengineexplorer.1 plasmapkg.1 plasmoidviewer.1
-
-# PyKDE4, Xmms and Googlegadgets could be enabled.
-CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
+# Xmms and Googlegadgets could be enabled.
+CMAKE_ARGS=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
 		-DBUILD_python:BOOL=OFF \
 		-DBUILD_ruby:BOOL=OFF \
 		-DWITH_BlueZ:BOOL=OFF \
@@ -83,18 +73,32 @@ CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
 		-DWITH_Googlegadgets:BOOL=OFF \
 		-DWITH_PyKDE4:BOOL=OFF
 
-OPTIONS=	GPS "Support for GPS geolocation dataengine" on \
-		PHONON_GSTREAMER "GStreamer backend for Phonon (recommended)" on \
-		PHONON_VLC "VLC backend for Phonon" off \
-		PLASMA_PYTHON "Support for plasmoids written in Python" off \
-		PLASMA_RUBY "Support for plasmoids written in Ruby" off \
-		UPOWER "Support for power management" on \
-		WALLPAPERS "Official KDE wallpapers" on
+SUB_FILES=	pkg-message
+USE_RC_SUBR=	kdm4
+
+USERS=		kdm
+GROUPS=		kdm
+
+MAN1=		plasmaengineexplorer.1 plasmapkg.1 plasmoidviewer.1
+
+OPTIONS_DEFINE=	GPS UPOWER WALLPAPERS
+OPTIONS_GROUP=	PHONON PLASMA
+OPTIONS_GROUP_PHONON=	GSTREAMER VLC
+OPTIONS_GROUP_PLASMA=	PYTHON RUBY
+OPTIONS_DEFAULT=GPS GSTREAMER UPOWER WALLPAPERS
+
+GPS_DESC=	GPS geolocation via gpsd
+GSTREAMER_DESC=	Multimedia via Phonon-GStreamer
+PYTHON_DESC=	Python plasmoids support
+RUBY_DESC=	Ruby plasmoids support
+UPOWER_DESC=	Power management via UPower
+VLC_DESC=	Multimedia via Phonon-VLC
+WALLPAPERS_DESC=Install official KDE wallpapers
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_GPS)
-LIB_DEPENDS+=	gps.20:${PORTSDIR}/astro/gpsd
+.if ${PORT_OPTIONS:MGPS}
+LIB_DEPENDS+=	gps:${PORTSDIR}/astro/gpsd
 CMAKE_ARGS+=	-DWITH_libgps:BOOL=ON
 PLIST_SUB+=	GPS=""
 .else
@@ -102,35 +106,35 @@ CMAKE_ARGS+=	-DWITH_libgps:BOOL=OFF
 PLIST_SUB+=	GPS="@comment "
 .endif
 
-.if !defined(WITHOUT_PHONON_GSTREAMER)
+.if ${PORT_OPTIONS:MGSTREAMER}
 USE_GSTREAMER+=	core
 USE_QT4+=	phonon-gst_run
 .endif
 
-.if defined(WITH_PHONON_VLC)
-RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:${PORTSDIR}/multimedia/phonon-vlc
-.endif
-
-.if defined(WITH_PLASMA_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 RUN_DEPENDS+=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:${PORTSDIR}/x11/plasma-scriptengine-python
 .endif
 
-.if defined(WITH_PLASMA_RUBY)
+.if ${PORT_OPTIONS:MRUBY}
 RUN_DEPENDS+=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:${PORTSDIR}/x11/plasma-scriptengine-ruby
 .endif
 
-.if !defined(WITHOUT_UPOWER)
+.if ${PORT_OPTIONS:MUPOWER}
 RUN_DEPENDS+=	${LOCALBASE}/libexec/upowerd:${PORTSDIR}/sysutils/upower
 .endif
 
-.if !defined(WITHOUT_WALLPAPERS)
+.if ${PORT_OPTIONS:MVLC}
+RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:${PORTSDIR}/multimedia/phonon-vlc
+.endif
+
+.if ${PORT_OPTIONS:MWALLPAPERS}
 RUN_DEPENDS+=	${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:${PORTSDIR}/x11-themes/kde4-wallpapers
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 800069
-LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
+LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
 .endif
 
 .if ${OSVERSION} < 900004
@@ -150,6 +154,7 @@ post-patch:
 		${PATCH_WRKSRC}/kdm/backend/client.c \
 		${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c \
 		${PATCH_WRKSRC}/CMakeLists.txt
+	@${RM} ${WRKSRC}/plasma/generic/applets/batterymonitor/contents/ui/*.orig
 
 pre-configure:
 	${REINPLACE_CMD} -e '/ksysguardd/ d' \
@@ -165,8 +170,8 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/05-freebsdWallpaper.js ${PREFIX}/share/apps/plasma-desktop/init
 	cd ${WRKDIR}/stripes-freebsd-1.0 && \
 		${COPYTREE_SHARE} . ${PREFIX}/share/wallpapers
-.if defined(WITHOUT_PHONON_GSTREAMER)
-	@${CAT} ${FILESDIR}/pkg-message-phonon-gstreamer >> ${PKGMESSAGE}
+.if ! ${PORT_OPTIONS:MGSTREAMER}
+	@${CAT} ${FILESDIR}/pkg-message.gstreamer >> ${PKGMESSAGE}
 .endif
 	@${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}