Honor PKG_SYSCONFDIR. Bump PKGREVISION to 1.

4 files changed, 25 insertions, 10 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 7b519914e6a..dce4aba0428 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/02/14 21:05:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/15 12:02:33 jmmv Exp $
 #
 
 DISTNAME=		gnome-panel-2.2.0.1
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -25,6 +26,15 @@ CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
+EGDIR=			${PREFIX}/share/examples/gnome-panel
+.if defined(PKG_SYSCONFDIR.libgnome)
+CONF_FILES=		${EGDIR}/sound/events/mailcheck2.soundlist \
+			${PKG_SYSCONFDIR.libgnome}/sound/events/mailcheck2.soundlist
+.else
+CONF_FILES=		${EGDIR}/sound/events/mailcheck2.soundlist \
+			${PKG_SYSCONFBASE}/sound/events/mailcheck2.soundlist
+.endif
+
 GCONF2_SCHEMAS= 	clock.schemas
 GCONF2_SCHEMAS+=	fish.schemas
 GCONF2_SCHEMAS+=	gnome-panel-screenshot.schemas
diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST
index f65c9f9077c..f06692ac0ae 100644
--- a/x11/gnome-panel/PLIST
+++ b/x11/gnome-panel/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/14 21:05:27 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/15 12:02:34 jmmv Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/gnome-panel-preferences
 bin/gnome2-panel-screenshot
 bin/panel-test-applets
-etc/sound/events/mailcheck2.soundlist
 include/panel-2.0/GNOME_Panel.h
 include/panel-2.0/panel-applet-gconf.h
 include/panel-2.0/panel-applet.h
@@ -37,6 +36,7 @@ share/doc/html/panel-applet/panel-signals.html
 share/doc/html/panel-applet/panelapplet.html
 share/doc/html/panel-applet/server-files.html
 share/doc/html/panel-applet/session-saving.html
+share/examples/gnome-panel/sound/events/mailcheck2.soundlist
 share/fish/fish.glade
 share/gconf/schemas/clock.schemas
 share/gconf/schemas/fish.schemas
@@ -178,9 +178,10 @@ share/pixmaps/mailcheck2/tux-anim.png
 @dirrm share/gen_util
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/fish
+@dirrm share/examples/gnome-panel/sound/events
+@dirrm share/examples/gnome-panel/sound
+@dirrm share/examples/gnome-panel
 @dirrm share/doc/html/panel-applet
 @comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
 @comment in bonobo-activation: @dirrm lib/bonobo/servers
 @dirrm include/panel-2.0
-@dirrm etc/sound/events
-@dirrm etc/sound
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index db3018d93ba..61271397449 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2003/02/14 21:05:27 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/02/15 12:02:34 jmmv Exp $
 
 SHA1 (gnome-panel-2.2.0.1.tar.bz2) = 5da094f37dfb5433bcd7eba42ceea9c86e11e586
 Size (gnome-panel-2.2.0.1.tar.bz2) = 1775486 bytes
 SHA1 (patch-ab) = 4673a6b83dc31e129e81419275fe3f60ad7b7eda
-SHA1 (patch-ac) = cab00f662f4a31bccfd673fa50489ba63fac4bc0
+SHA1 (patch-ac) = 01ee6684dca4076384c96d869e7e77ff68e55f2a
 SHA1 (patch-ad) = 137b18f7fcbebbe12126278e94c85a281a5d80ca
 SHA1 (patch-ae) = 0e2b0efbce597d5517b05216ed3eaaa5ae5b7351
 SHA1 (patch-af) = 78d8cecec09db1743b640b9b516033b1fc8f96d4
diff --git a/x11/gnome-panel/patches/patch-ac b/x11/gnome-panel/patches/patch-ac
index 469dc9b80b7..2dc0e202aa7 100644
--- a/x11/gnome-panel/patches/patch-ac
+++ b/x11/gnome-panel/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2003/02/14 21:05:28 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2003/02/15 12:02:34 jmmv Exp $
 
 --- applets/gen_util/Makefile.in.orig	2003-02-04 00:29:54.000000000 +0100
 +++ applets/gen_util/Makefile.in
-@@ -182,7 +182,7 @@ PRINTER_BITMAPS = print.xpm
+@@ -182,10 +182,10 @@ PRINTER_BITMAPS = print.xpm
  MAILCHECK_BITMAPS = email.png email-e.png tux-anim.png email-eclouds.png                     email-tiny.png eclouds.png
  
  
@@ -10,7 +10,11 @@ $NetBSD: patch-ac,v 1.2 2003/02/14 21:05:28 jmmv Exp $
 +mailcheckbitmapsdir = $(datadir)/pixmaps/mailcheck2
  mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS)
  
- soundlistdir = $(sysconfdir)/sound/events
+-soundlistdir = $(sysconfdir)/sound/events
++soundlistdir = $(datadir)/examples/gnome-panel/sound/events
+ soundlist_in_files = mailcheck.soundlist.in
+ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
+ 
 @@ -197,7 +197,7 @@ serverdir = $(libdir)/bonobo/servers
  server_in_files = GNOME_GenUtilApplet_Factory.server.in
  server_DATA = $(server_in_files:.server.in=.server)