--- Makefile 25 Oct 2009 22:54:03 -0000 1.81 +++ Makefile 30 Dec 2009 22:52:20 -0000 @@ -4,7 +4,7 @@ COMMENT= Like the XLock session-locker/screensaver, but with more -CONFIGURE_ARGS+= --with-mesagl +CONFIGURE_ARGS+= --with-mesa PLIST_SUBST+= LITE="" --- Makefile.common 2 Nov 2009 11:51:43 -0000 1.57 +++ Makefile.common 30 Dec 2009 22:52:13 -0000 @@ -57,6 +57,7 @@ CONFIGURE_ARGS+= --without-rplay CONFIGURE_ARGS+= --without-nas CONFIGURE_ARGS+= --without-gtk +CONFIGURE_ARGS+= --without-ttf CONFIGURE_ARGS+= --enable-appdefaultdir=${PREFIX}/lib/X11/app-defaults .if ${OPSYS} == "NetBSD" --- distinfo 25 Oct 2009 22:54:03 -0000 1.45 +++ distinfo 22 Jan 2010 17:09:17 -0000 @@ -4,7 +4,7 @@ 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) = 3672c8f53087485b5ed87705d945602d495e52ec SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f SHA1 (patch-ad) = a76c7d9f17dec5cf2a3de6d0c3343c80cf53d314 SHA1 (patch-ae) = b78d7d148c9a62dbdf72e05aeec8d22d10ab9cce --- patches/patch-ab 15 Oct 2009 21:24:26 -0000 1.22 +++ patches/patch-ab 22 Jan 2010 17:09:14 -0000 @@ -1,8 +1,16 @@ -$NetBSD: patch-ab,v 1.22 2009/10/15 21:24:26 dsainty Exp $ +$NetBSD$ ---- configure.orig 2008-08-29 01:55:43.000000000 +0200 -+++ configure -@@ -6763,139 +6763,6 @@ EOF +--- configure.orig 2009-08-10 03:39:25.000000000 +0200 ++++ configure 2010-01-22 18:07:33.000000000 +0100 +@@ -6009,6 +6009,7 @@ + # Check X11 before X11Rn because it is often a symlink to the current release. + ac_x_header_dirs=' + /usr/X11/include ++/usr/X11R7/include + /usr/X11R6/include + /usr/X11R5/include + /usr/X11R4/include +@@ -7385,139 +7386,6 @@ cd .. rm -fr conftestdir fi @@ -142,7 +150,151 @@ if test x"$ac_x_app_defaults" = x; then ac_cv_x_app_defaults="/usr/lib/X11/app-defaults" -@@ -8838,7 +8705,7 @@ else +@@ -7615,6 +7483,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ +@@ -7691,6 +7560,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ +@@ -7823,6 +7693,7 @@ + /usr/include/X11R6.3 \ + /usr/include/X11R6.2 \ + /usr/include/X11R6.1 \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ +@@ -7896,6 +7767,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ +@@ -8031,6 +7903,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ +@@ -8107,6 +7980,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ +@@ -8242,6 +8116,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ +@@ -8317,6 +8192,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ +@@ -8449,6 +8325,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ +@@ -8524,6 +8401,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ +@@ -8667,6 +8545,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ +@@ -8742,6 +8621,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ +@@ -8874,6 +8754,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ +@@ -8950,6 +8831,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ +@@ -9098,6 +8980,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11/include \ +@@ -9167,6 +9050,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + \ +@@ -9313,6 +9197,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11/include \ +@@ -9381,6 +9266,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + \ +@@ -9460,7 +9346,7 @@ #define USE_GL 1 _ACEOF @@ -151,7 +303,87 @@ 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 +@@ -9825,6 +9711,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ +@@ -9900,6 +9787,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ +@@ -10035,6 +9923,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ +@@ -10110,6 +9999,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ +@@ -10249,6 +10139,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ +@@ -10325,6 +10216,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ +@@ -10457,6 +10349,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11/include \ +@@ -10486,6 +10379,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11/lib \ +@@ -10725,6 +10619,7 @@ + /usr/X11R6.3/include \ + /usr/X11R6.2/include \ + /usr/X11R6.1/include \ ++ /usr/X11R7/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11/include \ +@@ -10754,6 +10649,7 @@ + /usr/X11R6.3/lib \ + /usr/X11R6.2/lib \ + /usr/X11R6.1/lib \ ++ /usr/X11R7/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11/lib \ +@@ -11369,10 +11265,10 @@ dirname=`which gcc` dirname=`dirname $dirname` dirname=`dirname $dirname`/lib @@ -166,7 +398,7 @@ fi XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}" XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}" -@@ -10833,10 +10700,10 @@ _ACEOF +@@ -11672,10 +11568,10 @@ dirname=`which gcc` dirname=`dirname $dirname` dirname=`dirname $dirname`/lib