[kde-freebsd] area51/x11/kdelibs4: fix plist for 4.2.85

[Dima Panov]

Some updates for area51/x11/kdelibs4: 

* fix plist
* fix avahi-dnssd detection
* fix BDB detection
* fix libUtempter detection
* switch to qt-phonon

============
Index: x11/kdelibs4/pkg-plist
===================================================================
--- x11/kdelibs4/pkg-plist	(revision 4790)
+++ x11/kdelibs4/pkg-plist	(working copy)
@@ -343,7 +343,6 @@
 include/KDE/KFind
 include/KDE/KFindDialog
 include/KDE/KFloatValidator
-include/KDE/KFolderType
 include/KDE/KFontAction
 include/KDE/KFontChooser
 include/KDE/KFontComboBox
@@ -372,6 +371,7 @@
 include/KDE/KIEBookmarkImporter
 include/KDE/KIEBookmarkImporterImpl
 include/KDE/KIMProxy
+include/KDE/KIO/AccessManager
 include/KDE/KIO/AuthInfo
 include/KDE/KIO/ChmodJob
 include/KDE/KIO/Connection
@@ -456,6 +456,7 @@
 include/KDE/KMimeTypeResolver
 include/KDE/KMimeTypeTrader
 include/KDE/KMimeTypeValidator
+include/KDE/KModifierKeyInfo
 include/KDE/KMozillaBookmarkImporterImpl
 include/KDE/KMultiTabBar
 include/KDE/KMultiTabBarButton
@@ -762,6 +763,7 @@
 include/KDE/Plasma/Delegate
 include/KDE/Plasma/Dialog
 include/KDE/Plasma/Extender
+include/KDE/Plasma/ExtenderGroup
 include/KDE/Plasma/ExtenderItem
 include/KDE/Plasma/FlashingLabel
 include/KDE/Plasma/Frame
@@ -786,13 +788,16 @@
 include/KDE/Plasma/RunnerScript
 include/KDE/Plasma/ScriptEngine
 include/KDE/Plasma/ScrollBar
+include/KDE/Plasma/ScrollWidget
 include/KDE/Plasma/Service
 include/KDE/Plasma/ServiceJob
 include/KDE/Plasma/SignalPlotter
 include/KDE/Plasma/Slider
+include/KDE/Plasma/SpinBox
 include/KDE/Plasma/Svg
 include/KDE/Plasma/SvgWidget
 include/KDE/Plasma/TabBar
+include/KDE/Plasma/TextBrowser
 include/KDE/Plasma/TextEdit
 include/KDE/Plasma/Theme
 include/KDE/Plasma/ToolButton
@@ -800,6 +805,7 @@
 include/KDE/Plasma/ToolTipManager
 include/KDE/Plasma/TreeView
 include/KDE/Plasma/Version
+include/KDE/Plasma/VideoWidget
 include/KDE/Plasma/View
 include/KDE/Plasma/Wallpaper
 include/KDE/Plasma/WebView
@@ -826,6 +832,11 @@
 include/KDE/Solid/StorageAccess
 include/KDE/Solid/StorageDrive
 include/KDE/Solid/StorageVolume
+include/KDE/Sonnet/ConfigDialog
+include/KDE/Sonnet/ConfigWidget
+include/KDE/Sonnet/Dialog
+include/KDE/Sonnet/DictionaryComboBox
+include/KDE/Sonnet/Highlighter
 include/KDE/SshProcess
 include/KDE/StubProcess
 include/KDE/SuProcess
@@ -1031,6 +1042,7 @@
 include/kde3support_export.h
 include/kde_file.h
 include/kde_terminal_interface.h
+include/kde_terminal_interface_v2.h
 include/kdebug.h
 include/kdecore_export.h
 include/kdedmodule.h
@@ -1078,7 +1090,9 @@
 include/kfiledialog.h
 include/kfilefiltercombo.h
 include/kfileitem.h
+include/kfileitemactions.h
 include/kfileitemdelegate.h
+include/kfileitemlistproperties.h
 include/kfilemetainfo.h
 include/kfilemetainfoitem.h
 include/kfileplacesmodel.h
@@ -1137,6 +1151,7 @@
 include/kimproxy.h
 include/kimproxy_export.h
 include/kinputdialog.h
+include/kio/accessmanager.h
 include/kio/authinfo.h
 include/kio/chmodjob.h
 include/kio/connection.h
@@ -1157,6 +1172,7 @@
 include/kio/kio_export.h
 include/kio/kntlm.h
 include/kio/kntlm_export.h
+include/kio/ksslcertificatemanager.h
 include/kio/metainfojob.h
 include/kio/netaccess.h
 include/kio/passworddialog.h
@@ -1174,6 +1190,7 @@
 include/kio/slaveinterface.h
 include/kio/tcpslavebase.h
 include/kio/thumbcreator.h
+include/kio/thumbsequencecreator.h
 include/kio/udsentry.h
 include/kjob.h
 include/kjobtrackerinterface.h
@@ -1214,6 +1231,7 @@
 include/kmimetypechooser.h
 include/kmimetyperesolver.h
 include/kmimetypetrader.h
+include/kmodifierkeyinfo.h
 include/kmountpoint.h
 include/kmultitabbar.h
 include/knewpassworddialog.h
@@ -1366,6 +1384,7 @@
 include/ktabbar.h
 include/ktabwidget.h
 include/ktar.h
+include/ktcpsocket.h
 include/ktempdir.h
 include/ktemporaryfile.h
 include/ktextbrowser.h
@@ -1494,6 +1513,7 @@
 include/plasma/delegate.h
 include/plasma/dialog.h
 include/plasma/extender.h
+include/plasma/extendergroup.h
 include/plasma/extenderitem.h
 include/plasma/framesvg.h
 include/plasma/glapplet.h
@@ -1507,6 +1527,7 @@
 include/plasma/querymatch.h
 include/plasma/runnercontext.h
 include/plasma/runnermanager.h
+include/plasma/runnersyntax.h
 include/plasma/scripting/appletscript.h
 include/plasma/scripting/dataenginescript.h
 include/plasma/scripting/runnerscript.h
@@ -1533,13 +1554,17 @@
 include/plasma/widgets/pushbutton.h
 include/plasma/widgets/radiobutton.h
 include/plasma/widgets/scrollbar.h
+include/plasma/widgets/scrollwidget.h
 include/plasma/widgets/signalplotter.h
 include/plasma/widgets/slider.h
+include/plasma/widgets/spinbox.h
 include/plasma/widgets/svgwidget.h
 include/plasma/widgets/tabbar.h
+include/plasma/widgets/textbrowser.h
 include/plasma/widgets/textedit.h
 include/plasma/widgets/toolbutton.h
 include/plasma/widgets/treeview.h
+include/plasma/widgets/videowidget.h
 include/plasma/widgets/webview.h
 include/predicateproperties.h
 include/qtest_kde.h
@@ -1563,6 +1588,7 @@
 include/solid/powermanagement.h
 include/solid/predicate.h
 include/solid/processor.h
+include/solid/serialinterface.h
 include/solid/solid_export.h
 include/solid/solidnamespace.h
 include/solid/storageaccess.h
@@ -1617,7 +1643,6 @@
 lib/kde4/kspell_aspell.so
 lib/kde4/kspell_enchant.so
 lib/kde4/kspell_hspell.so
-lib/kde4/ktexteditor_docwordcompletion.so
 lib/kde4/ktexteditor_insertfile.so
 lib/kde4/ktexteditor_kdatatool.so
 lib/kde4/ktexteditor_python-encoding.so
@@ -1751,6 +1776,8 @@
 share/apps/LICENSES/LGPL_V2
 share/apps/LICENSES/LGPL_V3
 share/apps/LICENSES/QPL_V1.0
+share/apps/cmake/modules/CheckCXXSourceCompiles.cmake
+share/apps/cmake/modules/CheckCXXSourceRuns.cmake
 share/apps/cmake/modules/BasicFindPackageVersion.cmake.in
 share/apps/cmake/modules/CheckPointerMember.cmake
 share/apps/cmake/modules/CheckPrototypeExists.cmake
@@ -1785,6 +1812,7 @@
 share/apps/cmake/modules/FindGStreamer.cmake
 share/apps/cmake/modules/FindGettext.cmake
 share/apps/cmake/modules/FindGphoto2.cmake
+share/apps/cmake/modules/FindIOKit.cmake
 share/apps/cmake/modules/FindKDE4Internal.cmake
 share/apps/cmake/modules/FindKDE4Workspace.cmake
 share/apps/cmake/modules/FindKDEWIN32.cmake
@@ -1792,7 +1820,6 @@
 share/apps/cmake/modules/FindKNepomuk.cmake
 share/apps/cmake/modules/FindKdcraw.cmake
 share/apps/cmake/modules/FindKdeMultimedia.cmake
-share/apps/cmake/modules/FindKdepim.cmake
 share/apps/cmake/modules/FindKdepimLibs.cmake
 share/apps/cmake/modules/FindKexiv2.cmake
 share/apps/cmake/modules/FindKipi.cmake
@@ -1802,6 +1829,7 @@
 share/apps/cmake/modules/FindLCMS.cmake
 share/apps/cmake/modules/FindLibArt.cmake
 share/apps/cmake/modules/FindLibKonq.cmake
+share/apps/cmake/modules/FindLibLZMA.cmake
 share/apps/cmake/modules/FindLibPython.py
 share/apps/cmake/modules/FindLibXml2.cmake
 share/apps/cmake/modules/FindLibXslt.cmake
@@ -1817,10 +1845,12 @@
 share/apps/cmake/modules/FindOpenEXR.cmake
 share/apps/cmake/modules/FindOpenSSL.cmake
 share/apps/cmake/modules/FindPCRE.cmake
+share/apps/cmake/modules/FindPkgConfig.cmake
 share/apps/cmake/modules/FindPhonon.cmake
 share/apps/cmake/modules/FindPlasma.cmake
 share/apps/cmake/modules/FindPopplerQt4.cmake
 share/apps/cmake/modules/FindPostgreSQL.cmake
+share/apps/cmake/modules/FindPulseAudio.cmake
 share/apps/cmake/modules/FindPyKDE4.cmake
 share/apps/cmake/modules/FindPyKDE4.py
 share/apps/cmake/modules/FindPyQt.py
@@ -1845,7 +1875,7 @@
 share/apps/cmake/modules/FindXKB.cmake
 share/apps/cmake/modules/FindXine.cmake
 share/apps/cmake/modules/FindXmms.cmake
-share/apps/cmake/modules/KDE4CTestNightlySetup.cmake
+share/apps/cmake/modules/HandleImportedTargetsInCMakeRequiredLibraries.cmake
 share/apps/cmake/modules/KDE4Defaults.cmake
 share/apps/cmake/modules/KDE4Macros.cmake
 share/apps/cmake/modules/KDELibs4LibraryTargets-%%KDE4_BUILD_TYPE%%.cmake
@@ -1876,6 +1906,7 @@
 share/apps/cmake/modules/check_installed_exports_file.cmake
 share/apps/cmake/modules/cmake-modules-styleguide.txt
 share/apps/cmake/modules/config-alsa.h.cmake
+share/apps/cmake/modules/create_exe_symlink.cmake
 share/apps/cmake/modules/kde4_cmake_uninstall.cmake.in
 share/apps/cmake/modules/kde4_exec_via_sh.cmake
 share/apps/cmake/modules/kde4automoc.files.in
@@ -1904,10 +1935,12 @@
 share/apps/katepart/syntax/asm6502.xml
 share/apps/katepart/syntax/asn1.xml
 share/apps/katepart/syntax/asp.xml
+share/apps/katepart/syntax/asterisk.xml
 share/apps/katepart/syntax/awk.xml
 share/apps/katepart/syntax/bash.xml
 share/apps/katepart/syntax/bibtex.xml
 share/apps/katepart/syntax/bmethod.xml
+share/apps/katepart/syntax/boo.xml
 share/apps/katepart/syntax/c.xml
 share/apps/katepart/syntax/cg.xml
 share/apps/katepart/syntax/cgis.xml
@@ -1972,6 +2005,7 @@
 share/apps/katepart/syntax/literate-haskell.xml
 share/apps/katepart/syntax/logtalk.xml
 share/apps/katepart/syntax/lpc.xml
+share/apps/katepart/syntax/lsl.xml
 share/apps/katepart/syntax/lua.xml
 share/apps/katepart/syntax/m3u.xml
 share/apps/katepart/syntax/mab.xml
@@ -2062,6 +2096,8 @@
 share/apps/kconf_update/kio_help.upd
 share/apps/kconf_update/kioslave.upd
 share/apps/kconf_update/move_kio_help_cache.sh
+share/apps/kconf_update/plasma_popupapplet_fix_groups.pl
+share/apps/kconf_update/plasma_popupapplet_fix_groups.upd
 share/apps/kconf_update/proxytype.pl
 share/apps/kconf_update/useragent.pl
 share/apps/kdeui/about/bar-bottom-left.png
@@ -2144,7 +2180,6 @@
 share/apps/kjava/kjava.jar
 share/apps/kjava/kjava.policy
 share/apps/kjava/pluginsinfo
-share/apps/knewstuff/pics/ghns.png
 share/apps/knewstuff/pics/ghns_star.png
 share/apps/knewstuff/pics/ghns_star_gray.png
 share/apps/knewstuff/pics/thumb_frame.png
@@ -2572,6 +2607,24 @@
 share/apps/ksgmltools2/customization/lt/lang.entities
 share/apps/ksgmltools2/customization/lt/strings.entities
 share/apps/ksgmltools2/customization/lt/user.entities
+share/apps/ksgmltools2/customization/nds/catalog.xml
+share/apps/ksgmltools2/customization/nds/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/nds/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/nds/entities/help-menu.docbook
+share/apps/ksgmltools2/customization/nds/entities/install-compile.docbook
+share/apps/ksgmltools2/customization/nds/entities/install-intro.docbook
+share/apps/ksgmltools2/customization/nds/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/nds/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/nds/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/nds/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/nds/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/nds/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/nds/entities/underLGPL.docbook
+share/apps/ksgmltools2/customization/nds/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/nds/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/nds/lang.entities
+share/apps/ksgmltools2/customization/nds/strings.entities
+share/apps/ksgmltools2/customization/nds/user.entities
 share/apps/ksgmltools2/customization/nl/catalog.xml
 share/apps/ksgmltools2/customization/nl/entities/fdl-notice.docbook
 share/apps/ksgmltools2/customization/nl/entities/gpl-notice.docbook
@@ -2641,7 +2694,6 @@
 share/apps/ksgmltools2/customization/pl/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/pl/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/pl/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/pl/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/pl/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/pl/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/pl/lang.entities
@@ -2910,6 +2962,7 @@
 share/apps/ksgmltools2/customization/xsl/it.xml
 share/apps/ksgmltools2/customization/xsl/ja.xml
 share/apps/ksgmltools2/customization/xsl/ko.xml
+share/apps/ksgmltools2/customization/xsl/nds.xml
 share/apps/ksgmltools2/customization/xsl/nl.xml
 share/apps/ksgmltools2/customization/xsl/nn.xml
 share/apps/ksgmltools2/customization/xsl/no.xml
@@ -3077,9 +3130,10 @@
 share/apps/ksgmltools2/docbook/xsl/common/la.xml
 share/apps/ksgmltools2/docbook/xsl/common/labels.xsl
 share/apps/ksgmltools2/docbook/xsl/common/lt.xml
+share/apps/ksgmltools2/docbook/xsl/common/nb.xml
+share/apps/ksgmltools2/docbook/xsl/common/nds.xml
 share/apps/ksgmltools2/docbook/xsl/common/nl.xml
 share/apps/ksgmltools2/docbook/xsl/common/nn.xml
-share/apps/ksgmltools2/docbook/xsl/common/no.xml
 share/apps/ksgmltools2/docbook/xsl/common/olink.xsl
 share/apps/ksgmltools2/docbook/xsl/common/pi.xsl
 share/apps/ksgmltools2/docbook/xsl/common/pl.xml
@@ -3630,7 +3684,6 @@
 share/apps/ksgmltools2/docbook/xsl/params/xref.title-page.separator.xml
 share/apps/ksgmltools2/docbook/xsl/params/xref.with.number.and.title.xml
 share/apps/kssl/ca-bundle.crt
-share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc
 share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
 share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc
 share/apps/nepomuk/pics/rating.png
@@ -3657,6 +3710,7 @@
 share/dbus-1/interfaces/org.kde.KIMIface.xml
 share/dbus-1/interfaces/org.kde.KLauncher.xml
 share/dbus-1/interfaces/org.kde.KMediaPlayer.xml
+share/dbus-1/interfaces/org.kde.KPasswdServer.xml
 share/dbus-1/interfaces/org.kde.KSpeech.xml
 share/dbus-1/interfaces/org.kde.KWallet.xml
 share/dbus-1/interfaces/org.kde.Solid.Networking.Client.xml
@@ -3774,8 +3828,6 @@
 share/kde4/services/kspell_aspell.desktop
 share/kde4/services/kspell_enchant.desktop
 share/kde4/services/kspell_hspell.desktop
-share/kde4/services/ktexteditor_docwordcompletion.desktop
-share/kde4/services/ktexteditor_docwordcompletion_config.desktop
 share/kde4/services/ktexteditor_insertfile.desktop
 share/kde4/services/ktexteditor_kdatatool.desktop
 share/kde4/services/ktexteditor_python-encoding.desktop
@@ -3845,6 +3897,7 @@
 share/kde4/servicetypes/kurifilterplugin.desktop
 share/kde4/servicetypes/plasma-animator.desktop
 share/kde4/servicetypes/plasma-applet.desktop
+share/kde4/servicetypes/plasma-applet-popupapplet.desktop
 share/kde4/servicetypes/plasma-containment.desktop
 share/kde4/servicetypes/plasma-dataengine.desktop
 share/kde4/servicetypes/plasma-packagestructure.desktop
@@ -3947,6 +4000,8 @@
 @dirrm share/apps/ksgmltools2/customization/nn
 @dirrm share/apps/ksgmltools2/customization/nl/entities
 @dirrm share/apps/ksgmltools2/customization/nl
+ at dirrm share/apps/ksgmltools2/customization/nds/entities
+ at dirrm share/apps/ksgmltools2/customization/nds
 @dirrm share/apps/ksgmltools2/customization/lt/entities
 @dirrm share/apps/ksgmltools2/customization/lt
 @dirrm share/apps/ksgmltools2/customization/ko/entities
@@ -4037,6 +4092,7 @@
 @dirrm include/dnssd
 @dirrm include/KDE/khtml
 @dirrm include/KDE/ThreadWeaver
+ at dirrm include/KDE/Sonnet
 @dirrm include/KDE/Solid
 @dirrmtry include/KDE/Plasma
 @dirrm include/KDE/Nepomuk/Types
Index: x11/kdelibs4/Makefile
===================================================================
--- x11/kdelibs4/Makefile	(revision 4790)
+++ x11/kdelibs4/Makefile	(working copy)
@@ -31,20 +31,12 @@
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		idn:${PORTSDIR}/dns/libidn \
 		hal.1:${PORTSDIR}/sysutils/hal \
-		smbclient.0:${PORTSDIR}/net/samba-libsmbclient \
-		phonon.4:${PORTSDIR}/multimedia/phonon
+		smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		update-mime-database:${PORTSDIR}/misc/shared-mime-info \
 		iceauth:${PORTSDIR}/x11/iceauth \
 		xauth:${PORTSDIR}/x11/xauth
 
-.if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h) || defined(WITH_LIBDNS)
-LIB_DEPENDS+=	avahi-qt4:${PORTSDIR}/net/avahi-qt4 \
-		dns_sd:${PORTSDIR}/net/avahi-libdns
-.else
-LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
-.endif
-
 CONFLICTS=	kdebase-workspace-4.1.*
 
 LATEST_LINK=	${PORTNAME}4
@@ -54,9 +46,10 @@
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_OPENSSL=	yes
+USE_BDB=	40+
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib dbus gui network opengl qt3support \
-		qtestlib script sql svg xml designer \
+		qtestlib script sql svg xml designer phonon \
 		assistant svg qdbusviewer makeqpf imageformats \
 		qmake_build moc_build rcc_build uic_build
 USE_GNOME=	libxml2 libxslt
@@ -64,7 +57,19 @@
 
 CMAKE_ARGS+=	-DWITH_FAM:BOOL=Off \
 		-DKDE4_PREFIX:String=${KDE4_PREFIX}
+CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include"
+CMAKE_ARGS+=	-DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib"
+CMAKE_ARGS+=	-DCMAKE_SHARED_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h) || defined(WITH_LIBDNS)
+LIB_DEPENDS+=	avahi-qt4:${PORTSDIR}/net/avahi-qt4 \
+		dns_sd:${PORTSDIR}/net/avahi-libdns
+.else
+LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
+.endif
+
 MAN1=	checkXML.1 \
 	kde4-config.1 \
 	kdecmake.1 \
@@ -86,6 +91,12 @@
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/../cmake/modules/*.cmake
+	${REINPLACE_CMD} -e 's|/usr/local/include/db4|${BDB_INCLUDE_DIR}|' \
+			-e 's|NAMES db|NAMES ${BDB_LIB_NAME} ${LOCALBASE}/lib|' \
+		${WRKSRC}/../cmake/modules/FindBerkeleyDB.cmake
+	${REINPLACE_CMD} -e 's|addToUtmp ""|addToUtmp "${LOCALBASE}/lib"|' \
+			-e 's|utempter.h|${LOCALBASE}/include/utempter.h|' \
+		${WRKSRC}/../ConfigureChecks.cmake
 	#prevent updating mime during build
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \
 		${WRKSRC}/../mimetypes/CMakeLists.txt
@@ -96,4 +107,4 @@
 post-install:
 	@-update-mime-database ${PREFIX}/share/mime
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
============


-- 
Dmitry "Red Fox" Panov @ Home	                  FreeBSD since September, 1995
Khabarovsk, Russia       Skype:dima.panov | Jabber.org:fluffy.khv | ICQ:1745024