Remove (broken) screensaver-capplet code, in favor of the code from

x11/xscreensaver-gnome

12 files changed, 32 insertions, 600 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 218ae3c4a511..573ed5c088f2 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomecontrolcenter
 PORTVERSION=	1.4.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
diff --git a/sysutils/gnome-control-center/files/patch-capplets::Makefile.in b/sysutils/gnome-control-center/files/patch-capplets::Makefile.in
new file mode 100644
index 000000000000..c1c29de83cb1
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets::Makefile.in
@@ -0,0 +1,7 @@
+--- capplets/Makefile.in.orig	Sun Feb 10 15:41:49 2002
++++ capplets/Makefile.in	Wed Feb 13 09:34:28 2002
+@@ -154,3 +154,3 @@
+ always_built_SUBDIRS = desktop-links mouse-properties \
+-	screensaver-properties background-properties \
++	background-properties \
+         theme-switcher sound-properties \
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 2ec3f6a88344..790f300cb7ec 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -4,7 +4,6 @@ bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
 bin/mouse-properties-capplet
-bin/screensaver-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
@@ -18,7 +17,6 @@ lib/libcapplet.so
 lib/libcapplet.so.5
 share/gnome/apps/Settings/Desktop/.directory
 share/gnome/apps/Settings/Desktop/background-properties.desktop
-share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
 share/gnome/apps/Settings/Documents/.directory
@@ -33,155 +31,9 @@ share/gnome/apps/Settings/Session/.directory
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/control-center/.data/3d.desktop
-share/gnome/control-center/.data/3d.png
-share/gnome/control-center/.data/Ant.desktop
-share/gnome/control-center/.data/Atlantis.desktop
-share/gnome/control-center/.data/Attraction.desktop
-share/gnome/control-center/.data/Blitspin.desktop
-share/gnome/control-center/.data/Bouboule.desktop
-share/gnome/control-center/.data/Braid.desktop
-share/gnome/control-center/.data/Bsod.desktop
-share/gnome/control-center/.data/Bubble3d.desktop
-share/gnome/control-center/.data/Bubbles.desktop
-share/gnome/control-center/.data/Bumps.desktop
-share/gnome/control-center/.data/Cage.desktop
-share/gnome/control-center/.data/Compass.desktop
-share/gnome/control-center/.data/Coral.desktop
-share/gnome/control-center/.data/Critical.desktop
-share/gnome/control-center/.data/Crystal.desktop
-share/gnome/control-center/.data/Cynosure.desktop
-share/gnome/control-center/.data/Decayscreen.desktop
-share/gnome/control-center/.data/Deco.desktop
-share/gnome/control-center/.data/Deluxe.desktop
-share/gnome/control-center/.data/Demon.desktop
-share/gnome/control-center/.data/Discrete.desktop
-share/gnome/control-center/.data/Distort.desktop
-share/gnome/control-center/.data/Drift.desktop
-share/gnome/control-center/.data/Epicycle.desktop
-share/gnome/control-center/.data/Fadeplot.desktop
-share/gnome/control-center/.data/Flag.desktop
-share/gnome/control-center/.data/Flame.desktop
-share/gnome/control-center/.data/Flow.desktop
-share/gnome/control-center/.data/Forest.desktop
-share/gnome/control-center/.data/GLPlanet.desktop
-share/gnome/control-center/.data/Galaxy.desktop
-share/gnome/control-center/.data/Gears.desktop
-share/gnome/control-center/.data/Goop.desktop
-share/gnome/control-center/.data/Grav.desktop
-share/gnome/control-center/.data/Greynetic.desktop
-share/gnome/control-center/.data/Halo.desktop
-share/gnome/control-center/.data/Helix.desktop
-share/gnome/control-center/.data/Hopalong.desktop
-share/gnome/control-center/.data/Hypercube.desktop
-share/gnome/control-center/.data/Ifs.desktop
-share/gnome/control-center/.data/Imsmap.desktop
-share/gnome/control-center/.data/Interference.desktop
-share/gnome/control-center/.data/Jigsaw.desktop
-share/gnome/control-center/.data/Julia.desktop
-share/gnome/control-center/.data/Kaleidescope.desktop
-share/gnome/control-center/.data/Kumppa.desktop
-share/gnome/control-center/.data/Lament.desktop
-share/gnome/control-center/.data/Laser.desktop
-share/gnome/control-center/.data/Lightning.desktop
-share/gnome/control-center/.data/Lisa.desktop
-share/gnome/control-center/.data/Lissie.desktop
-share/gnome/control-center/.data/Lmorph.desktop
-share/gnome/control-center/.data/Loop.desktop
-share/gnome/control-center/.data/Maze.desktop
-share/gnome/control-center/.data/Moebius.desktop
-share/gnome/control-center/.data/Moire.desktop
-share/gnome/control-center/.data/Moire2.desktop
-share/gnome/control-center/.data/Morph3d.desktop
-share/gnome/control-center/.data/Mountain.desktop
-share/gnome/control-center/.data/Munch.desktop
-share/gnome/control-center/.data/Noseguy.desktop
-share/gnome/control-center/.data/Pedal.desktop
-share/gnome/control-center/.data/Penetrate.desktop
-share/gnome/control-center/.data/Penrose.desktop
-share/gnome/control-center/.data/Phosphor.desktop
-share/gnome/control-center/.data/Pipes.desktop
-share/gnome/control-center/.data/Pyro.desktop
-share/gnome/control-center/.data/Qix.desktop
-share/gnome/control-center/.data/Rd-bomb.desktop
-share/gnome/control-center/.data/Ripples.desktop
-share/gnome/control-center/.data/Rocks.desktop
-share/gnome/control-center/.data/Rorschach.desktop
-share/gnome/control-center/.data/Rotor.desktop
-share/gnome/control-center/.data/Rubik.desktop
-share/gnome/control-center/.data/Shadebobs.desktop
-share/gnome/control-center/.data/Sierpinski.desktop
-share/gnome/control-center/.data/Slidescreen.desktop
-share/gnome/control-center/.data/Slip.desktop
-share/gnome/control-center/.data/Sonar.desktop
-share/gnome/control-center/.data/Sphere.desktop
-share/gnome/control-center/.data/Spiral.desktop
-share/gnome/control-center/.data/Spotlight.desktop
-share/gnome/control-center/.data/Sproingies.desktop
-share/gnome/control-center/.data/Squiral.desktop
-share/gnome/control-center/.data/Stairs.desktop
-share/gnome/control-center/.data/Starfish.desktop
-share/gnome/control-center/.data/Strange.desktop
-share/gnome/control-center/.data/Superquadrics.desktop
-share/gnome/control-center/.data/Swirl.desktop
-share/gnome/control-center/.data/Triangle.desktop
-share/gnome/control-center/.data/Truchet.desktop
-share/gnome/control-center/.data/Vines.desktop
-share/gnome/control-center/.data/Worm.desktop
-share/gnome/control-center/.data/Xflame.desktop
-share/gnome/control-center/.data/Xjack.desktop
-share/gnome/control-center/.data/Xlyap.desktop
-share/gnome/control-center/.data/Xmatrix.desktop
-share/gnome/control-center/.data/Xroger.desktop
-share/gnome/control-center/.data/Xteevee.desktop
-share/gnome/control-center/.data/ant.png
-share/gnome/control-center/.data/attraction.png
-share/gnome/control-center/.data/blitspin.png
-share/gnome/control-center/.data/bouboule.png
-share/gnome/control-center/.data/braid.png
-share/gnome/control-center/.data/bsod.png
-share/gnome/control-center/.data/bubbles.png
-share/gnome/control-center/.data/coral.png
-share/gnome/control-center/.data/crystal.png
-share/gnome/control-center/.data/cynosure.png
-share/gnome/control-center/.data/decayscreen.png
-share/gnome/control-center/.data/deco.png
-share/gnome/control-center/.data/discrete.png
-share/gnome/control-center/.data/drift.png
-share/gnome/control-center/.data/epicycle.png
-share/gnome/control-center/.data/flag.png
-share/gnome/control-center/.data/flame.png
-share/gnome/control-center/.data/forest.png
-share/gnome/control-center/.data/goop.png
-share/gnome/control-center/.data/grav.png
-share/gnome/control-center/.data/greynetic.png
-share/gnome/control-center/.data/halo.png
-share/gnome/control-center/.data/helix.png
-share/gnome/control-center/.data/hopalong.png
-share/gnome/control-center/.data/hypercube.png
-share/gnome/control-center/.data/ifs.png
-share/gnome/control-center/.data/julia.png
-share/gnome/control-center/.data/kaleidescope.png
-share/gnome/control-center/.data/laser.png
-share/gnome/control-center/.data/lightning.png
-share/gnome/control-center/.data/lisa.png
-share/gnome/control-center/.data/lmorph.png
-share/gnome/control-center/.data/maze.png
-share/gnome/control-center/.data/moire.png
-share/gnome/control-center/.data/munch.png
-share/gnome/control-center/.data/pedal.png
-share/gnome/control-center/.data/qix.png
-share/gnome/control-center/.data/ripples.png
-share/gnome/control-center/.data/sierpinski.png
-share/gnome/control-center/.data/spiral.png
-share/gnome/control-center/.data/starfish.png
-share/gnome/control-center/.data/vines.png
-share/gnome/control-center/.data/xroger.png
-share/gnome/control-center/.data/xteevee.png
 share/gnome/control-center/.directory
 share/gnome/control-center/Desktop/.directory
 share/gnome/control-center/Desktop/background-properties.desktop
-share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
 share/gnome/control-center/Documents/.directory
@@ -296,7 +148,6 @@ share/locale/zh_TW/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/control-center/Multimedia
 @dirrm share/gnome/control-center/Documents
 @dirrm share/gnome/control-center/Desktop
-@dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
 @dirrm share/gnome/apps/Settings/UIOptions
 @dirrm share/gnome/apps/Settings/Session
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index 218ae3c4a511..573ed5c088f2 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomecontrolcenter
 PORTVERSION=	1.4.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
diff --git a/sysutils/gnome-control-center1/files/patch-capplets::Makefile.in b/sysutils/gnome-control-center1/files/patch-capplets::Makefile.in
new file mode 100644
index 000000000000..c1c29de83cb1
--- /dev/null
+++ b/sysutils/gnome-control-center1/files/patch-capplets::Makefile.in
@@ -0,0 +1,7 @@
+--- capplets/Makefile.in.orig	Sun Feb 10 15:41:49 2002
++++ capplets/Makefile.in	Wed Feb 13 09:34:28 2002
+@@ -154,3 +154,3 @@
+ always_built_SUBDIRS = desktop-links mouse-properties \
+-	screensaver-properties background-properties \
++	background-properties \
+         theme-switcher sound-properties \
diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist
index 2ec3f6a88344..790f300cb7ec 100644
--- a/sysutils/gnome-control-center1/pkg-plist
+++ b/sysutils/gnome-control-center1/pkg-plist
@@ -4,7 +4,6 @@ bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
 bin/mouse-properties-capplet
-bin/screensaver-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
@@ -18,7 +17,6 @@ lib/libcapplet.so
 lib/libcapplet.so.5
 share/gnome/apps/Settings/Desktop/.directory
 share/gnome/apps/Settings/Desktop/background-properties.desktop
-share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
 share/gnome/apps/Settings/Documents/.directory
@@ -33,155 +31,9 @@ share/gnome/apps/Settings/Session/.directory
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/control-center/.data/3d.desktop
-share/gnome/control-center/.data/3d.png
-share/gnome/control-center/.data/Ant.desktop
-share/gnome/control-center/.data/Atlantis.desktop
-share/gnome/control-center/.data/Attraction.desktop
-share/gnome/control-center/.data/Blitspin.desktop
-share/gnome/control-center/.data/Bouboule.desktop
-share/gnome/control-center/.data/Braid.desktop
-share/gnome/control-center/.data/Bsod.desktop
-share/gnome/control-center/.data/Bubble3d.desktop
-share/gnome/control-center/.data/Bubbles.desktop
-share/gnome/control-center/.data/Bumps.desktop
-share/gnome/control-center/.data/Cage.desktop
-share/gnome/control-center/.data/Compass.desktop
-share/gnome/control-center/.data/Coral.desktop
-share/gnome/control-center/.data/Critical.desktop
-share/gnome/control-center/.data/Crystal.desktop
-share/gnome/control-center/.data/Cynosure.desktop
-share/gnome/control-center/.data/Decayscreen.desktop
-share/gnome/control-center/.data/Deco.desktop
-share/gnome/control-center/.data/Deluxe.desktop
-share/gnome/control-center/.data/Demon.desktop
-share/gnome/control-center/.data/Discrete.desktop
-share/gnome/control-center/.data/Distort.desktop
-share/gnome/control-center/.data/Drift.desktop
-share/gnome/control-center/.data/Epicycle.desktop
-share/gnome/control-center/.data/Fadeplot.desktop
-share/gnome/control-center/.data/Flag.desktop
-share/gnome/control-center/.data/Flame.desktop
-share/gnome/control-center/.data/Flow.desktop
-share/gnome/control-center/.data/Forest.desktop
-share/gnome/control-center/.data/GLPlanet.desktop
-share/gnome/control-center/.data/Galaxy.desktop
-share/gnome/control-center/.data/Gears.desktop
-share/gnome/control-center/.data/Goop.desktop
-share/gnome/control-center/.data/Grav.desktop
-share/gnome/control-center/.data/Greynetic.desktop
-share/gnome/control-center/.data/Halo.desktop
-share/gnome/control-center/.data/Helix.desktop
-share/gnome/control-center/.data/Hopalong.desktop
-share/gnome/control-center/.data/Hypercube.desktop
-share/gnome/control-center/.data/Ifs.desktop
-share/gnome/control-center/.data/Imsmap.desktop
-share/gnome/control-center/.data/Interference.desktop
-share/gnome/control-center/.data/Jigsaw.desktop
-share/gnome/control-center/.data/Julia.desktop
-share/gnome/control-center/.data/Kaleidescope.desktop
-share/gnome/control-center/.data/Kumppa.desktop
-share/gnome/control-center/.data/Lament.desktop
-share/gnome/control-center/.data/Laser.desktop
-share/gnome/control-center/.data/Lightning.desktop
-share/gnome/control-center/.data/Lisa.desktop
-share/gnome/control-center/.data/Lissie.desktop
-share/gnome/control-center/.data/Lmorph.desktop
-share/gnome/control-center/.data/Loop.desktop
-share/gnome/control-center/.data/Maze.desktop
-share/gnome/control-center/.data/Moebius.desktop
-share/gnome/control-center/.data/Moire.desktop
-share/gnome/control-center/.data/Moire2.desktop
-share/gnome/control-center/.data/Morph3d.desktop
-share/gnome/control-center/.data/Mountain.desktop
-share/gnome/control-center/.data/Munch.desktop
-share/gnome/control-center/.data/Noseguy.desktop
-share/gnome/control-center/.data/Pedal.desktop
-share/gnome/control-center/.data/Penetrate.desktop
-share/gnome/control-center/.data/Penrose.desktop
-share/gnome/control-center/.data/Phosphor.desktop
-share/gnome/control-center/.data/Pipes.desktop
-share/gnome/control-center/.data/Pyro.desktop
-share/gnome/control-center/.data/Qix.desktop
-share/gnome/control-center/.data/Rd-bomb.desktop
-share/gnome/control-center/.data/Ripples.desktop
-share/gnome/control-center/.data/Rocks.desktop
-share/gnome/control-center/.data/Rorschach.desktop
-share/gnome/control-center/.data/Rotor.desktop
-share/gnome/control-center/.data/Rubik.desktop
-share/gnome/control-center/.data/Shadebobs.desktop
-share/gnome/control-center/.data/Sierpinski.desktop
-share/gnome/control-center/.data/Slidescreen.desktop
-share/gnome/control-center/.data/Slip.desktop
-share/gnome/control-center/.data/Sonar.desktop
-share/gnome/control-center/.data/Sphere.desktop
-share/gnome/control-center/.data/Spiral.desktop
-share/gnome/control-center/.data/Spotlight.desktop
-share/gnome/control-center/.data/Sproingies.desktop
-share/gnome/control-center/.data/Squiral.desktop
-share/gnome/control-center/.data/Stairs.desktop
-share/gnome/control-center/.data/Starfish.desktop
-share/gnome/control-center/.data/Strange.desktop
-share/gnome/control-center/.data/Superquadrics.desktop
-share/gnome/control-center/.data/Swirl.desktop
-share/gnome/control-center/.data/Triangle.desktop
-share/gnome/control-center/.data/Truchet.desktop
-share/gnome/control-center/.data/Vines.desktop
-share/gnome/control-center/.data/Worm.desktop
-share/gnome/control-center/.data/Xflame.desktop
-share/gnome/control-center/.data/Xjack.desktop
-share/gnome/control-center/.data/Xlyap.desktop
-share/gnome/control-center/.data/Xmatrix.desktop
-share/gnome/control-center/.data/Xroger.desktop
-share/gnome/control-center/.data/Xteevee.desktop
-share/gnome/control-center/.data/ant.png
-share/gnome/control-center/.data/attraction.png
-share/gnome/control-center/.data/blitspin.png
-share/gnome/control-center/.data/bouboule.png
-share/gnome/control-center/.data/braid.png
-share/gnome/control-center/.data/bsod.png
-share/gnome/control-center/.data/bubbles.png
-share/gnome/control-center/.data/coral.png
-share/gnome/control-center/.data/crystal.png
-share/gnome/control-center/.data/cynosure.png
-share/gnome/control-center/.data/decayscreen.png
-share/gnome/control-center/.data/deco.png
-share/gnome/control-center/.data/discrete.png
-share/gnome/control-center/.data/drift.png
-share/gnome/control-center/.data/epicycle.png
-share/gnome/control-center/.data/flag.png
-share/gnome/control-center/.data/flame.png
-share/gnome/control-center/.data/forest.png
-share/gnome/control-center/.data/goop.png
-share/gnome/control-center/.data/grav.png
-share/gnome/control-center/.data/greynetic.png
-share/gnome/control-center/.data/halo.png
-share/gnome/control-center/.data/helix.png
-share/gnome/control-center/.data/hopalong.png
-share/gnome/control-center/.data/hypercube.png
-share/gnome/control-center/.data/ifs.png
-share/gnome/control-center/.data/julia.png
-share/gnome/control-center/.data/kaleidescope.png
-share/gnome/control-center/.data/laser.png
-share/gnome/control-center/.data/lightning.png
-share/gnome/control-center/.data/lisa.png
-share/gnome/control-center/.data/lmorph.png
-share/gnome/control-center/.data/maze.png
-share/gnome/control-center/.data/moire.png
-share/gnome/control-center/.data/munch.png
-share/gnome/control-center/.data/pedal.png
-share/gnome/control-center/.data/qix.png
-share/gnome/control-center/.data/ripples.png
-share/gnome/control-center/.data/sierpinski.png
-share/gnome/control-center/.data/spiral.png
-share/gnome/control-center/.data/starfish.png
-share/gnome/control-center/.data/vines.png
-share/gnome/control-center/.data/xroger.png
-share/gnome/control-center/.data/xteevee.png
 share/gnome/control-center/.directory
 share/gnome/control-center/Desktop/.directory
 share/gnome/control-center/Desktop/background-properties.desktop
-share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
 share/gnome/control-center/Documents/.directory
@@ -296,7 +148,6 @@ share/locale/zh_TW/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/control-center/Multimedia
 @dirrm share/gnome/control-center/Documents
 @dirrm share/gnome/control-center/Desktop
-@dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
 @dirrm share/gnome/apps/Settings/UIOptions
 @dirrm share/gnome/apps/Settings/Session
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index 218ae3c4a511..573ed5c088f2 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomecontrolcenter
 PORTVERSION=	1.4.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
diff --git a/sysutils/gnomecontrolcenter/files/patch-capplets::Makefile.in b/sysutils/gnomecontrolcenter/files/patch-capplets::Makefile.in
new file mode 100644
index 000000000000..c1c29de83cb1
--- /dev/null
+++ b/sysutils/gnomecontrolcenter/files/patch-capplets::Makefile.in
@@ -0,0 +1,7 @@
+--- capplets/Makefile.in.orig	Sun Feb 10 15:41:49 2002
++++ capplets/Makefile.in	Wed Feb 13 09:34:28 2002
+@@ -154,3 +154,3 @@
+ always_built_SUBDIRS = desktop-links mouse-properties \
+-	screensaver-properties background-properties \
++	background-properties \
+         theme-switcher sound-properties \
diff --git a/sysutils/gnomecontrolcenter/pkg-plist b/sysutils/gnomecontrolcenter/pkg-plist
index 2ec3f6a88344..790f300cb7ec 100644
--- a/sysutils/gnomecontrolcenter/pkg-plist
+++ b/sysutils/gnomecontrolcenter/pkg-plist
@@ -4,7 +4,6 @@ bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
 bin/mouse-properties-capplet
-bin/screensaver-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
@@ -18,7 +17,6 @@ lib/libcapplet.so
 lib/libcapplet.so.5
 share/gnome/apps/Settings/Desktop/.directory
 share/gnome/apps/Settings/Desktop/background-properties.desktop
-share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
 share/gnome/apps/Settings/Documents/.directory
@@ -33,155 +31,9 @@ share/gnome/apps/Settings/Session/.directory
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/control-center/.data/3d.desktop
-share/gnome/control-center/.data/3d.png
-share/gnome/control-center/.data/Ant.desktop
-share/gnome/control-center/.data/Atlantis.desktop
-share/gnome/control-center/.data/Attraction.desktop
-share/gnome/control-center/.data/Blitspin.desktop
-share/gnome/control-center/.data/Bouboule.desktop
-share/gnome/control-center/.data/Braid.desktop
-share/gnome/control-center/.data/Bsod.desktop
-share/gnome/control-center/.data/Bubble3d.desktop
-share/gnome/control-center/.data/Bubbles.desktop
-share/gnome/control-center/.data/Bumps.desktop
-share/gnome/control-center/.data/Cage.desktop
-share/gnome/control-center/.data/Compass.desktop
-share/gnome/control-center/.data/Coral.desktop
-share/gnome/control-center/.data/Critical.desktop
-share/gnome/control-center/.data/Crystal.desktop
-share/gnome/control-center/.data/Cynosure.desktop
-share/gnome/control-center/.data/Decayscreen.desktop
-share/gnome/control-center/.data/Deco.desktop
-share/gnome/control-center/.data/Deluxe.desktop
-share/gnome/control-center/.data/Demon.desktop
-share/gnome/control-center/.data/Discrete.desktop
-share/gnome/control-center/.data/Distort.desktop
-share/gnome/control-center/.data/Drift.desktop
-share/gnome/control-center/.data/Epicycle.desktop
-share/gnome/control-center/.data/Fadeplot.desktop
-share/gnome/control-center/.data/Flag.desktop
-share/gnome/control-center/.data/Flame.desktop
-share/gnome/control-center/.data/Flow.desktop
-share/gnome/control-center/.data/Forest.desktop
-share/gnome/control-center/.data/GLPlanet.desktop
-share/gnome/control-center/.data/Galaxy.desktop
-share/gnome/control-center/.data/Gears.desktop
-share/gnome/control-center/.data/Goop.desktop
-share/gnome/control-center/.data/Grav.desktop
-share/gnome/control-center/.data/Greynetic.desktop
-share/gnome/control-center/.data/Halo.desktop
-share/gnome/control-center/.data/Helix.desktop
-share/gnome/control-center/.data/Hopalong.desktop
-share/gnome/control-center/.data/Hypercube.desktop
-share/gnome/control-center/.data/Ifs.desktop
-share/gnome/control-center/.data/Imsmap.desktop
-share/gnome/control-center/.data/Interference.desktop
-share/gnome/control-center/.data/Jigsaw.desktop
-share/gnome/control-center/.data/Julia.desktop
-share/gnome/control-center/.data/Kaleidescope.desktop
-share/gnome/control-center/.data/Kumppa.desktop
-share/gnome/control-center/.data/Lament.desktop
-share/gnome/control-center/.data/Laser.desktop
-share/gnome/control-center/.data/Lightning.desktop
-share/gnome/control-center/.data/Lisa.desktop
-share/gnome/control-center/.data/Lissie.desktop
-share/gnome/control-center/.data/Lmorph.desktop
-share/gnome/control-center/.data/Loop.desktop
-share/gnome/control-center/.data/Maze.desktop
-share/gnome/control-center/.data/Moebius.desktop
-share/gnome/control-center/.data/Moire.desktop
-share/gnome/control-center/.data/Moire2.desktop
-share/gnome/control-center/.data/Morph3d.desktop
-share/gnome/control-center/.data/Mountain.desktop
-share/gnome/control-center/.data/Munch.desktop
-share/gnome/control-center/.data/Noseguy.desktop
-share/gnome/control-center/.data/Pedal.desktop
-share/gnome/control-center/.data/Penetrate.desktop
-share/gnome/control-center/.data/Penrose.desktop
-share/gnome/control-center/.data/Phosphor.desktop
-share/gnome/control-center/.data/Pipes.desktop
-share/gnome/control-center/.data/Pyro.desktop
-share/gnome/control-center/.data/Qix.desktop
-share/gnome/control-center/.data/Rd-bomb.desktop
-share/gnome/control-center/.data/Ripples.desktop
-share/gnome/control-center/.data/Rocks.desktop
-share/gnome/control-center/.data/Rorschach.desktop
-share/gnome/control-center/.data/Rotor.desktop
-share/gnome/control-center/.data/Rubik.desktop
-share/gnome/control-center/.data/Shadebobs.desktop
-share/gnome/control-center/.data/Sierpinski.desktop
-share/gnome/control-center/.data/Slidescreen.desktop
-share/gnome/control-center/.data/Slip.desktop
-share/gnome/control-center/.data/Sonar.desktop
-share/gnome/control-center/.data/Sphere.desktop
-share/gnome/control-center/.data/Spiral.desktop
-share/gnome/control-center/.data/Spotlight.desktop
-share/gnome/control-center/.data/Sproingies.desktop
-share/gnome/control-center/.data/Squiral.desktop
-share/gnome/control-center/.data/Stairs.desktop
-share/gnome/control-center/.data/Starfish.desktop
-share/gnome/control-center/.data/Strange.desktop
-share/gnome/control-center/.data/Superquadrics.desktop
-share/gnome/control-center/.data/Swirl.desktop
-share/gnome/control-center/.data/Triangle.desktop
-share/gnome/control-center/.data/Truchet.desktop
-share/gnome/control-center/.data/Vines.desktop
-share/gnome/control-center/.data/Worm.desktop
-share/gnome/control-center/.data/Xflame.desktop
-share/gnome/control-center/.data/Xjack.desktop
-share/gnome/control-center/.data/Xlyap.desktop
-share/gnome/control-center/.data/Xmatrix.desktop
-share/gnome/control-center/.data/Xroger.desktop
-share/gnome/control-center/.data/Xteevee.desktop
-share/gnome/control-center/.data/ant.png
-share/gnome/control-center/.data/attraction.png
-share/gnome/control-center/.data/blitspin.png
-share/gnome/control-center/.data/bouboule.png
-share/gnome/control-center/.data/braid.png
-share/gnome/control-center/.data/bsod.png
-share/gnome/control-center/.data/bubbles.png
-share/gnome/control-center/.data/coral.png
-share/gnome/control-center/.data/crystal.png
-share/gnome/control-center/.data/cynosure.png
-share/gnome/control-center/.data/decayscreen.png
-share/gnome/control-center/.data/deco.png
-share/gnome/control-center/.data/discrete.png
-share/gnome/control-center/.data/drift.png
-share/gnome/control-center/.data/epicycle.png
-share/gnome/control-center/.data/flag.png
-share/gnome/control-center/.data/flame.png
-share/gnome/control-center/.data/forest.png
-share/gnome/control-center/.data/goop.png
-share/gnome/control-center/.data/grav.png
-share/gnome/control-center/.data/greynetic.png
-share/gnome/control-center/.data/halo.png
-share/gnome/control-center/.data/helix.png
-share/gnome/control-center/.data/hopalong.png
-share/gnome/control-center/.data/hypercube.png
-share/gnome/control-center/.data/ifs.png
-share/gnome/control-center/.data/julia.png
-share/gnome/control-center/.data/kaleidescope.png
-share/gnome/control-center/.data/laser.png
-share/gnome/control-center/.data/lightning.png
-share/gnome/control-center/.data/lisa.png
-share/gnome/control-center/.data/lmorph.png
-share/gnome/control-center/.data/maze.png
-share/gnome/control-center/.data/moire.png
-share/gnome/control-center/.data/munch.png
-share/gnome/control-center/.data/pedal.png
-share/gnome/control-center/.data/qix.png
-share/gnome/control-center/.data/ripples.png
-share/gnome/control-center/.data/sierpinski.png
-share/gnome/control-center/.data/spiral.png
-share/gnome/control-center/.data/starfish.png
-share/gnome/control-center/.data/vines.png
-share/gnome/control-center/.data/xroger.png
-share/gnome/control-center/.data/xteevee.png
 share/gnome/control-center/.directory
 share/gnome/control-center/Desktop/.directory
 share/gnome/control-center/Desktop/background-properties.desktop
-share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
 share/gnome/control-center/Documents/.directory
@@ -296,7 +148,6 @@ share/locale/zh_TW/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/control-center/Multimedia
 @dirrm share/gnome/control-center/Documents
 @dirrm share/gnome/control-center/Desktop
-@dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
 @dirrm share/gnome/apps/Settings/UIOptions
 @dirrm share/gnome/apps/Settings/Session
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 218ae3c4a511..573ed5c088f2 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomecontrolcenter
 PORTVERSION=	1.4.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in
new file mode 100644
index 000000000000..c1c29de83cb1
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in
@@ -0,0 +1,7 @@
+--- capplets/Makefile.in.orig	Sun Feb 10 15:41:49 2002
++++ capplets/Makefile.in	Wed Feb 13 09:34:28 2002
+@@ -154,3 +154,3 @@
+ always_built_SUBDIRS = desktop-links mouse-properties \
+-	screensaver-properties background-properties \
++	background-properties \
+         theme-switcher sound-properties \
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 2ec3f6a88344..790f300cb7ec 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -4,7 +4,6 @@ bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
 bin/mouse-properties-capplet
-bin/screensaver-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
@@ -18,7 +17,6 @@ lib/libcapplet.so
 lib/libcapplet.so.5
 share/gnome/apps/Settings/Desktop/.directory
 share/gnome/apps/Settings/Desktop/background-properties.desktop
-share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
 share/gnome/apps/Settings/Documents/.directory
@@ -33,155 +31,9 @@ share/gnome/apps/Settings/Session/.directory
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/control-center/.data/3d.desktop
-share/gnome/control-center/.data/3d.png
-share/gnome/control-center/.data/Ant.desktop
-share/gnome/control-center/.data/Atlantis.desktop
-share/gnome/control-center/.data/Attraction.desktop
-share/gnome/control-center/.data/Blitspin.desktop
-share/gnome/control-center/.data/Bouboule.desktop
-share/gnome/control-center/.data/Braid.desktop
-share/gnome/control-center/.data/Bsod.desktop
-share/gnome/control-center/.data/Bubble3d.desktop
-share/gnome/control-center/.data/Bubbles.desktop
-share/gnome/control-center/.data/Bumps.desktop
-share/gnome/control-center/.data/Cage.desktop
-share/gnome/control-center/.data/Compass.desktop
-share/gnome/control-center/.data/Coral.desktop
-share/gnome/control-center/.data/Critical.desktop
-share/gnome/control-center/.data/Crystal.desktop
-share/gnome/control-center/.data/Cynosure.desktop
-share/gnome/control-center/.data/Decayscreen.desktop
-share/gnome/control-center/.data/Deco.desktop
-share/gnome/control-center/.data/Deluxe.desktop
-share/gnome/control-center/.data/Demon.desktop
-share/gnome/control-center/.data/Discrete.desktop
-share/gnome/control-center/.data/Distort.desktop
-share/gnome/control-center/.data/Drift.desktop
-share/gnome/control-center/.data/Epicycle.desktop
-share/gnome/control-center/.data/Fadeplot.desktop
-share/gnome/control-center/.data/Flag.desktop
-share/gnome/control-center/.data/Flame.desktop
-share/gnome/control-center/.data/Flow.desktop
-share/gnome/control-center/.data/Forest.desktop
-share/gnome/control-center/.data/GLPlanet.desktop
-share/gnome/control-center/.data/Galaxy.desktop
-share/gnome/control-center/.data/Gears.desktop
-share/gnome/control-center/.data/Goop.desktop
-share/gnome/control-center/.data/Grav.desktop
-share/gnome/control-center/.data/Greynetic.desktop
-share/gnome/control-center/.data/Halo.desktop
-share/gnome/control-center/.data/Helix.desktop
-share/gnome/control-center/.data/Hopalong.desktop
-share/gnome/control-center/.data/Hypercube.desktop
-share/gnome/control-center/.data/Ifs.desktop
-share/gnome/control-center/.data/Imsmap.desktop
-share/gnome/control-center/.data/Interference.desktop
-share/gnome/control-center/.data/Jigsaw.desktop
-share/gnome/control-center/.data/Julia.desktop
-share/gnome/control-center/.data/Kaleidescope.desktop
-share/gnome/control-center/.data/Kumppa.desktop
-share/gnome/control-center/.data/Lament.desktop
-share/gnome/control-center/.data/Laser.desktop
-share/gnome/control-center/.data/Lightning.desktop
-share/gnome/control-center/.data/Lisa.desktop
-share/gnome/control-center/.data/Lissie.desktop
-share/gnome/control-center/.data/Lmorph.desktop
-share/gnome/control-center/.data/Loop.desktop
-share/gnome/control-center/.data/Maze.desktop
-share/gnome/control-center/.data/Moebius.desktop
-share/gnome/control-center/.data/Moire.desktop
-share/gnome/control-center/.data/Moire2.desktop
-share/gnome/control-center/.data/Morph3d.desktop
-share/gnome/control-center/.data/Mountain.desktop
-share/gnome/control-center/.data/Munch.desktop
-share/gnome/control-center/.data/Noseguy.desktop
-share/gnome/control-center/.data/Pedal.desktop
-share/gnome/control-center/.data/Penetrate.desktop
-share/gnome/control-center/.data/Penrose.desktop
-share/gnome/control-center/.data/Phosphor.desktop
-share/gnome/control-center/.data/Pipes.desktop
-share/gnome/control-center/.data/Pyro.desktop
-share/gnome/control-center/.data/Qix.desktop
-share/gnome/control-center/.data/Rd-bomb.desktop
-share/gnome/control-center/.data/Ripples.desktop
-share/gnome/control-center/.data/Rocks.desktop
-share/gnome/control-center/.data/Rorschach.desktop
-share/gnome/control-center/.data/Rotor.desktop
-share/gnome/control-center/.data/Rubik.desktop
-share/gnome/control-center/.data/Shadebobs.desktop
-share/gnome/control-center/.data/Sierpinski.desktop
-share/gnome/control-center/.data/Slidescreen.desktop
-share/gnome/control-center/.data/Slip.desktop
-share/gnome/control-center/.data/Sonar.desktop
-share/gnome/control-center/.data/Sphere.desktop
-share/gnome/control-center/.data/Spiral.desktop
-share/gnome/control-center/.data/Spotlight.desktop
-share/gnome/control-center/.data/Sproingies.desktop
-share/gnome/control-center/.data/Squiral.desktop
-share/gnome/control-center/.data/Stairs.desktop
-share/gnome/control-center/.data/Starfish.desktop
-share/gnome/control-center/.data/Strange.desktop
-share/gnome/control-center/.data/Superquadrics.desktop
-share/gnome/control-center/.data/Swirl.desktop
-share/gnome/control-center/.data/Triangle.desktop
-share/gnome/control-center/.data/Truchet.desktop
-share/gnome/control-center/.data/Vines.desktop
-share/gnome/control-center/.data/Worm.desktop
-share/gnome/control-center/.data/Xflame.desktop
-share/gnome/control-center/.data/Xjack.desktop
-share/gnome/control-center/.data/Xlyap.desktop
-share/gnome/control-center/.data/Xmatrix.desktop
-share/gnome/control-center/.data/Xroger.desktop
-share/gnome/control-center/.data/Xteevee.desktop
-share/gnome/control-center/.data/ant.png
-share/gnome/control-center/.data/attraction.png
-share/gnome/control-center/.data/blitspin.png
-share/gnome/control-center/.data/bouboule.png
-share/gnome/control-center/.data/braid.png
-share/gnome/control-center/.data/bsod.png
-share/gnome/control-center/.data/bubbles.png
-share/gnome/control-center/.data/coral.png
-share/gnome/control-center/.data/crystal.png
-share/gnome/control-center/.data/cynosure.png
-share/gnome/control-center/.data/decayscreen.png
-share/gnome/control-center/.data/deco.png
-share/gnome/control-center/.data/discrete.png
-share/gnome/control-center/.data/drift.png
-share/gnome/control-center/.data/epicycle.png
-share/gnome/control-center/.data/flag.png
-share/gnome/control-center/.data/flame.png
-share/gnome/control-center/.data/forest.png
-share/gnome/control-center/.data/goop.png
-share/gnome/control-center/.data/grav.png
-share/gnome/control-center/.data/greynetic.png
-share/gnome/control-center/.data/halo.png
-share/gnome/control-center/.data/helix.png
-share/gnome/control-center/.data/hopalong.png
-share/gnome/control-center/.data/hypercube.png
-share/gnome/control-center/.data/ifs.png
-share/gnome/control-center/.data/julia.png
-share/gnome/control-center/.data/kaleidescope.png
-share/gnome/control-center/.data/laser.png
-share/gnome/control-center/.data/lightning.png
-share/gnome/control-center/.data/lisa.png
-share/gnome/control-center/.data/lmorph.png
-share/gnome/control-center/.data/maze.png
-share/gnome/control-center/.data/moire.png
-share/gnome/control-center/.data/munch.png
-share/gnome/control-center/.data/pedal.png
-share/gnome/control-center/.data/qix.png
-share/gnome/control-center/.data/ripples.png
-share/gnome/control-center/.data/sierpinski.png
-share/gnome/control-center/.data/spiral.png
-share/gnome/control-center/.data/starfish.png
-share/gnome/control-center/.data/vines.png
-share/gnome/control-center/.data/xroger.png
-share/gnome/control-center/.data/xteevee.png
 share/gnome/control-center/.directory
 share/gnome/control-center/Desktop/.directory
 share/gnome/control-center/Desktop/background-properties.desktop
-share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
 share/gnome/control-center/Documents/.directory
@@ -296,7 +148,6 @@ share/locale/zh_TW/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/control-center/Multimedia
 @dirrm share/gnome/control-center/Documents
 @dirrm share/gnome/control-center/Desktop
-@dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
 @dirrm share/gnome/apps/Settings/UIOptions
 @dirrm share/gnome/apps/Settings/Session