$PKG_SYSCONFDIR support. Bump PKG_REVISION.

4 files changed, 25 insertions, 6 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index de16710a3d5..d2ae0f051ff 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2004/12/23 12:56:04 markd Exp $
+# $NetBSD: Makefile,v 1.21 2005/03/06 13:02:59 markd Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
@@ -11,9 +11,13 @@ DEPENDS+=	xine-arts>=1rc0a:../../audio/xine-arts
 
 USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
+USE_PKGINSTALL=		YES
 
 REPLACE_PERL=		kscd/workman2cddb.pl
 
+CONF_FILES+=		${PREFIX}/share/examples/kdemultimedia3/applications-merged/kde-multimedia-music.menu \
+			${PKG_SYSCONFDIR}/xdg/menus/applications-merged/kde-multimedia-music.menu
+
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-3.*)
 BUILDLINK_DEPENDS.xine-lib=	xine-lib>=1rc0anb1
diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST
index 98e2ab7af1e..20b93fea0c5 100644
--- a/multimedia/kdemultimedia3/PLIST
+++ b/multimedia/kdemultimedia3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2004/12/10 06:13:03 markd Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/03/06 13:02:59 markd Exp $
 bin/artsbuilder
 bin/artscontrol
 bin/juk
@@ -19,7 +19,6 @@ bin/yaf-splay
 bin/yaf-tplay
 bin/yaf-vorbis
 bin/yaf-yuv
-etc/xdg/menus/applications-merged/kde-multimedia-music.menu
 include/akode/akodelib.h
 include/akode/audiobuffer.h
 include/akode/audioconfiguration.h
@@ -526,6 +525,7 @@ share/doc/kde/HTML/en/kscd/kscd9.png
 share/doc/kde/HTML/en/noatun/common
 share/doc/kde/HTML/en/noatun/index.cache.bz2
 share/doc/kde/HTML/en/noatun/index.docbook
+share/examples/kdemultimedia3/applications-merged/kde-multimedia-music.menu
 share/kde/apps/artsbuilder/artsbuilderui.rc
 share/kde/apps/artsbuilder/examples/README
 share/kde/apps/artsbuilder/examples/example_adsr.arts
@@ -1175,6 +1175,8 @@ share/kde/servicetypes/krec_exportitem.desktop
 @dirrm share/kde/apps/artsbuilder/examples
 @dirrm share/kde/apps/artsbuilder
 @comment in kde: @dirrm share/kde/apps
+@dirrm share/examples/kdemultimedia3/applications-merged
+@dirrm share/examples/kdemultimedia3
 @dirrm share/doc/kde/HTML/en/noatun
 @dirrm share/doc/kde/HTML/en/kscd
 @dirrm share/doc/kde/HTML/en/krec
@@ -1215,4 +1217,3 @@ share/kde/servicetypes/krec_exportitem.desktop
 @dirrm include/libkcddb
 @comment in arts: @dirrm include/arts
 @dirrm include/akode
-@comment dirrm etc/xdg/menus/applications-merged
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index d09bd41113e..f094016384c 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/02/24 11:24:02 agc Exp $
+$NetBSD: distinfo,v 1.14 2005/03/06 13:02:59 markd Exp $
 
 SHA1 (kdemultimedia-3.3.2.tar.bz2) = 383515292f8c02df9a960a2e9c511aebacf13b78
 RMD160 (kdemultimedia-3.3.2.tar.bz2) = b41cfeb8b410e1da1fb128e928c8aecaf66c8b00
@@ -10,6 +10,7 @@ SHA1 (patch-ad) = 272548cfda5b9d8ea2fd16d7d490ef74a5c349e6
 SHA1 (patch-ae) = 3bede7137841708b43e63500972f4c4e84fcfedb
 SHA1 (patch-af) = 0336b3def99c649a635e6f5eb0cc962944e890b2
 SHA1 (patch-ag) = c9d1d9d3cf8f18ed9bc8c2054dc641af961d8fb1
+SHA1 (patch-ah) = e84b9dc302a5c8bb7259cd23343bfbc80c287cf2
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
diff --git a/multimedia/kdemultimedia3/patches/patch-ah b/multimedia/kdemultimedia3/patches/patch-ah
new file mode 100644
index 00000000000..7ce787450af
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/03/06 13:02:59 markd Exp $
+
+--- kappfinder-data/Makefile.in.orig	2004-11-30 04:21:02.000000000 +1300
++++ kappfinder-data/Makefile.in
+@@ -424,7 +424,7 @@ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+-xdg_menudir = @xdg_menudir@
++xdg_menudir = $(prefix)/share/examples/kdemultimedia3
+ xine_artsplugin_SUBDIR_included_FALSE = @xine_artsplugin_SUBDIR_included_FALSE@
+ xine_artsplugin_SUBDIR_included_TRUE = @xine_artsplugin_SUBDIR_included_TRUE@
+ kappfinder_multimedia_data_DATA = \