summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/xfce4-mixer/Makefile15
-rw-r--r--audio/xfce4-mixer/PLIST78
-rw-r--r--audio/xfce4-mixer/buildlink3.mk13
-rw-r--r--audio/xfce4-mixer/distinfo8
-rw-r--r--audio/xfce4-xmms-plugin/Makefile12
-rw-r--r--audio/xfce4-xmms-plugin/PLIST22
-rw-r--r--audio/xfce4-xmms-plugin/buildlink3.mk16
-rw-r--r--audio/xfce4-xmms-plugin/distinfo9
-rw-r--r--audio/xfce4-xmms-plugin/patches/patch-panel-plugin_Makefile.in32
9 files changed, 101 insertions, 104 deletions
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 78ae84fb572..4bfdabbbfe1 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.49 2014/05/05 00:47:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.50 2015/04/21 08:56:37 jperkin Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-DISTNAME= xfce4-mixer-${XFCE4_VERSION}
-PKGREVISION= 21
+DISTNAME= xfce4-mixer-4.11.0
CATEGORIES= audio
COMMENT= Xfce mixer plugin
+MASTER_SITES= http://archive.xfce.org/src/apps/xfce4-mixer/4.11/
-BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.14
+BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.25
-.include "../../devel/xfconf/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libxfce4gui/buildlink3.mk"
-.include "../../x11/libxfce4util/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xfce4-mixer/PLIST b/audio/xfce4-mixer/PLIST
index 97d28860b6d..fab67083bb3 100644
--- a/audio/xfce4-mixer/PLIST
+++ b/audio/xfce4-mixer/PLIST
@@ -1,77 +1,59 @@
-@comment $NetBSD: PLIST,v 1.19 2009/09/16 01:15:33 reed Exp $
+@comment $NetBSD: PLIST,v 1.20 2015/04/21 08:56:37 jperkin Exp $
bin/xfce4-mixer
-libexec/xfce4/panel-plugins/xfce4-mixer-plugin
+lib/xfce4/panel/plugins/libmixer.la
+man/man1/xfce4-mixer.1
share/applications/xfce4-mixer.desktop
-share/locale/am/LC_MESSAGES/xfce4-mixer.mo
share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ast/LC_MESSAGES/xfce4-mixer.mo
+share/locale/bg/LC_MESSAGES/xfce4-mixer.mo
share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
share/locale/cs/LC_MESSAGES/xfce4-mixer.mo
share/locale/da/LC_MESSAGES/xfce4-mixer.mo
share/locale/de/LC_MESSAGES/xfce4-mixer.mo
+share/locale/el/LC_MESSAGES/xfce4-mixer.mo
+share/locale/en_AU/LC_MESSAGES/xfce4-mixer.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo
share/locale/es/LC_MESSAGES/xfce4-mixer.mo
share/locale/eu/LC_MESSAGES/xfce4-mixer.mo
share/locale/fi/LC_MESSAGES/xfce4-mixer.mo
share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
share/locale/gl/LC_MESSAGES/xfce4-mixer.mo
+share/locale/hr/LC_MESSAGES/xfce4-mixer.mo
share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
share/locale/id/LC_MESSAGES/xfce4-mixer.mo
+share/locale/is/LC_MESSAGES/xfce4-mixer.mo
share/locale/it/LC_MESSAGES/xfce4-mixer.mo
share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
+share/locale/kk/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ko/LC_MESSAGES/xfce4-mixer.mo
+share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
+share/locale/lv/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
share/locale/nb/LC_MESSAGES/xfce4-mixer.mo
share/locale/nl/LC_MESSAGES/xfce4-mixer.mo
+share/locale/nn/LC_MESSAGES/xfce4-mixer.mo
+share/locale/oc/LC_MESSAGES/xfce4-mixer.mo
share/locale/pl/LC_MESSAGES/xfce4-mixer.mo
share/locale/pt/LC_MESSAGES/xfce4-mixer.mo
share/locale/pt_BR/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ro/LC_MESSAGES/xfce4-mixer.mo
share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
share/locale/si/LC_MESSAGES/xfce4-mixer.mo
+share/locale/sk/LC_MESSAGES/xfce4-mixer.mo
+share/locale/sr/LC_MESSAGES/xfce4-mixer.mo
share/locale/sv/LC_MESSAGES/xfce4-mixer.mo
+share/locale/th/LC_MESSAGES/xfce4-mixer.mo
share/locale/tr/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ug/LC_MESSAGES/xfce4-mixer.mo
share/locale/uk/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ur/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-mixer.mo
+share/locale/vi/LC_MESSAGES/xfce4-mixer.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo
+share/locale/zh_HK/LC_MESSAGES/xfce4-mixer.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
share/pixmaps/xfce4-mixer/chain-broken.png
share/pixmaps/xfce4-mixer/chain.png
-share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-muted.png
-share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-no-muted.png
-share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-no-record.png
-share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-record.png
-share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-high.png
-share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-low-medium.png
-share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-low.png
-share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-medium.png
-share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-muted.png
-share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-ultra-low.png
-share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-very-high.png
-share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-muted.png
-share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-no-muted.png
-share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-no-record.png
-share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-record.png
-share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-high.png
-share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-low-medium.png
-share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-low.png
-share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-medium.png
-share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-muted.png
-share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-ultra-low.png
-share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-very-high.png
-share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-muted.png
-share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-no-muted.png
-share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-no-record.png
-share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-record.png
-share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-high.png
-share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-low-medium.png
-share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-low.png
-share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-medium.png
-share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-muted.png
-share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-ultra-low.png
-share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-very-high.png
-share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-muted.svg
-share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-no-muted.svg
-share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-no-record.svg
-share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-record.svg
-share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-high.svg
-share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-low-medium.svg
-share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-low.svg
-share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-medium.svg
-share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-muted.svg
-share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-ultra-low.svg
-share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-very-high.svg
-share/xfce4/panel-plugins/xfce4-mixer-plugin.desktop
+share/xfce4-mixer/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+share/xfce4-mixer/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
+share/xfce4/panel/plugins/mixer.desktop
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
deleted file mode 100644
index 05985e5971a..00000000000
--- a/audio/xfce4-mixer/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.25 2009/09/16 01:15:33 reed Exp $
-
-BUILDLINK_TREE+= xfce4-mixer
-
-.if !defined(XFCE4_MIXER_BUILDLINK3_MK)
-XFCE4_MIXER_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.6.0
-BUILDLINK_PKGSRCDIR.xfce4-mixer?= ../../audio/xfce4-mixer
-
-.endif # XFCE4_MIXER_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -xfce4-mixer
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index 7b5830076b0..55db003bc77 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2009/09/16 01:15:33 reed Exp $
+$NetBSD: distinfo,v 1.19 2015/04/21 08:56:37 jperkin Exp $
-SHA1 (xfce4-mixer-4.6.1.tar.bz2) = e86163782fc4fc31671c7cb212d23d34106ad3af
-RMD160 (xfce4-mixer-4.6.1.tar.bz2) = 1fd6c450967a87c28082f960de3659633b876efe
-Size (xfce4-mixer-4.6.1.tar.bz2) = 412483 bytes
+SHA1 (xfce4-mixer-4.11.0.tar.bz2) = c7829f85552d210c62c76fce274e07f7ae7b2565
+RMD160 (xfce4-mixer-4.11.0.tar.bz2) = e02644086898f39ef069b5be591355983106b434
+Size (xfce4-mixer-4.11.0.tar.bz2) = 472235 bytes
diff --git a/audio/xfce4-xmms-plugin/Makefile b/audio/xfce4-xmms-plugin/Makefile
index de058df9d15..7ef330745a5 100644
--- a/audio/xfce4-xmms-plugin/Makefile
+++ b/audio/xfce4-xmms-plugin/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.37 2014/05/05 00:47:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2015/04/21 08:56:37 jperkin Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.5.1
-
-DISTNAME= xfce4-xmms-plugin-${XFCE4_VERSION}
-PKGREVISION= 22
+DISTNAME= xfce4-xmms-plugin-0.5.3
CATEGORIES= audio
-MASTER_SITES= http://goodies.xfce.org/releases/xfce4-xmms-plugin/
+MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-xmms-plugin/0.5/
+
+HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-xmms-plugin
COMMENT= Xfce XMMS plugin
.include "../../audio/bmp/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xfce4-xmms-plugin/PLIST b/audio/xfce4-xmms-plugin/PLIST
index 2adfa81139f..1674a509a06 100644
--- a/audio/xfce4-xmms-plugin/PLIST
+++ b/audio/xfce4-xmms-plugin/PLIST
@@ -1,18 +1,34 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:32:24 joerg Exp $
-libexec/xfce4/panel-plugins/xfce4-xmms-plugin
+@comment $NetBSD: PLIST,v 1.7 2015/04/21 08:56:37 jperkin Exp $
+libexec/xfce4/panel/plugins/xfce4-xmms-plugin
+share/locale/ar/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/ast/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/ca/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/cs/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/da/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/de/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/es/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/eu/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/fr/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/hu/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/id/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/it/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/ja/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/ko/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/lt/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/lv/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/pl/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/pt/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/sv/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/tr/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/uk/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/ur/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/vi/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/xfce4/panel-plugins/xfce4-xmms-plugin.desktop
+share/locale/zh_CN/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/xfce4/panel/plugins/xfce4-xmms-plugin.desktop
share/xfce4/xfce4-xmms-plugin/xmms-plugin-menu.png
share/xfce4/xfce4-xmms-plugin/xmms-plugin-next.png
share/xfce4/xfce4-xmms-plugin/xmms-plugin-pause.png
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
deleted file mode 100644
index 1c6e1c7b0bc..00000000000
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.40 2014/05/05 00:47:39 ryoon Exp $
-
-BUILDLINK_TREE+= xfce4-xmms-plugin
-
-.if !defined(XFCE4_XMMS_PLUGIN_BUILDLINK3_MK)
-XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+= xfce4-xmms-plugin>=0.5.1
-BUILDLINK_ABI_DEPENDS.xfce4-xmms-plugin+= xfce4-xmms-plugin>=0.5.1nb22
-BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?= ../../audio/xfce4-xmms-plugin
-
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.endif # XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -xfce4-xmms-plugin
diff --git a/audio/xfce4-xmms-plugin/distinfo b/audio/xfce4-xmms-plugin/distinfo
index 5ed7c13de66..49f152163c9 100644
--- a/audio/xfce4-xmms-plugin/distinfo
+++ b/audio/xfce4-xmms-plugin/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/04/12 09:55:08 martti Exp $
+$NetBSD: distinfo,v 1.6 2015/04/21 08:56:37 jperkin Exp $
-SHA1 (xfce4-xmms-plugin-0.5.1.tar.bz2) = 8fa306b003935d1c54ed078c5f18cb61513df682
-RMD160 (xfce4-xmms-plugin-0.5.1.tar.bz2) = 52ac130a300a9b3e79d103e51a56c7bee639270c
-Size (xfce4-xmms-plugin-0.5.1.tar.bz2) = 314121 bytes
+SHA1 (xfce4-xmms-plugin-0.5.3.tar.bz2) = 30bebf95c09aa57d77453209b0bf2d429307d7f2
+RMD160 (xfce4-xmms-plugin-0.5.3.tar.bz2) = a99f95524345cc643f44d64661c9232313836772
+Size (xfce4-xmms-plugin-0.5.3.tar.bz2) = 264326 bytes
+SHA1 (patch-panel-plugin_Makefile.in) = 87e3ac66ddd606bdc416508b298a8bced5e6cb20
diff --git a/audio/xfce4-xmms-plugin/patches/patch-panel-plugin_Makefile.in b/audio/xfce4-xmms-plugin/patches/patch-panel-plugin_Makefile.in
new file mode 100644
index 00000000000..7592de48c67
--- /dev/null
+++ b/audio/xfce4-xmms-plugin/patches/patch-panel-plugin_Makefile.in
@@ -0,0 +1,32 @@
+$NetBSD: patch-panel-plugin_Makefile.in,v 1.1 2015/04/21 08:56:37 jperkin Exp $
+
+Adjust config path.
+--- panel-plugin/Makefile.in.orig 2015-03-11 11:33:20.000000000 +0000
++++ panel-plugin/Makefile.in
+@@ -266,7 +266,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-plugindir = $(libexecdir)/xfce4/panel-plugins
++plugindir = $(libexecdir)/xfce4/panel/plugins
+ xfce4_xmms_plugin_SOURCES = \
+ xmms_plugin.h \
+ xmms_plugin.c \
+@@ -298,7 +298,7 @@ xfce4_xmms_plugin_LDADD = \
+
+ desktop_in_in_files = xfce4-xmms-plugin.desktop.in.in
+ desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+-desktopdir = $(datadir)/xfce4/panel-plugins
++desktopdir = $(datadir)/xfce4/panel/plugins
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ EXTRA_DIST = \
+ $(desktop_in_in_files)
+@@ -708,7 +708,7 @@ uninstall-am: uninstall-desktopDATA unin
+
+ # get full path into .desktop file
+ %.desktop.in: %.desktop.in.in
+- sed -e "s^@EXTERNAL_PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
++ sed -e "s^@EXTERNAL_PLUGIN_PATH@^$(libexecdir)/xfce4/panel/plugins^" \
+ $< > $@
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.