Fix wmakerconf so it can locate all files installed by WindowMaker in

non-standard locations (i.e., /usr/pkg/* and PKG_SYSCONFDIR).
Bump PKGREVISION to 3.

5 files changed, 92 insertions, 8 deletions

diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 2f257b89e94..aa8a0d8a8f8 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/05/02 11:56:38 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/06 16:21:26 jmmv Exp $
 #
 
 DISTNAME=	wmakerconf-2.8.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://ulli.on.openave.net/wmakerconf/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,6 +16,19 @@ USE_PKGLOCALEDIR=	yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 
+.if defined(PKG_SYSCONFDIR.windowmaker)
+CONFIGURE_ARGS+=	--with-wmakeretcprefix=${PKG_SYSCONFDIR.windowmaker}
+.else
+CONFIGURE_ARGS+=	--with-wmakeretcprefix=${PKG_SYSCONFDIR}/WindowMaker
+.endif
+
+post-extract:
+	${MV} ${WRKSRC}/data/WMWmakerconf ${WRKSRC}/data/WMWmakerconf.in
+
+pre-configure:
+	${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${WRKSRC}/data/WMWmakerconf.in \
+		> ${WRKSRC}/data/WMWmakerconf
+
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libproplist/buildlink2.mk"
 .include "../../graphics/imlib/buildlink2.mk"
diff --git a/wm/wmakerconf/distinfo b/wm/wmakerconf/distinfo
index 8689a269885..467c67aa418 100644
--- a/wm/wmakerconf/distinfo
+++ b/wm/wmakerconf/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/08/03 17:49:40 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/05/06 16:21:26 jmmv Exp $
 
 SHA1 (wmakerconf-2.8.1.tar.bz2) = 570021015265f3d44a144981e93ee6755ba9b943
 Size (wmakerconf-2.8.1.tar.bz2) = 446073 bytes
-SHA1 (patch-aa) = 5c7a45201acd8630e19ab186f8cf7ee532458310
+SHA1 (patch-aa) = 73bf90a8c009325cd0dfbccc673bc45a07ca008c
 SHA1 (patch-ab) = 5b65a4eb480eeec18d5ee8357d1741480c5a193b
+SHA1 (patch-ac) = 074c96d12f7fe4cf770e5dc973b380e29d9094ce
+SHA1 (patch-ad) = 3a56d3117d8eb6b473a9bc82387b350a42751907
diff --git a/wm/wmakerconf/patches/patch-aa b/wm/wmakerconf/patches/patch-aa
index 78c645cf6bf..a99a101168b 100644
--- a/wm/wmakerconf/patches/patch-aa
+++ b/wm/wmakerconf/patches/patch-aa
@@ -1,8 +1,34 @@
-$NetBSD: patch-aa,v 1.2 2001/08/03 17:49:40 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2003/05/06 16:21:26 jmmv Exp $
 
---- configure.orig	Fri Dec  3 16:34:48 1999
-+++ configure	Sun Jan  2 01:48:50 2000
-@@ -1212,8 +1212,8 @@
+--- configure.orig	2001-03-16 18:01:49.000000000 +0100
++++ configure
+@@ -18,7 +18,7 @@ ac_help="$ac_help
+        (e.g., PFX=/usr/share if the dir WindowMaker/Styles is part of this dir)"
+ ac_help="$ac_help
+   --with-wmakeretcprefix=PFX Prefix to sysconfig files installed by Window Maker
+-       (e.g., PFX=/etc if the file WindowMaker/WindowMaker is part of this dir)"
++       (e.g., PFX=/etc if the file WindowMaker is part of this dir)"
+ ac_help="$ac_help
+   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
+ ac_help="$ac_help
+@@ -914,13 +914,13 @@ echo $ac_n "checking for Window Maker sy
+ echo "configure:915: checking for Window Maker sysconfig directory" >&5
+ if test ! -r "$wmakeretcprefix/WindowMaker/WindowMaker"; then
+         echo "$ac_t""missing" 1>&6
+-        echo "configure: warning: file WindowMaker not found in $wmakeretcprefix/WindowMaker.
++        echo "configure: warning: file WindowMaker not found in $wmakeretcprefix.
+ Use option --with-wmakeretcprefix=PFX to find Window Maker sysconfig directory" 1>&2
+ else
+-        echo "$ac_t""$wmakeretcprefix/WindowMaker" 1>&6
++        echo "$ac_t""$wmakeretcprefix" 1>&6
+ fi
+ cat >> confdefs.h <<EOF
+-#define WMAKERDIR "$wmakeretcprefix/WindowMaker"
++#define WMAKERDIR "$wmakeretcprefix"
+ EOF
+ 
+ 
+@@ -1259,8 +1259,8 @@ if test "$x_libraries" != "NONE"; then
  fi
  
  # Add some common include and library path's
diff --git a/wm/wmakerconf/patches/patch-ac b/wm/wmakerconf/patches/patch-ac
new file mode 100644
index 00000000000..8107998f874
--- /dev/null
+++ b/wm/wmakerconf/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/05/06 16:21:26 jmmv Exp $
+
+--- src/rootmenu.c.orig	2000-09-25 20:15:24.000000000 +0200
++++ src/rootmenu.c
+@@ -471,7 +471,7 @@ real_rootmenu (GtkTooltips *tooltips, pr
+ 
+       if (!file)
+       {
+-	 file = fopen ("/etc/X11/WindowMaker/menu.hook", "r");
++	 file = fopen (WMAKERDIR "/menu.hook", "r");
+ 	 if (file)
+ 	 {
+ 	    debian_menu = YES;
diff --git a/wm/wmakerconf/patches/patch-ad b/wm/wmakerconf/patches/patch-ad
new file mode 100644
index 00000000000..7cbf88fea3f
--- /dev/null
+++ b/wm/wmakerconf/patches/patch-ad
@@ -0,0 +1,30 @@
+$NetBSD: patch-ad,v 1.1 2003/05/06 16:21:26 jmmv Exp $
+
+--- data/WMWmakerconf.in.orig	2001-03-16 18:07:08.000000000 +0100
++++ data/WMWmakerconf.in
+@@ -553,6 +553,8 @@
+       Default = (
+         "~/GNUstep/Library/WindowMaker/Pixmaps",
+         "~/GNUstep/Library/WindowMaker/Backgrounds",
++        "@PREFIX@/share/WindowMaker/Pixmaps",
++        "@PREFIX@/share/WindowMaker/Backgrounds",
+         "/usr/share/WindowMaker/Pixmaps",
+         "/usr/share/WindowMaker/Backgrounds",
+         "/usr/local/share/WindowMaker/Pixmaps",
+@@ -571,6 +573,8 @@
+       Default = (
+         "~/GNUstep/Library/Icons",
+         "~/GNUstep/Library/WindowMaker/Pixmaps",
++        "@PREFIX@/share/WindowMaker/Icons",
++        "@PREFIX@/share/WindowMaker/Pixmaps",
+         "/usr/share/WindowMaker/Icons",
+         "/usr/share/WindowMaker/Pixmaps",
+         "/usr/local/share/WindowMaker/Icons",
+@@ -587,6 +591,7 @@
+       Info = "Wmakerconf searches each of these paths in order for the list of available themes.";
+       Title = "Theme search paths";
+       Default = (
++        "@PREFIX@/share/WindowMaker/Themes",
+         "/usr/share/WindowMaker/Themes",
+ 	"/usr/local/share/WindowMaker/Themes",
+         "~/GNUstep/Library/WindowMaker/Themes"