head 1.26; access; symbols pkgsrc-2015Q1:1.25.0.62 pkgsrc-2015Q1-base:1.25 pkgsrc-2014Q4:1.25.0.60 pkgsrc-2014Q4-base:1.25 pkgsrc-2014Q3:1.25.0.58 pkgsrc-2014Q3-base:1.25 pkgsrc-2014Q2:1.25.0.56 pkgsrc-2014Q2-base:1.25 pkgsrc-2014Q1:1.25.0.54 pkgsrc-2014Q1-base:1.25 pkgsrc-2013Q4:1.25.0.52 pkgsrc-2013Q4-base:1.25 pkgsrc-2013Q3:1.25.0.50 pkgsrc-2013Q3-base:1.25 pkgsrc-2013Q2:1.25.0.48 pkgsrc-2013Q2-base:1.25 pkgsrc-2013Q1:1.25.0.46 pkgsrc-2013Q1-base:1.25 pkgsrc-2012Q4:1.25.0.44 pkgsrc-2012Q4-base:1.25 pkgsrc-2012Q3:1.25.0.42 pkgsrc-2012Q3-base:1.25 pkgsrc-2012Q2:1.25.0.40 pkgsrc-2012Q2-base:1.25 pkgsrc-2012Q1:1.25.0.38 pkgsrc-2012Q1-base:1.25 pkgsrc-2011Q4:1.25.0.36 pkgsrc-2011Q4-base:1.25 pkgsrc-2011Q3:1.25.0.34 pkgsrc-2011Q3-base:1.25 pkgsrc-2011Q2:1.25.0.32 pkgsrc-2011Q2-base:1.25 pkgsrc-2011Q1:1.25.0.30 pkgsrc-2011Q1-base:1.25 pkgsrc-2010Q4:1.25.0.28 pkgsrc-2010Q4-base:1.25 pkgsrc-2010Q3:1.25.0.26 pkgsrc-2010Q3-base:1.25 pkgsrc-2010Q2:1.25.0.24 pkgsrc-2010Q2-base:1.25 pkgsrc-2010Q1:1.25.0.22 pkgsrc-2010Q1-base:1.25 pkgsrc-2009Q4:1.25.0.20 pkgsrc-2009Q4-base:1.25 pkgsrc-2009Q3:1.25.0.18 pkgsrc-2009Q3-base:1.25 pkgsrc-2009Q2:1.25.0.16 pkgsrc-2009Q2-base:1.25 pkgsrc-2009Q1:1.25.0.14 pkgsrc-2009Q1-base:1.25 pkgsrc-2008Q4:1.25.0.12 pkgsrc-2008Q4-base:1.25 pkgsrc-2008Q3:1.25.0.10 pkgsrc-2008Q3-base:1.25 cube-native-xorg:1.25.0.8 cube-native-xorg-base:1.25 pkgsrc-2008Q2:1.25.0.6 pkgsrc-2008Q2-base:1.25 cwrapper:1.25.0.4 pkgsrc-2008Q1:1.25.0.2 pkgsrc-2008Q1-base:1.25 pkgsrc-2007Q4:1.24.0.12 pkgsrc-2007Q4-base:1.24 pkgsrc-2007Q3:1.24.0.10 pkgsrc-2007Q3-base:1.24 pkgsrc-2007Q2:1.24.0.8 pkgsrc-2007Q2-base:1.24 pkgsrc-2007Q1:1.24.0.6 pkgsrc-2007Q1-base:1.24 pkgsrc-2006Q4:1.24.0.4 pkgsrc-2006Q4-base:1.24 pkgsrc-2006Q3:1.24.0.2 pkgsrc-2006Q3-base:1.24 pkgsrc-2006Q2:1.23.0.24 pkgsrc-2006Q2-base:1.23 pkgsrc-2006Q1:1.23.0.22 pkgsrc-2006Q1-base:1.23 pkgsrc-2005Q4:1.23.0.20 pkgsrc-2005Q4-base:1.23 pkgsrc-2005Q3:1.23.0.18 pkgsrc-2005Q3-base:1.23 pkgsrc-2005Q2:1.23.0.16 pkgsrc-2005Q2-base:1.23 pkgsrc-2005Q1:1.23.0.14 pkgsrc-2005Q1-base:1.23 pkgsrc-2004Q4:1.23.0.12 pkgsrc-2004Q4-base:1.23 pkgsrc-2004Q3:1.23.0.10 pkgsrc-2004Q3-base:1.23 pkgsrc-2004Q2:1.23.0.8 pkgsrc-2004Q2-base:1.23 pkgsrc-2004Q1:1.23.0.6 pkgsrc-2004Q1-base:1.23 pkgsrc-2003Q4:1.23.0.4 pkgsrc-2003Q4-base:1.23 netbsd-1-6-1:1.23.0.2 netbsd-1-6-1-base:1.23 netbsd-1-6:1.21.0.6 netbsd-1-6-RELEASE-base:1.21 pkgviews:1.21.0.2 pkgviews-base:1.21 buildlink2:1.20.0.2 buildlink2-base:1.21 netbsd-1-5-PATCH003:1.20 netbsd-1-5-PATCH001:1.11 netbsd-1-5-RELEASE:1.9 netbsd-1-4-PATCH003:1.9 netbsd-1-4-PATCH002:1.4 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.1; locks; strict; comment @# @; 1.26 date 2015.05.09.03.58.15; author mef; state dead; branches; next 1.25; commitid bsIG0iLfFMIaSIky; 1.25 date 2008.03.10.12.37.12; author drochner; state Exp; branches; next 1.24; 1.24 date 2006.07.18.18.40.36; author wiz; state Exp; branches; next 1.23; 1.23 date 2002.10.28.22.37.10; author wiz; state Exp; branches; next 1.22; 1.22 date 2002.08.25.21.52.55; author jlam; state Exp; branches; next 1.21; 1.21 date 2002.06.01.22.02.48; author wiz; state Exp; branches; next 1.20; 1.20 date 2002.04.09.22.50.02; author jlam; state Exp; branches 1.20.2.1; next 1.19; 1.19 date 2002.04.06.11.16.43; author wiz; state Exp; branches; next 1.18; 1.18 date 2002.04.05.11.25.54; author skrll; state Exp; branches; next 1.17; 1.17 date 2002.03.19.15.34.32; author wiz; state Exp; branches; next 1.16; 1.16 date 2002.03.01.06.46.50; author fredb; state Exp; branches; next 1.15; 1.15 date 2002.02.24.21.42.56; author wiz; state Exp; branches; next 1.14; 1.14 date 2002.02.09.21.12.57; author wiz; state Exp; branches; next 1.13; 1.13 date 2001.10.24.14.05.48; author tron; state Exp; branches; next 1.12; 1.12 date 2001.06.18.15.41.50; author fredb; state dead; branches; next 1.11; 1.11 date 2001.02.08.06.26.47; author fredb; state Exp; branches; next 1.10; 1.10 date 2001.02.08.05.57.53; author fredb; state dead; branches; next 1.9; 1.9 date 2000.09.10.18.00.21; author fredb; state Exp; branches; next 1.8; 1.8 date 2000.07.26.18.15.04; author frueauf; state Exp; branches; next 1.7; 1.7 date 2000.07.10.20.19.28; author tron; state Exp; branches; next 1.6; 1.6 date 2000.07.10.19.57.10; author tron; state Exp; branches; next 1.5; 1.5 date 2000.07.10.19.44.15; author tron; state Exp; branches; next 1.4; 1.4 date 2000.02.01.00.50.47; author wiz; state Exp; branches; next 1.3; 1.3 date 99.06.02.07.44.17; author frueauf; state Exp; branches; next 1.2; 1.2 date 99.05.17.05.23.41; author frueauf; state Exp; branches; next 1.1; 1.1 date 99.01.05.11.34.38; author frueauf; state Exp; branches; next ; 1.20.2.1 date 2002.06.23.19.07.25; author jlam; state Exp; branches; next 1.20.2.2; 1.20.2.2 date 2002.06.30.06.24.49; author jlam; state Exp; branches; next ; desc @@ 1.26 log @(pkgsrc) - Drop three patches, those are now included in upstream code. patch-aa patch-hacks_Makefile.in patch-hacks_memscroller.c - recover pt_BR.po (seems not empty) Makefile and patch-ab (upstream) - Update 5.29 to 5.32 ------------------- 5.32 * Fixed some X11 compilation problems. * Fixed display size and shake gestures on iOS. 5.31 * New hacks, `geodesicgears', `binaryring' and `cityflow'. * UTF-8 text support (instead of only Latin1) and antialiased text on X11 with Xft (instead of only on OSX/iOS) in `fontglide', `noseguy', `fliptext', `starwars', and `winduprobot'. The other text-displaying hacks (`apple2', `phosphor', `xmatrix', and `gltext') also now accept UTF-8 input, though they convert it to Latin1 or ASCII. * `glplanet' now has both day and night maps, and a sharp terminator. * Fixed `webcollage' on OSX. * Fixed a transparency glitch in `winduprobot'. * `lockward' works on iOS. * Text and image loading work on OSX 10.10. * Rotation works properly on iOS 8. * Added a search field on iOS. * Preliminary, unfinished support for Android. 5.30 * New hack, `winduprobot'. * Many improvements to `lament', including Leviathan. * Fixed the normals in `flyingtoasters': shading is correct now. * Implemented TEXTURE_GEN in GLES: flying toast is now toasted on iOS. * Make cel-shading sort-of work in `skytentacles' on iOS. * Fixed dragging-to-rotate on rotated iOS devices, I think. * Dragging has inertia now. * Most hacks respond to mouse-clicks, double-taps and swipes as meaning "do something different now". * Reworked OpenGL fonts. * The OSX auto-update installer wasn't working. This time for sure? * Various minor fixes. @ text @$NetBSD: patch-aa,v 1.25 2008/03/10 12:37:12 drochner Exp $ --- config.guess.orig 2007-11-10 09:12:11.000000000 +0100 +++ config.guess @@@@ -398,6 +398,9 @@@@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit ;; + macppc:NetBSD:*:*) + echo powerpc-apple-netbsd${UNAME_RELEASE} + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; @ 1.25 log @update xscreensaver to 5.05 changes: -added, updated and improved hacks -bugfixes -Reworked PAM code to support fingerprint readers, etc. -Minor tweaks for compilation on MacOS 10.5.0 @ text @d1 1 a1 1 $NetBSD$ @ 1.24 log @Update to 5.00: Changes since 4.24: * Ported to MacOS X! (10.4.0 or newer) * API change: instead of providing a single screenhack() function that does not return, screen savers using the screenhack.h framework must now provide "init" and "draw one frame" functions instead. All bundled savers have been updated; third-party patches will need work. * All image-loading happens asynchronously. * xscreensaver-getimage-file caches the contents of the image directory for a few hours, so consecutive runs won't have to re-list the whole directory tree. * New hacks, `topblock' and `glschool'. * Removed `xteevee' (superceded by `xanalogtv'). * Added variable-sized puzzle pieces to `jigsaw'. * Changes to the defaults and command-line options of many hacks to make the .xml files more consistent. * Reap zombies in `glslideshow' and `carousel'. * `sonar' works without setuid on OSX (dgram icmp). * `xmatrix -mode pipe' displays the text of a subprocess. * `endgame' has higher resolution chess-piece models. * `webcollage' takes a -directory option to get images from a local directory. Changes since 4.23: * New versions of `cube21', `glsnake', `celtic'. * Backed out a DPMS-related patch that cause desktop flickering with some X servers. * Fixed startup crash in getgroups() when running setuid. * Default to not displaying stderr on the saver window. * Fixed bad free() in "Documentation" button. * Don't try to run hacks that aren't installed. * Minor fixes to various XML config files and man pages. Changes since 4.22: * New hacks, `glhanoi', `cube21', `timetunnel', `juggler3d', and `celtic'. * New versions of `tangram', `webcollage', `hypertorus', `polytopes', and `ripples'. * `sonar' is now quiet about unresolvable hosts. * Minor corrections to BASIC code in `apple2'. * Don't install `ant' by default, since there is some Java tool of that name, which was causing confusion. And also it's boring. * Made screen grabbing work again on MacOS 10.4.2. * No longer prints bogus warnings about ClientMessages intended for the window manager. * Ignore unprintable characters in passwd entry field. * Fixed yet another cross-host-display image-loading endian problem. * `xscreensaver-command -watch' and `-time' now work on 64-bit machines. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.23 2002/10/28 22:37:10 wiz Exp $ d3 1 a3 1 --- config.guess.orig 2005-07-13 15:44:55.000000000 +0000 d5 1 a5 1 @@@@ -409,6 +409,9 @@@@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ d8 1 a8 1 exit 0 ;; d11 1 a11 1 + exit 0 ;; d14 1 a14 1 exit 0 ;; @ 1.23 log @Update to 4.06. Changes since 4.05: * New hack, `glblur' (disabled by default, since it requires fast OpenGL texture support.) * New hack, `halftone'. * Updates to `endgame', `queens', `bumps', `glplanet', `engine', and `circuit'. * New version of `menger' that uses far fewer polygons. * Fixed minor bug in `critical' that could cause some bogus X servers to crash. * Better labels in `molecule': the labels now appear to be attached to the atoms, instead of floating in front of the whole scene. * Fixed bug that could rarely cause GL hacks to fail to double-buffer (causing intermittent flickering.) * Fixed a relative-URL-parsing bug in `webcollage'. * Fixed a bug that (sometimes) caused the window manager close box to kill `xscreensaver-demo' with a crash instead of a graceful exit. * Updated xscreensaver.pam to the Red Hat 7.3 way. * More Gnome2-related configure crap. * Updated to latest `config.guess' and `config.sub'. * Fixed occasional core dump in `distort'. * Added a Linux fsck failure and kernel panic to `bsod'. * Added MacOS X kernel panic to `bsod'. * Fixed a bug in `bsod' (all bsod bugs are ironic.) * Fixed a bug that caused `xscreensaver-gl-helper' to print a nonsense visual ID with some versions of `printf': this could cause GL programs to display incorrectly (e.g., flickery.) Changes since 4.04: * More `configure' tweaks to try and get things working on systems that both Gtk 1.x and 2.x installed. * New hack, `endgame'. * Minor updates to `gltext'. Changes since 4.03: * Support for GTK 2.x / GNOME 2.x. * The `configure' script will now use `pkg-config' if you have it, in preference to `gtk-config', etc. * New hacks, `lavalite', `queens', and `anemone'. * Minor updates to `spheremonics', `gltext', `xmatrix'. * You can use the mouse to manually spin most of the GL hacks now (when they are displaying in a window.) * Fixed a bug in `webcollage' (due to recent Alta Vista url changes) that was causing it to try and load incorrect image URLs. * Made `xscreensaver-getimage' use gdk_pixbuf if it is available: this means that those hacks that load images will no longer rely on "xv", "xloadimage", etc. This will close a race condition that could sometimes cause your desktop background to be changed; and also makes it possible for those programs to operate on image files when running in windowed mode. * `webcollage' can now be used in conjunction with `driftnet' to display images snooped from your local ethernet instead of obtained from search engines. * Added man pages for all the hacks that didn't have them. Changes since 4.02: * New hack, `spheremonics'. * Minor updates to `webcollage', `cage', `moebius', `morph3d', `boxed', `circuit', and `helix'. * `pulsar' and `extrusion' can now load texture JPEGs. * `rubik' now does non-square cubes. * `fluidballs' now does various sizes of balls. * `menger' and `sierpinski3d' now also show polygon counts in -fps mode. * `molecule' displays real subscripts in the formulae. * GTK internationalization/localization support. * Better detection of the various versions of libxml. * Upgraded to autoconf 2.53 (from 2.13.) @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- config.guess.orig Mon Sep 9 10:33:43 2002 d5 1 a5 1 @@@@ -402,6 +402,9 @@@@ EOF @ 1.22 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.20.2.2 2002/06/30 06:24:49 jlam Exp $ d3 12 a14 29 --- configure.orig Mon Mar 18 18:42:35 2002 +++ configure @@@@ -6095,7 +6095,7 @@@@ if test "$have_kerberos5" = yes ; then # from Matt Knopp # (who got it from amu@@mit.edu) - PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err" + PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err -lcrypt" elif test "$have_kerberos" = yes ; then # from Tim Showalter for FreeBSD 4.2 PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err" @@@@ -7584,7 +7584,7 @@@@ /*) echo $ac_n "checking for XML headers""... $ac_c" 1>&6 echo "configure:7598: checking for XML headers" >&5 - d=$with_xml/include + d=$with_xml/include/gnome-xml if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" echo "$ac_t""$d" 1>&6 @@@@ -10745,7 +10745,7 @@@@ GTK_ICONDIR='$(GNOME_DATADIR)/pixmaps' elif test "$have_gtk" = yes; then # should this be "$(prefix)/share/pixmaps"? But /usr/X11R6/share/ is wrong... - GTK_ICONDIR='/usr/share/pixmaps' + GTK_ICONDIR='$(prefix)/share/pixmaps' else GTK_ICONDIR='' fi @ 1.21 log @We don't have to set INSTALL, nor comment out the INSTALL_SCRIPT line in configure. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.20 2002/04/09 22:50:02 jlam Exp $ d23 1 a23 17 @@@@ -10635,15 +10635,6 @@@@ DEPEND_DEFINES= -if test \! -z "$includedir" ; then - INCLUDES="$INCLUDES -I$includedir" -fi - -if test \! -z "$libdir" ; then - LDFLAGS="$LDFLAGS -L$libdir" -fi - - PREFERRED_DEMO_PROGRAM=xscreensaver-demo-Xm ALL_DEMO_PROGRAMS= if test "$have_motif" = yes; then @@@@ -10745,7 +10736,7 @@@@ @ 1.20 log @Strongly buildlinkify. @ text @d1 1 a1 1 $NetBSD$ a4 9 @@@@ -1638,7 +1638,7 @@@@ # implement the "install-strip" target properly (strip executables, # but do not try to strip scripts.) # -INSTALL_SCRIPT='${INSTALL}' +#INSTALL_SCRIPT='${INSTALL}' # random libc stuff echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 @ 1.20.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.21 2002/06/01 22:02:48 wiz Exp $ d5 9 @ 1.20.2.2 log @Convert to use the buildlink2 framework. Trim any unnecessary changes in the patches or remove them entirely. @ text @d1 1 a1 1 $NetBSD$ d23 17 a39 1 @@@@ -10745,7 +10745,7 @@@@ @ 1.19 log @Install GTK pixmaps in ${PREFIX}/share/pixmaps, not /usr/share/pixmaps. Fix PLIST to include the files. XXX: If you had this package installed, you can rm /usr/share/pixmaps/*screensaver* and probably rmdir /usr/share/pixmaps @ text @d3 1 a3 1 --- configure.orig Tue Mar 19 00:42:35 2002 d32 17 a48 1 @@@@ -10745,7 +10745,7 @@@@ @ 1.18 log @Remove BUILD_DEPENDS on autoconf. It actually lost the changes made to configure. Hi Charles. Thanks to Thomas Klausner for pointing out the BUILD_DEPENDS. @ text @d3 1 a3 1 --- configure.orig Mon Mar 18 23:42:35 2002 d32 9 @ 1.17 log @Update xscreensaver and xscreensaver-gnome to 4.02. * Plugged a few minor leaks in `xscreensaver' and `xscreensaver-demo'. * New hacks, `cubenetic' and `fluidballs'. * Sped up `pipes'. * Fixed sphere projection error in `glplanet'; installed a better image of earth. * Added Win2K and MacOS 1 crashes to `bsod'. * Put back previous (better) version of `forest' that was accidentially downgraded in the last release. * New version of `bumps'. * Made FPS computation in GL hacks more efficient: it will influence the results less, thus resulting in higher (but more accurate) reported frame rates. @ text @d3 1 a3 1 --- configure.orig Tue Mar 19 00:42:35 2002 d14 9 @ 1.16 log @Make the demo and some of the hacks slightly more featureful, by helping it find "libxml" and "libjpeg" and adding depencencies for them. Also, "gdk_pixbuf" gets favored now over "Xpm" anyway, so add an explicit dependency for it, too. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.15 2002/02/24 21:42:56 wiz Exp $ d3 1 a3 1 --- configure.orig Sun Feb 24 03:56:28 2002 d5 1 a5 1 @@@@ -1544,7 +1544,7 @@@@ d14 1 a14 1 @@@@ -7479,7 +7479,7 @@@@ d17 1 a17 1 echo "configure:7493: checking for XML headers" >&5 @ 1.15 log @Update xscreensaver to 4.01. Changes since 4.00: * New hacks: `twang', `glsnake', `boxed', `sballs', and `glforestfire'. * New hacks `apollonian', `euler2d', `juggle', `polyominoes' and `thornbird', from xlockmore. * Merged recent xlockmore changes into `ant', `braid', `demon', `discrete', `drift', `fadeplot', `forest', `grav', `hopalong', `ifs', `laser', `lightning', `lisa', `lissie', `loop', `mountain', `penrose', `rotor', `sierpinski', `slip', `sphere', `spiral', `strange', and `vines'. * Fixed the `gltext' bug that sometimes caused horizontal lines to vanish again. This time for sure. * Sped up `webcollage' by adding a C helper program to replace the PPM pipeline. It also pastes images semi-transparently now. * Added support for the gdk_pixbuf library: if this lib is available, then `blitspin', `xflame', and `flag' can load GIF, JPEG, and PNG images in addition to XPM and XBM. [not enabled in pkg] * Fixed a rare race condition where the desktop-grabbing hacks could sometimes leave the screen wedged, if the user moved the mouse exactly when they were grabbing the screen image (it would un-wedge the next time the saver timed out or was activated.) * Fixed incorrect colors in the screen-grabbing GL hacks (`gflux' and `flipscreen3d'.) * Made SIGHUP restart the daemon process (though using `xscreensaver-command -restart' is still the preferred way.) * Tweaks to `xspirograph'. * Minor configure and portability tweaks. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig Sun Feb 24 10:56:28 2002 d14 9 @ 1.14 log @Update xscreensaver to 4.00: * Redesigned xscreensaver-demo GUI: it now includes small-preview and per-hack configuration dialogs. * Added three new modes of operation: One Screen Saver, Blank Screen, and Don't Blank (in addition to the historical Random Screen Saver). * Configure now defaults to installing the hacks in /lib/xscreensaver/ instead of /bin/. (Most distros already did it this way.) * New GL hacks, menger, engine, flipscreen3d. * Made sierpinski3d be more colorful. * New versions of xmatrix and nerverot. * Fixed a bug in starwars that made the font be drawn with thin lines in -root mode. * Fixed a bad colormap bug in crystal that could make subsequent hacks malfunction! * Made gflux able to grab screen images (-mode grab). * Updated webcollage for recent search engine changes. * Removed most command-line options to xscreensaver: just edit the ~/.xscreensaver file instead. * Improved behavior on multi-screen and Xinerama systems: the mouse now stays on the screen where the user left it, and the password and splash dialogs always appear on the screen that has the mouse. * Made the splash dialog use more Gtk-like colors; made it have only two buttons, ``Settings'' and ``Help''. * Made sonar understand .ssh/known_hosts2 format files, and be better about stripping out illegal addresses. @ text @d3 1 a3 1 --- configure.orig Wed Jan 2 09:15:22 2002 d5 1 a5 1 @@@@ -1536,7 +1536,7 @@@@ a13 19 @@@@ -3790,15 +3790,15 @@@@ # there must be a better way than this... if test -z "`echo $with_configdir | sed 's@@^/.*@@@@'`" ; then # absolute path - CONFIGDIR=$with_configdir + HACK_CONF_DIR=$with_configdir else # relative path - CONFIGDIR="\${exec_prefix}$with_configdir" + HACK_CONF_DIR="\${exec_prefix}$with_configdir" fi fi # canonicalize slashes. -CONFIGDIR=`echo "${CONFIGDIR}" | sed 's@@/$@@@@;s@@//*@@/@@g'` +HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@@/$@@@@;s@@//*@@/@@g'` @ 1.13 log @Remove a stupid assignment of "INSTALL_SCRIPT" in "configure" which caused a "make reinstall" of the "xscreensaver" and the "xscreensaver-gnome" package to fail. @ text @d3 3 a5 3 --- configure.orig Mon Jun 4 01:43:39 2001 +++ configure Wed Oct 24 15:59:51 2001 @@@@ -1531,7 +1531,7 @@@@ d14 19 @ 1.12 log @Update xscreensaver package(s) to 3.33, with patches submitted by Daniel Hagerty in PR pkg/13233. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.11 2001/02/08 06:26:47 fredb Exp $ d3 11 a13 11 --- driver/Makefile.in.orig Fri Feb 2 03:01:03 2001 +++ driver/Makefile.in Thu Feb 8 00:09:37 2001 @@@@ -37,7 +37,7 @@@@ INSTALL = @@INSTALL@@ SUID_FLAGS = -o root -m 4755 INSTALL_PROGRAM = @@INSTALL_PROGRAM@@ -INSTALL_SCRIPT = @@INSTALL_PROGRAM@@ +INSTALL_SCRIPT = @@INSTALL_SCRIPT@@ INSTALL_SETUID = @@INSTALL_SETUID@@ INSTALL_DATA = @@INSTALL_DATA@@ INSTALL_DIRS = @@INSTALL_DIRS@@ @ 1.11 log @Missed this one. Still can't strip a script. @ text @d1 1 a1 1 $NetBSD$ @ 1.10 log @Update to 3.28 -- new "hacks", bug fixes, configure updates for XFree86-4 and *BSD (allows to simplify the package somewhat), and revamped Screensaver Options: xscreensaver now lets you configure your DPMS settings. More detail on the web page -- http://www.jwz.org/xscreensaver/changelog.html [The README in the package currently only goes to 3.27.] @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 2000/09/10 18:00:21 fredb Exp $ d3 11 a13 29 --- driver/Makefile.in.orig Wed Jul 19 09:37:22 2000 +++ driver/Makefile.in Tue Jul 25 23:23:19 2000 @@@@ -141,8 +141,8 @@@@ DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS) DEMO_OBJS = prefs.o remote.o $(DEMO_UTIL_OBJS) -SAVER_LIBS = $(LIBS) $(X_LIBS) @@SAVER_LIBS@@ $(GL_LIBS) \ - $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ +SAVER_LIBS = $(LIBS) $(X_LIBS) @@SAVER_LIBS@@ $(GL_LIBS) -lXt \ + $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) \ $(PASSWD_LIBS) CMD_LIBS = $(LIBS) $(X_LIBS) \ @@@@ -377,11 +377,11 @@@@ install-kde: @@src="$(srcdir)/xscreensaver.kss" ; \ - if [ "$$KDEDIR" != "" ]; then \ - dir="$(install_prefix)$$KDEDIR/bin" ; \ + if true; then \ + dir="$(bindir)" ; \ dest="$$dir/xscreensaver.kss" ; \ - echo $(INSTALL_SCRIPT) $$src $$dest ; \ - if $(INSTALL_SCRIPT) $$src $$dest ; then \ + echo $(BSD_INSTALL_SCRIPT) $$src $$dest ; \ + if $(BSD_INSTALL_SCRIPT) $$src $$dest ; then \ true ; \ else \ e=echo ; \ @ 1.9 log @Revert a NetBSD patch. We want this to install _over_ the xscreensaver that ships with gnome, in order to upgrade it properly. Otherwise, trying to handle two screensavers causes the control panel to crash frequently. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2000/07/26 18:15:04 frueauf Exp $ @ 1.8 log @Update xscreensaver to 3.25. Changes since 3.24: * New hack, `nerverot'. * Added BSD kernel panic to `bsod'. * New version of `shadebobs'. * New version of `petri'. * Updated `webcollage' to handle recent Altavista URL format changes; made it search the AP photo gallery. * Revamped command-line options of `sonar' and made it properly handle subnets. * The `bubbles' hack can now trickle up or down the screen . * The `xsublim' hack can now read its text from programs. * Support for GLE version 3 in `extrusion'. * Fixed compilation problems in `maze'. * Fixed a rare crash in `flow'. * Fixes for minor installation problems. @ text @d1 1 a1 1 $NetBSD$ a15 31 @@@@ -328,17 +328,17 @@@@ lost2="" ;\ if [ "$(install_prefix)$(GNOME_DATADIR)" != "" ]; then \ echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop ;\ + $(install_prefix)$(GNOME_CCDIR)/xscreensaver-properties.desktop ;\ if $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop ;\ + $(install_prefix)$(GNOME_CCDIR)/xscreensaver-properties.desktop ;\ then true ;\ else \ lost1="$(install_prefix)$(GNOME_CCDIR)" ;\ fi ;\ echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ - $(GNOME_PANELDIR)/screensaver-properties.desktop ;\ + $(GNOME_PANELDIR)/xscreensaver-properties.desktop ;\ if $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ - $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop ;\ + $(install_prefix)$(GNOME_PANELDIR)/xscreensaver-properties.desktop ;\ then true ;\ else \ lost2="$(install_prefix)$(GNOME_PANELDIR)" ;\ @@@@ -368,7 +368,7 @@@@ uninstall-gnome: @@if [ "$(install_prefix)$(GNOME_DATADIR)" != "" ]; then \ - f=screensaver-properties.desktop ;\ + f=xscreensaver-properties.desktop ;\ echo rm -f $(install_prefix)$(GNOME_CCDIR)/$$f ;\ rm -f $(install_prefix)$(GNOME_CCDIR)/$$f ;\ echo rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f ;\ @ 1.7 log @Avoid conflict between "control-center" and "xscreensave-gnome" package. @ text @d3 3 a5 3 --- driver/Makefile.in.orig Mon Apr 3 11:04:08 2000 +++ driver/Makefile.in Mon Jul 10 22:05:33 2000 @@@@ -140,8 +140,8 @@@@ d16 23 a38 16 @@@@ -325,30 +325,30 @@@@ install-gnome: screensaver-properties.desktop @@if [ "$(GNOME_DATADIR)" != "" ]; then \ echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ - $(GNOME_CCDIR)/screensaver-properties.desktop ; \ + $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \ $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ - $(GNOME_CCDIR)/screensaver-properties.desktop ; \ + $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \ echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ - $(GNOME_PANELDIR)/screensaver-properties.desktop ; \ + $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \ $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ - $(GNOME_PANELDIR)/screensaver-properties.desktop ; \ + $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \ fi d41 7 a47 10 @@if [ "$(GNOME_DATADIR)" != "" ]; then \ - echo rm -f $(GNOME_CCDIR)/screensaver-properties.desktop ; \ - rm -f $(GNOME_CCDIR)/screensaver-properties.desktop ; \ - echo rm -f $(GNOME_PANELDIR)/screensaver-properties.desktop ; \ - rm -f $(GNOME_PANELDIR)/screensaver-properties.desktop ; \ + echo rm -f $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \ + rm -f $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \ + echo rm -f $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \ + rm -f $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \ fi d56 3 a58 3 - echo $(INSTALL_PROGRAM) $$src $$dest ; \ - if $(INSTALL_PROGRAM) $$src $$dest ; then \ + echo $(BSD_INSTALL_SCRIPT) $$src $$dest ; \ @ 1.6 log @Properly merge "patch-aa" and "patch-af". @ text @d3 2 a4 2 --- driver/Makefile.in.orig Mon Jul 10 21:54:54 2000 +++ driver/Makefile.in Mon Jul 10 21:55:02 2000 d16 28 a43 1 @@@@ -344,11 +344,11 @@@@ @ 1.5 log @Don't patch "drivers/Makefile.in" twice. @ text @d1 15 a15 2 --- driver/Makefile.in.orig Mon Jul 10 21:39:55 2000 +++ driver/Makefile.in Mon Jul 10 21:39:57 2000 @ 1.4 log @update xscreensaver to 3.22. Changes since 3.21: * Fixed some bugs in xscreensaver-demo. * Rewrote the Motif version of xscreensaver-demo to match the new Gtk version. * The Athena toolkit is no longer supported. XXX: depends on lesstif>=0.89.9 (or motif), but dependency is handled indirectly by USE_MOTIF... how to handle this? @ text @d1 3 a3 7 $NetBSD$ --- ./driver/Makefile.in.orig Thu Dec 9 13:29:41 1999 +++ ./driver/Makefile.in Mon Jan 31 02:10:27 2000 @@@@ -136,8 +136,8 @@@@ DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS) DEMO_OBJS = prefs.o remote.o $(DEMO_UTIL_OBJS) d5 14 a18 7 -SAVER_LIBS = $(LIBS) $(X_LIBS) @@SAVER_LIBS@@ $(GL_LIBS) \ - $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ +SAVER_LIBS = $(LIBS) $(X_LIBS) @@SAVER_LIBS@@ $(GL_LIBS) -lXt \ + $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) \ $(PASSWD_LIBS) CMD_LIBS = $(LIBS) $(X_LIBS) \ @ 1.3 log @Update xscreensaver to 3.13. @ text @d3 4 a6 4 --- driver/Makefile.in.orig Tue Jun 1 03:59:21 1999 +++ driver/Makefile.in Wed Jun 2 08:41:52 1999 @@@@ -138,8 +138,8 @@@@ DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS) demo.c @ 1.2 log @Update xscreensaver to 3.12. @ text @d3 5 a7 5 --- driver/Makefile.in.orig Mon May 10 20:43:48 1999 +++ driver/Makefile.in Mon May 17 06:31:14 1999 @@@@ -136,15 +136,15 @@@@ DEMO_OBJS = $(DEMO_OBJS_1) remote.o \ $(TOOLKIT_OBJS) $(DEMO_UTIL_OBJS) a15 9 $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -DEMO_LIBS = $(LIBS) $(X_LIBS) $(TOOLKIT_LIBS) \ - $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) +DEMO_LIBS = $(LIBS) $(X_LIBS) $(TOOLKIT_LIBS) -lXt \ + $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) EXES = xscreensaver xscreensaver-command xscreensaver-demo @ 1.1 log @For some reason the pmax X11 (1.3.3) needs a forced ordering of libs while linking, e.g. -Xt before -lSM and -lICE, sometimes even -lXext before -X11. This rearangment does not affect e.g. i386, so I hope this does not open problems on other ports. This way xscreensaver works on pmax. @ text @d3 3 a5 3 --- driver/Makefile.in-orig Sun Nov 22 09:00:54 1998 +++ driver/Makefile.in Tue Jan 5 01:28:35 1999 @@@@ -129,15 +129,15 @@@@ d9 1 a9 1 -SAVER_LIBS = $(LIBS) $(X_LIBS) @@SAVER_LIBS@@ \ d11 1 a11 1 +SAVER_LIBS = $(LIBS) $(X_LIBS) @@SAVER_LIBS@@ -lXt \ @