summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner>2011-01-25 19:00:29 +0000
committerdrochner <drochner>2011-01-25 19:00:29 +0000
commitd0a1316e2b1f7a5593218aa2efa25fdc58967199 (patch)
tree87dd3d91f2691813f4dbed901514a1284b8d2a45
parent1d83e3b0ccb405a59c8112b22433c4aad0f9befe (diff)
downloadpkgsrc-d0a1316e2b1f7a5593218aa2efa25fdc58967199.tar.gz
fix PLIST inconsistency if KDE is installed, from Mark Davies
-rw-r--r--multimedia/vlc/Makefile3
-rw-r--r--multimedia/vlc/PLIST8
2 files changed, 6 insertions, 5 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index b673375da8d..e9bd46833dd 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2011/01/24 18:54:04 drochner Exp $
+# $NetBSD: Makefile,v 1.103 2011/01/25 19:00:29 drochner Exp $
#
DISTNAME= vlc-${VLC_VERSION}
@@ -21,6 +21,7 @@ USE_TOOLS+= gmake perl pkg-config \
autoconf automake autoreconf
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-kde-solid=${PREFIX}/share/kde/apps/solid/actions
PTHREAD_OPTS+= require
USE_LANGUAGES= c99 c++
PLIST_VARS+= x86simd altivec v4l2 vcd cdda
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 922c1ad0a07..828d2e3261c 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2011/01/24 18:54:04 drochner Exp $
+@comment $NetBSD: PLIST,v 1.38 2011/01/25 19:00:29 drochner Exp $
bin/cvlc
bin/qvlc
bin/rvlc
@@ -356,9 +356,9 @@ share/icons/hicolor/32x32/apps/vlc.png
share/icons/hicolor/32x32/apps/vlc.xpm
share/icons/hicolor/48x48/apps/vlc-christmas.png
share/icons/hicolor/48x48/apps/vlc.png
-share/kde4/apps/solid/actions/vlc-opencda.desktop
-share/kde4/apps/solid/actions/vlc-opendvd.desktop
-share/kde4/apps/solid/actions/vlc-openvcd.desktop
+share/kde/apps/solid/actions/vlc-opencda.desktop
+share/kde/apps/solid/actions/vlc-opendvd.desktop
+share/kde/apps/solid/actions/vlc-openvcd.desktop
share/locale/af/LC_MESSAGES/vlc.mo
share/locale/ar/LC_MESSAGES/vlc.mo
share/locale/ast/LC_MESSAGES/vlc.mo