From cfabf6920142ef9ff59e878b22dc1a11b4c11779 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Tue, 3 Jul 2001 13:51:43 +0000
Subject: Move setting of USE_XPM and USE_MESA to before include bsd.prefs.mk -
 otherwise recent HAVE_BUILTIN_XPM changes break this Makefile.

---
 x11/xlockmore/Makefile | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'x11/xlockmore/Makefile')

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 55015dbc2ec..ba8f50affc8 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2001/05/29 00:55:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.44 2001/07/03 13:51:43 abs Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
 #
 
@@ -13,26 +13,25 @@ COMMENT=	Like the XLock session locker/screen saver, but with more
 
 CHECK_MESA=	YES
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !defined(XLOCK_LIGHT)
+.if defined(XLOCK_LIGHT)
+CONFIGURE_ARGS+=--without-gltt --without-ttf --without-opengl --without-mesagl \
+		--without-xpm # --without-cxx XXX doesn't work
+CONFIGURE_ENV+= CXX="${CC}"	# no dependency on libstdc++
+.else
+USE_XPM=	YES
 USE_MESA=	YES
+CONFIGURE_ARGS+= --with-mesagl
 .endif
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !exists(${X11BASE}/lib/libXdpms.a)
 XLOCK_NO_DPMS=	YES
 .endif
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
-.if defined(XLOCK_LIGHT)
-CONFIGURE_ARGS+=--without-gltt --without-ttf --without-opengl --without-mesagl \
-		--without-xpm # --without-cxx XXX doesn't work
-CONFIGURE_ENV+= CXX="${CC}"	# no dependency on libstdc++
-.else
-USE_XPM=	YES
-CONFIGURE_ARGS+= --with-mesagl
-.endif
+
 CONFIGURE_ARGS+= --without-motif --without-sx \
 		--without-editres --without-dtsaver --without-rplay \
 		--without-nas --without-gtk
-- 
cgit v1.2.3