Thu Feb 11 18:16:22 2010 UTC ()
update to 5.10
changes:
-bugfixes
-Ported to MacOS 10.6, including various 64-bit fixes
-Merged juggle and juggler3d hacks
-New hack, surfaces, incorporating objects from old klein hack, plus
 new ones
-New hack, rubikblocks
-Retired hypercube and hyperball, which are redundant with polytopes
-updates to various hacks


(drochner)
diff -r1.87 -r1.88 pkgsrc/x11/xscreensaver/Makefile
diff -r1.99 -r1.100 pkgsrc/x11/xscreensaver/Makefile.common
diff -r1.35 -r1.36 pkgsrc/x11/xscreensaver/PLIST
diff -r1.54 -r1.55 pkgsrc/x11/xscreensaver/distinfo
diff -r1.21 -r1.22 pkgsrc/x11/xscreensaver/patches/patch-ac

cvs diff -r1.87 -r1.88 pkgsrc/x11/xscreensaver/Makefile (switch to unified diff)

--- pkgsrc/x11/xscreensaver/Makefile 2010/01/24 13:26:13 1.87
+++ pkgsrc/x11/xscreensaver/Makefile 2010/02/11 18:16:21 1.88
@@ -1,40 +1,38 @@ @@ -1,40 +1,38 @@
1# $NetBSD: Makefile,v 1.87 2010/01/24 13:26:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.88 2010/02/11 18:16:21 drochner Exp $
2 
3PKGREVISION= 2 
4 2
5COMMENT= Screen saver and locker for the X window system 3COMMENT= Screen saver and locker for the X window system
6 4
7CONFLICTS+= xscreensaver-gnome<4.14 5CONFLICTS+= xscreensaver-gnome<4.14
8 6
9PKG_DESTDIR_SUPPORT= user-destdir 7PKG_DESTDIR_SUPPORT= user-destdir
10 8
11.include "Makefile.common" 9.include "Makefile.common"
12 10
13CONFIGURE_ARGS+= --without-gtk 11CONFIGURE_ARGS+= --without-gtk
14CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} 12CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
15CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config 13CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config
16 14
17EGDIR= ${PREFIX}/share/examples/xscreensaver 15EGDIR= ${PREFIX}/share/examples/xscreensaver
18MESSAGE_SUBST+= EGDIR=${EGDIR:Q} 16MESSAGE_SUBST+= EGDIR=${EGDIR:Q}
19 17
20.include "options.mk" 18.include "options.mk"
21.include "../../textproc/libxml2/buildlink3.mk" 19.include "../../textproc/libxml2/buildlink3.mk"
22 20
23# Remove useless locale files that have no translations in them. 21# Remove useless locale files that have no translations in them.
24post-extract: 22post-extract:
25 cd ${WRKSRC}/po && ${RM} -f ca.po pt_BR.po 23 cd ${WRKSRC}/po && ${RM} -f ca.po pt_BR.po
26 24
27INSTALLATION_DIRS= ${EGDIR}/pam.d 25INSTALLATION_DIRS= ${EGDIR}/pam.d
28 26
29post-install: 27post-install:
30 ${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \ 28 ${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \
31 ${DESTDIR}${EGDIR}/pam.d/xscreensaver-NetBSD 29 ${DESTDIR}${EGDIR}/pam.d/xscreensaver-NetBSD
32 30
33.include "../../x11/libXScrnSaver/buildlink3.mk" 31.include "../../x11/libXScrnSaver/buildlink3.mk"
34.include "../../x11/libXext/buildlink3.mk" 32.include "../../x11/libXext/buildlink3.mk"
35.include "../../x11/libXinerama/buildlink3.mk" 33.include "../../x11/libXinerama/buildlink3.mk"
36.include "../../x11/libXpm/buildlink3.mk" 34.include "../../x11/libXpm/buildlink3.mk"
37.include "../../x11/libXxf86misc/buildlink3.mk" 35.include "../../x11/libXxf86misc/buildlink3.mk"
38.include "../../x11/libXxf86vm/buildlink3.mk" 36.include "../../x11/libXxf86vm/buildlink3.mk"
39.include "../../x11/xextproto/buildlink3.mk" 37.include "../../x11/xextproto/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"

cvs diff -r1.99 -r1.100 pkgsrc/x11/xscreensaver/Attic/Makefile.common (switch to unified diff)

--- pkgsrc/x11/xscreensaver/Attic/Makefile.common 2009/07/07 17:28:04 1.99
+++ pkgsrc/x11/xscreensaver/Attic/Makefile.common 2010/02/11 18:16:21 1.100
@@ -1,71 +1,71 @@ @@ -1,71 +1,71 @@
1# $NetBSD: Makefile.common,v 1.99 2009/07/07 17:28:04 joerg Exp $ 1# $NetBSD: Makefile.common,v 1.100 2010/02/11 18:16:21 drochner Exp $
2# 2#
3 3
4# When updating the package, 4# When updating the package,
5# please check kdeartwork3 -- it installs some extra 5# please check kdeartwork3 -- it installs some extra
6# files depending on which screensavers it finds. 6# files depending on which screensavers it finds.
7DISTNAME= xscreensaver-5.08 7DISTNAME= xscreensaver-5.10
8CATEGORIES= x11 8CATEGORIES= x11
9MASTER_SITES= ${HOMEPAGE} 9MASTER_SITES= ${HOMEPAGE}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.jwz.org/xscreensaver/ 12HOMEPAGE= http://www.jwz.org/xscreensaver/
13 13
14BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.2 14BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.2
15 15
16USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
17USE_X11= yes 17USE_X11= yes
18USE_TOOLS+= msgfmt perl 18USE_TOOLS+= msgfmt perl
19 19
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver 21CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver
22CONFIGURE_ARGS+= --with-gl 22CONFIGURE_ARGS+= --with-gl
23CONFIGURE_ARGS+= --with-gle 23CONFIGURE_ARGS+= --with-gle
24CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} 24CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg}
25CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune 25CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune
26 26
27CONFIGURE_ARGS+= --without-motif 27CONFIGURE_ARGS+= --without-motif
28 28
29CONFIGURE_ENV+= X_PRE_LIBS=-lXt 29CONFIGURE_ENV+= X_PRE_LIBS=-lXt
30CONFIGURE_ENV+= ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults" 30CONFIGURE_ENV+= ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
31CONFIGURE_ENV+= ac_cv_perl_version="${PERL_VERSION_cmd:sh}" 31CONFIGURE_ENV+= ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
32CONFIGURE_ENV+= INTLTOOL_PERL=${PERL5:Q} 32CONFIGURE_ENV+= INTLTOOL_PERL=${PERL5:Q}
33.if defined(PKGREVISION) 33.if defined(PKGREVISION)
34CONFIGURE_ENV+= X_CFLAGS="-DPKGREVISION=${PKGREVISION}" 34CONFIGURE_ENV+= X_CFLAGS="-DPKGREVISION=${PKGREVISION}"
35.endif 35.endif
36CONFIGURE_ARGS+= ac_cv_path_INTLTOOL_PERL=${PERL5:Q} 36CONFIGURE_ARGS+= ac_cv_path_INTLTOOL_PERL=${PERL5:Q}
37 37
38DISTINFO_FILE= ${.CURDIR}/../../x11/xscreensaver/distinfo 38DISTINFO_FILE= ${.CURDIR}/../../x11/xscreensaver/distinfo
39PATCHDIR= ${.CURDIR}/../../x11/xscreensaver/patches 39PATCHDIR= ${.CURDIR}/../../x11/xscreensaver/patches
40 40
41.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
42 42
43PERL_VERSION_cmd= if ${TEST} -x ${PERL5}; then \ 43PERL_VERSION_cmd= if ${TEST} -x ${PERL5}; then \
44 ${PERL5} -e 'print $$]'; \ 44 ${PERL5} -e 'print $$]'; \
45 else \ 45 else \
46 ${ECHO} "5.006"; \ 46 ${ECHO} "5.006"; \
47 fi 47 fi
48 48
49.if (${OPSYS} == "NetBSD") 49.if (${OPSYS} == "NetBSD")
50. if defined(KERBEROS) 50. if defined(KERBEROS)
51CFLAGS+= -I/usr/include/kerberosIV 51CFLAGS+= -I/usr/include/kerberosIV
52. else 52. else
53CONFIGURE_ARGS+= --without-kerberos 53CONFIGURE_ARGS+= --without-kerberos
54. endif 54. endif
55.endif 55.endif
56 56
57.include "../../mk/compiler.mk" 57.include "../../mk/compiler.mk"
58.if !empty(CC_VERSION:Mgcc*) 58.if !empty(CC_VERSION:Mgcc*)
59CFLAGS+= -fno-strict-aliasing 59CFLAGS+= -fno-strict-aliasing
60.endif 60.endif
61 61
62.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" 62.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
63GCC_REQD+= 2.95.3 63GCC_REQD+= 2.95.3
64.endif 64.endif
65 65
66INSTALL_MAKE_FLAGS= install_prefix=${DESTDIR} 66INSTALL_MAKE_FLAGS= install_prefix=${DESTDIR}
67 67
68.include "../../devel/gettext-lib/buildlink3.mk" 68.include "../../devel/gettext-lib/buildlink3.mk"
69.include "../../graphics/gle/buildlink3.mk" 69.include "../../graphics/gle/buildlink3.mk"
70.include "../../graphics/jpeg/buildlink3.mk" 70.include "../../graphics/jpeg/buildlink3.mk"
71.include "../../x11/libXrandr/buildlink3.mk" 71.include "../../x11/libXrandr/buildlink3.mk"

cvs diff -r1.35 -r1.36 pkgsrc/x11/xscreensaver/PLIST (switch to unified diff)

--- pkgsrc/x11/xscreensaver/PLIST 2009/06/14 18:25:18 1.35
+++ pkgsrc/x11/xscreensaver/PLIST 2010/02/11 18:16:21 1.36
@@ -1,627 +1,624 @@ @@ -1,627 +1,624 @@
1@comment $NetBSD: PLIST,v 1.35 2009/06/14 18:25:18 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.36 2010/02/11 18:16:21 drochner Exp $
2bin/xscreensaver 2bin/xscreensaver
3bin/xscreensaver-command 3bin/xscreensaver-command
4bin/xscreensaver-getimage 4bin/xscreensaver-getimage
5bin/xscreensaver-getimage-file 5bin/xscreensaver-getimage-file
6bin/xscreensaver-getimage-video 6bin/xscreensaver-getimage-video
7bin/xscreensaver-gl-helper 7bin/xscreensaver-gl-helper
8bin/xscreensaver-text 8bin/xscreensaver-text
9lib/X11/app-defaults/XScreenSaver 9lib/X11/app-defaults/XScreenSaver
10libexec/xscreensaver/abstractile 10libexec/xscreensaver/abstractile
11libexec/xscreensaver/anemone 11libexec/xscreensaver/anemone
12libexec/xscreensaver/anemotaxis 12libexec/xscreensaver/anemotaxis
13libexec/xscreensaver/antinspect 13libexec/xscreensaver/antinspect
14libexec/xscreensaver/antmaze 14libexec/xscreensaver/antmaze
15libexec/xscreensaver/antspotlight 15libexec/xscreensaver/antspotlight
16libexec/xscreensaver/apollonian 16libexec/xscreensaver/apollonian
17libexec/xscreensaver/apple2 17libexec/xscreensaver/apple2
18libexec/xscreensaver/atlantis 18libexec/xscreensaver/atlantis
19libexec/xscreensaver/attraction 19libexec/xscreensaver/attraction
20libexec/xscreensaver/atunnel 20libexec/xscreensaver/atunnel
21libexec/xscreensaver/barcode 21libexec/xscreensaver/barcode
22libexec/xscreensaver/blaster 22libexec/xscreensaver/blaster
23libexec/xscreensaver/blinkbox 23libexec/xscreensaver/blinkbox
24libexec/xscreensaver/blitspin 24libexec/xscreensaver/blitspin
25libexec/xscreensaver/blocktube 25libexec/xscreensaver/blocktube
26libexec/xscreensaver/boing 26libexec/xscreensaver/boing
27libexec/xscreensaver/bouboule 27libexec/xscreensaver/bouboule
28libexec/xscreensaver/bouncingcow 28libexec/xscreensaver/bouncingcow
29libexec/xscreensaver/boxed 29libexec/xscreensaver/boxed
30libexec/xscreensaver/boxfit 30libexec/xscreensaver/boxfit
31libexec/xscreensaver/braid 31libexec/xscreensaver/braid
32libexec/xscreensaver/bsod 32libexec/xscreensaver/bsod
33libexec/xscreensaver/bubble3d 33libexec/xscreensaver/bubble3d
34libexec/xscreensaver/bumps 34libexec/xscreensaver/bumps
35libexec/xscreensaver/cage 35libexec/xscreensaver/cage
36libexec/xscreensaver/carousel 36libexec/xscreensaver/carousel
37libexec/xscreensaver/ccurve 37libexec/xscreensaver/ccurve
38libexec/xscreensaver/celtic 38libexec/xscreensaver/celtic
39libexec/xscreensaver/circuit 39libexec/xscreensaver/circuit
40libexec/xscreensaver/cloudlife 40libexec/xscreensaver/cloudlife
41libexec/xscreensaver/compass 41libexec/xscreensaver/compass
42libexec/xscreensaver/config/README 42libexec/xscreensaver/config/README
43libexec/xscreensaver/config/abstractile.xml 43libexec/xscreensaver/config/abstractile.xml
44libexec/xscreensaver/config/anemone.xml 44libexec/xscreensaver/config/anemone.xml
45libexec/xscreensaver/config/anemotaxis.xml 45libexec/xscreensaver/config/anemotaxis.xml
46libexec/xscreensaver/config/antinspect.xml 46libexec/xscreensaver/config/antinspect.xml
47libexec/xscreensaver/config/antmaze.xml 47libexec/xscreensaver/config/antmaze.xml
48libexec/xscreensaver/config/antspotlight.xml 48libexec/xscreensaver/config/antspotlight.xml
49libexec/xscreensaver/config/apollonian.xml 49libexec/xscreensaver/config/apollonian.xml
50libexec/xscreensaver/config/apple2.xml 50libexec/xscreensaver/config/apple2.xml
51libexec/xscreensaver/config/atlantis.xml 51libexec/xscreensaver/config/atlantis.xml
52libexec/xscreensaver/config/attraction.xml 52libexec/xscreensaver/config/attraction.xml
53libexec/xscreensaver/config/atunnel.xml 53libexec/xscreensaver/config/atunnel.xml
54libexec/xscreensaver/config/barcode.xml 54libexec/xscreensaver/config/barcode.xml
55libexec/xscreensaver/config/blaster.xml 55libexec/xscreensaver/config/blaster.xml
56libexec/xscreensaver/config/blinkbox.xml 56libexec/xscreensaver/config/blinkbox.xml
57libexec/xscreensaver/config/blitspin.xml 57libexec/xscreensaver/config/blitspin.xml
58libexec/xscreensaver/config/blocktube.xml 58libexec/xscreensaver/config/blocktube.xml
59libexec/xscreensaver/config/boing.xml 59libexec/xscreensaver/config/boing.xml
60libexec/xscreensaver/config/bouboule.xml 60libexec/xscreensaver/config/bouboule.xml
61libexec/xscreensaver/config/bouncingcow.xml 61libexec/xscreensaver/config/bouncingcow.xml
62libexec/xscreensaver/config/boxed.xml 62libexec/xscreensaver/config/boxed.xml
63libexec/xscreensaver/config/boxfit.xml 63libexec/xscreensaver/config/boxfit.xml
64libexec/xscreensaver/config/braid.xml 64libexec/xscreensaver/config/braid.xml
65libexec/xscreensaver/config/bsod.xml 65libexec/xscreensaver/config/bsod.xml
66libexec/xscreensaver/config/bubble3d.xml 66libexec/xscreensaver/config/bubble3d.xml
67libexec/xscreensaver/config/bumps.xml 67libexec/xscreensaver/config/bumps.xml
68libexec/xscreensaver/config/cage.xml 68libexec/xscreensaver/config/cage.xml
69libexec/xscreensaver/config/carousel.xml 69libexec/xscreensaver/config/carousel.xml
70libexec/xscreensaver/config/ccurve.xml 70libexec/xscreensaver/config/ccurve.xml
71libexec/xscreensaver/config/celtic.xml 71libexec/xscreensaver/config/celtic.xml
72libexec/xscreensaver/config/circuit.xml 72libexec/xscreensaver/config/circuit.xml
73libexec/xscreensaver/config/cloudlife.xml 73libexec/xscreensaver/config/cloudlife.xml
74libexec/xscreensaver/config/compass.xml 74libexec/xscreensaver/config/compass.xml
75libexec/xscreensaver/config/coral.xml 75libexec/xscreensaver/config/coral.xml
76libexec/xscreensaver/config/crackberg.xml 76libexec/xscreensaver/config/crackberg.xml
77libexec/xscreensaver/config/crystal.xml 77libexec/xscreensaver/config/crystal.xml
78libexec/xscreensaver/config/cube21.xml 78libexec/xscreensaver/config/cube21.xml
79libexec/xscreensaver/config/cubenetic.xml 79libexec/xscreensaver/config/cubenetic.xml
80libexec/xscreensaver/config/cubestorm.xml 80libexec/xscreensaver/config/cubestorm.xml
81libexec/xscreensaver/config/cubicgrid.xml 81libexec/xscreensaver/config/cubicgrid.xml
82libexec/xscreensaver/config/cwaves.xml 82libexec/xscreensaver/config/cwaves.xml
83libexec/xscreensaver/config/cynosure.xml 83libexec/xscreensaver/config/cynosure.xml
84libexec/xscreensaver/config/dangerball.xml 84libexec/xscreensaver/config/dangerball.xml
85libexec/xscreensaver/config/decayscreen.xml 85libexec/xscreensaver/config/decayscreen.xml
86libexec/xscreensaver/config/deco.xml 86libexec/xscreensaver/config/deco.xml
87libexec/xscreensaver/config/deluxe.xml 87libexec/xscreensaver/config/deluxe.xml
88libexec/xscreensaver/config/demon.xml 88libexec/xscreensaver/config/demon.xml
89libexec/xscreensaver/config/discrete.xml 89libexec/xscreensaver/config/discrete.xml
90libexec/xscreensaver/config/distort.xml 90libexec/xscreensaver/config/distort.xml
91libexec/xscreensaver/config/drift.xml 91libexec/xscreensaver/config/drift.xml
92libexec/xscreensaver/config/endgame.xml 92libexec/xscreensaver/config/endgame.xml
93libexec/xscreensaver/config/engine.xml 93libexec/xscreensaver/config/engine.xml
94libexec/xscreensaver/config/epicycle.xml 94libexec/xscreensaver/config/epicycle.xml
95libexec/xscreensaver/config/eruption.xml 95libexec/xscreensaver/config/eruption.xml
96libexec/xscreensaver/config/euler2d.xml 96libexec/xscreensaver/config/euler2d.xml
97libexec/xscreensaver/config/extrusion.xml 97libexec/xscreensaver/config/extrusion.xml
98libexec/xscreensaver/config/fadeplot.xml 98libexec/xscreensaver/config/fadeplot.xml
99libexec/xscreensaver/config/fiberlamp.xml 99libexec/xscreensaver/config/fiberlamp.xml
100libexec/xscreensaver/config/fireworkx.xml 100libexec/xscreensaver/config/fireworkx.xml
101libexec/xscreensaver/config/flame.xml 101libexec/xscreensaver/config/flame.xml
102libexec/xscreensaver/config/flipflop.xml 102libexec/xscreensaver/config/flipflop.xml
103libexec/xscreensaver/config/flipscreen3d.xml 103libexec/xscreensaver/config/flipscreen3d.xml
104libexec/xscreensaver/config/fliptext.xml 104libexec/xscreensaver/config/fliptext.xml
105libexec/xscreensaver/config/flow.xml 105libexec/xscreensaver/config/flow.xml
106libexec/xscreensaver/config/fluidballs.xml 106libexec/xscreensaver/config/fluidballs.xml
107libexec/xscreensaver/config/flurry.xml 107libexec/xscreensaver/config/flurry.xml
108libexec/xscreensaver/config/flyingtoasters.xml 108libexec/xscreensaver/config/flyingtoasters.xml
109libexec/xscreensaver/config/fontglide.xml 109libexec/xscreensaver/config/fontglide.xml
110libexec/xscreensaver/config/fuzzyflakes.xml 110libexec/xscreensaver/config/fuzzyflakes.xml
111libexec/xscreensaver/config/galaxy.xml 111libexec/xscreensaver/config/galaxy.xml
112libexec/xscreensaver/config/gears.xml 112libexec/xscreensaver/config/gears.xml
113libexec/xscreensaver/config/gflux.xml 113libexec/xscreensaver/config/gflux.xml
114libexec/xscreensaver/config/glblur.xml 114libexec/xscreensaver/config/glblur.xml
115libexec/xscreensaver/config/glcells.xml 115libexec/xscreensaver/config/glcells.xml
116libexec/xscreensaver/config/gleidescope.xml 116libexec/xscreensaver/config/gleidescope.xml
117libexec/xscreensaver/config/glhanoi.xml 117libexec/xscreensaver/config/glhanoi.xml
118libexec/xscreensaver/config/glknots.xml 118libexec/xscreensaver/config/glknots.xml
119libexec/xscreensaver/config/glmatrix.xml 119libexec/xscreensaver/config/glmatrix.xml
120libexec/xscreensaver/config/glplanet.xml 120libexec/xscreensaver/config/glplanet.xml
121libexec/xscreensaver/config/glschool.xml 121libexec/xscreensaver/config/glschool.xml
122libexec/xscreensaver/config/glslideshow.xml 122libexec/xscreensaver/config/glslideshow.xml
123libexec/xscreensaver/config/glsnake.xml 123libexec/xscreensaver/config/glsnake.xml
124libexec/xscreensaver/config/gltext.xml 124libexec/xscreensaver/config/gltext.xml
125libexec/xscreensaver/config/goop.xml 125libexec/xscreensaver/config/goop.xml
126libexec/xscreensaver/config/grav.xml 126libexec/xscreensaver/config/grav.xml
127libexec/xscreensaver/config/greynetic.xml 127libexec/xscreensaver/config/greynetic.xml
128libexec/xscreensaver/config/halftone.xml 128libexec/xscreensaver/config/halftone.xml
129libexec/xscreensaver/config/halo.xml 129libexec/xscreensaver/config/halo.xml
130libexec/xscreensaver/config/helix.xml 130libexec/xscreensaver/config/helix.xml
131libexec/xscreensaver/config/hopalong.xml 131libexec/xscreensaver/config/hopalong.xml
132libexec/xscreensaver/config/hyperball.xml 
133libexec/xscreensaver/config/hypercube.xml 
134libexec/xscreensaver/config/hypertorus.xml 132libexec/xscreensaver/config/hypertorus.xml
135libexec/xscreensaver/config/hypnowheel.xml 133libexec/xscreensaver/config/hypnowheel.xml
136libexec/xscreensaver/config/ifs.xml 134libexec/xscreensaver/config/ifs.xml
137libexec/xscreensaver/config/imsmap.xml 135libexec/xscreensaver/config/imsmap.xml
138libexec/xscreensaver/config/interaggregate.xml 136libexec/xscreensaver/config/interaggregate.xml
139libexec/xscreensaver/config/interference.xml 137libexec/xscreensaver/config/interference.xml
140libexec/xscreensaver/config/intermomentary.xml 138libexec/xscreensaver/config/intermomentary.xml
141libexec/xscreensaver/config/jigglypuff.xml 139libexec/xscreensaver/config/jigglypuff.xml
142libexec/xscreensaver/config/jigsaw.xml 140libexec/xscreensaver/config/jigsaw.xml
143libexec/xscreensaver/config/juggle.xml 
144libexec/xscreensaver/config/juggler3d.xml 141libexec/xscreensaver/config/juggler3d.xml
145libexec/xscreensaver/config/julia.xml 142libexec/xscreensaver/config/julia.xml
146libexec/xscreensaver/config/kaleidescope.xml 143libexec/xscreensaver/config/kaleidescope.xml
147libexec/xscreensaver/config/klein.xml 144libexec/xscreensaver/config/klein.xml
148libexec/xscreensaver/config/kumppa.xml 145libexec/xscreensaver/config/kumppa.xml
149libexec/xscreensaver/config/lament.xml 146libexec/xscreensaver/config/lament.xml
150libexec/xscreensaver/config/lavalite.xml 147libexec/xscreensaver/config/lavalite.xml
151libexec/xscreensaver/config/lcdscrub.xml 148libexec/xscreensaver/config/lcdscrub.xml
152libexec/xscreensaver/config/lockward.xml 149libexec/xscreensaver/config/lockward.xml
153libexec/xscreensaver/config/loop.xml 150libexec/xscreensaver/config/loop.xml
154libexec/xscreensaver/config/m6502.xml 151libexec/xscreensaver/config/m6502.xml
155libexec/xscreensaver/config/maze.xml 152libexec/xscreensaver/config/maze.xml
156libexec/xscreensaver/config/memscroller.xml 153libexec/xscreensaver/config/memscroller.xml
157libexec/xscreensaver/config/menger.xml 154libexec/xscreensaver/config/menger.xml
158libexec/xscreensaver/config/metaballs.xml 155libexec/xscreensaver/config/metaballs.xml
159libexec/xscreensaver/config/mirrorblob.xml 156libexec/xscreensaver/config/mirrorblob.xml
160libexec/xscreensaver/config/moebius.xml 157libexec/xscreensaver/config/moebius.xml
161libexec/xscreensaver/config/moebiusgears.xml 158libexec/xscreensaver/config/moebiusgears.xml
162libexec/xscreensaver/config/moire.xml 159libexec/xscreensaver/config/moire.xml
163libexec/xscreensaver/config/moire2.xml 160libexec/xscreensaver/config/moire2.xml
164libexec/xscreensaver/config/molecule.xml 161libexec/xscreensaver/config/molecule.xml
165libexec/xscreensaver/config/morph3d.xml 162libexec/xscreensaver/config/morph3d.xml
166libexec/xscreensaver/config/mountain.xml 163libexec/xscreensaver/config/mountain.xml
167libexec/xscreensaver/config/munch.xml 164libexec/xscreensaver/config/munch.xml
168libexec/xscreensaver/config/nerverot.xml 165libexec/xscreensaver/config/nerverot.xml
169libexec/xscreensaver/config/noof.xml 166libexec/xscreensaver/config/noof.xml
170libexec/xscreensaver/config/noseguy.xml 167libexec/xscreensaver/config/noseguy.xml
171libexec/xscreensaver/config/pacman.xml 168libexec/xscreensaver/config/pacman.xml
172libexec/xscreensaver/config/pedal.xml 169libexec/xscreensaver/config/pedal.xml
173libexec/xscreensaver/config/penetrate.xml 170libexec/xscreensaver/config/penetrate.xml
174libexec/xscreensaver/config/penrose.xml 171libexec/xscreensaver/config/penrose.xml
175libexec/xscreensaver/config/petri.xml 172libexec/xscreensaver/config/petri.xml
176libexec/xscreensaver/config/phosphor.xml 173libexec/xscreensaver/config/phosphor.xml
177libexec/xscreensaver/config/photopile.xml 174libexec/xscreensaver/config/photopile.xml
178libexec/xscreensaver/config/piecewise.xml 175libexec/xscreensaver/config/piecewise.xml
179libexec/xscreensaver/config/pinion.xml 176libexec/xscreensaver/config/pinion.xml
180libexec/xscreensaver/config/pipes.xml 177libexec/xscreensaver/config/pipes.xml
181libexec/xscreensaver/config/polyhedra.xml 178libexec/xscreensaver/config/polyhedra.xml
182libexec/xscreensaver/config/polyominoes.xml 179libexec/xscreensaver/config/polyominoes.xml
183libexec/xscreensaver/config/polytopes.xml 180libexec/xscreensaver/config/polytopes.xml
184libexec/xscreensaver/config/pong.xml 181libexec/xscreensaver/config/pong.xml
185libexec/xscreensaver/config/popsquares.xml 182libexec/xscreensaver/config/popsquares.xml
186libexec/xscreensaver/config/providence.xml 183libexec/xscreensaver/config/providence.xml
187libexec/xscreensaver/config/pulsar.xml 184libexec/xscreensaver/config/pulsar.xml
188libexec/xscreensaver/config/pyro.xml 185libexec/xscreensaver/config/pyro.xml
189libexec/xscreensaver/config/qix.xml 186libexec/xscreensaver/config/qix.xml
190libexec/xscreensaver/config/queens.xml 187libexec/xscreensaver/config/queens.xml
191libexec/xscreensaver/config/rd-bomb.xml 188libexec/xscreensaver/config/rd-bomb.xml
192libexec/xscreensaver/config/ripples.xml 189libexec/xscreensaver/config/ripples.xml
193libexec/xscreensaver/config/rocks.xml 190libexec/xscreensaver/config/rocks.xml
194libexec/xscreensaver/config/rorschach.xml 191libexec/xscreensaver/config/rorschach.xml
195libexec/xscreensaver/config/rotzoomer.xml 192libexec/xscreensaver/config/rotzoomer.xml
196libexec/xscreensaver/config/rubik.xml 193libexec/xscreensaver/config/rubik.xml
 194libexec/xscreensaver/config/rubikblocks.xml
197libexec/xscreensaver/config/sballs.xml 195libexec/xscreensaver/config/sballs.xml
198libexec/xscreensaver/config/shadebobs.xml 196libexec/xscreensaver/config/shadebobs.xml
199libexec/xscreensaver/config/sierpinski.xml 197libexec/xscreensaver/config/sierpinski.xml
200libexec/xscreensaver/config/sierpinski3d.xml 198libexec/xscreensaver/config/sierpinski3d.xml
201libexec/xscreensaver/config/skytentacles.xml 199libexec/xscreensaver/config/skytentacles.xml
202libexec/xscreensaver/config/slidescreen.xml 200libexec/xscreensaver/config/slidescreen.xml
203libexec/xscreensaver/config/slip.xml 201libexec/xscreensaver/config/slip.xml
204libexec/xscreensaver/config/sonar.xml 202libexec/xscreensaver/config/sonar.xml
205libexec/xscreensaver/config/speedmine.xml 203libexec/xscreensaver/config/speedmine.xml
206libexec/xscreensaver/config/spheremonics.xml 204libexec/xscreensaver/config/spheremonics.xml
207libexec/xscreensaver/config/spotlight.xml 205libexec/xscreensaver/config/spotlight.xml
208libexec/xscreensaver/config/sproingies.xml 206libexec/xscreensaver/config/sproingies.xml
209libexec/xscreensaver/config/squiral.xml 207libexec/xscreensaver/config/squiral.xml
210libexec/xscreensaver/config/stairs.xml 208libexec/xscreensaver/config/stairs.xml
211libexec/xscreensaver/config/starfish.xml 209libexec/xscreensaver/config/starfish.xml
212libexec/xscreensaver/config/starwars.xml 210libexec/xscreensaver/config/starwars.xml
213libexec/xscreensaver/config/stonerview.xml 211libexec/xscreensaver/config/stonerview.xml
214libexec/xscreensaver/config/strange.xml 212libexec/xscreensaver/config/strange.xml
215libexec/xscreensaver/config/substrate.xml 213libexec/xscreensaver/config/substrate.xml
216libexec/xscreensaver/config/superquadrics.xml 214libexec/xscreensaver/config/superquadrics.xml
 215libexec/xscreensaver/config/surfaces.xml
217libexec/xscreensaver/config/swirl.xml 216libexec/xscreensaver/config/swirl.xml
218libexec/xscreensaver/config/tangram.xml 217libexec/xscreensaver/config/tangram.xml
219libexec/xscreensaver/config/thornbird.xml 218libexec/xscreensaver/config/thornbird.xml
220libexec/xscreensaver/config/timetunnel.xml 219libexec/xscreensaver/config/timetunnel.xml
221libexec/xscreensaver/config/topblock.xml 220libexec/xscreensaver/config/topblock.xml
222libexec/xscreensaver/config/triangle.xml 221libexec/xscreensaver/config/triangle.xml
223libexec/xscreensaver/config/truchet.xml 222libexec/xscreensaver/config/truchet.xml
224libexec/xscreensaver/config/twang.xml 223libexec/xscreensaver/config/twang.xml
225libexec/xscreensaver/config/vermiculate.xml 224libexec/xscreensaver/config/vermiculate.xml
226libexec/xscreensaver/config/vidwhacker.xml 225libexec/xscreensaver/config/vidwhacker.xml
227libexec/xscreensaver/config/voronoi.xml 226libexec/xscreensaver/config/voronoi.xml
228libexec/xscreensaver/config/wander.xml 227libexec/xscreensaver/config/wander.xml
229libexec/xscreensaver/config/whirlwindwarp.xml 228libexec/xscreensaver/config/whirlwindwarp.xml
230libexec/xscreensaver/config/wormhole.xml 229libexec/xscreensaver/config/wormhole.xml
231libexec/xscreensaver/config/xanalogtv.xml 230libexec/xscreensaver/config/xanalogtv.xml
232libexec/xscreensaver/config/xflame.xml 231libexec/xscreensaver/config/xflame.xml
233libexec/xscreensaver/config/xjack.xml 232libexec/xscreensaver/config/xjack.xml
234libexec/xscreensaver/config/xlyap.xml 233libexec/xscreensaver/config/xlyap.xml
235libexec/xscreensaver/config/xmatrix.xml 234libexec/xscreensaver/config/xmatrix.xml
236libexec/xscreensaver/config/xrayswarm.xml 235libexec/xscreensaver/config/xrayswarm.xml
237libexec/xscreensaver/config/xspirograph.xml 236libexec/xscreensaver/config/xspirograph.xml
238libexec/xscreensaver/config/zoom.xml 237libexec/xscreensaver/config/zoom.xml
239libexec/xscreensaver/coral 238libexec/xscreensaver/coral
240libexec/xscreensaver/crackberg 239libexec/xscreensaver/crackberg
241libexec/xscreensaver/crystal 240libexec/xscreensaver/crystal
242libexec/xscreensaver/cube21 241libexec/xscreensaver/cube21
243libexec/xscreensaver/cubenetic 242libexec/xscreensaver/cubenetic
244libexec/xscreensaver/cubestorm 243libexec/xscreensaver/cubestorm
245libexec/xscreensaver/cubicgrid 244libexec/xscreensaver/cubicgrid
246libexec/xscreensaver/cwaves 245libexec/xscreensaver/cwaves
247libexec/xscreensaver/cynosure 246libexec/xscreensaver/cynosure
248libexec/xscreensaver/dangerball 247libexec/xscreensaver/dangerball
249libexec/xscreensaver/decayscreen 248libexec/xscreensaver/decayscreen
250libexec/xscreensaver/deco 249libexec/xscreensaver/deco
251libexec/xscreensaver/deluxe 250libexec/xscreensaver/deluxe
252libexec/xscreensaver/demon 251libexec/xscreensaver/demon
253libexec/xscreensaver/discrete 252libexec/xscreensaver/discrete
254libexec/xscreensaver/distort 253libexec/xscreensaver/distort
255libexec/xscreensaver/drift 254libexec/xscreensaver/drift
256libexec/xscreensaver/endgame 255libexec/xscreensaver/endgame
257libexec/xscreensaver/engine 256libexec/xscreensaver/engine
258libexec/xscreensaver/epicycle 257libexec/xscreensaver/epicycle
259libexec/xscreensaver/eruption 258libexec/xscreensaver/eruption
260libexec/xscreensaver/euler2d 259libexec/xscreensaver/euler2d
261libexec/xscreensaver/extrusion 260libexec/xscreensaver/extrusion
262libexec/xscreensaver/fadeplot 261libexec/xscreensaver/fadeplot
263libexec/xscreensaver/fiberlamp 262libexec/xscreensaver/fiberlamp
264libexec/xscreensaver/fireworkx 263libexec/xscreensaver/fireworkx
265libexec/xscreensaver/flame 264libexec/xscreensaver/flame
266libexec/xscreensaver/flipflop 265libexec/xscreensaver/flipflop
267libexec/xscreensaver/flipscreen3d 266libexec/xscreensaver/flipscreen3d
268libexec/xscreensaver/fliptext 267libexec/xscreensaver/fliptext
269libexec/xscreensaver/flow 268libexec/xscreensaver/flow
270libexec/xscreensaver/fluidballs 269libexec/xscreensaver/fluidballs
271libexec/xscreensaver/flurry 270libexec/xscreensaver/flurry
272libexec/xscreensaver/flyingtoasters 271libexec/xscreensaver/flyingtoasters
273libexec/xscreensaver/fontglide 272libexec/xscreensaver/fontglide
274libexec/xscreensaver/fuzzyflakes 273libexec/xscreensaver/fuzzyflakes
275libexec/xscreensaver/galaxy 274libexec/xscreensaver/galaxy
276libexec/xscreensaver/gears 275libexec/xscreensaver/gears
277libexec/xscreensaver/gflux 276libexec/xscreensaver/gflux
278libexec/xscreensaver/glblur 277libexec/xscreensaver/glblur
279libexec/xscreensaver/glcells 278libexec/xscreensaver/glcells
280libexec/xscreensaver/gleidescope 279libexec/xscreensaver/gleidescope
281libexec/xscreensaver/glhanoi 280libexec/xscreensaver/glhanoi
282libexec/xscreensaver/glknots 281libexec/xscreensaver/glknots
283libexec/xscreensaver/glmatrix 282libexec/xscreensaver/glmatrix
284libexec/xscreensaver/glplanet 283libexec/xscreensaver/glplanet
285libexec/xscreensaver/glschool 284libexec/xscreensaver/glschool
286libexec/xscreensaver/glslideshow 285libexec/xscreensaver/glslideshow
287libexec/xscreensaver/glsnake 286libexec/xscreensaver/glsnake
288libexec/xscreensaver/gltext 287libexec/xscreensaver/gltext
289libexec/xscreensaver/goop 288libexec/xscreensaver/goop
290libexec/xscreensaver/grav 289libexec/xscreensaver/grav
291libexec/xscreensaver/greynetic 290libexec/xscreensaver/greynetic
292libexec/xscreensaver/halftone 291libexec/xscreensaver/halftone
293libexec/xscreensaver/halo 292libexec/xscreensaver/halo
294libexec/xscreensaver/helix 293libexec/xscreensaver/helix
295libexec/xscreensaver/hopalong 294libexec/xscreensaver/hopalong
296libexec/xscreensaver/hyperball 
297libexec/xscreensaver/hypercube 
298libexec/xscreensaver/hypertorus 295libexec/xscreensaver/hypertorus
299libexec/xscreensaver/hypnowheel 296libexec/xscreensaver/hypnowheel
300libexec/xscreensaver/ifs 297libexec/xscreensaver/ifs
301libexec/xscreensaver/imsmap 298libexec/xscreensaver/imsmap
302libexec/xscreensaver/interaggregate 299libexec/xscreensaver/interaggregate
303libexec/xscreensaver/interference 300libexec/xscreensaver/interference
304libexec/xscreensaver/intermomentary 301libexec/xscreensaver/intermomentary
305libexec/xscreensaver/jigglypuff 302libexec/xscreensaver/jigglypuff
306libexec/xscreensaver/jigsaw 303libexec/xscreensaver/jigsaw
307libexec/xscreensaver/juggle 
308libexec/xscreensaver/juggler3d 304libexec/xscreensaver/juggler3d
309libexec/xscreensaver/julia 305libexec/xscreensaver/julia
310libexec/xscreensaver/kaleidescope 306libexec/xscreensaver/kaleidescope
311libexec/xscreensaver/klein 307libexec/xscreensaver/klein
312libexec/xscreensaver/kumppa 308libexec/xscreensaver/kumppa
313libexec/xscreensaver/lament 309libexec/xscreensaver/lament
314libexec/xscreensaver/lavalite 310libexec/xscreensaver/lavalite
315libexec/xscreensaver/lcdscrub 311libexec/xscreensaver/lcdscrub
316libexec/xscreensaver/ljlatest 312libexec/xscreensaver/ljlatest
317libexec/xscreensaver/lockward 313libexec/xscreensaver/lockward
318libexec/xscreensaver/loop 314libexec/xscreensaver/loop
319libexec/xscreensaver/m6502 315libexec/xscreensaver/m6502
320libexec/xscreensaver/maze 316libexec/xscreensaver/maze
321libexec/xscreensaver/memscroller 317libexec/xscreensaver/memscroller
322libexec/xscreensaver/menger 318libexec/xscreensaver/menger
323libexec/xscreensaver/metaballs 319libexec/xscreensaver/metaballs
324libexec/xscreensaver/mirrorblob 320libexec/xscreensaver/mirrorblob
325libexec/xscreensaver/moebius 321libexec/xscreensaver/moebius
326libexec/xscreensaver/moebiusgears 322libexec/xscreensaver/moebiusgears
327libexec/xscreensaver/moire 323libexec/xscreensaver/moire
328libexec/xscreensaver/moire2 324libexec/xscreensaver/moire2
329libexec/xscreensaver/molecule 325libexec/xscreensaver/molecule
330libexec/xscreensaver/morph3d 326libexec/xscreensaver/morph3d
331libexec/xscreensaver/mountain 327libexec/xscreensaver/mountain
332libexec/xscreensaver/munch 328libexec/xscreensaver/munch
333libexec/xscreensaver/nerverot 329libexec/xscreensaver/nerverot
334libexec/xscreensaver/noof 330libexec/xscreensaver/noof
335libexec/xscreensaver/noseguy 331libexec/xscreensaver/noseguy
336libexec/xscreensaver/pacman 332libexec/xscreensaver/pacman
337libexec/xscreensaver/pedal 333libexec/xscreensaver/pedal
338libexec/xscreensaver/penetrate 334libexec/xscreensaver/penetrate
339libexec/xscreensaver/penrose 335libexec/xscreensaver/penrose
340libexec/xscreensaver/petri 336libexec/xscreensaver/petri
341libexec/xscreensaver/phosphor 337libexec/xscreensaver/phosphor
342libexec/xscreensaver/photopile 338libexec/xscreensaver/photopile
343libexec/xscreensaver/piecewise 339libexec/xscreensaver/piecewise
344libexec/xscreensaver/pinion 340libexec/xscreensaver/pinion
345libexec/xscreensaver/pipes 341libexec/xscreensaver/pipes
346libexec/xscreensaver/polyhedra 342libexec/xscreensaver/polyhedra
347libexec/xscreensaver/polyominoes 343libexec/xscreensaver/polyominoes
348libexec/xscreensaver/polytopes 344libexec/xscreensaver/polytopes
349libexec/xscreensaver/pong 345libexec/xscreensaver/pong
350libexec/xscreensaver/popsquares 346libexec/xscreensaver/popsquares
351libexec/xscreensaver/providence 347libexec/xscreensaver/providence
352libexec/xscreensaver/pulsar 348libexec/xscreensaver/pulsar
353libexec/xscreensaver/pyro 349libexec/xscreensaver/pyro
354libexec/xscreensaver/qix 350libexec/xscreensaver/qix
355libexec/xscreensaver/queens 351libexec/xscreensaver/queens
356libexec/xscreensaver/rd-bomb 352libexec/xscreensaver/rd-bomb
357libexec/xscreensaver/ripples 353libexec/xscreensaver/ripples
358libexec/xscreensaver/rocks 354libexec/xscreensaver/rocks
359libexec/xscreensaver/rorschach 355libexec/xscreensaver/rorschach
360libexec/xscreensaver/rotzoomer 356libexec/xscreensaver/rotzoomer
361libexec/xscreensaver/rubik 357libexec/xscreensaver/rubik
 358libexec/xscreensaver/rubikblocks
362libexec/xscreensaver/sballs 359libexec/xscreensaver/sballs
363libexec/xscreensaver/shadebobs 360libexec/xscreensaver/shadebobs
364libexec/xscreensaver/sierpinski 361libexec/xscreensaver/sierpinski
365libexec/xscreensaver/sierpinski3d 362libexec/xscreensaver/sierpinski3d
366libexec/xscreensaver/skytentacles 363libexec/xscreensaver/skytentacles
367libexec/xscreensaver/slidescreen 364libexec/xscreensaver/slidescreen
368libexec/xscreensaver/slip 365libexec/xscreensaver/slip
369libexec/xscreensaver/sonar 366libexec/xscreensaver/sonar
370libexec/xscreensaver/speedmine 367libexec/xscreensaver/speedmine
371libexec/xscreensaver/spheremonics 368libexec/xscreensaver/spheremonics
372libexec/xscreensaver/spotlight 369libexec/xscreensaver/spotlight
373libexec/xscreensaver/sproingies 370libexec/xscreensaver/sproingies
374libexec/xscreensaver/squiral 371libexec/xscreensaver/squiral
375libexec/xscreensaver/stairs 372libexec/xscreensaver/stairs
376libexec/xscreensaver/starfish 373libexec/xscreensaver/starfish
377libexec/xscreensaver/starwars 374libexec/xscreensaver/starwars
378libexec/xscreensaver/stonerview 375libexec/xscreensaver/stonerview
379libexec/xscreensaver/strange 376libexec/xscreensaver/strange
380libexec/xscreensaver/substrate 377libexec/xscreensaver/substrate
381libexec/xscreensaver/superquadrics 378libexec/xscreensaver/superquadrics
 379libexec/xscreensaver/surfaces
382libexec/xscreensaver/swirl 380libexec/xscreensaver/swirl
383libexec/xscreensaver/tangram 381libexec/xscreensaver/tangram
384libexec/xscreensaver/thornbird 382libexec/xscreensaver/thornbird
385libexec/xscreensaver/timetunnel 383libexec/xscreensaver/timetunnel
386libexec/xscreensaver/topblock 384libexec/xscreensaver/topblock
387libexec/xscreensaver/triangle 385libexec/xscreensaver/triangle
388libexec/xscreensaver/truchet 386libexec/xscreensaver/truchet
389libexec/xscreensaver/twang 387libexec/xscreensaver/twang
390libexec/xscreensaver/vermiculate 388libexec/xscreensaver/vermiculate
391libexec/xscreensaver/vidwhacker 389libexec/xscreensaver/vidwhacker
392libexec/xscreensaver/voronoi 390libexec/xscreensaver/voronoi
393libexec/xscreensaver/wander 391libexec/xscreensaver/wander
394libexec/xscreensaver/whirlwindwarp 392libexec/xscreensaver/whirlwindwarp
395libexec/xscreensaver/wormhole 393libexec/xscreensaver/wormhole
396libexec/xscreensaver/xanalogtv 394libexec/xscreensaver/xanalogtv
397libexec/xscreensaver/xflame 395libexec/xscreensaver/xflame
398libexec/xscreensaver/xjack 396libexec/xscreensaver/xjack
399libexec/xscreensaver/xlyap 397libexec/xscreensaver/xlyap
400libexec/xscreensaver/xmatrix 398libexec/xscreensaver/xmatrix
401libexec/xscreensaver/xrayswarm 399libexec/xscreensaver/xrayswarm
402libexec/xscreensaver/xspirograph 400libexec/xscreensaver/xspirograph
403libexec/xscreensaver/zoom 401libexec/xscreensaver/zoom
404man/man1/xscreensaver-command.1 402man/man1/xscreensaver-command.1
405man/man1/xscreensaver-getimage-file.1 403man/man1/xscreensaver-getimage-file.1
406man/man1/xscreensaver-getimage-video.1 404man/man1/xscreensaver-getimage-video.1
407man/man1/xscreensaver-getimage.1 405man/man1/xscreensaver-getimage.1
408man/man1/xscreensaver-text.1 406man/man1/xscreensaver-text.1
409man/man1/xscreensaver.1 407man/man1/xscreensaver.1
410man/man6/abstractile.6 408man/man6/abstractile.6
411man/man6/anemone.6 409man/man6/anemone.6
412man/man6/anemotaxis.6 410man/man6/anemotaxis.6
413man/man6/antinspect.6 411man/man6/antinspect.6
414man/man6/antmaze.6 412man/man6/antmaze.6
415man/man6/antspotlight.6 413man/man6/antspotlight.6
416man/man6/apollonian.6 414man/man6/apollonian.6
417man/man6/apple2.6 415man/man6/apple2.6
418man/man6/atlantis.6 416man/man6/atlantis.6
419man/man6/attraction.6 417man/man6/attraction.6
420man/man6/atunnel.6 418man/man6/atunnel.6
421man/man6/barcode.6 419man/man6/barcode.6
422man/man6/blaster.6 420man/man6/blaster.6
423man/man6/blinkbox.6 421man/man6/blinkbox.6
424man/man6/blitspin.6 422man/man6/blitspin.6
425man/man6/blocktube.6 423man/man6/blocktube.6
426man/man6/boing.6 424man/man6/boing.6
427man/man6/bouboule.6 425man/man6/bouboule.6
428man/man6/bouncingcow.6 426man/man6/bouncingcow.6
429man/man6/boxed.6 427man/man6/boxed.6
430man/man6/boxfit.6 428man/man6/boxfit.6
431man/man6/braid.6 429man/man6/braid.6
432man/man6/bsod.6 430man/man6/bsod.6
433man/man6/bubble3d.6 431man/man6/bubble3d.6
434man/man6/bumps.6 432man/man6/bumps.6
435man/man6/cage.6 433man/man6/cage.6
436man/man6/carousel.6 434man/man6/carousel.6
437man/man6/ccurve.6 435man/man6/ccurve.6
438man/man6/celtic.6 436man/man6/celtic.6
439man/man6/circuit.6 437man/man6/circuit.6
440man/man6/cloudlife.6 438man/man6/cloudlife.6
441man/man6/compass.6 439man/man6/compass.6
442man/man6/coral.6 440man/man6/coral.6
443man/man6/crackberg.6 441man/man6/crackberg.6
444man/man6/crystal.6 442man/man6/crystal.6
445man/man6/cube21.6 443man/man6/cube21.6
446man/man6/cubenetic.6 444man/man6/cubenetic.6
447man/man6/cubestorm.6 445man/man6/cubestorm.6
448man/man6/cubicgrid.6 446man/man6/cubicgrid.6
449man/man6/cwaves.6 447man/man6/cwaves.6
450man/man6/cynosure.6 448man/man6/cynosure.6
451man/man6/dangerball.6 449man/man6/dangerball.6
452man/man6/decayscreen.6 450man/man6/decayscreen.6
453man/man6/deco.6 451man/man6/deco.6
454man/man6/deluxe.6 452man/man6/deluxe.6
455man/man6/demon.6 453man/man6/demon.6
456man/man6/discrete.6 454man/man6/discrete.6
457man/man6/distort.6 455man/man6/distort.6
458man/man6/drift.6 456man/man6/drift.6
459man/man6/endgame.6 457man/man6/endgame.6
460man/man6/engine.6 458man/man6/engine.6
461man/man6/epicycle.6 459man/man6/epicycle.6
462man/man6/eruption.6 460man/man6/eruption.6
463man/man6/euler2d.6 461man/man6/euler2d.6
464man/man6/extrusion.6 462man/man6/extrusion.6
465man/man6/fadeplot.6 463man/man6/fadeplot.6
466man/man6/fiberlamp.6 464man/man6/fiberlamp.6
467man/man6/fireworkx.6 465man/man6/fireworkx.6
468man/man6/flame.6 466man/man6/flame.6
469man/man6/flipflop.6 467man/man6/flipflop.6
470man/man6/flipscreen3d.6 468man/man6/flipscreen3d.6
471man/man6/fliptext.6 469man/man6/fliptext.6
472man/man6/flow.6 470man/man6/flow.6
473man/man6/fluidballs.6 471man/man6/fluidballs.6
474man/man6/flurry.6 472man/man6/flurry.6
475man/man6/flyingtoasters.6 473man/man6/flyingtoasters.6
476man/man6/fontglide.6 474man/man6/fontglide.6
477man/man6/fuzzyflakes.6 475man/man6/fuzzyflakes.6
478man/man6/galaxy.6 476man/man6/galaxy.6
479man/man6/gears.6 477man/man6/gears.6
480man/man6/gflux.6 478man/man6/gflux.6
481man/man6/glblur.6 479man/man6/glblur.6
482man/man6/glcells.6 480man/man6/glcells.6
483man/man6/gleidescope.6 481man/man6/gleidescope.6
484man/man6/glhanoi.6 482man/man6/glhanoi.6
485man/man6/glknots.6 483man/man6/glknots.6
486man/man6/glmatrix.6 484man/man6/glmatrix.6
487man/man6/glplanet.6 485man/man6/glplanet.6
488man/man6/glschool.6 486man/man6/glschool.6
489man/man6/glslideshow.6 487man/man6/glslideshow.6
490man/man6/glsnake.6 488man/man6/glsnake.6
491man/man6/gltext.6 489man/man6/gltext.6
492man/man6/goop.6 490man/man6/goop.6
493man/man6/grav.6 491man/man6/grav.6
494man/man6/greynetic.6 492man/man6/greynetic.6
495man/man6/halftone.6 493man/man6/halftone.6
496man/man6/halo.6 494man/man6/halo.6
497man/man6/helix.6 495man/man6/helix.6
498man/man6/hopalong.6 496man/man6/hopalong.6
499man/man6/hyperball.6 
500man/man6/hypercube.6 
501man/man6/hypertorus.6 497man/man6/hypertorus.6
502man/man6/hypnowheel.6 498man/man6/hypnowheel.6
503man/man6/ifs.6 499man/man6/ifs.6
504man/man6/imsmap.6 500man/man6/imsmap.6
505man/man6/interaggregate.6 501man/man6/interaggregate.6
506man/man6/interference.6 502man/man6/interference.6
507man/man6/intermomentary.6 503man/man6/intermomentary.6
508man/man6/jigglypuff.6 504man/man6/jigglypuff.6
509man/man6/jigsaw.6 505man/man6/jigsaw.6
510man/man6/juggle.6 
511man/man6/juggler3d.6 506man/man6/juggler3d.6
512man/man6/julia.6 507man/man6/julia.6
513man/man6/kaleidescope.6 508man/man6/kaleidescope.6
514man/man6/klein.6 509man/man6/klein.6
515man/man6/kumppa.6 510man/man6/kumppa.6
516man/man6/lament.6 511man/man6/lament.6
517man/man6/lavalite.6 512man/man6/lavalite.6
518man/man6/lcdscrub.6 513man/man6/lcdscrub.6
519man/man6/ljlatest.6 514man/man6/ljlatest.6
520man/man6/lockward.6 515man/man6/lockward.6
521man/man6/loop.6 516man/man6/loop.6
522man/man6/maze.6 517man/man6/maze.6
523man/man6/memscroller.6 518man/man6/memscroller.6
524man/man6/menger.6 519man/man6/menger.6
525man/man6/metaballs.6 520man/man6/metaballs.6
526man/man6/mirrorblob.6 521man/man6/mirrorblob.6
527man/man6/moebius.6 522man/man6/moebius.6
528man/man6/moebiusgears.6 523man/man6/moebiusgears.6
529man/man6/moire.6 524man/man6/moire.6
530man/man6/moire2.6 525man/man6/moire2.6
531man/man6/molecule.6 526man/man6/molecule.6
532man/man6/morph3d.6 527man/man6/morph3d.6
533man/man6/mountain.6 528man/man6/mountain.6
534man/man6/munch.6 529man/man6/munch.6
535man/man6/nerverot.6 530man/man6/nerverot.6
536man/man6/noof.6 531man/man6/noof.6
537man/man6/noseguy.6 532man/man6/noseguy.6
538man/man6/pacman.6 533man/man6/pacman.6
539man/man6/pedal.6 534man/man6/pedal.6
540man/man6/penetrate.6 535man/man6/penetrate.6
541man/man6/penrose.6 536man/man6/penrose.6
542man/man6/petri.6 537man/man6/petri.6
543man/man6/phosphor.6 538man/man6/phosphor.6
544man/man6/photopile.6 539man/man6/photopile.6
545man/man6/piecewise.6 540man/man6/piecewise.6
546man/man6/pinion.6 541man/man6/pinion.6
547man/man6/pipes.6 542man/man6/pipes.6
548man/man6/polyhedra.6 543man/man6/polyhedra.6
549man/man6/polyominoes.6 544man/man6/polyominoes.6
550man/man6/polytopes.6 545man/man6/polytopes.6
551man/man6/pong.6 546man/man6/pong.6
552man/man6/providence.6 547man/man6/providence.6
553man/man6/pulsar.6 548man/man6/pulsar.6
554man/man6/pyro.6 549man/man6/pyro.6
555man/man6/qix.6 550man/man6/qix.6
556man/man6/queens.6 551man/man6/queens.6
557man/man6/rd-bomb.6 552man/man6/rd-bomb.6
558man/man6/ripples.6 553man/man6/ripples.6
559man/man6/rocks.6 554man/man6/rocks.6
560man/man6/rorschach.6 555man/man6/rorschach.6
561man/man6/rotzoomer.6 556man/man6/rotzoomer.6
562man/man6/rubik.6 557man/man6/rubik.6
 558man/man6/rubikblocks.6
563man/man6/sballs.6 559man/man6/sballs.6
564man/man6/shadebobs.6 560man/man6/shadebobs.6
565man/man6/sierpinski.6 561man/man6/sierpinski.6
566man/man6/sierpinski3d.6 562man/man6/sierpinski3d.6
567man/man6/skytentacles.6 563man/man6/skytentacles.6
568man/man6/slidescreen.6 564man/man6/slidescreen.6
569man/man6/slip.6 565man/man6/slip.6
570man/man6/sonar.6 566man/man6/sonar.6
571man/man6/speedmine.6 567man/man6/speedmine.6
572man/man6/spheremonics.6 568man/man6/spheremonics.6
573man/man6/spotlight.6 569man/man6/spotlight.6
574man/man6/sproingies.6 570man/man6/sproingies.6
575man/man6/squiral.6 571man/man6/squiral.6
576man/man6/stairs.6 572man/man6/stairs.6
577man/man6/starfish.6 573man/man6/starfish.6
578man/man6/starwars.6 574man/man6/starwars.6
579man/man6/stonerview.6 575man/man6/stonerview.6
580man/man6/strange.6 576man/man6/strange.6
581man/man6/substrate.6 577man/man6/substrate.6
582man/man6/superquadrics.6 578man/man6/superquadrics.6
 579man/man6/surfaces.6
583man/man6/swirl.6 580man/man6/swirl.6
584man/man6/tangram.6 581man/man6/tangram.6
585man/man6/thornbird.6 582man/man6/thornbird.6
586man/man6/timetunnel.6 583man/man6/timetunnel.6
587man/man6/topblock.6 584man/man6/topblock.6
588man/man6/triangle.6 585man/man6/triangle.6
589man/man6/truchet.6 586man/man6/truchet.6
590man/man6/twang.6 587man/man6/twang.6
591man/man6/vermiculate.6 588man/man6/vermiculate.6
592man/man6/vidwhacker.6 589man/man6/vidwhacker.6
593man/man6/voronoi.6 590man/man6/voronoi.6
594man/man6/wander.6 591man/man6/wander.6
595man/man6/whirlwindwarp.6 592man/man6/whirlwindwarp.6
596man/man6/wormhole.6 593man/man6/wormhole.6
597man/man6/xanalogtv.6 594man/man6/xanalogtv.6
598man/man6/xflame.6 595man/man6/xflame.6
599man/man6/xjack.6 596man/man6/xjack.6
600man/man6/xlyap.6 597man/man6/xlyap.6
601man/man6/xmatrix.6 598man/man6/xmatrix.6
602man/man6/xrayswarm.6 599man/man6/xrayswarm.6
603man/man6/xscreensaver-gl-helper.6 600man/man6/xscreensaver-gl-helper.6
604man/man6/xspirograph.6 601man/man6/xspirograph.6
605man/man6/zoom.6 602man/man6/zoom.6
606share/examples/xscreensaver/pam.d/xscreensaver-NetBSD 603share/examples/xscreensaver/pam.d/xscreensaver-NetBSD
607share/locale/da/LC_MESSAGES/xscreensaver.mo 604share/locale/da/LC_MESSAGES/xscreensaver.mo
608share/locale/de/LC_MESSAGES/xscreensaver.mo 605share/locale/de/LC_MESSAGES/xscreensaver.mo
609share/locale/es/LC_MESSAGES/xscreensaver.mo 606share/locale/es/LC_MESSAGES/xscreensaver.mo
610share/locale/et/LC_MESSAGES/xscreensaver.mo 607share/locale/et/LC_MESSAGES/xscreensaver.mo
611share/locale/fi/LC_MESSAGES/xscreensaver.mo 608share/locale/fi/LC_MESSAGES/xscreensaver.mo
612share/locale/fr/LC_MESSAGES/xscreensaver.mo 609share/locale/fr/LC_MESSAGES/xscreensaver.mo
613share/locale/hu/LC_MESSAGES/xscreensaver.mo 610share/locale/hu/LC_MESSAGES/xscreensaver.mo
614share/locale/it/LC_MESSAGES/xscreensaver.mo 611share/locale/it/LC_MESSAGES/xscreensaver.mo
615share/locale/ja/LC_MESSAGES/xscreensaver.mo 612share/locale/ja/LC_MESSAGES/xscreensaver.mo
616share/locale/ko/LC_MESSAGES/xscreensaver.mo 613share/locale/ko/LC_MESSAGES/xscreensaver.mo
617share/locale/nb/LC_MESSAGES/xscreensaver.mo 614share/locale/nb/LC_MESSAGES/xscreensaver.mo
618share/locale/nl/LC_MESSAGES/xscreensaver.mo 615share/locale/nl/LC_MESSAGES/xscreensaver.mo
619share/locale/pl/LC_MESSAGES/xscreensaver.mo 616share/locale/pl/LC_MESSAGES/xscreensaver.mo
620share/locale/pt/LC_MESSAGES/xscreensaver.mo 617share/locale/pt/LC_MESSAGES/xscreensaver.mo
621share/locale/ru/LC_MESSAGES/xscreensaver.mo 618share/locale/ru/LC_MESSAGES/xscreensaver.mo
622share/locale/sk/LC_MESSAGES/xscreensaver.mo 619share/locale/sk/LC_MESSAGES/xscreensaver.mo
623share/locale/sv/LC_MESSAGES/xscreensaver.mo 620share/locale/sv/LC_MESSAGES/xscreensaver.mo
624share/locale/vi/LC_MESSAGES/xscreensaver.mo 621share/locale/vi/LC_MESSAGES/xscreensaver.mo
625share/locale/wa/LC_MESSAGES/xscreensaver.mo 622share/locale/wa/LC_MESSAGES/xscreensaver.mo
626share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo 623share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
627share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo 624share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo

cvs diff -r1.54 -r1.55 pkgsrc/x11/xscreensaver/distinfo (switch to unified diff)

--- pkgsrc/x11/xscreensaver/distinfo 2009/01/14 13:29:15 1.54
+++ pkgsrc/x11/xscreensaver/distinfo 2010/02/11 18:16:22 1.55
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.54 2009/01/14 13:29:15 drochner Exp $ 1$NetBSD: distinfo,v 1.55 2010/02/11 18:16:22 drochner Exp $
2 2
3SHA1 (xscreensaver-5.08.tar.gz) = 4e6889d7171eaf18b856c484a87d5701787e5dc6 3SHA1 (xscreensaver-5.10.tar.gz) = d8379928de2e6e86cc7b17d75150daafe57e93c4
4RMD160 (xscreensaver-5.08.tar.gz) = f37ba887a656a4ffd14f3809de3269806271352d 4RMD160 (xscreensaver-5.10.tar.gz) = 6c437ef89969a0bf886f27b2430b53a431146b20
5Size (xscreensaver-5.08.tar.gz) = 5466460 bytes 5Size (xscreensaver-5.10.tar.gz) = 5561162 bytes
6SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979 6SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979
7SHA1 (patch-ab) = 77d41e44143f94297375d5497a0ddd4298e9510f 7SHA1 (patch-ab) = 77d41e44143f94297375d5497a0ddd4298e9510f
8SHA1 (patch-ac) = 5704efa8940569febc95d49eade2dca0e764f0f1 8SHA1 (patch-ac) = d575520bbe7d2ba2363a19620576b12d7110c19d
9SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5 9SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5
10SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 10SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
11SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3 11SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
12SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5 12SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5

cvs diff -r1.21 -r1.22 pkgsrc/x11/xscreensaver/patches/Attic/patch-ac (switch to unified diff)

--- pkgsrc/x11/xscreensaver/patches/Attic/patch-ac 2009/01/14 13:29:15 1.21
+++ pkgsrc/x11/xscreensaver/patches/Attic/patch-ac 2010/02/11 18:16:22 1.22
@@ -1,71 +1,71 @@ @@ -1,71 +1,71 @@
1$NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ 1$NetBSD: patch-ac,v 1.22 2010/02/11 18:16:22 drochner Exp $
2 2
3--- configure.orig 2008-12-28 08:59:19.000000000 +0100 3--- configure.orig 2009-09-08 04:54:40.000000000 +0000
4+++ configure 4+++ configure
5@@ -3504,6 +3504,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp 5@@ -3505,6 +3505,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp
6 ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp" 6 ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp"
7 fi 7 fi
8  8
9+# Disable c89 options, since these trigger more errors than expected and 9+# Disable c89 options, since these trigger more errors than expected and
10+# cause build failures. 10+# cause build failures.
11+if false; then 11+if false; then
12 if test -n "$GCC"; then 12 if test -n "$GCC"; then
13 if test -n "$GCC"; then 13
14 { echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5 14 case "$host" in
15@@ -3554,6 +3557,7 @@ echo "${ECHO_T}Disabling C++ comments in 15@@ -3565,6 +3568,7 @@ echo "${ECHO_T}Disabling C++ comments in
16 CC="$CC -Wp,-lang-c89" 16 CC="$CC -Wp,-lang-c89"
17 fi 17 fi
18 fi 18 fi
19+fi 19+fi
20  20
21 ac_ext=c 21 ac_ext=c
22 ac_cpp='$CPP $CPPFLAGS' 22 ac_cpp='$CPP $CPPFLAGS'
23@@ -7925,7 +7929,7 @@ _ACEOF 23@@ -7936,7 +7940,7 @@ _ACEOF
24  24
25  25
26  26
27-ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" 27-ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
28+ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt ru sk sv vi wa zh_CN zh_TW" 28+ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt ru sk sv vi wa zh_CN zh_TW"
29 if test -n "$ac_tool_prefix"; then 29 if test -n "$ac_tool_prefix"; then
30 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. 30 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
31 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 31 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
32@@ -13644,7 +13648,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea 32@@ -13632,7 +13636,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
33 echo $ECHO_N "(cached) $ECHO_C" >&6 33 echo $ECHO_N "(cached) $ECHO_C" >&6
34 else 34 else
35 ac_check_lib_save_LIBS=$LIBS 35 ac_check_lib_save_LIBS=$LIBS
36-LIBS="-lkrb4 $LIBS" 36-LIBS="-lkrb4 $LIBS"
37+LIBS="-lkrb -lcrypto -lroken -lcom_err $LIBS" 37+LIBS="-lkrb -lcrypto -lroken -lcom_err $LIBS"
38 cat >conftest.$ac_ext <<_ACEOF 38 cat >conftest.$ac_ext <<_ACEOF
39 /* confdefs.h. */ 39 /* confdefs.h. */
40 _ACEOF 40 _ACEOF
41@@ -13731,7 +13735,7 @@ echo "$as_me: WARNING: Cannot find compa 41@@ -13719,7 +13723,7 @@ echo "$as_me: WARNING: Cannot find compa
42 # from Matt Knopp <mhat@infocalypse.netlag.com> 42 # from Matt Knopp <mhat@infocalypse.netlag.com>
43 # (who got it from amu@mit.edu) 43 # (who got it from amu@mit.edu)
44  44
45- PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err" 45- PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
46+ PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err" 46+ PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err"
47  47
48 # jwz: MacOS X uses -lkrb5, but not -lcrypt 48 # jwz: MacOS X uses -lkrb5, but not -lcrypt
49  49
50@@ -14893,7 +14897,7 @@ fi 50@@ -14881,7 +14885,7 @@ fi
51 # 51 #
52 if test "$enable_locking" = yes ; then 52 if test "$enable_locking" = yes ; then
53 case "$host" in 53 case "$host" in
54- *-hpux* | *-aix* | *-netbsd* | *-freebsd* | *-openbsd* ) 54- *-hpux* | *-aix* | *-netbsd* | *-freebsd* | *-openbsd* )
55+ *-hpux* | *-aix* | *-freebsd* | *-openbsd* ) 55+ *-hpux* | *-aix* | *-freebsd* | *-openbsd* )
56 need_setuid=yes 56 need_setuid=yes
57 ;; 57 ;;
58 esac 58 esac
59@@ -15327,11 +15331,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > 59@@ -15315,11 +15319,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" >
60 ac_gtk_config_libs=$ac_cv_gtk_config_libs 60 ac_gtk_config_libs=$ac_cv_gtk_config_libs
61  61
62 GTK_EXTRA_OBJS="" 62 GTK_EXTRA_OBJS=""
63- GTK_DATADIR="" 63- GTK_DATADIR=""
64- if test "$have_gtk" = yes; then 64- if test "$have_gtk" = yes; then
65- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` 65- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
66- GTK_DATADIR="$GTK_DATADIR/share" 66- GTK_DATADIR="$GTK_DATADIR/share"
67- fi 67- fi
68+ GTK_DATADIR="$datadir" 68+ GTK_DATADIR="$datadir"
69  69
70 if test "$have_gtk" = yes; then 70 if test "$have_gtk" = yes; then
71 INCLUDES="$INCLUDES $ac_gtk_config_cflags" 71 INCLUDES="$INCLUDES $ac_gtk_config_cflags"