Mon Oct 6 22:40:12 2008 UTC ()
Update x11/xlockmore to 5.27. Changes:

  PAM_putText() would set pointer resp->resp to buffer.  This will work
    until memory is reused.  Thanks to Howard Kash <hmkash AT arl.army.mil>.
  ico updated to show the two edge transitive Catalan solids, i.e. the
    rhombic dodecahedron and the rhombic triacontahedron.
  Added __linux__ to define list to allow newer sig masking to get rid of
    pesky deprecated message.
  configure checks for libXdpms
    libXext has the DPMS functionality on both XFree86 4 and X.org.
    (libXdpms may be Xfree86 3.x). Added /usr/pkg/lib and /usr/pkg/include to
    long list of paths it checks in.
  life added more life forms triangular life from Bays' paper and added
    S245B3 with glider (-neighbors 8) from Bays' paper.  Found some
    patterns in S245B3 for the glider to crash into.
  life3d -rule S45/B4 -neighbors 18 and -rule S45/B4 -neighbors 20 from
    Bays' paper.  Found some patterns for the gliders to crash into.
  life3d -search added.  Need to add more symmetries for 3D.
  life3d -rule S3/B3 -neighbors 12 and -rule S456/B3 -neighbors 12.  Added
    a bunch of patterns from Bays' papers but not all.  -neighbors 12 now
    a rhombic dodecahedron instead of a cube.
  ant3d -neighbors 12 (3d bees). Added eyes option to this.
  Just noticed solitaire a mode I added was spelled wrong, ie it was spelled
    without the second "i".  Fixed a goof in solitaire.cc.


(hubertf)
diff -r1.51 -r1.52 pkgsrc/x11/xlockmore/Makefile.common
diff -r1.40 -r1.41 pkgsrc/x11/xlockmore/distinfo
diff -r1.5 -r1.6 pkgsrc/x11/xlockmore/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/x11/xlockmore/patches/patch-ae
diff -r1.19 -r1.20 pkgsrc/x11/xlockmore/patches/patch-ab
cvs diff -r1.51 -r1.52 pkgsrc/x11/xlockmore/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/Makefile.common 2008/08/26 23:18:53 1.51
+++ pkgsrc/x11/xlockmore/Makefile.common 2008/10/06 22:40:12 1.52
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile.common,v 1.51 2008/08/26 23:18:53 hubertf Exp $ 1# $NetBSD: Makefile.common,v 1.52 2008/10/06 22:40:12 hubertf Exp $
2# 2#
3# This Makefile.common is included by: 3# This Makefile.common is included by:
4# 4#
5# x11/xlockmore/Makefile 5# x11/xlockmore/Makefile
6# x11/xlockmore-lite/Makefile 6# x11/xlockmore-lite/Makefile
7# 7#
8# If these packages are updated, please remember to reset any PKGREVISIONs 8# If these packages are updated, please remember to reset any PKGREVISIONs
9# in those Makefiles. 9# in those Makefiles.
10 10
11DISTNAME= xlockmore-5.26.1 11DISTNAME= xlockmore-5.27
12CATEGORIES= x11 12CATEGORIES= x11
13MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/${DISTNAME}/ \ 13MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/${DISTNAME}/ \
14 ftp://ibiblio.org/pub/Linux/X11/screensavers/ \ 14 ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
15 ${MASTER_SITE_XCONTRIB:=applications/} 15 ${MASTER_SITE_XCONTRIB:=applications/}
16EXTRACT_SUFX= .tar.bz2 16EXTRACT_SUFX= .tar.bz2
17 17
18MAINTAINER= hubertf@NetBSD.org 18MAINTAINER= hubertf@NetBSD.org
19HOMEPAGE= http://www.tux.org/~bagleyd/xlockmore.html 19HOMEPAGE= http://www.tux.org/~bagleyd/xlockmore.html
20 20
21CONFLICTS+= xlockmore-[0-9]* xlockmore-lite-[0-9]* 21CONFLICTS+= xlockmore-[0-9]* xlockmore-lite-[0-9]*
22 22
23DISTINFO_FILE?= ${.CURDIR}/../xlockmore/distinfo 23DISTINFO_FILE?= ${.CURDIR}/../xlockmore/distinfo
24PATCHDIR?= ${.CURDIR}/../xlockmore/patches 24PATCHDIR?= ${.CURDIR}/../xlockmore/patches
cvs diff -r1.40 -r1.41 pkgsrc/x11/xlockmore/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/distinfo 2008/08/26 23:18:53 1.40
+++ pkgsrc/x11/xlockmore/distinfo 2008/10/06 22:40:12 1.41
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.40 2008/08/26 23:18:53 hubertf Exp $ 1$NetBSD: distinfo,v 1.41 2008/10/06 22:40:12 hubertf Exp $
2 2
3SHA1 (xlockmore-5.26.1.tar.bz2) = 518b6acb93715d867f4a9a44c78b9bb819d763cc 3SHA1 (xlockmore-5.27.tar.bz2) = 6f2405b6429c1eeac75b659bec73c387db3eda6d
4RMD160 (xlockmore-5.26.1.tar.bz2) = b6235cafe0da00ffef7e7391ce9ae15ab4c91c24 4RMD160 (xlockmore-5.27.tar.bz2) = 48f29ddca13984ef03952903a60b81f9d74df694
5Size (xlockmore-5.26.1.tar.bz2) = 1842373 bytes 5Size (xlockmore-5.27.tar.bz2) = 1864212 bytes
6SHA1 (patch-aa) = 98243d9a615d3f44b6e3aab71388acb72b96d383 6SHA1 (patch-aa) = 548646fe62b2d201328ca25a067e19998d58eb18
7SHA1 (patch-ab) = 89f12f16e0756dd0eb1afc9df9bb175fd294e2f9 7SHA1 (patch-ab) = f535c3f9792248416fb1b1c4699c131682cfcf16
8SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f 8SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f
9SHA1 (patch-ad) = a76c7d9f17dec5cf2a3de6d0c3343c80cf53d314 9SHA1 (patch-ad) = a76c7d9f17dec5cf2a3de6d0c3343c80cf53d314
10SHA1 (patch-ae) = bfd31fdd2d4a9ce3e9f4c23e6dff90631416c33d 10SHA1 (patch-ae) = b78d7d148c9a62dbdf72e05aeec8d22d10ab9cce
cvs diff -r1.5 -r1.6 pkgsrc/x11/xlockmore/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/patches/Attic/patch-aa 2004/11/27 00:15:22 1.5
+++ pkgsrc/x11/xlockmore/patches/Attic/patch-aa 2008/10/06 22:40:12 1.6
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.5 2004/11/27 00:15:22 hubertf Exp $ 1$NetBSD: patch-aa,v 1.6 2008/10/06 22:40:12 hubertf Exp $
2 2
3--- xlock/XLock.ad.orig 2004-11-02 02:23:44.000000000 +0100 3--- xlock/XLock.ad.orig 2008-10-05 02:51:17.000000000 +0200
4+++ xlock/XLock.ad 4+++ xlock/XLock.ad
5@@ -60,9 +60,9 @@ XLock.left3d: Red 5@@ -62,9 +62,9 @@ XLock.left3d: Red
6 XLock.both3d: Magenta 6 XLock.both3d: Magenta
7  7
8 ! For marquee & nose modes 8 ! For marquee & nose modes
9-!XLock.program: fortune -o 9-!XLock.program: fortune -o
10-XLock.program: fortune -s 10-XLock.program: fortune -s
11-!XLock.program: fortune 11-!XLock.program: fortune
12+!XLock.program: /usr/games/fortune -o 12+!XLock.program: /usr/games/fortune -o
13+XLock.program: /usr/games/fortune -s 13+XLock.program: /usr/games/fortune -s
14+!XLock.program: /usr/games/fortune 14+!XLock.program: /usr/games/fortune
15 !XLock.program: /usr/games/fortune -o 15 !XLock.program: /usr/games/fortune -o
16 !XLock.program: /usr/games/fortune -s 16 !XLock.program: /usr/games/fortune -s
17 !XLock.program: /usr/games/fortune 17 !XLock.program: /usr/games/fortune
cvs diff -r1.5 -r1.6 pkgsrc/x11/xlockmore/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/patches/Attic/patch-ae 2007/10/28 16:15:22 1.5
+++ pkgsrc/x11/xlockmore/patches/Attic/patch-ae 2008/10/06 22:40:12 1.6
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ae,v 1.5 2007/10/28 16:15:22 joerg Exp $ 1$NetBSD: patch-ae,v 1.6 2008/10/06 22:40:12 hubertf Exp $
2 2
3--- modes/Makefile.in.orig 2007-09-16 20:43:06.000000000 +0200 3--- modes/Makefile.in.orig 2008-10-05 02:50:23.000000000 +0200
4+++ modes/Makefile.in 4+++ modes/Makefile.in
5@@ -579,19 +579,19 @@ install : install-program install-man in 5@@ -588,19 +588,19 @@ install : install-program install-man in
6 @ $(ECHO) "" 6 @ $(ECHO) ""
7  7
8 install-program : xlock 8 install-program : xlock
9- $(top_srcdir)/mkinstalldirs $(bindir) 9- $(top_srcdir)/mkinstalldirs $(bindir)
10- $(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(bindir) 10- $(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(bindir)
11- @MODULES@mkdir -p $(DEF_MODULEPATH) 11- @MODULES@mkdir -p $(DEF_MODULEPATH)
12- @MODULES@cp *.xlk $(DEF_MODULEPATH) 12- @MODULES@cp *.xlk $(DEF_MODULEPATH)
13- @MODULES@cp glx/*.xlk $(DEF_MODULEPATH) 13- @MODULES@cp glx/*.xlk $(DEF_MODULEPATH)
14+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) 14+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
15+ $(INSTALL_PROGRAM) $(UTILOBJDIR)xlock$(E) ${DESTDIR}$(bindir) 15+ $(INSTALL_PROGRAM) $(UTILOBJDIR)xlock$(E) ${DESTDIR}$(bindir)
16+ @MODULES@mkdir -p ${DESTDIR}$(DEF_MODULEPATH) 16+ @MODULES@mkdir -p ${DESTDIR}$(DEF_MODULEPATH)
17+ @MODULES@cp *.xlk ${DESTDIR}$(DEF_MODULEPATH) 17+ @MODULES@cp *.xlk ${DESTDIR}$(DEF_MODULEPATH)
18+ @MODULES@cp glx/*.xlk ${DESTDIR}$(DEF_MODULEPATH) 18+ @MODULES@cp glx/*.xlk ${DESTDIR}$(DEF_MODULEPATH)
cvs diff -r1.19 -r1.20 pkgsrc/x11/xlockmore/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/patches/Attic/patch-ab 2005/09/18 19:16:49 1.19
+++ pkgsrc/x11/xlockmore/patches/Attic/patch-ab 2008/10/06 22:40:12 1.20
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-ab,v 1.19 2005/09/18 19:16:49 minskim Exp $ 1$NetBSD: patch-ab,v 1.20 2008/10/06 22:40:12 hubertf Exp $
2 2
3--- configure.orig 2005-07-24 08:22:34.000000000 -0700 3--- configure.orig 2008-08-29 01:55:43.000000000 +0200
4+++ configure 4+++ configure
5@@ -6299,7 +6299,7 @@ else 5@@ -6754,7 +6754,7 @@ else
6 # Make sure to not put "make" in the Imakefile rules, since we grep it out. 6 # Make sure to not put "make" in the Imakefile rules, since we grep it out.
7 cat > Imakefile <<'EOF' 7 cat > Imakefile <<'EOF'
8 acfindx: 8 acfindx:
9- @echo 'ac_x_app_defaults="${XAPPLOADDIR}"' 9- @echo 'ac_x_app_defaults="${XAPPLOADDIR}"'
10+ @echo 'ac_x_app_defaults="${XAPPLOADDIR}"' 10+ @echo 'ac_x_app_defaults="${XAPPLOADDIR}"'
11 EOF 11 EOF
12 if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then 12 if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
13 # GNU make sometimes prints "make[1]: Entering...", which'd confuse us. 13 # GNU make sometimes prints "make[1]: Entering...", which'd confuse us.
14@@ -6308,138 +6308,6 @@ EOF 14@@ -6763,139 +6763,6 @@ EOF
15 cd .. 15 cd ..
16 rm -fr conftestdir 16 rm -fr conftestdir
17 fi 17 fi
18- # Look for the directory under a standard set of common directories. 18- # Look for the directory under a standard set of common directories.
19- # Check X11 before X11Rn because it's often a symlink to the current release. 19- # Check X11 before X11Rn because it's often a symlink to the current release.
20- for ac_dir in \ 20- for ac_dir in \
21- /lib/X11/app-defaults \ 21- /lib/X11/app-defaults \
22- /lib/app-defaults \ 22- /lib/app-defaults \
23- /lib/X11R6.5.1/app-defaults \ 23- /lib/X11R6.5.1/app-defaults \
24- /lib/X11R6.5.1/X11/app-defaults \ 24- /lib/X11R6.5.1/X11/app-defaults \
25- /lib/X11R6.4/app-defaults \ 25- /lib/X11R6.4/app-defaults \
26- /lib/X11R6.4/X11/app-defaults \ 26- /lib/X11R6.4/X11/app-defaults \
27- /lib/X11R6.3/app-defaults \ 27- /lib/X11R6.3/app-defaults \
@@ -106,26 +106,27 @@ $NetBSD: patch-ab,v 1.19 2005/09/18 19:1 @@ -106,26 +106,27 @@ $NetBSD: patch-ab,v 1.19 2005/09/18 19:1
106- /usr/local/lib/X11R6.2/X11/app-defaults \ 106- /usr/local/lib/X11R6.2/X11/app-defaults \
107- /usr/local/lib/X11R6.1/app-defaults \ 107- /usr/local/lib/X11R6.1/app-defaults \
108- /usr/local/lib/X11R6.1/X11/app-defaults \ 108- /usr/local/lib/X11R6.1/X11/app-defaults \
109- /usr/local/lib/X11R6/app-defaults \ 109- /usr/local/lib/X11R6/app-defaults \
110- /usr/local/lib/X11R6/X11/app-defaults \ 110- /usr/local/lib/X11R6/X11/app-defaults \
111- /usr/local/lib/X11R5/app-defaults \ 111- /usr/local/lib/X11R5/app-defaults \
112- /usr/local/lib/X11R5/X11/app-defaults \ 112- /usr/local/lib/X11R5/X11/app-defaults \
113- /usr/local/lib/X11R4/app-defaults \ 113- /usr/local/lib/X11R4/app-defaults \
114- /usr/local/lib/X11R4/X11/app-defaults \ 114- /usr/local/lib/X11R4/X11/app-defaults \
115- \ 115- \
116- /usr/X386/lib/X11/app-defaults \ 116- /usr/X386/lib/X11/app-defaults \
117- /usr/x386/lib/X11/app-defaults \ 117- /usr/x386/lib/X11/app-defaults \
118- /usr/XFree86/lib/X11/app-defaults \ 118- /usr/XFree86/lib/X11/app-defaults \
 119- /usr/pkg/lib/app-defaults \
119- \ 120- \
120- /usr/lib/X11/app-defaults \ 121- /usr/lib/X11/app-defaults \
121- /usr/unsupported/lib/X11/app-defaults \ 122- /usr/unsupported/lib/X11/app-defaults \
122- /usr/athena/lib/X11/app-defaults \ 123- /usr/athena/lib/X11/app-defaults \
123- /usr/local/x11r5/lib/X11/app-defaults \ 124- /usr/local/x11r5/lib/X11/app-defaults \
124- /usr/lpp/Xamples/lib/X11/app-defaults \ 125- /usr/lpp/Xamples/lib/X11/app-defaults \
125- /lib/usr/lib/X11/app-defaults \ 126- /lib/usr/lib/X11/app-defaults \
126- /usr/local/lib/app-defaults \ 127- /usr/local/lib/app-defaults \
127- /usr/remote/lib/app-defaults \ 128- /usr/remote/lib/app-defaults \
128- \ 129- \
129- /usr/openwin/lib/app-defaults \ 130- /usr/openwin/lib/app-defaults \
130- /usr/openwin/lib/X11/app-defaults \ 131- /usr/openwin/lib/X11/app-defaults \
131- /usr/openwin/share/lib/app-defaults \ 132- /usr/openwin/share/lib/app-defaults \
@@ -140,22 +141,22 @@ $NetBSD: patch-ab,v 1.19 2005/09/18 19:1 @@ -140,22 +141,22 @@ $NetBSD: patch-ab,v 1.19 2005/09/18 19:1
140- /X11R5/lib/app-defaults \ 141- /X11R5/lib/app-defaults \
141- /X11R4/lib/app-defaults \ 142- /X11R4/lib/app-defaults \
142- ; \ 143- ; \
143- do 144- do
144- if test -d "$ac_dir"; then 145- if test -d "$ac_dir"; then
145- ac_x_app_defaults=$ac_dir 146- ac_x_app_defaults=$ac_dir
146- break 147- break
147- fi 148- fi
148- done 149- done
149- fi 150- fi
150  151
151 if test x"$ac_x_app_defaults" = x; then 152 if test x"$ac_x_app_defaults" = x; then
152 ac_cv_x_app_defaults="/usr/lib/X11/app-defaults" 153 ac_cv_x_app_defaults="/usr/lib/X11/app-defaults"
153@@ -8364,7 +8232,7 @@ else 154@@ -8838,7 +8705,7 @@ else
154 #define USE_GL 1 155 #define USE_GL 1
155 _ACEOF 156 _ACEOF
156  157
157- XLOCKLIBS="${XLOCKLIBS} -lMesaGL -lMesaGLU" 158- XLOCKLIBS="${XLOCKLIBS} -lMesaGL -lMesaGLU"
158+ XLOCKLIBS="${XLOCKLIBS} -lGL -lGLU" 159+ XLOCKLIBS="${XLOCKLIBS} -lGL -lGLU"
159 test "x$mesa_includes" = xNONE && mesa_includes=$ac_mesa_includes 160 test "x$mesa_includes" = xNONE && mesa_includes=$ac_mesa_includes
160 test "x$mesa_libraries" = xNONE && mesa_libraries=$ac_mesa_libraries 161 test "x$mesa_libraries" = xNONE && mesa_libraries=$ac_mesa_libraries
161 case "${canonical}" in 162 case "${canonical}" in