* exactly disable TTF detection.

* tell Mesa, XPM, Xinerama and XDPMS manually instead of fancy configure.
  Then those features are enabled with native X.

Those changes should resolve PR#40662.

Bump PKGREVISION.

4 files changed, 29 insertions, 156 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 189c563e489..a1067bf105d 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,11 +1,23 @@
-# $NetBSD: Makefile,v 1.84 2010/11/15 22:59:18 abs Exp $
+# $NetBSD: Makefile,v 1.85 2010/12/08 12:54:30 obache Exp $
 
 .include "Makefile.common"
-PKGREVISION=	3
+PKGREVISION=	4
 
 COMMENT=	Like the XLock session-locker/screensaver, but with more
 
-CONFIGURE_ARGS+=	--with-mesagl
+CONFIGURE_ARGS+=	--with-opengl
+CONFIGURE_ARGS+=	--with-mesa
+CONFIGURE_ARGS+=	--without-ttf
+XPM_ENV=	no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib
+CONFIGURE_ENV+=	ac_cv_path_xpm=${XPM_ENV:Q}
+OPENGL_ENV= 	no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
+CONFIGURE_ENV+=	ac_cv_path_opengl=${OPENGL_ENV:Q}
+MESA_ENV= 	no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
+CONFIGURE_ENV+=	ac_cv_path_mesa=${MESA_ENV:Q}
+#BUILDLINK_TRANSFORM+=	l:MesaGL:GL
+#BUILDLINK_TRANSFORM+=	l:MesaGLU:GLU
+XEXT_ENV=	no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xextproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib
+CONFIGURE_ENV+=	ac_cv_path_ext=${XEXT_ENV:Q}
 
 PLIST_SUBST+=    LITE=""
 
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index a2f18287965..0f14fa16c35 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.57 2009/11/02 11:51:43 asau Exp $
+# $NetBSD: Makefile.common,v 1.58 2010/12/08 12:54:30 obache Exp $
 #
 # This Makefile.common is included by:
 #
@@ -58,6 +58,7 @@ CONFIGURE_ARGS+=	--without-rplay
 CONFIGURE_ARGS+=	--without-nas
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--enable-appdefaultdir=${PREFIX}/lib/X11/app-defaults
+CONFIGURE_ENV+=		ac_cv_x_app_defaults=${PREFIX}/lib/X11/app-defaults
 
 .if ${OPSYS} == "NetBSD"
 XLOCK_AUDIOPLAY?=	/usr/bin/audioplay
@@ -66,6 +67,12 @@ CONFIGURE_ARGS+=	--enable-def-play=${XLOCK_AUDIOPLAY:Q}
 
 .if empty(PKG_OPTIONS:Mxlockmore-dpms)
 CONFIGURE_ARGS+=	--without-dpms
+.else
+.  if ${X11_TYPE} != "native" || !exists(${X11BASE}/lib${LIBABISUFFIX}/libXdpms.a)
+BUILDLINK_TRANSFORM+=	l:Xdpms:Xext
+.  endif
+DPMS_ENV=	no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xextproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib
+CONFIGURE_ENV+=		ac_cv_path_dpms=${DPMS_ENV:Q}
 .endif
 
 .if empty(PKG_OPTIONS:Mxlockmore-allow-root)
@@ -93,6 +100,9 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 
+XINERAMA_ENV=	no_xenerama= ac_xinerama_includes=${BUILDLINK_PREFIX.libXinerama}/include ac_xinerama_libraries=${BUILDLINK_PREFIX.libXinerama}/lib
+CONFIGURE_ENV+=	ac_cv_path_xinerama=${XINERAMA_ENV:Q}
+
 # Set the complete paths to the sound files and set the default xlock
 # mode/screensaver.
 #
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index c9a15334bdf..300f5dc667f 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.45 2009/10/25 22:54:03 tron Exp $
+$NetBSD: distinfo,v 1.46 2010/12/08 12:54:30 obache Exp $
 
 SHA1 (xlockmore-5.29.1.tar.bz2) = c6d0380a54e403dce4dfe6570d7c9d11363d2eea
 RMD160 (xlockmore-5.29.1.tar.bz2) = 8ade29e088de990c4dffcaa721fe4cc359c201c2
 Size (xlockmore-5.29.1.tar.bz2) = 1938941 bytes
 SHA1 (patch-aa) = 548646fe62b2d201328ca25a067e19998d58eb18
-SHA1 (patch-ab) = ad28c034c773027343e2867fe1f5d4ec26232404
+SHA1 (patch-ab) = 5bd37106a67b3bb3ef437092555cec223999b550
 SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f
 SHA1 (patch-ad) = a76c7d9f17dec5cf2a3de6d0c3343c80cf53d314
 SHA1 (patch-ae) = b78d7d148c9a62dbdf72e05aeec8d22d10ab9cce
diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab
index b0c17a84ff8..d77af08959c 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-ab
@@ -1,156 +1,7 @@
-$NetBSD: patch-ab,v 1.22 2009/10/15 21:24:26 dsainty Exp $
+$NetBSD: patch-ab,v 1.23 2010/12/08 12:54:32 obache Exp $
 
 --- configure.orig	2008-08-29 01:55:43.000000000 +0200
 +++ configure
-@@ -6763,139 +6763,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/pkg/lib/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"
-@@ -8838,7 +8705,7 @@ else
- #define USE_GL 1
- _ACEOF
- 
--    XLOCKLIBS="${XLOCKLIBS} -lMesaGL -lMesaGLU"
-+    XLOCKLIBS="${XLOCKLIBS} -lGL -lGLU"
-     test "x$mesa_includes" = xNONE && mesa_includes=$ac_mesa_includes
-     test "x$mesa_libraries" = xNONE && mesa_libraries=$ac_mesa_libraries
-     case "${canonical}" in
 @@ -10532,10 +10399,10 @@ _ACEOF
          dirname=`which gcc`
          dirname=`dirname $dirname`