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

10 files changed, 80 insertions, 83 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index ebbb8308aba..4019e0e88f6 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2007/01/15 17:38:18 joerg Exp $
-
-PKGREVISION=	1
+# $NetBSD: Makefile,v 1.84 2008/03/10 12:37:12 drochner Exp $
 
 COMMENT=	Screen saver and locker for the X window system
 
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 5745de630e4..55680e66fa1 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.95 2007/01/15 17:38:18 joerg Exp $
+# $NetBSD: Makefile.common,v 1.96 2008/03/10 12:37:12 drochner Exp $
 #
 
-# When updating the package, and screensavers are removed,
+# When updating the package,
 # please check kdeartwork3 -- it installs some extra
 # files depending on which screensavers it finds.
-DISTNAME=		xscreensaver-5.00
+DISTNAME=		xscreensaver-5.05
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index bf4d0badc94..da05e9b3dad 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2007/01/08 21:45:10 drochner Exp $
+@comment $NetBSD: PLIST,v 1.32 2008/03/10 12:37:12 drochner Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -7,6 +7,7 @@ bin/xscreensaver-getimage-video
 bin/xscreensaver-gl-helper
 bin/xscreensaver-text
 lib/X11/app-defaults/XScreenSaver
+libexec/xscreensaver/abstractile
 libexec/xscreensaver/anemone
 libexec/xscreensaver/anemotaxis
 libexec/xscreensaver/antinspect
@@ -40,6 +41,7 @@ libexec/xscreensaver/circuit
 libexec/xscreensaver/cloudlife
 libexec/xscreensaver/compass
 libexec/xscreensaver/config/README
+libexec/xscreensaver/config/abstractile.xml
 libexec/xscreensaver/config/anemone.xml
 libexec/xscreensaver/config/anemotaxis.xml
 libexec/xscreensaver/config/antinspect.xml
@@ -80,6 +82,8 @@ libexec/xscreensaver/config/crystal.xml
 libexec/xscreensaver/config/cube21.xml
 libexec/xscreensaver/config/cubenetic.xml
 libexec/xscreensaver/config/cubestorm.xml
+libexec/xscreensaver/config/cubicgrid.xml
+libexec/xscreensaver/config/cwaves.xml
 libexec/xscreensaver/config/cynosure.xml
 libexec/xscreensaver/config/dangerball.xml
 libexec/xscreensaver/config/decayscreen.xml
@@ -116,6 +120,7 @@ libexec/xscreensaver/config/galaxy.xml
 libexec/xscreensaver/config/gears.xml
 libexec/xscreensaver/config/gflux.xml
 libexec/xscreensaver/config/glblur.xml
+libexec/xscreensaver/config/glcells.xml
 libexec/xscreensaver/config/gleidescope.xml
 libexec/xscreensaver/config/glforestfire.xml
 libexec/xscreensaver/config/glhanoi.xml
@@ -137,6 +142,7 @@ libexec/xscreensaver/config/hopalong.xml
 libexec/xscreensaver/config/hyperball.xml
 libexec/xscreensaver/config/hypercube.xml
 libexec/xscreensaver/config/hypertorus.xml
+libexec/xscreensaver/config/hypnowheel.xml
 libexec/xscreensaver/config/ifs.xml
 libexec/xscreensaver/config/imsmap.xml
 libexec/xscreensaver/config/interaggregate.xml
@@ -153,11 +159,14 @@ libexec/xscreensaver/config/kumppa.xml
 libexec/xscreensaver/config/lament.xml
 libexec/xscreensaver/config/laser.xml
 libexec/xscreensaver/config/lavalite.xml
+libexec/xscreensaver/config/lcdscrub.xml
 libexec/xscreensaver/config/lightning.xml
 libexec/xscreensaver/config/lisa.xml
 libexec/xscreensaver/config/lissie.xml
 libexec/xscreensaver/config/lmorph.xml
+libexec/xscreensaver/config/lockward.xml
 libexec/xscreensaver/config/loop.xml
+libexec/xscreensaver/config/m6502.xml
 libexec/xscreensaver/config/maze.xml
 libexec/xscreensaver/config/memscroller.xml
 libexec/xscreensaver/config/menger.xml
@@ -165,6 +174,7 @@ libexec/xscreensaver/config/metaballs.xml
 libexec/xscreensaver/config/mirrorblob.xml
 libexec/xscreensaver/config/mismunch.xml
 libexec/xscreensaver/config/moebius.xml
+libexec/xscreensaver/config/moebiusgears.xml
 libexec/xscreensaver/config/moire.xml
 libexec/xscreensaver/config/moire2.xml
 libexec/xscreensaver/config/molecule.xml
@@ -234,6 +244,7 @@ libexec/xscreensaver/config/twang.xml
 libexec/xscreensaver/config/vermiculate.xml
 libexec/xscreensaver/config/vidwhacker.xml
 libexec/xscreensaver/config/vines.xml
+libexec/xscreensaver/config/voronoi.xml
 libexec/xscreensaver/config/wander.xml
 libexec/xscreensaver/config/whirlwindwarp.xml
 libexec/xscreensaver/config/whirlygig.xml
@@ -259,6 +270,8 @@ libexec/xscreensaver/crystal
 libexec/xscreensaver/cube21
 libexec/xscreensaver/cubenetic
 libexec/xscreensaver/cubestorm
+libexec/xscreensaver/cubicgrid
+libexec/xscreensaver/cwaves
 libexec/xscreensaver/cynosure
 libexec/xscreensaver/dangerball
 libexec/xscreensaver/decayscreen
@@ -293,6 +306,7 @@ libexec/xscreensaver/galaxy
 libexec/xscreensaver/gears
 libexec/xscreensaver/gflux
 libexec/xscreensaver/glblur
+libexec/xscreensaver/glcells
 libexec/xscreensaver/gleidescope
 libexec/xscreensaver/glforestfire
 libexec/xscreensaver/glhanoi
@@ -313,6 +327,7 @@ libexec/xscreensaver/hopalong
 libexec/xscreensaver/hyperball
 libexec/xscreensaver/hypercube
 libexec/xscreensaver/hypertorus
+libexec/xscreensaver/hypnowheel
 libexec/xscreensaver/ifs
 libexec/xscreensaver/imsmap
 libexec/xscreensaver/interaggregate
@@ -329,12 +344,15 @@ libexec/xscreensaver/kumppa
 libexec/xscreensaver/lament
 libexec/xscreensaver/laser
 libexec/xscreensaver/lavalite
+libexec/xscreensaver/lcdscrub
 libexec/xscreensaver/lightning
 libexec/xscreensaver/lisa
 libexec/xscreensaver/lissie
 libexec/xscreensaver/ljlatest
 libexec/xscreensaver/lmorph
+libexec/xscreensaver/lockward
 libexec/xscreensaver/loop
+libexec/xscreensaver/m6502
 libexec/xscreensaver/maze
 libexec/xscreensaver/memscroller
 libexec/xscreensaver/menger
@@ -342,6 +360,7 @@ libexec/xscreensaver/metaballs
 libexec/xscreensaver/mirrorblob
 libexec/xscreensaver/mismunch
 libexec/xscreensaver/moebius
+libexec/xscreensaver/moebiusgears
 libexec/xscreensaver/moire
 libexec/xscreensaver/moire2
 libexec/xscreensaver/molecule
@@ -410,6 +429,7 @@ libexec/xscreensaver/twang
 libexec/xscreensaver/vermiculate
 libexec/xscreensaver/vidwhacker
 libexec/xscreensaver/vines
+libexec/xscreensaver/voronoi
 libexec/xscreensaver/wander
 libexec/xscreensaver/whirlwindwarp
 libexec/xscreensaver/whirlygig
@@ -430,6 +450,7 @@ man/man1/xscreensaver-getimage-video.1
 man/man1/xscreensaver-getimage.1
 man/man1/xscreensaver-text.1
 man/man1/xscreensaver.1
+man/man6/abstractile.6
 man/man6/anemone.6
 man/man6/anemotaxis.6
 man/man6/antinspect.6
@@ -469,6 +490,8 @@ man/man6/crystal.6
 man/man6/cube21.6
 man/man6/cubenetic.6
 man/man6/cubestorm.6
+man/man6/cubicgrid.6
+man/man6/cwaves.6
 man/man6/cynosure.6
 man/man6/dangerball.6
 man/man6/decayscreen.6
@@ -503,6 +526,7 @@ man/man6/galaxy.6
 man/man6/gears.6
 man/man6/gflux.6
 man/man6/glblur.6
+man/man6/glcells.6
 man/man6/gleidescope.6
 man/man6/glforestfire.6
 man/man6/glhanoi.6
@@ -523,6 +547,7 @@ man/man6/hopalong.6
 man/man6/hyperball.6
 man/man6/hypercube.6
 man/man6/hypertorus.6
+man/man6/hypnowheel.6
 man/man6/ifs.6
 man/man6/imsmap.6
 man/man6/interaggregate.6
@@ -539,11 +564,13 @@ man/man6/kumppa.6
 man/man6/lament.6
 man/man6/laser.6
 man/man6/lavalite.6
+man/man6/lcdscrub
 man/man6/lightning.6
 man/man6/lisa.6
 man/man6/lissie.6
 man/man6/ljlatest.6
 man/man6/lmorph.6
+man/man6/lockward.6
 man/man6/loop.6
 man/man6/maze.6
 man/man6/memscroller.6
@@ -552,6 +579,7 @@ man/man6/metaballs.6
 man/man6/mirrorblob.6
 man/man6/mismunch.6
 man/man6/moebius.6
+man/man6/moebiusgears.6
 man/man6/moire.6
 man/man6/moire2.6
 man/man6/molecule.6
@@ -619,6 +647,7 @@ man/man6/twang.6
 man/man6/vermiculate.6
 man/man6/vidwhacker.6
 man/man6/vines.6
+man/man6/voronoi.6
 man/man6/wander.6
 man/man6/whirlwindwarp.6
 man/man6/whirlygig.6
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 5f6a4cc5a91..7c064cc2ff0 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.51 2007/01/08 21:45:10 drochner Exp $
+$NetBSD: distinfo,v 1.52 2008/03/10 12:37:12 drochner Exp $
 
-SHA1 (xscreensaver-5.00.tar.gz) = 631eb0414112b2db2e62e2ab5a984726d61696d2
-RMD160 (xscreensaver-5.00.tar.gz) = 7630ff42cfd24557cf1459902ddc6256004fc938
-Size (xscreensaver-5.00.tar.gz) = 5263478 bytes
-SHA1 (patch-aa) = e9081bc1b18d6906fcda3d652df9954092b93a84
+SHA1 (xscreensaver-5.05.tar.gz) = 6f23422b17dd8a06cdaf419fd16d398eee50601b
+RMD160 (xscreensaver-5.05.tar.gz) = 8f174d544ae68f54454d946c854cf81749427afb
+Size (xscreensaver-5.05.tar.gz) = 5468293 bytes
+SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979
 SHA1 (patch-ab) = d49a0854e40d6e0dcd9dfcec9c4007d0dd62dfdb
-SHA1 (patch-ac) = c51781671f11d4fcfbc19ef41c01228bd3c6d529
-SHA1 (patch-ad) = 5d0e3fe79d0161897cf945ca4f2a2178342d3ba5
+SHA1 (patch-ac) = a18940984f4ebb96bcfb07618ae86aacbdc9cbfb
+SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
-SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114
-SHA1 (patch-ah) = e998a9ee7f5928c6eb652deb847a0655bb6da562
+SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5
diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa
index 821f9e5b409..a3caa036e81 100644
--- a/x11/xscreensaver/patches/patch-aa
+++ b/x11/xscreensaver/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.24 2006/07/18 18:40:36 wiz Exp $
+$NetBSD: patch-aa,v 1.25 2008/03/10 12:37:12 drochner Exp $
 
---- config.guess.orig	2005-07-13 15:44:55.000000000 +0000
+--- config.guess.orig	2007-11-10 09:12:11.000000000 +0100
 +++ config.guess
-@@ -409,6 +409,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -398,6 +398,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
      powerpc:machten:*:*)
  	echo powerpc-apple-machten${UNAME_RELEASE}
- 	exit 0 ;;
+ 	exit ;;
 +    macppc:NetBSD:*:*)
 +	echo powerpc-apple-netbsd${UNAME_RELEASE}
-+	exit 0 ;;
++	exit ;;
      RISC*:Mach:*:*)
  	echo mips-dec-mach_bsd4.3
- 	exit 0 ;;
+ 	exit ;;
diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
index 9ab9a82ded7..1321b6b8b88 100644
--- a/x11/xscreensaver/patches/patch-ac
+++ b/x11/xscreensaver/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.18 2007/01/08 21:45:10 drochner Exp $
+$NetBSD: patch-ac,v 1.19 2008/03/10 12:37:12 drochner Exp $
 
---- configure.orig	2006-05-24 01:01:32.000000000 +0200
+--- configure.orig	2008-03-02 06:34:45.000000000 +0100
 +++ configure
-@@ -2872,6 +2872,9 @@ echo "${ECHO_T}Turning on SGI compiler w
-     esac
+@@ -3510,6 +3510,9 @@ echo "${ECHO_T}Disabling Objective C ext
+    fi
    fi
  
 +# Disable c89 options, since these trigger more errors than expected and
@@ -11,16 +11,16 @@ $NetBSD: patch-ac,v 1.18 2007/01/08 21:45:10 drochner Exp $
 +if false; then
  if test -n "$GCC"; then
     if test -n "$GCC"; then
-    echo "$as_me:$LINENO: checking whether gcc accepts -std" >&5
-@@ -2918,6 +2921,7 @@ echo "${ECHO_T}Disabling C++ comments in
+    { echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5
+@@ -3558,6 +3561,7 @@ echo "${ECHO_T}Disabling C++ comments in
       CC="$CC -Wp,-lang-c89"
     fi
    fi
 +fi
  
- if test -n "$GCC"; then
-    if test -n "$GCC"; then
-@@ -7434,7 +7438,7 @@ _ACEOF
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7929,7 +7933,7 @@ _ACEOF
  
  
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.18 2007/01/08 21:45:10 drochner Exp $
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-@@ -13073,7 +13077,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
+@@ -13552,7 +13556,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.18 2007/01/08 21:45:10 drochner Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13163,7 +13167,7 @@ echo "$as_me: WARNING: Cannot find compa
+@@ -13639,7 +13643,7 @@ echo "$as_me: WARNING: Cannot find compa
      # from Matt Knopp <mhat@infocalypse.netlag.com>
      # (who got it from amu@mit.edu)
  
@@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.18 2007/01/08 21:45:10 drochner Exp $
  
      # jwz: MacOS X uses -lkrb5, but not -lcrypt
  
-@@ -14371,7 +14375,7 @@ fi
+@@ -14801,7 +14805,7 @@ fi
  #
  if test "$enable_locking" = yes ; then
    case "$host" in
@@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.18 2007/01/08 21:45:10 drochner Exp $
        need_setuid=yes
      ;;
    esac
-@@ -14800,11 +14804,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" >
+@@ -15235,11 +15239,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" >
    ac_gtk_config_libs=$ac_cv_gtk_config_libs
  
    GTK_EXTRA_OBJS=""
diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad
index 1c0ce6fb341..338fd32c8e7 100644
--- a/x11/xscreensaver/patches/patch-ad
+++ b/x11/xscreensaver/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.20 2006/07/18 18:40:36 wiz Exp $
+$NetBSD: patch-ad,v 1.21 2008/03/10 12:37:12 drochner Exp $
 
---- driver/Makefile.in.orig	2006-05-23 23:01:35.000000000 +0000
+--- driver/Makefile.in.orig	2008-03-02 06:34:46.000000000 +0100
 +++ driver/Makefile.in
-@@ -226,7 +226,7 @@ HDRS		= XScreenSaver_ad.h XScreenSaver_X
+@@ -227,7 +227,7 @@ HDRS		= XScreenSaver_ad.h XScreenSaver_X
  		  xscreensaver.h prefs.h remote.h exec.h \
  		  demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
- 		  demo-Gtk-conf.h
+ 		  demo-Gtk-conf.h auth.h mlstring.h types.h
 -MEN_1		= xscreensaver.man xscreensaver-demo.man \
 +MEN_1		= xscreensaver.man \
  		  xscreensaver-command.man \
  		  xscreensaver-text.man \
  		  xscreensaver-getimage.man \
-@@ -257,7 +257,7 @@ all: $(EXES) $(EXES2)
+@@ -258,7 +258,7 @@ all: $(EXES) $(EXES2)
  tests: $(TEST_EXES)
  
  install:   install-program   install-ad    install-scripts \
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.20 2006/07/18 18:40:36 wiz Exp $
  uninstall: uninstall-program uninstall-ad  \
  	   uninstall-gnome   uninstall-man uninstall-xml  
  
-@@ -292,7 +292,7 @@ install-program: $(EXES)
+@@ -293,7 +293,7 @@ install-program: $(EXES)
  	fi ;								      \
  	echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ;    \
  	$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.20 2006/07/18 18:40:36 wiz Exp $
  		    xscreensaver-getimage @EXES_OSX@ ; do	           \
  	  echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
  	       $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
-@@ -489,7 +489,7 @@ install-pam:
+@@ -492,7 +492,7 @@ install-pam:
  
  # screensaver-properties.desktop
  # into /usr/share/applications/
@@ -38,21 +38,3 @@ $NetBSD: patch-ad,v 1.20 2006/07/18 18:40:36 wiz Exp $
  	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
  	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
  	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
-@@ -521,7 +521,7 @@ install-gnome:: $(LOGO)
- # ../utils/images/screensaver-*.png
- # into /usr/share/xscreensaver/glade/
- install-gnome::
--	@if [ "$(GTK_GLADEDIR)" != "" ]; then                                 \
-+	@if [ "$(GTK_DATADIR)" != "" -a "$(GTK_GLADEDIR)" != "" ]; then       \
-            if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then               \
-              echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"         ;\
-                   $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"         ;\
-@@ -538,7 +538,7 @@ install-gnome::
- # xscreensaver-demo.glade2
- # into /usr/share/xscreensaver/glade/
- install-gnome:: xscreensaver-demo.glade2
--	@if [ "$(GTK_GLADEDIR)" != "" ]; then				      \
-+	@if [ "$(GTK_DATADIR)" != "" -a "$(GTK_GLADEDIR)" != "" ]; then       \
- 	  if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then		      \
- 	    echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"	     ;\
- 	         $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"	     ;\
diff --git a/x11/xscreensaver/patches/patch-ag b/x11/xscreensaver/patches/patch-ag
deleted file mode 100644
index b37e2ce3d25..00000000000
--- a/x11/xscreensaver/patches/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/11/14 15:05:09 fredb Exp $
-
---- driver/screensaver-properties.desktop.in.orig	2003-05-20 07:24:06.000000000 -0500
-+++ driver/screensaver-properties.desktop.in
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Exec=xscreensaver-demo
-+Exec=xscreensaver-demo --crapplet
- Icon=xscreensaver.xpm
- Terminal=false
- _Name=Screensaver
diff --git a/x11/xscreensaver/patches/patch-ah b/x11/xscreensaver/patches/patch-ah
deleted file mode 100644
index 9261d8115dd..00000000000
--- a/x11/xscreensaver/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2006/08/10 14:51:39 reed Exp $
-
---- hacks/apple2-main.c.orig	2006-08-10 09:32:10.000000000 -0500
-+++ hacks/apple2-main.c	2006-08-10 09:32:31.000000000 -0500
-@@ -27,6 +27,7 @@
- #ifndef HAVE_COCOA
- # define XK_MISCELLANY
- # include <X11/keysymdef.h>
-+# include <X11/Xlib.h>
- # include <X11/Xutil.h>
- # include <X11/Intrinsic.h>
- #endif
diff --git a/x11/xscreensaver/patches/patch-ai b/x11/xscreensaver/patches/patch-ai
new file mode 100644
index 00000000000..2b21191d195
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.3 2008/03/10 12:37:12 drochner Exp $
+
+--- utils/visual-gl.c.orig	2008-03-02 16:26:23.000000000 +0100
++++ utils/visual-gl.c
+@@ -26,6 +26,7 @@
+ #ifdef HAVE_GL
+ # include <GL/gl.h>
+ # include <GL/glx.h>
++# include <GL/glxext.h>
+ #endif /* HAVE_GL */
+ 
+ extern char *progname;