From be35a00bcd8b78582a2d590a0bf598b964a62b44 Mon Sep 17 00:00:00 2001 From: hubertf Date: Wed, 10 Oct 2001 02:41:14 +0000 Subject: Update xlockmore to 5.02. Changes: fire update for wandering and sball update, thanks to Eric Lassauge . text3d fix on a fix when a symbol.ttf or wingding.ttf is used (double free). Thanks to Tom Schmidt. apollonian mode thanks to a program by Allan R. Wilks . -1,2,2,3 are numbers that represent curvature (1 / radius) in Euclidean space. (-1,1,1,2 is in spherical space and -1,1,1,1 is in hyperbolic). Hyperbolic and spherical numbers now added for all but double bounded. Automatic generation of numbers with -count. Enforce a upper bound of outer circle at 99, since run time goes up polynomially by at least n^3. qix updated with -solid, got the idea from xscreensaver New "tetris -well", now uses generated images, also cleaned up some bugs too. Bug fix thanks to Tom Schmidt. gears added -size but defaults to 0, only -planetary will use up lots of CPU so added a -planetsize 400 which takes over if -size is 0 (full screen if both are 0). --- x11/xlockmore/Makefile | 11 ++++++++--- x11/xlockmore/distinfo | 11 ++++------- x11/xlockmore/patches/patch-ab | 14 -------------- x11/xlockmore/patches/patch-ac | 6 +++--- x11/xlockmore/patches/patch-ad | 13 ------------- x11/xlockmore/patches/patch-ae | 22 ---------------------- 6 files changed, 15 insertions(+), 62 deletions(-) delete mode 100644 x11/xlockmore/patches/patch-ab delete mode 100644 x11/xlockmore/patches/patch-ad delete mode 100644 x11/xlockmore/patches/patch-ae (limited to 'x11/xlockmore') diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 0037c535bbf..d5d14823592 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.45 2001/07/26 03:35:25 lukem Exp $ +# $NetBSD: Makefile,v 1.46 2001/10/10 02:41:14 hubertf Exp $ # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp # -DISTNAME= xlockmore-5.01.2 +DISTNAME= xlockmore-5.02 CATEGORIES= x11 MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \ ${MASTER_SITE_XCONTRIB:=applications/} @@ -31,6 +31,11 @@ XLOCK_NO_DPMS= YES GNU_CONFIGURE= YES USE_X11BASE= YES +#USE_GMAKE= yes +DEFINES= -DDEFAULT_SOUND_DIR='\"${PREFIX}/lib/X11/xlock/sounds/\"' \ + -DDEF_MODULEPATH='\"lib/X11/xlock/modules\"' +CC+= ${DEFINES} +CXX+= ${DEFINES} CONFIGURE_ARGS+= --without-motif --without-sx \ --without-editres --without-dtsaver --without-rplay \ @@ -44,7 +49,7 @@ CONFIGURE_ARGS+= --without-dpms .endif post-patch: - for i in xlock/sound.c xlock/resource.c ; do \ + for i in xlock/resource.c ; do \ f=${WRKSRC}/$$i ; \ [ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \ ${SED} \ diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo index a17c28240e4..e1b3836af5f 100644 --- a/x11/xlockmore/distinfo +++ b/x11/xlockmore/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/05/29 00:55:34 hubertf Exp $ +$NetBSD: distinfo,v 1.4 2001/10/10 02:41:14 hubertf Exp $ -SHA1 (xlockmore-5.01.2.tar.gz) = fa51ee731522d8bfb59a7554e17765f7b616a4b0 -Size (xlockmore-5.01.2.tar.gz) = 1696131 bytes +SHA1 (xlockmore-5.02.tar.gz) = da5fe2704553f321a2d229344cf5e0f2b57dfbb8 +Size (xlockmore-5.02.tar.gz) = 1714009 bytes SHA1 (patch-aa) = 88ba89782704f03552a02a917ab68be2e7875d2b -SHA1 (patch-ab) = 525f7b3466d910ea838e3f81b77d1fba6f4566c4 -SHA1 (patch-ac) = 167adbc68bd7e985fb42dab90e770fcfb7d1f961 -SHA1 (patch-ad) = c2123e8579920922d9e33445316edbb29245b82a -SHA1 (patch-ae) = f7d93917b2526384f8f455158e5cbeec53f40d74 +SHA1 (patch-ac) = 6492c505961c3f6cf2c94f19456fd9d7adcdf0f0 diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab deleted file mode 100644 index 3f63edbfd72..00000000000 --- a/x11/xlockmore/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.12 2001/05/29 00:55:35 hubertf Exp $ - ---- xlock/xlock.c.orig Thu Apr 26 22:02:42 2001 -+++ xlock/xlock.c -@@ -614,7 +614,9 @@ - #endif - #else /* XFree86 < 4.x */ - #include -+#ifndef __NetBSD__ - extern unsigned char DPMSQueryExtension(Display *, int *, int *); -+#endif - extern int DPMSGetTimeouts(Display *, unsigned short *, unsigned short *, unsigned short *); - extern int DPMSSetTimeouts(Display *, unsigned short, unsigned short, unsigned short); - #endif diff --git a/x11/xlockmore/patches/patch-ac b/x11/xlockmore/patches/patch-ac index ca050fb8b5a..be8a7e7cfe2 100644 --- a/x11/xlockmore/patches/patch-ac +++ b/x11/xlockmore/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2001/05/29 00:55:35 hubertf Exp $ +$NetBSD: patch-ac,v 1.8 2001/10/10 02:41:17 hubertf Exp $ ---- configure.orig Wed Apr 18 16:17:26 2001 +--- configure.orig Tue Sep 25 20:25:48 2001 +++ configure -@@ -4699,7 +4699,7 @@ +@@ -4681,7 +4681,7 @@ #define USE_GL 1 EOF diff --git a/x11/xlockmore/patches/patch-ad b/x11/xlockmore/patches/patch-ad deleted file mode 100644 index a3a79ac3f1c..00000000000 --- a/x11/xlockmore/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2000/08/15 03:54:17 hubertf Exp $ - ---- xlock/sound.c.orig Mon Jun 26 21:05:45 2000 -+++ xlock/sound.c Tue Aug 15 05:41:29 2000 -@@ -154,7 +154,7 @@ - #ifdef USE_ESOUND - - #ifndef DEFAULT_SOUND_DIR --#define DEFAULT_SOUND_DIR "/usr/share/sounds/xlockmore/" -+#define DEFAULT_SOUND_DIR "@PREFIX@/lib/X11/xlockmore/" - #endif - - #ifdef HAVE_LIBESD diff --git a/x11/xlockmore/patches/patch-ae b/x11/xlockmore/patches/patch-ae deleted file mode 100644 index a45f5ed184d..00000000000 --- a/x11/xlockmore/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2001/05/29 00:55:35 hubertf Exp $ - ---- xlock/resource.c.orig Fri Mar 9 17:57:06 2001 -+++ xlock/resource.c -@@ -90,7 +90,7 @@ - - #ifdef USE_MODULES - # ifndef DEF_MODULEPATH --# define DEF_MODULEPATH "/usr/lib/X11/xlock_modules" -+# define DEF_MODULEPATH "@PREFIX@/lib/X11/xlocklock/modules" - # endif - #endif - -@@ -256,7 +256,7 @@ - # endif /* !USE_VMSPLAY */ - # ifdef USE_ESOUND - # ifndef DEFAULT_SOUND_DIR --# define DEFAULT_SOUND_DIR "/usr/share/sounds/xlockmore" -+# define DEFAULT_SOUND_DIR "@PREFIX@/lib/X11/xlockmore" - # endif - # define DEF_LOCKSOUND "thank-you.au" - # define DEF_INFOSOUND "identify-please.au" -- cgit v1.2.3