Honour PKG_SYSCONFDIR: the package was actually looking for files in

/usr/pkg/etc so I've changed this to sysconfdir; I'm not adding an extra
search path.

Also install default configuration files in place, so that this works out
of the box.  If they are not there, the window manager is unconfigured, and
things like window menus do not appear at all.

Bump PKGREVISION to 2.

4 files changed, 26 insertions, 28 deletions

diff --git a/wm/openbox/MESSAGE b/wm/openbox/MESSAGE
deleted file mode 100644
index ac05d37e9ac..00000000000
--- a/wm/openbox/MESSAGE
+++ /dev/null
@@ -1,20 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/12/20 04:20:32 xtraeme Exp $
-
-There are no default system-wide configuration files for this package.
-
-Examples of configuration files can be found in
-${PREFIX}/share/examples/openbox/
-
-Copy rc.xml and menu.xml to the desired location. This path must include a
-directory named openbox. For example: /usr/pkg/etc/openbox. Then set the
-environment variable XDG_CONFIG_DIRS in your shell's configuration files.
-If /usr/pkg/etc/openbox is where you want the openbox configuration files
-to go, then you would set XDG_CONFIG_DIRS to /usr/pkg/etc.
-
-See http://www.freedesktop.org/standards/basedir-spec/basedir-spec-0.6.html
-for more information.
-
-If you are not concerned with system-wide configuration, install wm/obconf
-and run it before you start openbox for the first time.
-===========================================================================
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 5fb68430d4a..9fac978b4e9 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/07 23:22:17 jmmv Exp $
 
 DISTNAME=	openbox-3.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	wm x11
 MASTER_SITES=	http://icculus.org/openbox/releases/
 
@@ -16,6 +16,7 @@ DEPENDS+=		vera-ttf>=1.10:../../fonts/vera-ttf
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
+USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 
@@ -23,6 +24,14 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/parser/obparser-3.0.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/render/obrender-3.0.pc.in
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+PKG_SYSCONFSUBDIR=	xdg
+OWN_DIRS=		${PKG_SYSCONFDIR}/openbox
+
+EGDIR=			${PREFIX}/share/examples/openbox
+CONF_FILES=		${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml
+CONF_FILES+=		${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml
+
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
diff --git a/wm/openbox/distinfo b/wm/openbox/distinfo
index 6cf147640d0..48fe45b8970 100644
--- a/wm/openbox/distinfo
+++ b/wm/openbox/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/12/23 08:34:36 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2004/02/07 23:22:17 jmmv Exp $
 
 SHA1 (openbox-3.1.tar.gz) = 9dc134c52717931d59d64db68cc4c7418ced9468
 Size (openbox-3.1.tar.gz) = 550425 bytes
-SHA1 (patch-aa) = 41cc531d21ac23814d33b20ec754784396fe2b05
+SHA1 (patch-aa) = 8ef551974b465a55e56d635df1f0e449250c579f
diff --git a/wm/openbox/patches/patch-aa b/wm/openbox/patches/patch-aa
index 6be57cf213e..68672ccf246 100644
--- a/wm/openbox/patches/patch-aa
+++ b/wm/openbox/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2003/12/18 09:57:27 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2004/02/07 23:22:17 jmmv Exp $
 
---- Makefile.in.orig	2003-10-27 12:47:51.000000000 -0800
-+++ Makefile.in	2003-11-11 14:29:45.000000000 -0800
-@@ -2725,12 +2725,12 @@
+--- Makefile.in.orig	2003-12-22 20:54:44.000000000 +0100
++++ Makefile.in
+@@ -183,7 +183,7 @@ SUBDIRS = m4 po
+ 
+ themedir = $(datadir)/themes
+ localedir = $(datadir)/locale
+-configdir = $(sysconfdir)/xdg
++configdir = $(sysconfdir)
+ rcdir = $(configdir)/openbox
+ desktopfilesdir = $(datadir)/gnome/wm-properties
+ pkgconfigdir = $(libdir)/pkgconfig
+@@ -2725,12 +2725,12 @@ uninstall-nodist_pkgconfigDATA:
  nodist_rcDATA_INSTALL = $(INSTALL_DATA)
  install-nodist_rcDATA: $(nodist_rc_DATA)
  	@$(NORMAL_INSTALL)