diff options
Diffstat (limited to 'x11/xscreensaver')
| -rw-r--r-- | x11/xscreensaver/Makefile | 8 | ||||
| -rw-r--r-- | x11/xscreensaver/Makefile.common | 17 | ||||
| -rw-r--r-- | x11/xscreensaver/PLIST | 125 | ||||
| -rw-r--r-- | x11/xscreensaver/distinfo | 15 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-aa | 43 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ab | 28 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ac | 43 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ad | 22 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ae | 55 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-af | 22 |
10 files changed, 192 insertions, 186 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index d84ac8e8a4d..217261b444f 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2002/09/21 22:47:11 jlam Exp $ +# $NetBSD: Makefile,v 1.51 2002/10/28 22:37:10 wiz Exp $ # COMMENT= Screen saver and locker for the X window system @@ -8,6 +8,12 @@ CONFLICTS+= xscreensaver-gnome-[0-9]* .include "../../x11/xscreensaver/Makefile.common" CONFIGURE_ARGS+= --without-gnome +CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk2} +CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} + CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config +.include "../../devel/libglade2/buildlink2.mk" +.include "../../textproc/libxml2/buildlink2.mk" +.include "../../x11/gtk2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 39b7ef6e710..e7dbbc89e10 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.37 2002/09/29 09:38:20 jlam Exp $ +# $NetBSD: Makefile.common,v 1.38 2002/10/28 22:37:10 wiz Exp $ # -DISTNAME= xscreensaver-4.02 +DISTNAME= xscreensaver-4.06 CATEGORIES= x11 MASTER_SITES= ${HOMEPAGE} \ ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/ @@ -16,10 +16,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver CONFIGURE_ARGS+= --with-gl CONFIGURE_ARGS+= --with-gle -CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk} CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} -CONFIGURE_ARGS+= --with-gdk-pixbuf=${BUILDLINK_PREFIX.gdk-pixbuf} -CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml} CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune CONFIGURE_ARGS+= --without-motif @@ -54,13 +51,5 @@ CONFIGURE_ARGS+= --without-kerberos . include "../../lang/gcc/buildlink2.mk" .endif -post-patch: - cd ${WRKSRC}/driver ; \ - f=xscreensaver.kss ; \ - [ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \ - ${SED} -e 's|@PREFIX@|${PREFIX}|g' < $$f.BAK > $$f - -.include "../../graphics/gdk-pixbuf/buildlink2.mk" .include "../../graphics/gle/buildlink2.mk" -.include "../../textproc/libxml/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST index 2606c14d1d8..aebb09146a0 100644 --- a/x11/xscreensaver/PLIST +++ b/x11/xscreensaver/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.7 2002/04/06 11:16:43 wiz Exp $ +@comment $NetBSD: PLIST,v 1.8 2002/10/28 22:37:10 wiz Exp $ +@comment bin/screensaver-properties-capplet bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-demo @@ -8,6 +9,7 @@ bin/xscreensaver-getimage-video bin/xscreensaver-gl-helper bin/xscreensaver.kss lib/X11/app-defaults/XScreenSaver +libexec/xscreensaver/anemone libexec/xscreensaver/ant libexec/xscreensaver/apollonian libexec/xscreensaver/atlantis @@ -26,6 +28,7 @@ libexec/xscreensaver/ccurve libexec/xscreensaver/circuit libexec/xscreensaver/compass libexec/xscreensaver/config/README +libexec/xscreensaver/config/anemone.xml libexec/xscreensaver/config/ant.xml libexec/xscreensaver/config/apollonian.xml libexec/xscreensaver/config/atlantis.xml @@ -46,8 +49,8 @@ libexec/xscreensaver/config/compass.xml libexec/xscreensaver/config/coral.xml libexec/xscreensaver/config/cosmos.xml libexec/xscreensaver/config/critical.xml -libexec/xscreensaver/config/cubenetic.xml libexec/xscreensaver/config/crystal.xml +libexec/xscreensaver/config/cubenetic.xml libexec/xscreensaver/config/cynosure.xml libexec/xscreensaver/config/dangerball.xml libexec/xscreensaver/config/decayscreen.xml @@ -58,6 +61,7 @@ libexec/xscreensaver/config/discrete.xml libexec/xscreensaver/config/distort.xml libexec/xscreensaver/config/drift.xml libexec/xscreensaver/config/electricsheep.xml +libexec/xscreensaver/config/endgame.xml libexec/xscreensaver/config/engine.xml libexec/xscreensaver/config/epicycle.xml libexec/xscreensaver/config/euler2d.xml @@ -67,10 +71,12 @@ libexec/xscreensaver/config/flag.xml libexec/xscreensaver/config/flame.xml libexec/xscreensaver/config/flipscreen3d.xml libexec/xscreensaver/config/flow.xml +libexec/xscreensaver/config/fluidballs.xml libexec/xscreensaver/config/forest.xml libexec/xscreensaver/config/galaxy.xml libexec/xscreensaver/config/gears.xml libexec/xscreensaver/config/gflux.xml +libexec/xscreensaver/config/glblur.xml libexec/xscreensaver/config/glforestfire.xml libexec/xscreensaver/config/glplanet.xml libexec/xscreensaver/config/glsnake.xml @@ -79,6 +85,7 @@ libexec/xscreensaver/config/goban.xml libexec/xscreensaver/config/goop.xml libexec/xscreensaver/config/grav.xml libexec/xscreensaver/config/greynetic.xml +libexec/xscreensaver/config/halftone.xml libexec/xscreensaver/config/halo.xml libexec/xscreensaver/config/helix.xml libexec/xscreensaver/config/hopalong.xml @@ -94,6 +101,7 @@ libexec/xscreensaver/config/kaleidescope.xml libexec/xscreensaver/config/kumppa.xml libexec/xscreensaver/config/lament.xml libexec/xscreensaver/config/laser.xml +libexec/xscreensaver/config/lavalite.xml libexec/xscreensaver/config/lightning.xml libexec/xscreensaver/config/lisa.xml libexec/xscreensaver/config/lissie.xml @@ -120,6 +128,7 @@ libexec/xscreensaver/config/polyominoes.xml libexec/xscreensaver/config/pulsar.xml libexec/xscreensaver/config/pyro.xml libexec/xscreensaver/config/qix.xml +libexec/xscreensaver/config/queens.xml libexec/xscreensaver/config/rd-bomb.xml libexec/xscreensaver/config/ripples.xml libexec/xscreensaver/config/rocks.xml @@ -137,6 +146,7 @@ libexec/xscreensaver/config/sonar.xml libexec/xscreensaver/config/speedmine.xml libexec/xscreensaver/config/sphere.xml libexec/xscreensaver/config/sphereEversion.xml +libexec/xscreensaver/config/spheremonics.xml libexec/xscreensaver/config/spiral.xml libexec/xscreensaver/config/spotlight.xml libexec/xscreensaver/config/sproingies.xml @@ -189,6 +199,7 @@ libexec/xscreensaver/demon libexec/xscreensaver/discrete libexec/xscreensaver/distort libexec/xscreensaver/drift +libexec/xscreensaver/endgame libexec/xscreensaver/engine libexec/xscreensaver/epicycle libexec/xscreensaver/euler2d @@ -203,6 +214,7 @@ libexec/xscreensaver/forest libexec/xscreensaver/galaxy libexec/xscreensaver/gears libexec/xscreensaver/gflux +libexec/xscreensaver/glblur libexec/xscreensaver/glforestfire libexec/xscreensaver/glplanet libexec/xscreensaver/glsnake @@ -210,6 +222,7 @@ libexec/xscreensaver/gltext libexec/xscreensaver/goop libexec/xscreensaver/grav libexec/xscreensaver/greynetic +libexec/xscreensaver/halftone libexec/xscreensaver/halo libexec/xscreensaver/helix libexec/xscreensaver/hopalong @@ -225,6 +238,7 @@ libexec/xscreensaver/kaleidescope libexec/xscreensaver/kumppa libexec/xscreensaver/lament libexec/xscreensaver/laser +libexec/xscreensaver/lavalite libexec/xscreensaver/lightning libexec/xscreensaver/lisa libexec/xscreensaver/lissie @@ -251,6 +265,7 @@ libexec/xscreensaver/polyominoes libexec/xscreensaver/pulsar libexec/xscreensaver/pyro libexec/xscreensaver/qix +libexec/xscreensaver/queens libexec/xscreensaver/rd-bomb libexec/xscreensaver/ripples libexec/xscreensaver/rocks @@ -267,6 +282,7 @@ libexec/xscreensaver/slip libexec/xscreensaver/sonar libexec/xscreensaver/speedmine libexec/xscreensaver/sphere +libexec/xscreensaver/spheremonics libexec/xscreensaver/spiral libexec/xscreensaver/spotlight libexec/xscreensaver/sproingies @@ -301,30 +317,61 @@ libexec/xscreensaver/xspirograph libexec/xscreensaver/xsublim libexec/xscreensaver/xteevee libexec/xscreensaver/zoom +man/man1/anemone.1 +man/man1/ant.1 +man/man1/apollonian.1 +man/man1/atlantis.1 man/man1/attraction.1 +man/man1/blaster.1 man/man1/blitspin.1 man/man1/bouboule.1 +man/man1/boxed.1 man/man1/braid.1 man/man1/bsod.1 +man/man1/bubble3d.1 man/man1/bubbles.1 man/man1/bumps.1 +man/man1/cage.1 +man/man1/ccurve.1 +man/man1/circuit.1 +man/man1/compass.1 +man/man1/coral.1 man/man1/critical.1 +man/man1/crystal.1 +man/man1/cubenetic.1 +man/man1/cynosure.1 +man/man1/dangerball.1 man/man1/decayscreen.1 man/man1/deco.1 +man/man1/deluxe.1 +man/man1/demon.1 +man/man1/discrete.1 man/man1/distort.1 man/man1/drift.1 +man/man1/endgame.1 +man/man1/engine.1 man/man1/epicycle.1 +man/man1/euler2d.1 +man/man1/extrusion.1 +man/man1/fadeplot.1 man/man1/flag.1 man/man1/flame.1 +man/man1/flipscreen3d.1 +man/man1/flow.1 +man/man1/fluidballs.1 man/man1/forest.1 man/man1/galaxy.1 +man/man1/gears.1 man/man1/gflux.1 +man/man1/glblur.1 man/man1/glforestfire.1 +man/man1/glplanet.1 man/man1/glsnake.1 man/man1/gltext.1 man/man1/goop.1 man/man1/grav.1 man/man1/greynetic.1 +man/man1/halftone.1 man/man1/halo.1 man/man1/helix.1 man/man1/hopalong.1 @@ -332,17 +379,28 @@ man/man1/hyperball.1 man/man1/hypercube.1 man/man1/ifs.1 man/man1/imsmap.1 +man/man1/interference.1 man/man1/jigsaw.1 +man/man1/juggle.1 man/man1/julia.1 man/man1/kaleidescope.1 +man/man1/kumppa.1 man/man1/lament.1 man/man1/laser.1 +man/man1/lavalite.1 man/man1/lightning.1 man/man1/lisa.1 +man/man1/lissie.1 man/man1/lmorph.1 +man/man1/loop.1 man/man1/maze.1 +man/man1/menger.1 +man/man1/moebius.1 man/man1/moire.1 +man/man1/moire2.1 man/man1/molecule.1 +man/man1/morph3d.1 +man/man1/mountain.1 man/man1/munch.1 man/man1/nerverot.1 man/man1/noseguy.1 @@ -351,37 +409,58 @@ man/man1/penetrate.1 man/man1/penrose.1 man/man1/petri.1 man/man1/phosphor.1 +man/man1/pipes.1 +man/man1/polyominoes.1 +man/man1/pulsar.1 man/man1/pyro.1 man/man1/qix.1 +man/man1/queens.1 man/man1/rd-bomb.1 +man/man1/ripples.1 man/man1/rocks.1 man/man1/rorschach.1 +man/man1/rotor.1 man/man1/rotzoomer.1 +man/man1/rubik.1 man/man1/sballs.1 +man/man1/shadebobs.1 man/man1/sierpinski.1 +man/man1/sierpinski3d.1 man/man1/slidescreen.1 man/man1/slip.1 man/man1/sonar.1 man/man1/speedmine.1 man/man1/sphere.1 +man/man1/spheremonics.1 man/man1/spiral.1 man/man1/spotlight.1 +man/man1/sproingies.1 man/man1/squiral.1 +man/man1/stairs.1 man/man1/starfish.1 man/man1/starwars.1 +man/man1/stonerview.1 man/man1/strange.1 +man/man1/superquadrics.1 man/man1/swirl.1 man/man1/t3d.1 +man/man1/thornbird.1 +man/man1/triangle.1 +man/man1/truchet.1 man/man1/twang.1 +man/man1/vermiculate.1 man/man1/vidwhacker.1 man/man1/vines.1 +man/man1/wander.1 man/man1/webcollage.1 man/man1/whirlwindwarp.1 man/man1/whirlygig.1 +man/man1/worm.1 man/man1/xflame.1 man/man1/xjack.1 man/man1/xlyap.1 man/man1/xmatrix.1 +man/man1/xrayswarm.1 man/man1/xscreensaver-command.1 man/man1/xscreensaver-demo.1 man/man1/xscreensaver-getimage-file.1 @@ -393,12 +472,40 @@ man/man1/xspirograph.1 man/man1/xsublim.1 man/man1/xteevee.1 man/man1/zoom.1 -share/pixmaps/screensaver-cmndln.xpm -share/pixmaps/screensaver-colorselector.xpm -share/pixmaps/screensaver-diagnostic.xpm -share/pixmaps/screensaver-locking.xpm -share/pixmaps/screensaver-power.xpm -share/pixmaps/screensaver-snap.xpm -share/pixmaps/xscreensaver.xpm +@comment share/applications/screensaver-properties.desktop +@comment share/control-center-2.0/capplets/screensaver-properties.desktop +@comment share/control-center/Desktop/screensaver-properties.desktop +@comment share/control-center/capplets/screensaver-properties.desktop +${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xscreensaver.mo +share/xscreensaver/screensaver-cmndln.xpm +share/xscreensaver/screensaver-colorselector.xpm +share/xscreensaver/screensaver-diagnostic.xpm +share/xscreensaver/screensaver-locking.xpm +share/xscreensaver/screensaver-power.xpm +share/xscreensaver/screensaver-snap.xpm +share/xscreensaver/xscreensaver-demo.glade2 +share/xscreensaver/xscreensaver.xpm +@dirrm share/xscreensaver @dirrm libexec/xscreensaver/config @dirrm libexec/xscreensaver diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index f74f639d212..a6cbc4e27f4 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.20 2002/08/25 21:52:54 jlam Exp $ +$NetBSD: distinfo,v 1.21 2002/10/28 22:37:10 wiz Exp $ -SHA1 (xscreensaver-4.02.tar.gz) = b32cf3ed37680669a4a7ea2b945fadb5841fc6b3 -Size (xscreensaver-4.02.tar.gz) = 2201442 bytes -SHA1 (patch-aa) = 8ca99f66fab3e4eae5830c87f2931cefba6e4b36 -SHA1 (patch-ab) = 3f60a99f7d45f38b6c4afe2fcc6eafc9456acb30 -SHA1 (patch-ac) = 4f201f01b65935c57efa7bfec8291f29a7ff1280 -SHA1 (patch-ae) = 9209256c4dcc7bde3dd812bb8fcbad1f8b4f0f08 -SHA1 (patch-af) = 506ce93155589766c5f09f726237b7145fd37f3b +SHA1 (xscreensaver-4.06.tar.gz) = ba2c14d632ee5d876e1d2b580e6aa6d67b813119 +Size (xscreensaver-4.06.tar.gz) = 3209164 bytes +SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326 +SHA1 (patch-ab) = 5d6f368c6f007ac66a3346ba80fe38a8781e03f2 +SHA1 (patch-ac) = a129217c7452421bb9c20278acc8af575687d27c +SHA1 (patch-ad) = 64cd7a683da1afea599d1e8b8dffd951243c9d9b diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa index 67a2fd60c62..fc3cb4ea3f0 100644 --- a/x11/xscreensaver/patches/patch-aa +++ b/x11/xscreensaver/patches/patch-aa @@ -1,31 +1,14 @@ -$NetBSD: patch-aa,v 1.22 2002/08/25 21:52:55 jlam Exp $ +$NetBSD: patch-aa,v 1.23 2002/10/28 22:37:10 wiz Exp $ ---- configure.orig Mon Mar 18 18:42:35 2002 -+++ configure -@@ -6095,7 +6095,7 @@ - if test "$have_kerberos5" = yes ; then - # from Matt Knopp <mhat@infocalypse.netlag.com> - # (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 <tjs@psaux.com> 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 +--- config.guess.orig Mon Sep 9 10:33:43 2002 ++++ config.guess +@@ -402,6 +402,9 @@ EOF + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; ++ macppc:NetBSD:*:*) ++ echo powerpc-apple-netbsd${UNAME_RELEASE} ++ exit 0 ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit 0 ;; diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab index 80f1d30490d..9737c4589b8 100644 --- a/x11/xscreensaver/patches/patch-ab +++ b/x11/xscreensaver/patches/patch-ab @@ -1,17 +1,13 @@ -$NetBSD: patch-ab,v 1.9 2002/02/24 21:42:56 wiz Exp $ +$NetBSD: patch-ab,v 1.10 2002/10/28 22:37:11 wiz Exp $ ---- hacks/Makefile.in.orig Sun Feb 24 10:56:29 2002 -+++ hacks/Makefile.in -@@ -428,6 +428,12 @@ - .c.o: - $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $< - -+# Work around gcc codegen bug -+.if $(MACHINE_ARCH) == "arm32" -+distort.o: -+ $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) -O0 $< -+.endif -+ - # Some hacks use a slightly-differently-compiled variant of this file. - # This is how to make the the other .o file from it. - # +--- configure.in.orig Wed Oct 23 14:24:25 2002 ++++ configure.in +@@ -1535,7 +1535,7 @@ if test "$enable_locking" = yes -a "$wit + if test "$have_kerberos5" = yes ; then + # from Matt Knopp <mhat@infocalypse.netlag.com> + # (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 <tjs@psaux.com> for FreeBSD 4.2 + PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err" diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac index 8dad6f5b5ed..6ec81de6104 100644 --- a/x11/xscreensaver/patches/patch-ac +++ b/x11/xscreensaver/patches/patch-ac @@ -1,32 +1,13 @@ -$NetBSD: patch-ac,v 1.6 2002/03/19 15:34:32 wiz Exp $ +$NetBSD: patch-ac,v 1.7 2002/10/28 22:37:11 wiz Exp $ ---- driver/Makefile.in.orig Tue Mar 19 00:42:36 2002 -+++ driver/Makefile.in -@@ -433,10 +433,6 @@ - echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ - fi ;\ -- if [ ! -d "$(install_prefix)$(GNOME_CCDIR_2)" ]; then \ -- echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\ -- $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\ -- fi ;\ - \ - echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\ -@@ -446,16 +442,6 @@ - then true ;\ - else \ - lost="$$lost $(install_prefix)$(GNOME_CCDIR_1)" ;\ -- fi ;\ -- \ -- echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ -- $(install_prefix)$(GNOME_CCDIR_2)/screensaver.desktop ;\ -- \ -- if $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ -- $(install_prefix)$(GNOME_CCDIR_2)/screensaver.desktop ;\ -- then true ;\ -- else \ -- lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)" ;\ - fi ;\ - \ - if [ ! -d "$(install_prefix)$(GNOME_PANELDIR)" ]; then \ +--- configure.orig Thu Oct 24 05:26:17 2002 ++++ configure +@@ -11012,7 +11012,7 @@ _ACEOF + if test "$have_kerberos5" = yes ; then + # from Matt Knopp <mhat@infocalypse.netlag.com> + # (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 <tjs@psaux.com> for FreeBSD 4.2 + PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err" diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad new file mode 100644 index 00000000000..f7905a92a46 --- /dev/null +++ b/x11/xscreensaver/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.8 2002/10/28 22:37:11 wiz Exp $ + +--- driver/Makefile.in.orig Fri Oct 25 23:20:06 2002 ++++ driver/Makefile.in +@@ -452,7 +452,7 @@ install-pam: + fi ; \ + fi + +-install-gnome:: screensaver-properties.desktop ++xxxinstall-gnome:: screensaver-properties.desktop + @lost="" ;\ + if [ "$(GNOME_DATADIR)" != "" ]; then \ + \ +@@ -527,7 +527,7 @@ install-gnome:: screensaver-properties.d + fi ;\ + fi + +-install-gnome:: screensaver-properties-capplet ++xxxinstall-gnome:: screensaver-properties-capplet + @if [ "$(GNOME_DATADIR)" != "" ]; then \ + if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)" ;\ diff --git a/x11/xscreensaver/patches/patch-ae b/x11/xscreensaver/patches/patch-ae deleted file mode 100644 index 6bc92c40440..00000000000 --- a/x11/xscreensaver/patches/patch-ae +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2002/03/19 15:34:32 wiz Exp $ - ---- driver/xscreensaver.kss.orig Thu Feb 1 02:06:02 2001 -+++ driver/xscreensaver.kss -@@ -1,4 +1,4 @@ --#!/bin/bash - -+#!/bin/sh - - - # script - "xscreensaver.kss" - # -@@ -40,15 +40,15 @@ - # 2) Hack xscreensaver to accept alternate setup files, and create one on - # the fly here. - shift -- /usr/X11R6/lib/xscreensaver/xflame -delay 1 -window-id $1 & # Start new preview -+ @PREFIX@/libexec/xscreensaver/xflame -delay 1 -window-id $1 & # Start new preview - echo "$!" > $HOME/.kss-preview$1.pid.`hostname` # Write PID - wait $! # Wait for it to get killed - exit - ;; - - -setup) -- /usr/X11R6/bin/xscreensaver -no-splash & # daemon must be started -- /usr/X11R6/bin/xscreensaver-demo # or the setup will produce -+ @PREFIX@/bin/xscreensaver -no-splash & # daemon must be started -+ @PREFIX@/bin/xscreensaver-demo # or the setup will produce - kill $! # a warning. - exit - ;; -@@ -57,8 +57,8 @@ - # I was unable to grep stdout because xscreensaver nabs it. But I was able - # to output it to a file, and grep the file. - TEMP_FILE=/tmp/xsc.$RANDOM -- /usr/X11R6/bin/xscreensaver -no-splash -verbose -no-capture-stderr 2> $TEMP_FILE & -- /usr/X11R6/bin/xscreensaver-command -activate -+ @PREFIX@/bin/xscreensaver -no-splash -verbose -no-capture-stderr 2> $TEMP_FILE & -+ @PREFIX@/bin/xscreensaver-command -activate - while true; do - ExitNow=$(grep -E -c unblanking\|already $TEMP_FILE) - if [ $ExitNow != 0 ]; then -@@ -109,12 +109,12 @@ - kill `cat $PID_FILE` # Kill old screensaver - fi - echo "$$" > $PID_FILE # Write PID of this script -- /usr/X11R6/bin/xscreensaver -no-splash $timeout $lockmode $Nice & # Start XScreenSaver daemon -+ @PREFIX@/xscreensaver -no-splash $timeout $lockmode $Nice & # Start XScreenSaver daemon - trap "kill $!" SIGTERM # Set these to kill the daemon - trap "kill $!" SIGKILL - - # KDE sends SIGUSER1 to indicate the user has hit the "lock" button. -- trap "/usr/X11R6/bin/xscreensaver-command -lock" SIGUSR1 -+ trap "@PREFIX@/bin/xscreensaver-command -lock" SIGUSR1 - - wait $! # Do not exit, just wait for signals. - diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af deleted file mode 100644 index 2896e33bdde..00000000000 --- a/x11/xscreensaver/patches/patch-af +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-af,v 1.9 2002/08/25 21:52:55 jlam Exp $ - ---- configure.in.orig Mon Mar 18 18:01:26 2002 -+++ configure.in -@@ -1512,7 +1512,7 @@ - if test "$have_kerberos5" = yes ; then - # from Matt Knopp <mhat@infocalypse.netlag.com> - # (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 <tjs@psaux.com> for FreeBSD 4.2 - PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err" -@@ -2988,7 +2988,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 |