18 files changed, 83 insertions, 72 deletions

diff --git a/deskutils/gdesklets-psi_displaypackage/Makefile b/deskutils/gdesklets-psi_displaypackage/Makefile
index 4ac9022c7acf..a81826bd367c 100644
--- a/deskutils/gdesklets-psi_displaypackage/Makefile
+++ b/deskutils/gdesklets-psi_displaypackage/Makefile
@@ -30,10 +30,9 @@ RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutil
 		${DATADIR}/Sensors/VariableBorder/__init__.py:${PORTSDIR}/deskutils/gdesklets-sensor-psi_variableborder \
 		${DATADIR}/Sensors/IconButton/__init__.py:${PORTSDIR}/deskutils/gdesklets-sensor-psi_iconbutton
 
-USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 
-DISTVERSION=	20031028
+DISTVERSION=	20040420
 NAME=		psi-displays
 DATADIR=	${PREFIX}/share/gnome/gdesklets
 WRKSRC=		${WRKDIR}/${NAME}-v${PORTVERSION}
diff --git a/deskutils/gdesklets-psi_displaypackage/distinfo b/deskutils/gdesklets-psi_displaypackage/distinfo
index c240b840197f..3bc1bf4861e4 100644
--- a/deskutils/gdesklets-psi_displaypackage/distinfo
+++ b/deskutils/gdesklets-psi_displaypackage/distinfo
@@ -1,2 +1,2 @@
-MD5 (PsiDisplayPackage-20031028.tar.bz2) = ebde2a0b8130ddb161e8a1c0f06f0dc6
-SIZE (PsiDisplayPackage-20031028.tar.bz2) = 68956
+MD5 (PsiDisplayPackage-20040420.tar.gz) = a0c479d1a20df6a4838e84fdc4f0e7db
+SIZE (PsiDisplayPackage-20040420.tar.gz) = 130931
diff --git a/deskutils/gdesklets-psi_displaypackage/files/patch-fortune.display b/deskutils/gdesklets-psi_displaypackage/files/patch-fortune.display
index 18e9eba5e7ab..1460062033c9 100644
--- a/deskutils/gdesklets-psi_displaypackage/files/patch-fortune.display
+++ b/deskutils/gdesklets-psi_displaypackage/files/patch-fortune.display
@@ -1,11 +1,11 @@
---- fortune.display.orig	Fri Nov 21 22:11:34 2003
-+++ fortune.display	Fri Nov 21 22:11:43 2003
+--- fortune.display.orig	Thu Apr 22 11:51:38 2004
++++ fortune.display	Thu Apr 22 11:51:50 2004
 @@ -6,7 +6,7 @@
- 		version="0.2.1"
+ 		version="0.2.3"
  		description="Themable fortune (needs the Theme,FontSelector,ExternalInterval sensors)"/>
  	
--	<sensor id="fortune" module="ExternalInterval,fortune|fmt -w 35|iconv -t=UTF-8,Fortune refresh,60000"/>
-+	<sensor id="fortune" module="ExternalInterval,fortune|fmt -w 35|iconv -t UTF-8,Fortune refresh,60000"/>
+-	<sensor id="fortune" module="ExternalInterval,fortune|iconv -t=UTF-8,Fortune refresh,5000"/>
++	<sensor id="fortune" module="ExternalInterval,fortune|iconv -t UTF-8,Fortune refresh,5000"/>
  	<sensor id="FS" module="FontSelector,1,Sans 8,white"/>
  	<sensor id="THbg" module="Theme,Psi-Disp-Themes,backgrounds"/>
  	<sensor id="THb" module="Theme,Psi-Disp-Themes,borders"/>
diff --git a/deskutils/gdesklets-psi_displaypackage/pkg-descr b/deskutils/gdesklets-psi_displaypackage/pkg-descr
index e8b3c1cd3bba..0d9c9a4acf85 100644
--- a/deskutils/gdesklets-psi_displaypackage/pkg-descr
+++ b/deskutils/gdesklets-psi_displaypackage/pkg-descr
@@ -1,5 +1,5 @@
 Displays :
 borders, clock, diskinfo, fortune, info, meminfo, memo, 
-networkinfo, popmail, ping, variable-borders.
+networkinfo, popmail, ping, variable-borders, info-altuptime.
 
 WWW: http://gdesklets.gnomedesktop.org/
diff --git a/deskutils/gdesklets-psi_displaypackage/pkg-plist b/deskutils/gdesklets-psi_displaypackage/pkg-plist
index 55bcf0d1d972..3344a22919dd 100644
--- a/deskutils/gdesklets-psi_displaypackage/pkg-plist
+++ b/deskutils/gdesklets-psi_displaypackage/pkg-plist
@@ -5,6 +5,7 @@ share/gnome/gdesklets/Displays/psi-displays/border-top-right.display
 share/gnome/gdesklets/Displays/psi-displays/clock.display
 share/gnome/gdesklets/Displays/psi-displays/diskinfo.display
 share/gnome/gdesklets/Displays/psi-displays/fortune.display
+share/gnome/gdesklets/Displays/psi-displays/info-altuptime.display
 share/gnome/gdesklets/Displays/psi-displays/info.display
 share/gnome/gdesklets/Displays/psi-displays/meminfo.display
 share/gnome/gdesklets/Displays/psi-displays/memo.display
diff --git a/deskutils/gdesklets-psi_themes/Makefile b/deskutils/gdesklets-psi_themes/Makefile
index 24d928fcd717..aa5f8a496175 100644
--- a/deskutils/gdesklets-psi_themes/Makefile
+++ b/deskutils/gdesklets-psi_themes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	themes
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-psi_
@@ -15,10 +16,9 @@ DISTNAME=	PsiDisplayPackage-${DISTVERSION}
 MAINTAINER=	klammer@webonaut.com
 COMMENT=	Themes from the Psi Display Package
 
-USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 
-DISTVERSION=	20031028
+DISTVERSION=	20040420
 NAME_THEMES=	Psi-Disp-Themes
 DATADIR=	${PREFIX}/share/gnome
 WRKSRC=		${WRKDIR}/Themes
diff --git a/deskutils/gdesklets-psi_themes/distinfo b/deskutils/gdesklets-psi_themes/distinfo
index c240b840197f..3bc1bf4861e4 100644
--- a/deskutils/gdesklets-psi_themes/distinfo
+++ b/deskutils/gdesklets-psi_themes/distinfo
@@ -1,2 +1,2 @@
-MD5 (PsiDisplayPackage-20031028.tar.bz2) = ebde2a0b8130ddb161e8a1c0f06f0dc6
-SIZE (PsiDisplayPackage-20031028.tar.bz2) = 68956
+MD5 (PsiDisplayPackage-20040420.tar.gz) = a0c479d1a20df6a4838e84fdc4f0e7db
+SIZE (PsiDisplayPackage-20040420.tar.gz) = 130931
diff --git a/deskutils/gdesklets-psi_themes/pkg-plist b/deskutils/gdesklets-psi_themes/pkg-plist
index 4cdc40ab414c..d5839b89563e 100644
--- a/deskutils/gdesklets-psi_themes/pkg-plist
+++ b/deskutils/gdesklets-psi_themes/pkg-plist
@@ -108,6 +108,24 @@ share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-round-black/center.png
 share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-round-white/bg.png
 share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-round-white/center.png
 share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/themes
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/email.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/error.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/files.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/fortune-1.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/fortune.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/hd-1.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/hd-2.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/hd-3.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/hd-4.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/hd.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/memory.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/net.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/nonewmail.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/penguin-1.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/penguin.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/ping.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/ping2.png
+share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2/xclock.png
 share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal/email.png
 share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal/error.png
 share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal/files.png
@@ -133,40 +151,41 @@ share/gnome/gdesklets/Themes/Psi-Disp-Themes/shadows/black/bottom.png
 share/gnome/gdesklets/Themes/Psi-Disp-Themes/shadows/black/right.png
 share/gnome/gdesklets/Themes/Psi-Disp-Themes/shadows/black/top-right.png
 share/gnome/gdesklets/Themes/Psi-Disp-Themes/shadows/themes
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/backgrounds/dark
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/backgrounds/light
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/backgrounds
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/black-big
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/black-big-alpha
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/black-ext
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/black-thin
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/white-big
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/white-ext
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/white-med
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/white-thin
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/rect-rect-black
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/rect-rect-white
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/round-gradient-black
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/round-gradient-white
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/round-rect-black
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/round-rect-white
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/round-round-black
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/shadows/black
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/shadows/alpha
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/shadows
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal-2
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-round-white
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-round-black
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-rect-white
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-rect-black
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-gradient-white
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-gradient-black
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/rect-rect-white
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/rect-rect-black
 @dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/round-round-white
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/round-round-black
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/round-rect-white
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/round-rect-black
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/round-gradient-white
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/round-gradient-black
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/rect-rect-white
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin/rect-rect-black
 @dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge-thin
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/rect-rect-black
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/rect-rect-white
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-gradient-black
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-gradient-white
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-rect-black
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-rect-white
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-round-black
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge/round-round-white
 @dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/gauge
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons/crystal
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/icons
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/shadows/alpha
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/shadows/black
-@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/shadows
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/white-thin
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/white-med
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/white-ext
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/white-big
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/black-thin
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/black-ext
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/black-big-alpha
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders/black-big
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/borders
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/backgrounds/light
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/backgrounds/dark
+@dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes/backgrounds
 @dirrm share/gnome/gdesklets/Themes/Psi-Disp-Themes
 @dirrm share/gnome/gdesklets/Themes
diff --git a/deskutils/gdesklets-sensor-psi_externalinterval/Makefile b/deskutils/gdesklets-sensor-psi_externalinterval/Makefile
index 17f32e6cb0b4..0311460cdf6e 100644
--- a/deskutils/gdesklets-sensor-psi_externalinterval/Makefile
+++ b/deskutils/gdesklets-sensor-psi_externalinterval/Makefile
@@ -11,14 +11,13 @@ PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-sensor-psi_
-DISTNAME=	PsiSensorPackage-20031028
+DISTNAME=	PsiSensorPackage-20040420
 
 MAINTAINER=	klammer@webonaut.com
 COMMENT=	ExternalInterval sensor from the Psi Sensor Package
 
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
 
-USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 
diff --git a/deskutils/gdesklets-sensor-psi_externalinterval/distinfo b/deskutils/gdesklets-sensor-psi_externalinterval/distinfo
index 83c30dc1b5e2..9558f940131d 100644
--- a/deskutils/gdesklets-sensor-psi_externalinterval/distinfo
+++ b/deskutils/gdesklets-sensor-psi_externalinterval/distinfo
@@ -1,2 +1,2 @@
-MD5 (PsiSensorPackage-20031028.tar.bz2) = 24c891e1d0f66426040b4e4fb618f9f5
-SIZE (PsiSensorPackage-20031028.tar.bz2) = 26372
+MD5 (PsiSensorPackage-20040420.tar.gz) = a2e795b4b0c52d31f711eccebf0568f4
+SIZE (PsiSensorPackage-20040420.tar.gz) = 28428
diff --git a/deskutils/gdesklets-sensor-psi_memo/Makefile b/deskutils/gdesklets-sensor-psi_memo/Makefile
index a560f1876157..ee05f23e0dfb 100644
--- a/deskutils/gdesklets-sensor-psi_memo/Makefile
+++ b/deskutils/gdesklets-sensor-psi_memo/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	memo
-PORTVERSION=	0.1.4
-PORTREVISION=	1
+PORTVERSION=	0.1.5
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-sensor-psi_
@@ -18,11 +17,10 @@ COMMENT=	Memo Sensor from the Psi Sensor Package
 
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
 
-USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 
-DISTVERSION=	20031028
+DISTVERSION=	20040420
 NAME=		Memo
 DATADIR=	${PREFIX}/share/gnome
 WRKSRC=		${WRKDIR}/${NAME}-${PORTVERSION}
diff --git a/deskutils/gdesklets-sensor-psi_memo/distinfo b/deskutils/gdesklets-sensor-psi_memo/distinfo
index 83c30dc1b5e2..9558f940131d 100644
--- a/deskutils/gdesklets-sensor-psi_memo/distinfo
+++ b/deskutils/gdesklets-sensor-psi_memo/distinfo
@@ -1,2 +1,2 @@
-MD5 (PsiSensorPackage-20031028.tar.bz2) = 24c891e1d0f66426040b4e4fb618f9f5
-SIZE (PsiSensorPackage-20031028.tar.bz2) = 26372
+MD5 (PsiSensorPackage-20040420.tar.gz) = a2e795b4b0c52d31f711eccebf0568f4
+SIZE (PsiSensorPackage-20040420.tar.gz) = 28428
diff --git a/deskutils/gdesklets-sensor-psi_memoover/Makefile b/deskutils/gdesklets-sensor-psi_memoover/Makefile
index 01d5be0405df..31f68933d09c 100644
--- a/deskutils/gdesklets-sensor-psi_memoover/Makefile
+++ b/deskutils/gdesklets-sensor-psi_memoover/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	memoover
-PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTVERSION=	0.1.2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-sensor-psi_
@@ -18,11 +17,10 @@ COMMENT=	MemoOver Sensor from the Psi Sensor Package
 
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
 
-USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 
-DISTVERSION=	20031028
+DISTVERSION=	20040420
 NAME=		MemoOver
 DATADIR=	${PREFIX}/share/gnome
 WRKSRC=		${WRKDIR}/${NAME}-${PORTVERSION}
diff --git a/deskutils/gdesklets-sensor-psi_memoover/distinfo b/deskutils/gdesklets-sensor-psi_memoover/distinfo
index 83c30dc1b5e2..9558f940131d 100644
--- a/deskutils/gdesklets-sensor-psi_memoover/distinfo
+++ b/deskutils/gdesklets-sensor-psi_memoover/distinfo
@@ -1,2 +1,2 @@
-MD5 (PsiSensorPackage-20031028.tar.bz2) = 24c891e1d0f66426040b4e4fb618f9f5
-SIZE (PsiSensorPackage-20031028.tar.bz2) = 26372
+MD5 (PsiSensorPackage-20040420.tar.gz) = a2e795b4b0c52d31f711eccebf0568f4
+SIZE (PsiSensorPackage-20040420.tar.gz) = 28428
diff --git a/deskutils/gdesklets-sensor-psi_theme/Makefile b/deskutils/gdesklets-sensor-psi_theme/Makefile
index f22f01ca81f9..344dfe99a3f7 100644
--- a/deskutils/gdesklets-sensor-psi_theme/Makefile
+++ b/deskutils/gdesklets-sensor-psi_theme/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	theme
-PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTVERSION=	0.1.2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-sensor-psi_
@@ -19,12 +18,11 @@ COMMENT=	Theme Sensor from the Psi Sensor Package
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets \
 		${DATADIR}/gdesklets/Themes/Psi-Disp-Themes/icons/themes:${PORTSDIR}/deskutils/gdesklets-psi_themes
 
-USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 
-DISTVERSION=	20031028
+DISTVERSION=	20040420
 NAME=		Theme
 DATADIR=	${PREFIX}/share/gnome
 WRKSRC=		${WRKDIR}/${NAME}-${PORTVERSION}
diff --git a/deskutils/gdesklets-sensor-psi_theme/distinfo b/deskutils/gdesklets-sensor-psi_theme/distinfo
index 83c30dc1b5e2..9558f940131d 100644
--- a/deskutils/gdesklets-sensor-psi_theme/distinfo
+++ b/deskutils/gdesklets-sensor-psi_theme/distinfo
@@ -1,2 +1,2 @@
-MD5 (PsiSensorPackage-20031028.tar.bz2) = 24c891e1d0f66426040b4e4fb618f9f5
-SIZE (PsiSensorPackage-20031028.tar.bz2) = 26372
+MD5 (PsiSensorPackage-20040420.tar.gz) = a2e795b4b0c52d31f711eccebf0568f4
+SIZE (PsiSensorPackage-20040420.tar.gz) = 28428
diff --git a/deskutils/gdesklets-sensor-psi_variableborder/Makefile b/deskutils/gdesklets-sensor-psi_variableborder/Makefile
index 1319974306b5..ba19e507b37e 100644
--- a/deskutils/gdesklets-sensor-psi_variableborder/Makefile
+++ b/deskutils/gdesklets-sensor-psi_variableborder/Makefile
@@ -18,11 +18,10 @@ COMMENT=	VariableBorder Sensor from the Psi Sensor Package
 
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
 
-USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 
-DISTVERSION=	20031028
+DISTVERSION=	20040420
 NAME=		VariableBorder
 DATADIR=	${PREFIX}/share/gnome
 WRKSRC=		${WRKDIR}/${NAME}-${PORTVERSION}
diff --git a/deskutils/gdesklets-sensor-psi_variableborder/distinfo b/deskutils/gdesklets-sensor-psi_variableborder/distinfo
index 83c30dc1b5e2..9558f940131d 100644
--- a/deskutils/gdesklets-sensor-psi_variableborder/distinfo
+++ b/deskutils/gdesklets-sensor-psi_variableborder/distinfo
@@ -1,2 +1,2 @@
-MD5 (PsiSensorPackage-20031028.tar.bz2) = 24c891e1d0f66426040b4e4fb618f9f5
-SIZE (PsiSensorPackage-20031028.tar.bz2) = 26372
+MD5 (PsiSensorPackage-20040420.tar.gz) = a2e795b4b0c52d31f711eccebf0568f4
+SIZE (PsiSensorPackage-20040420.tar.gz) = 28428