4 files changed, 5 insertions, 59 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 5bebac8c3170..835680b9ee83 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -38,7 +38,6 @@ OPTIONS=	ALL_FORTUNES "Run fortune with -sa argument" off \
 		KERBEROS "Add support for kerberos" off \
 		PAM "Add support for pam authentication" off \
 		SETUID_HACKS "Install sonar hack suid so it can ping" off \
-		SHEEP "Add extra port x11/electricsheep" off \
 		FIREF "Add extra port x11/fireflies" off \
 		XAOS1 "Add extra port graphics/xaos" off \
 		XDALI "Add extra port x11-clocks/xdaliclock" off \
@@ -68,9 +67,6 @@ PLIST_SUB+=		PAM="@comment not installed: "
 CONFIGURE_ARGS+=	--with-setuid-hacks
 .endif
 
-.if defined(WITH_SHEEP)
-RUN_DEPENDS+=	electricsheep:${PORTSDIR}/x11/electricsheep
-.endif
 .if defined(WITH_FIREF)
 RUN_DEPENDS+=	${X11BASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
 .endif
diff --git a/x11/xscreensaver/files/electricsheep.xml b/x11/xscreensaver/files/electricsheep.xml
deleted file mode 100644
index 6062c0555080..000000000000
--- a/x11/xscreensaver/files/electricsheep.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<screensaver name="electricsheep" _label="ElectricSheep">
-
-  <command arg="--root 1"/>
-
-  <hgroup>
-    <string id="nick" _label="Nickname (Optional)" arg="--nick %"/>
-    <string id="url" _label="URL (Optional)" arg="--url %"/>
-  </hgroup>
-
-  <hgroup>
-    <number id="framerate" type="spinbutton" arg="--frame-rate %"
-            _label="Frame Rate" low="1" high="100" default="23"/>
-
-    <number id="nrepeats" type="spinbutton" arg="--nrepeats %"
-            _label="Repititions of each Sheep"
-            low="0" high="10" default="2"/>
-  </hgroup>
-
-  <hgroup>
-    <boolean id="zoom" _label="Zoom" arg-set="--zoom 1" />
-    <boolean id="hide" _label="No Animation" arg-set="--display-anim 0" />
-    <boolean id="standalone" _label="No Network" arg-set="--standalone 1" />
-  </hgroup>
-
-  <hgroup>
-    <select id="maxmegs">
-       <option id="m100" _label="100 Mbyte cache" arg-set="--max-megabytes 100"/>
-       <option id="m300" _label="300 Mbyte cache" arg-set="--max-megabytes 300"/>
-       <option id="g1" _label="1 Gbyte cache" arg-set="--max-megabytes 1000"/>
-       <option id="g3" _label="3 Gbyte cache" arg-set="--max-megabytes 3000"/>
-       <option id="u" _label="Unlimited" arg-set="--max-megabytes 0"/>
-    </select>
-  </hgroup>
-
-  <_description>
-Displays mpeg video of an animated fractal flame.  In the background,
-it contributes render cycles to the next animation.  Periodically it
-uploades completed frames to the server, where they are compressed for
-distribution to all clients.
-
-This program is recommended only if you have a high bandwidth,
-always-on connection to the Internet.
-
-Written by By Scott Draves.
-  </_description>
-</screensaver>
diff --git a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
index 92474002e8a6..4ff71e63e2d2 100644
--- a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
+++ b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
@@ -1,5 +1,5 @@
 --- driver/XScreenSaver.ad.in.orig	2008-12-27 23:33:15.000000000 -0800
-+++ driver/XScreenSaver.ad.in	2008-12-28 22:33:55.000000000 -0800
++++ driver/XScreenSaver.ad.in	2009-08-03 13:50:03.000000000 -0700
 @@ -54,7 +54,7 @@
  *splashDuration:	0:00:05
  *visualID:		default
@@ -9,11 +9,10 @@
  
  *textMode:		file
  *textLiteral:		XScreenSaver
-@@ -151,6 +151,19 @@
+@@ -151,6 +151,18 @@
  ! screen savers interactively.
  !
  *programs:								      \
-+				electricsheep --root 1 --max-megabytes 100  \n\
 +				xaos -root -autopilot -nogui -delay 10000     \
 +                                  -maxframerate 30                            \
 +                                  -incoloring -1 -outcoloring -1            \n\
@@ -29,7 +28,7 @@
  				maze -root				    \n\
  @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
  				attraction -root			    \n\
-@@ -248,7 +261,6 @@
+@@ -248,7 +260,6 @@
  				xspirograph -root			    \n\
  @GL_KLUDGE@ GL: 				circuit -root				    \n\
  @GL_KLUDGE@ GL: 				dangerball -root			    \n\
@@ -37,7 +36,7 @@
  @GL_KLUDGE@ GL: 				engine -root				    \n\
  @GL_KLUDGE@ GL: 				flipscreen3d -root			    \n\
  @GL_KLUDGE@ GL: 				gltext -root				    \n\
-@@ -347,7 +359,7 @@
+@@ -347,7 +358,7 @@
  @GL_KLUDGE@ GL: 				voronoi -root				    \n\
  @GL_KLUDGE@ GL: 				hypnowheel -root			    \n\
  -				lcdscrub -root				    \n\
@@ -46,7 +45,7 @@
  @GL_KLUDGE@ GL: 				skytentacles -root			    \n
  
  
-@@ -436,7 +448,6 @@
+@@ -436,7 +447,6 @@
  *hacks.cwaves.name:         CWaves
  *hacks.dangerball.name:     DangerBall
  *hacks.decayscreen.name:    DecayScreen
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 50675b9f1681..4f15b885a104 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -405,7 +405,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/xrayswarm.xml
 %%DATADIR%%/config/xspirograph.xml
 %%DATADIR%%/config/zoom.xml
-%%DATADIR%%/config/electricsheep.xml
 %%DATADIR%%/config/xaos.xml
 %%DATADIR%%/config/xdaliclock.xml
 %%DATADIR%%/config/xearth.xml