From 7c03722b61aafa79d665ab81abad765313c1246f Mon Sep 17 00:00:00 2001 From: hubertf Date: Sat, 27 Nov 2004 00:15:22 +0000 Subject: Update xlockmore and xlockmore-lite to 5.14.1. Changes: 5.14.1 Fixed PAM goof. 5.14 fadeplot,laser: do not clear so much with erase modes (void *) for (caddr_t *) in argtype to get rid of most gcc warnings. g++ cleanups for xglock, xmlock, flow, life, marqee, apollonian, pacman configure cleanups. Goof for random placement of labeling for life and life3d i.e. the S could burn in on those old monitors. flow mode improvements added thanks to Tim Auckland Replace 2D rendering of Periodic Attractors with a 3D 'interrupted' rendering. Replace "-/+allow2d" with "-/+periodic" Replace all ODE formulae with completely generic forms. Add '-search' option to perform background high-speed discovery for completely new attractors without impacting rendering performance. Use gaussian distribution for initial point positions and for parameter search. Add "+dbuf" option to allow Double-Buffering to be turned off on slow X servers. Remove redundant '-zoom' option. Now automatically zooms if both rotation and riding are permitted. Replace dynamic bounding box with static one pre-calculated during discovery phase. Simplify and fix bounding box clipping code. Should now be safe to run without double buffer on all XFree86 servers if desired. Sync'd up with xscreensaver version Orbital camera (-/+rotate) specify following bee (-/+ride) zoom between bee and orbit (-/+zoom) Bounding Box (-/+box) disable 2D Poincare' section flows (-/+allow2d). Also added basic double-buffering to avoid XFree86 'debris' problems when lines go out of bounds. A few more fixes from Eric Lassauge . gtk2/gtk detection in configure, automatically does a make for xglock xglock now uses GTK2 genlauncher fix for noof (used by xglock). life1d repeating patterns have a better chance of being caught. compile dependencies for ImageMagick for VMS thanks to Jouk Jansen. NICE_ONLY build option added. --enable-nice-only or --enable-blank-only nice modes also reevaluated thanks to Tom Schmidt. config.sub and config.guess updated from GNU. Changed PAM to USE_PAM to be consistent with imake. loop is more random when run as a single mode. -langton option added if one just wants Langton's Loops. atunnels resync with xsreensaver for new textures thanks to Eric Lassauge . --- x11/xlockmore-lite/Makefile | 9 ++++++++- x11/xlockmore/Makefile | 5 ++++- x11/xlockmore/Makefile.common | 5 ++--- x11/xlockmore/PLIST | 5 ++++- x11/xlockmore/distinfo | 12 ++++++------ x11/xlockmore/patches/patch-aa | 6 +++--- x11/xlockmore/patches/patch-ab | 6 +++--- x11/xlockmore/patches/patch-ac | 23 ++++++++++++----------- 8 files changed, 42 insertions(+), 29 deletions(-) (limited to 'x11') diff --git a/x11/xlockmore-lite/Makefile b/x11/xlockmore-lite/Makefile index 61947d769d6..503b7f0880c 100644 --- a/x11/xlockmore-lite/Makefile +++ b/x11/xlockmore-lite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/03/08 16:56:38 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2004/11/27 00:15:23 hubertf Exp $ .include "../xlockmore/Makefile.common" @@ -8,8 +8,15 @@ COMMENT= "lite" version of xlockmore CONFIGURE_ARGS+= --without-xpm CONFIGURE_ARGS+= --without-gltt CONFIGURE_ARGS+= --without-ttf +CONFIGURE_ARGS+= --without-glftgl +CONFIGURE_ARGS+= --without-freetype CONFIGURE_ARGS+= --without-opengl CONFIGURE_ARGS+= --without-mesa +CONFIGURE_ARGS+= --without-rplay CONFIGURE_ARGS+= --without-esound +CONFIGURE_ARGS+= --without-gtk2 +CONFIGURE_ARGS+= --without-gtk + +PLIST_SUBST+= LITE="@comment Not in lite version: " .include "../../mk/bsd.pkg.mk" diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 7157ba64cc3..1a3d2eb5434 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2004/01/06 15:44:10 hubertf Exp $ +# $NetBSD: Makefile,v 1.66 2004/11/27 00:15:22 hubertf Exp $ .include "../../mk/bsd.prefs.mk" @@ -22,10 +22,13 @@ COMMENT= Like the XLock session-locker/screensaver, but with more CONFIGURE_ARGS+= --with-mesagl +PLIST_SUBST+= LITE="" + .include "../../audio/esound/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common index 260cfa2be2f..a678c523070 100644 --- a/x11/xlockmore/Makefile.common +++ b/x11/xlockmore/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2004/10/03 00:18:40 tv Exp $ +# $NetBSD: Makefile.common,v 1.18 2004/11/27 00:15:22 hubertf Exp $ # # This Makefile.common is included by: # @@ -8,8 +8,7 @@ # If these packages are updated, please remember to reset any PKGREVISIONs # in those Makefiles. -DISTNAME= xlockmore-5.13 -PKGREVISION= 1 +DISTNAME= xlockmore-5.14.1 CATEGORIES= x11 MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \ ftp://ibiblio.org/pub/Linux/X11/screensavers/ \ diff --git a/x11/xlockmore/PLIST b/x11/xlockmore/PLIST index 27d7c3f2f75..04289364636 100644 --- a/x11/xlockmore/PLIST +++ b/x11/xlockmore/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2003/06/30 07:29:01 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/11/27 00:15:22 hubertf Exp $ +${LITE}bin/xglock bin/xlock lib/X11/app-defaults/XLock lib/X11/xlock/sounds/complete.au @@ -6,5 +7,7 @@ lib/X11/xlock/sounds/identify-please.au lib/X11/xlock/sounds/not-programmed.au lib/X11/xlock/sounds/thank-you.au man/man1/xlock.1 +${LITE}share/xlock/xglockrc +${LITE}@dirrm share/xlock @dirrm lib/X11/xlock/sounds @dirrm lib/X11/xlock diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo index 5f3ed318f3b..a14ba215f1d 100644 --- a/x11/xlockmore/distinfo +++ b/x11/xlockmore/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.20 2004/07/20 15:33:23 hubertf Exp $ +$NetBSD: distinfo,v 1.21 2004/11/27 00:15:22 hubertf Exp $ -SHA1 (xlockmore-5.13.tar.bz2) = cc67d2170e41d2587e7390ab8ad6b25b84b47847 -Size (xlockmore-5.13.tar.bz2) = 1606402 bytes -SHA1 (patch-aa) = 2d533dab923e0de20838c96e9b6e455fb2d724f8 -SHA1 (patch-ab) = 26d7e561da5c5f3c13fed172e4de9b1f345cd5ad -SHA1 (patch-ac) = 875c4fc5ae98cfe389852891997e724f450f526f +SHA1 (xlockmore-5.14.1.tar.bz2) = 0d3b120756275c1c3588b9a95430b97c1c3839ac +Size (xlockmore-5.14.1.tar.bz2) = 1724387 bytes +SHA1 (patch-aa) = 98243d9a615d3f44b6e3aab71388acb72b96d383 +SHA1 (patch-ab) = 93273c90ed447e5dec4c03c0f4ade960da2783b3 +SHA1 (patch-ac) = 1bcbf56cdb6709cf8f21855b141a4892a36751c1 diff --git a/x11/xlockmore/patches/patch-aa b/x11/xlockmore/patches/patch-aa index 9f6669bceec..6b19f4f52db 100644 --- a/x11/xlockmore/patches/patch-aa +++ b/x11/xlockmore/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2002/12/05 00:45:53 hubertf Exp $ +$NetBSD: patch-aa,v 1.5 2004/11/27 00:15:22 hubertf Exp $ ---- xlock/XLock.ad.orig Mon Sep 30 22:39:14 2002 +--- xlock/XLock.ad.orig 2004-11-02 02:23:44.000000000 +0100 +++ xlock/XLock.ad -@@ -58,9 +58,9 @@ +@@ -60,9 +60,9 @@ XLock.left3d: Red XLock.both3d: Magenta ! For marquee & nose modes diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab index ad57e61a6bf..94d4986aac6 100644 --- a/x11/xlockmore/patches/patch-ab +++ b/x11/xlockmore/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.16 2003/06/30 07:45:50 jlam Exp $ +$NetBSD: patch-ab,v 1.17 2004/11/27 00:15:22 hubertf Exp $ ---- configure.orig Mon Mar 10 07:25:26 2003 +--- configure.orig 2004-11-05 03:44:37.000000000 +0100 +++ configure -@@ -7427,7 +7427,7 @@ else +@@ -8364,7 +8364,7 @@ else #define USE_GL 1 _ACEOF diff --git a/x11/xlockmore/patches/patch-ac b/x11/xlockmore/patches/patch-ac index a8d208a7a4c..a6fbfd111e0 100644 --- a/x11/xlockmore/patches/patch-ac +++ b/x11/xlockmore/patches/patch-ac @@ -1,12 +1,13 @@ -$NetBSD: patch-ac,v 1.10 2003/02/06 06:49:09 briggs Exp $ +$NetBSD: patch-ac,v 1.11 2004/11/27 00:15:23 hubertf Exp $ ---- config.guess.orig Wed Feb 5 23:43:57 2003 -+++ config.guess Wed Feb 5 23:31:18 2003 -@@ -385,6 +385,7 @@ - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - *:NetBSD:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` || UNAME_MACHINE=unknown - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - *:OpenBSD:*:*) +--- xglock/Makefile.in.orig 2003-01-09 04:27:51.000000000 +0100 ++++ xglock/Makefile.in +@@ -122,7 +122,7 @@ install-man : + + install-ad : + $(top_srcdir)/mkinstalldirs $(datadir)/xlock +- $(INSTALL_PROGRAM) $(top_srcdir)/xglock/xglockrc $(datadir)/xlock/xglockrc ++ $(INSTALL_DATA) $(top_srcdir)/xglock/xglockrc $(datadir)/xlock/xglockrc + + uninstall : @UNINSTALL_XGLOCK@ + -- cgit v1.2.3