From 29f380d385bcd8b5919dd22f0686a235e7e58860 Mon Sep 17 00:00:00 2001 From: jschauma Date: Thu, 16 May 2002 22:19:54 +0000 Subject: Update to 5.04. Move patch-ac to patch-ab. New since last BETA2: + pacman AI update with trackmouse thanks to Edwin de Jong + C++ fixes, memcpy prefered over bcopy, random start. New since last BETA: * Changed delay on several GL modes. They were too fast on my GeForce4. * bounce drawing errors fixed on my nVidia fixed ant: fudged the truchet lines a bit more for squares and hexagons. molecule needs to be protected from pipes by a "glDrawBuffer(GL_BACK);" thanks to Jouk Jansen. molecule needs to be protected from pipes by a "glDrawBuffer(GL_BACK);" thanks to Jouk Jansen. Patch from Marcelo Vianna to get his modes (cage,moebius,morph3d,rubik) working on NVidia under XFree (NVidia has a policy to not release code open source and the bug crashes the system requiring a hard reset). Since skewb is similar that was done as well by maintainer. configure changes for 2.53, added option for .ad installation dir, check for xlockrc and pam. flag debugged for xpm, do not set byte order for ZPixmap. Flag ripples now flow left to right and from bottom to top. Combined XLock-jp.ad into XLock.ad fontset to use regular (not bold/italic) font/fontset as default, fix for sound.c using DEF_PLAY, and a fix for customName thanks to Shingo Yamaguchi . nice changes were causing problems, set_priority used instead thanks to Felicia Neff . (VMS still uses nice). noof mode added from GLUT demos thanks to Dave Riesz . USE_XPM changed to HAVE_XPM to be compatible with xscreensaver. --- x11/xlockmore/Makefile | 4 ++-- x11/xlockmore/distinfo | 8 ++++---- x11/xlockmore/patches/patch-ab | 11 +++++++++++ x11/xlockmore/patches/patch-ac | 13 ------------- 4 files changed, 17 insertions(+), 19 deletions(-) create mode 100644 x11/xlockmore/patches/patch-ab delete mode 100644 x11/xlockmore/patches/patch-ac (limited to 'x11') diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 76d83a1a1d4..ec0275779e9 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.47 2002/01/26 14:38:17 hubertf Exp $ +# $NetBSD: Makefile,v 1.48 2002/05/16 22:19:54 jschauma Exp $ # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp # -DISTNAME= xlockmore-5.03 +DISTNAME= xlockmore-5.04 CATEGORIES= x11 MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \ ${MASTER_SITE_XCONTRIB:=applications/} diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo index 58676f43147..5f6444a5f3e 100644 --- a/x11/xlockmore/distinfo +++ b/x11/xlockmore/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2002/01/26 14:38:17 hubertf Exp $ +$NetBSD: distinfo,v 1.6 2002/05/16 22:19:54 jschauma Exp $ -SHA1 (xlockmore-5.03.tar.bz2) = 37fe938f9b8a590c49f6fc2f38d502d590296efd -Size (xlockmore-5.03.tar.bz2) = 1430561 bytes +SHA1 (xlockmore-5.04.tar.bz2) = eb06fbb63b7f3e0246013b06f56bbf9608598059 +Size (xlockmore-5.04.tar.bz2) = 1471911 bytes SHA1 (patch-aa) = 88ba89782704f03552a02a917ab68be2e7875d2b -SHA1 (patch-ac) = 6492c505961c3f6cf2c94f19456fd9d7adcdf0f0 +SHA1 (patch-ab) = 3f4006969c2ae1427606e8e451295350fdffda90 diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab new file mode 100644 index 00000000000..3e17f597f01 --- /dev/null +++ b/x11/xlockmore/patches/patch-ab @@ -0,0 +1,11 @@ +--- configure.orig Thu May 16 17:35:54 2002 ++++ configure Thu May 16 17:37:02 2002 +@@ -7092,7 +7092,7 @@ + #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 diff --git a/x11/xlockmore/patches/patch-ac b/x11/xlockmore/patches/patch-ac deleted file mode 100644 index be8a7e7cfe2..00000000000 --- a/x11/xlockmore/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2001/10/10 02:41:17 hubertf Exp $ - ---- configure.orig Tue Sep 25 20:25:48 2001 -+++ configure -@@ -4681,7 +4681,7 @@ - #define USE_GL 1 - EOF - -- 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 -- cgit v1.2.3