From 682879f1b2d8760c80e607d463c94ceaa4893598 Mon Sep 17 00:00:00 2001 From: zhuk Date: Mon, 16 Dec 2013 10:39:51 +0000 Subject: [PATCH] Move Kopete sounds to separate subpackages in KDE 3 and 4. This is a part of KDE deconflicting work. Tested in a bulk by landry@ --- meta/kde4/Makefile | 3 +- x11/kde/network3/Makefile | 39 +++++++++---- x11/kde/network3/pkg/DESCR-kopsounds | 1 + x11/kde/network3/pkg/{DESCR => DESCR-main} | 2 +- x11/kde/network3/pkg/PLIST-kopsounds | 10 ++++ x11/kde/network3/pkg/{PLIST => PLIST-main} | 7 +-- x11/kde4/kopete/Makefile | 68 +++++++++++++--------- x11/kde4/kopete/pkg/{DESCR => DESCR-main} | 0 x11/kde4/kopete/pkg/DESCR-sounds | 1 + x11/kde4/kopete/pkg/{PLIST => PLIST-main} | 7 +-- x11/kde4/kopete/pkg/PLIST-sounds | 10 ++++ 11 files changed, 96 insertions(+), 52 deletions(-) create mode 100644 x11/kde/network3/pkg/DESCR-kopsounds rename x11/kde/network3/pkg/{DESCR => DESCR-main} (84%) create mode 100644 x11/kde/network3/pkg/PLIST-kopsounds rename x11/kde/network3/pkg/{PLIST => PLIST-main} (99%) rename x11/kde4/kopete/pkg/{DESCR => DESCR-main} (100%) create mode 100644 x11/kde4/kopete/pkg/DESCR-sounds rename x11/kde4/kopete/pkg/{PLIST => PLIST-main} (99%) create mode 100644 x11/kde4/kopete/pkg/PLIST-sounds diff --git a/meta/kde4/Makefile b/meta/kde4/Makefile index b6e47681e3b..5e42e1c552a 100644 --- a/meta/kde4/Makefile +++ b/meta/kde4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2013/12/13 07:16:04 zhuk Exp $ +# $OpenBSD: Makefile,v 1.4 2013/12/16 10:39:52 zhuk Exp $ PKGNAME = kde4-${MODKDE4_VERSION} @@ -22,6 +22,7 @@ PKGNAME-toys = kdetoys-${MODKDE4_VERSION} REVISION-minimal = 0 REVISION-main = 0 +REVISION-network = 0 MAINTAINER = KDE porting team diff --git a/x11/kde/network3/Makefile b/x11/kde/network3/Makefile index 216afb60b57..4913fbeb950 100644 --- a/x11/kde/network3/Makefile +++ b/x11/kde/network3/Makefile @@ -1,31 +1,46 @@ -# $OpenBSD: Makefile,v 1.76 2013/10/22 11:34:06 zhuk Exp $ +# $OpenBSD: Makefile,v 1.77 2013/12/16 10:39:51 zhuk Exp $ -COMMENT = K Desktop Environment, network applications +COMMENT-main = K Desktop Environment, network applications +COMMENT-kopsounds = notification sounds for Kopete CATEGORIES = x11 x11/kde VERSION = 3.5.10 DISTNAME = kdenetwork-${VERSION} MODKDE_VERSION = 3.5.8 -PKGSPEC = kdenetwork->=3,<4 +PKGNAME-main = ${DISTNAME} +PKGNAME-kopsounds = kde3-kopete-sounds-${VERSION} +PKGSPEC-main = kdenetwork->=3,<4 +PKG_ARCH-kopsounds = * +REVISION-main = 12 + SHARED_LIBS += kopete 2.0 # .1.0 SHARED_LIBS += kopete_videodevice 1.0 # .0.0 SHARED_LIBS += kopete_msn_shared 1.0 # .0.0 SHARED_LIBS += kopete_oscar 3.0 # .2.0 SHARED_LIBS += rss 2.0 # .1.0 +MULTI_PACKAGES = -main -kopsounds + MODULES = x11/kde devel/gettext -RUN_DEPENDS += devel/desktop-file-utils \ - x11/gtk+2,-guic -LIB_DEPENDS = x11/kde/libs3 \ - audio/xmms \ - devel/libidn \ - net/meanwhile -RUN_DEPENDS += security/qca-tls +RUN_DEPENDS-kopsounds = +RUN_DEPENDS-main = ${RUN_DEPENDS} \ + kde3-kopete-sounds-*|kde4-kopete-sounds-*:${BUILD_PKGPATH},-kopsounds \ + devel/desktop-file-utils \ + security/qca-tls \ + x11/gtk+2,-guic + +LIB_DEPENDS-kopsounds = +LIB_DEPENDS-main = ${LIB_DEPENDS} \ + x11/kde/libs3 \ + audio/xmms \ + devel/libidn \ + net/meanwhile SEPARATE_BUILD = flavored -REVISION = 11 -WANTLIB = GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi Xinerama \ +WANTLIB-kopsounds = +WANTLIB-main = ${WANTLIB} \ + GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi Xinerama \ Xmu Xrandr Xrender Xss Xt Xtst Xxf86vm art_lgpl_2 c crypto drm expat \ fam fontconfig freetype gdk glib glib-2.0 gmodule gmodule-2.0 gtk idn \ jpeg lcms lib/kde3/DCOP lib/kde3/kabc lib/kde3/kdecore>=6 \ diff --git a/x11/kde/network3/pkg/DESCR-kopsounds b/x11/kde/network3/pkg/DESCR-kopsounds new file mode 100644 index 00000000000..39593bfbb06 --- /dev/null +++ b/x11/kde/network3/pkg/DESCR-kopsounds @@ -0,0 +1 @@ +Collection of sounds used for notifications in Kopete. diff --git a/x11/kde/network3/pkg/DESCR b/x11/kde/network3/pkg/DESCR-main similarity index 84% rename from x11/kde/network3/pkg/DESCR rename to x11/kde/network3/pkg/DESCR-main index 38698943340..1982194ce7e 100644 --- a/x11/kde/network3/pkg/DESCR +++ b/x11/kde/network3/pkg/DESCR-main @@ -2,7 +2,7 @@ KDE is a network transparent contemporary desktop environment for UNIX workstations. It was written by a world-wide network of software engineers committed to free software development. KDE seeks to fill the need for an easy to use desktop for Unix workstations, similar to -the desktop environments found under the MacOS or Window95/NT. +the desktop environments found under the MacOS or Window95/NT. This package holds some network applications: - ktalkd talk daemon diff --git a/x11/kde/network3/pkg/PLIST-kopsounds b/x11/kde/network3/pkg/PLIST-kopsounds new file mode 100644 index 00000000000..57898aa0220 --- /dev/null +++ b/x11/kde/network3/pkg/PLIST-kopsounds @@ -0,0 +1,10 @@ +@comment $OpenBSD: PLIST-kopsounds,v 1.1 2013/12/16 10:39:52 zhuk Exp $ +@conflict kdenetwork-<3.5.10p12 +@conflict kdenetwork->=4,<4.11 +@conflict kopete-<4.11.4p3 +@conflict kde4-kopete-sounds-* +@pkgpath x11/kde4/kopete,-sounds +share/sounds/Kopete_Event.ogg +share/sounds/Kopete_Received.ogg +share/sounds/Kopete_Sent.ogg +share/sounds/Kopete_User_is_Online.ogg diff --git a/x11/kde/network3/pkg/PLIST b/x11/kde/network3/pkg/PLIST-main similarity index 99% rename from x11/kde/network3/pkg/PLIST rename to x11/kde/network3/pkg/PLIST-main index e04d27efffd..ba63fef89a2 100644 --- a/x11/kde/network3/pkg/PLIST +++ b/x11/kde/network3/pkg/PLIST-main @@ -1,5 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.45 2013/10/22 11:34:06 zhuk Exp $ +@comment $OpenBSD: PLIST-main,v 1.1 2013/12/16 10:39:52 zhuk Exp $ @conflict sirc-* +@pkgpath x11/kde/network3 bin/dsirc @bin bin/feedbrowser @bin bin/kdict @@ -1916,10 +1917,6 @@ share/sounds/KGet_Added.ogg share/sounds/KGet_Finished.ogg share/sounds/KGet_Finished_All.ogg share/sounds/KGet_Started.ogg -share/sounds/Kopete_Event.ogg -share/sounds/Kopete_Received.ogg -share/sounds/Kopete_Sent.ogg -share/sounds/Kopete_User_is_Online.ogg share/sounds/ktalkd.wav @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database diff --git a/x11/kde4/kopete/Makefile b/x11/kde4/kopete/Makefile index 91d062e6df8..81ae33198f9 100644 --- a/x11/kde4/kopete/Makefile +++ b/x11/kde4/kopete/Makefile @@ -1,8 +1,12 @@ -# $OpenBSD: Makefile,v 1.4 2013/12/13 16:25:31 zhuk Exp $ +# $OpenBSD: Makefile,v 1.5 2013/12/16 10:39:52 zhuk Exp $ -COMMENT = multi-protocol instant messenger for KDE -DISTNAME = kopete-${MODKDE4_VERSION} -REVISION = 2 +COMMENT-main = multi-protocol instant messenger for KDE +COMMENT-sounds = notification sounds for Kopete +DISTNAME = kopete-${MODKDE4_VERSION} +PKGNAME-main = ${DISTNAME} +PKGNAME-sounds = kde4-kopete-sounds-${MODKDE4_VERSION} +PKG_ARCH-sounds = * +REVISION-main = 3 CATEGORIES = network HOMEPAGE = http://kopete.kde.org/ @@ -21,35 +25,43 @@ SHARED_LIBS += kopetecontactlist 51.0 # 1.0 SHARED_LIBS += kopetestatusmenu 51.0 # 1.0 SHARED_LIBS += qgroupwise 51.0 # 4.10 -WANTLIB = c m pthread stdc++ z -WANTLIB += ICE SM X11 Xext -WANTLIB += lib/qt4/Qt3Support lib/qt4/QtDBus lib/qt4/QtGui -WANTLIB += lib/qt4/QtNetwork lib/qt4/QtSql lib/qt4/QtSvg lib/qt4/QtXml -WANTLIB += ${KDE4LIB}/kabc ${KDE4LIB}/kcmutils ${KDE4LIB}/kde3support -WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kdnssd ${KDE4LIB}/kemoticons -WANTLIB += ${KDE4LIB}/khtml ${KDE4LIB}/kidletime ${KDE4LIB}/kio -WANTLIB += ${KDE4LIB}/kjs ${KDE4LIB}/knewstuff2 -WANTLIB += ${KDE4LIB}/knotifyconfig ${KDE4LIB}/kparts -WANTLIB += ${KDE4LIB}/kpimidentities ${KDE4LIB}/kprintutils -WANTLIB += ${KDE4LIB}/kresources ${KDE4LIB}/ktexteditor -WANTLIB += ${KDE4LIB}/kutils ${KDE4LIB}/nepomuk -WANTLIB += ${KDE4LIB}/nepomukutils ${KDE4LIB}/solid -WANTLIB += gadu glib-2.0 idn jasper jpeg meanwhile otr qca2 -WANTLIB += qimageblitz soprano xml2 xmms xslt +MULTI_PACKAGES = -main -sounds + +WANTLIB-sounds = +WANTLIB-main = ${WANTLIB} c m pthread stdc++ z +WANTLIB-main += ICE SM X11 Xext +WANTLIB-main += lib/qt4/Qt3Support lib/qt4/QtDBus lib/qt4/QtGui +WANTLIB-main += lib/qt4/QtNetwork lib/qt4/QtSql lib/qt4/QtSvg lib/qt4/QtXml +WANTLIB-main += ${KDE4LIB}/kabc ${KDE4LIB}/kcmutils ${KDE4LIB}/kde3support +WANTLIB-main += ${KDE4LIB}/kdeui ${KDE4LIB}/kdnssd ${KDE4LIB}/kemoticons +WANTLIB-main += ${KDE4LIB}/khtml ${KDE4LIB}/kidletime ${KDE4LIB}/kio +WANTLIB-main += ${KDE4LIB}/kjs ${KDE4LIB}/knewstuff2 +WANTLIB-main += ${KDE4LIB}/knotifyconfig ${KDE4LIB}/kparts +WANTLIB-main += ${KDE4LIB}/kpimidentities ${KDE4LIB}/kprintutils +WANTLIB-main += ${KDE4LIB}/kresources ${KDE4LIB}/ktexteditor +WANTLIB-main += ${KDE4LIB}/kutils ${KDE4LIB}/nepomuk +WANTLIB-main += ${KDE4LIB}/nepomukutils ${KDE4LIB}/solid +WANTLIB-main += gadu glib-2.0 idn jasper jpeg meanwhile otr qca2 +WANTLIB-main += qimageblitz soprano xml2 xmms xslt MODULES = multimedia/phonon MODKDE4_USE = pim -RUN_DEPENDS = devel/desktop-file-utils \ - x11/gtk+2,-guic +RUN_DEPENDS-sounds = +RUN_DEPENDS-main = ${RUN_DEPENDS} \ + kde4-kopete-sounds-*|kde3-kopete-sounds-*:${BASE_PKGPATH},-sounds \ + devel/desktop-file-utils \ + x11/gtk+2,-guic -LIB_DEPENDS = audio/xmms \ - devel/libidn \ - graphics/qimageblitz \ - net/libgadu \ - net/meanwhile \ - security/libotr>=4 \ - security/qca2 +LIB_DEPENDS-sounds = +LIB_DEPENDS-main = ${LIB_DEPENDS} \ + audio/xmms \ + devel/libidn \ + graphics/qimageblitz \ + net/libgadu \ + net/meanwhile \ + security/libotr>=4 \ + security/qca2 CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_LibV4L2:Bool=Yes \ -DMOZPLUGIN_INSTALL_DIR=${LOCALBASE}/lib/mozilla/plugins \ diff --git a/x11/kde4/kopete/pkg/DESCR b/x11/kde4/kopete/pkg/DESCR-main similarity index 100% rename from x11/kde4/kopete/pkg/DESCR rename to x11/kde4/kopete/pkg/DESCR-main diff --git a/x11/kde4/kopete/pkg/DESCR-sounds b/x11/kde4/kopete/pkg/DESCR-sounds new file mode 100644 index 00000000000..39593bfbb06 --- /dev/null +++ b/x11/kde4/kopete/pkg/DESCR-sounds @@ -0,0 +1 @@ +Collection of sounds used for notifications in Kopete. diff --git a/x11/kde4/kopete/pkg/PLIST b/x11/kde4/kopete/pkg/PLIST-main similarity index 99% rename from x11/kde4/kopete/pkg/PLIST rename to x11/kde4/kopete/pkg/PLIST-main index 956c9cacbea..29bac13468b 100644 --- a/x11/kde4/kopete/pkg/PLIST +++ b/x11/kde4/kopete/pkg/PLIST-main @@ -1,5 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.2 2013/12/13 16:25:31 zhuk Exp $ +@comment $OpenBSD: PLIST-main,v 1.1 2013/12/16 10:39:52 zhuk Exp $ @conflict kdenetwork-<4.11 +@pkgpath x11/kde4/kopete @bin bin/kopete bin/kopete_latexconvert.sh bin/winpopup-install @@ -919,10 +920,6 @@ share/kde4/services/xmpp.protocol share/kde4/servicetypes/kopeteplugin.desktop share/kde4/servicetypes/kopeteprotocol.desktop share/kde4/servicetypes/kopeteui.desktop -share/sounds/Kopete_Event.ogg -share/sounds/Kopete_Received.ogg -share/sounds/Kopete_Sent.ogg -share/sounds/Kopete_User_is_Online.ogg @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor diff --git a/x11/kde4/kopete/pkg/PLIST-sounds b/x11/kde4/kopete/pkg/PLIST-sounds new file mode 100644 index 00000000000..53f91fce492 --- /dev/null +++ b/x11/kde4/kopete/pkg/PLIST-sounds @@ -0,0 +1,10 @@ +@comment $OpenBSD: PLIST-sounds,v 1.1 2013/12/16 10:39:52 zhuk Exp $ +@conflict kdenetwork-<3.5.10p12 +@conflict kdenetwork->=4,<4.11 +@conflict kopete-<4.11.4p3 +@conflict kde3-kopete-sounds-* +@pkgpath x11/kde/network3,-kopsounds +share/sounds/Kopete_Event.ogg +share/sounds/Kopete_Received.ogg +share/sounds/Kopete_Sent.ogg +share/sounds/Kopete_User_is_Online.ogg