Make sure that configure finds the correct app-defaults directory.

3 files changed, 155 insertions, 6 deletions

diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index c9adf8c9600..4f34f61746c 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2005/09/11 16:55:38 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.33 2005/09/18 19:16:49 minskim Exp $
 #
 # This Makefile.common is included by:
 #
@@ -35,6 +35,7 @@ PKG_OPTIONS_LEGACY_VARS+=XLOCK_NO_DPMS:-xlockmore-dpms
 .include "../../mk/bsd.options.mk"
 
 USE_LANGUAGES=		c c++
+USE_TOOLS+=		xmkmf
 USE_X11BASE=		YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index c6b231a877e..b27c245eef3 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.29 2005/09/04 17:37:23 hubertf Exp $
+$NetBSD: distinfo,v 1.30 2005/09/18 19:16:49 minskim Exp $
 
 SHA1 (xlockmore-5.19.tar.bz2) = bd925bac3c8bfbe73eb7023bed1c7d8864ff73aa
 RMD160 (xlockmore-5.19.tar.bz2) = cc28e93757574d505bce6c4de344734797287be0
 Size (xlockmore-5.19.tar.bz2) = 1749886 bytes
 SHA1 (patch-aa) = 98243d9a615d3f44b6e3aab71388acb72b96d383
-SHA1 (patch-ab) = 31eda5e02bd96e6abbff274a62b2136197ad67fc
+SHA1 (patch-ab) = 89f12f16e0756dd0eb1afc9df9bb175fd294e2f9
 SHA1 (patch-ac) = 1bcbf56cdb6709cf8f21855b141a4892a36751c1
diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab
index 96d230f1b8f..a4bfb81846e 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-ab
@@ -1,8 +1,156 @@
-$NetBSD: patch-ab,v 1.18 2005/06/07 23:35:16 hubertf Exp $
+$NetBSD: patch-ab,v 1.19 2005/09/18 19:16:49 minskim Exp $
 
---- configure.orig	2005-02-16 21:19:14.000000000 +0100
+--- configure.orig	2005-07-24 08:22:34.000000000 -0700
 +++ configure
-@@ -7856,7 +7856,7 @@ else
+@@ -6299,7 +6299,7 @@ else
+     # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+     cat > Imakefile <<'EOF'
+ acfindx:
+-  @echo 'ac_x_app_defaults="${XAPPLOADDIR}"'
++	@echo 'ac_x_app_defaults="${XAPPLOADDIR}"'
+ EOF
+     if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+       # GNU make sometimes prints "make[1]: Entering...", which'd confuse us.
+@@ -6308,138 +6308,6 @@ EOF
+     cd ..
+     rm -fr conftestdir
+   fi
+-        # Look for the directory under a standard set of common directories.
+-  # Check X11 before X11Rn because it's often a symlink to the current release.
+-  for ac_dir in         \
+-    /lib/X11/app-defaults \
+-    /lib/app-defaults \
+-    /lib/X11R6.5.1/app-defaults \
+-    /lib/X11R6.5.1/X11/app-defaults \
+-    /lib/X11R6.4/app-defaults \
+-    /lib/X11R6.4/X11/app-defaults \
+-    /lib/X11R6.3/app-defaults \
+-    /lib/X11R6.3/X11/app-defaults \
+-    /lib/X11R6.2/app-defaults \
+-    /lib/X11R6.2/X11/app-defaults \
+-    /lib/X11R6.1/app-defaults \
+-    /lib/X11R6.1/X11/app-defaults \
+-    /lib/X11R6/app-defaults \
+-    /lib/X11R6/X11/app-defaults \
+-    /lib/X11R5/app-defaults \
+-    /lib/X11R5/X11/app-defaults \
+-    /lib/X11R4/app-defaults \
+-    /lib/X11R4/X11/app-defaults \
+-    ; \
+-  do
+-    found=""
+-    if test -d "${prefix}$ac_dir"; then
+-      ac_x_app_defaults=\\\$\\\{prefix\\\}$ac_dir
+-    found="1"
+-      break
+-    fi
+-  done
+-  if test -z "$found"; then
+-  for ac_dir in         \
+-    /usr/X11/lib/app-defaults     \
+-    /lib/X11R6.5.1/lib/app-defaults \
+-    /lib/X11R6.5.1/lib/X11/app-defaults \
+-    /lib/X11R6.4/lib/app-defaults \
+-    /lib/X11R6.4/lib/X11/app-defaults \
+-    /usr/X11R6.3/lib/app-defaults     \
+-    /usr/X11R6.3/lib/X11/app-defaults   \
+-    /usr/X11R6.2/lib/app-defaults     \
+-    /usr/X11R6.2/lib/X11/app-defaults   \
+-    /usr/X11R6.1/lib/app-defaults     \
+-    /usr/X11R6.1/lib/X11/app-defaults   \
+-    /usr/X11R6/lib/app-defaults     \
+-    /usr/X11R6/lib/X11/app-defaults   \
+-    /usr/X11R5/lib/app-defaults     \
+-    /usr/X11R5/lib/X11/app-defaults   \
+-    /usr/X11R4/lib/app-defaults     \
+-    /usr/X11R4/lib/X11/app-defaults   \
+-            \
+-    /usr/lib/X11/app-defaults     \
+-    /usr/lib/X11R6.5.1/app-defaults \
+-    /usr/lib/X11R6.4/app-defaults \
+-    /usr/lib/X11R6.3/app-defaults     \
+-    /usr/lib/X11R6.2/app-defaults     \
+-    /usr/lib/X11R6.1/app-defaults     \
+-    /usr/lib/X11R6/app-defaults     \
+-    /usr/lib/X11R5/app-defaults     \
+-    /usr/lib/X11R4/app-defaults     \
+-            \
+-    /usr/local/X11/lib/app-defaults   \
+-    /usr/remote/X11/lib/app-defaults   \
+-    /usr/local/X11R6.5.1/lib/app-defaults   \
+-    /usr/local/X11R6.5.1/lib/X11/app-defaults   \
+-    /usr/local/X11R6.4/lib/app-defaults   \
+-    /usr/local/X11R6.4/lib/X11/app-defaults   \
+-    /usr/local/X11R6.3/lib/app-defaults   \
+-    /usr/local/X11R6.3/lib/X11/app-defaults   \
+-    /usr/local/X11R6.2/lib/app-defaults   \
+-    /usr/local/X11R6.2/lib/X11/app-defaults   \
+-    /usr/local/X11R6.1/lib/app-defaults   \
+-    /usr/local/X11R6.1/lib/X11/app-defaults   \
+-    /usr/local/X11R6/lib/app-defaults   \
+-    /usr/local/X11R6/lib/X11/app-defaults   \
+-    /usr/local/X11R5/lib/app-defaults   \
+-    /usr/local/X11R5/lib/X11/app-defaults   \
+-    /usr/local/X11R4/lib/app-defaults   \
+-    /usr/local/X11R4/lib/X11/app-defaults   \
+-            \
+-    /usr/local/lib/X11/app-defaults   \
+-    /usr/remote/lib/X11/app-defaults   \
+-    /usr/local/lib/X11R6.5.1/app-defaults   \
+-    /usr/local/lib/X11R6.5.1/X11/app-defaults \
+-    /usr/local/lib/X11R6.4/app-defaults   \
+-    /usr/local/lib/X11R6.4/X11/app-defaults \
+-    /usr/local/lib/X11R6.3/app-defaults   \
+-    /usr/local/lib/X11R6.3/X11/app-defaults \
+-    /usr/local/lib/X11R6.2/app-defaults   \
+-    /usr/local/lib/X11R6.2/X11/app-defaults \
+-    /usr/local/lib/X11R6.1/app-defaults   \
+-    /usr/local/lib/X11R6.1/X11/app-defaults \
+-    /usr/local/lib/X11R6/app-defaults   \
+-    /usr/local/lib/X11R6/X11/app-defaults \
+-    /usr/local/lib/X11R5/app-defaults   \
+-    /usr/local/lib/X11R5/X11/app-defaults \
+-    /usr/local/lib/X11R4/app-defaults   \
+-    /usr/local/lib/X11R4/X11/app-defaults \
+-            \
+-    /usr/X386/lib/X11/app-defaults    \
+-    /usr/x386/lib/X11/app-defaults    \
+-    /usr/XFree86/lib/X11/app-defaults   \
+-            \
+-    /usr/lib/X11/app-defaults     \
+-    /usr/unsupported/lib/X11/app-defaults \
+-    /usr/athena/lib/X11/app-defaults    \
+-    /usr/local/x11r5/lib/X11/app-defaults \
+-    /usr/lpp/Xamples/lib/X11/app-defaults \
+-    /lib/usr/lib/X11/app-defaults   \
+-    /usr/local/lib/app-defaults   \
+-    /usr/remote/lib/app-defaults   \
+-            \
+-    /usr/openwin/lib/app-defaults   \
+-    /usr/openwin/lib/X11/app-defaults   \
+-    /usr/openwin/share/lib/app-defaults   \
+-    /usr/openwin/share/lib/X11/app-defaults \
+-            \
+-    /X11R6.5.1/lib/app-defaults   \
+-    /X11R6.4/lib/app-defaults     \
+-    /X11R6.3/lib/app-defaults     \
+-    /X11R6.2/lib/app-defaults     \
+-    /X11R6.1/lib/app-defaults     \
+-    /X11R6/lib/app-defaults     \
+-    /X11R5/lib/app-defaults     \
+-    /X11R4/lib/app-defaults     \
+-    ; \
+-  do
+-    if test -d "$ac_dir"; then
+-      ac_x_app_defaults=$ac_dir
+-      break
+-    fi
+-  done
+-    fi
+ 
+       if test x"$ac_x_app_defaults" = x; then
+         ac_cv_x_app_defaults="/usr/lib/X11/app-defaults"
+@@ -8364,7 +8232,7 @@ else
  #define USE_GL 1
  _ACEOF