- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

66 files changed, 119 insertions, 28 deletions

diff --git a/x11-clocks/abclock/Makefile b/x11-clocks/abclock/Makefile
index 1a27cecabe59..67dd03fcf6c2 100644
--- a/x11-clocks/abclock/Makefile
+++ b/x11-clocks/abclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	abclock
 PORTVERSION=	1.0d
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://odur.let.rug.nl/~kleiweg/abclock/
 
diff --git a/x11-clocks/aclock/Makefile b/x11-clocks/aclock/Makefile
index 73a29cc18bd4..045f2048f6b0 100644
--- a/x11-clocks/aclock/Makefile
+++ b/x11-clocks/aclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aclock
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	x11-clocks gnustep
 MASTER_SITES=	http://www.linuks.mine.nu/aclock/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/x11-clocks/alltraxclock/Makefile b/x11-clocks/alltraxclock/Makefile
index 2c88f1d7dc81..d6473cbdb7b2 100644
--- a/x11-clocks/alltraxclock/Makefile
+++ b/x11-clocks/alltraxclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alltraxclock
 PORTVERSION=	2.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://perso.wanadoo.fr/alltrax/ \
 		${MASTER_SITE_LOCAL}
diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile
index 1d9026027d15..e711b619769e 100644
--- a/x11-clocks/asclock-gtk/Makefile
+++ b/x11-clocks/asclock-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asclock-gtk
 PORTVERSION=	2.1.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-clocks afterstep windowmaker
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index 4ea0f9467b77..50db4f2a28c5 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asclock-xlib
 PORTVERSION=	2.0.11
+PORTREVISION=	1
 CATEGORIES=	x11-clocks afterstep windowmaker
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile
index b6a809fb2d23..ef9416489b1f 100644
--- a/x11-clocks/asclock/Makefile
+++ b/x11-clocks/asclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asclock
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-clocks afterstep
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile
index 84252102a717..551595b7d2a0 100644
--- a/x11-clocks/astime/Makefile
+++ b/x11-clocks/astime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	astime
 PORTVERSION=	2.8
+PORTREVISION=	1
 CATEGORIES=	x11-clocks afterstep
 MASTER_SITES=	ftp://ftp.afterstep.org/apps/astime/ \
 		http://www.tigr.net/afterstep/download/astime/
diff --git a/x11-clocks/astzclock/Makefile b/x11-clocks/astzclock/Makefile
index 27e840604283..62a9e4eda4e7 100644
--- a/x11-clocks/astzclock/Makefile
+++ b/x11-clocks/astzclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	astzclock
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-clocks afterstep
 MASTER_SITES=	http://www.eyesbeyond.com/freebsddom/astzclock/
 
diff --git a/x11-clocks/bbdate/Makefile b/x11-clocks/bbdate/Makefile
index 3400fb5029f3..bb5e44a52cf7 100644
--- a/x11-clocks/bbdate/Makefile
+++ b/x11-clocks/bbdate/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bbdate
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bbtools
diff --git a/x11-clocks/bclock/Makefile b/x11-clocks/bclock/Makefile
index 4a97bf470992..ca6479ad7b0e 100644
--- a/x11-clocks/bclock/Makefile
+++ b/x11-clocks/bclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bclock
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/clocks
diff --git a/x11-clocks/bdesktopclock/Makefile b/x11-clocks/bdesktopclock/Makefile
index 0f68d155be4d..e72653dfd81b 100644
--- a/x11-clocks/bdesktopclock/Makefile
+++ b/x11-clocks/bdesktopclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bdesktopclock
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.bucote.com/opensource/bdesktopclock/
 
diff --git a/x11-clocks/bmp-alarm/Makefile b/x11-clocks/bmp-alarm/Makefile
index 074dc82a1bf3..e95d4a9002f9 100644
--- a/x11-clocks/bmp-alarm/Makefile
+++ b/x11-clocks/bmp-alarm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bmp-alarm
 PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.snika.uklinux.net/xmms-alarm/
 
diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile
index 503e6d41de95..e16e5096519b 100644
--- a/x11-clocks/buici-clock/Makefile
+++ b/x11-clocks/buici-clock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	buici-clock
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	ftp://ftp.buici.com/pub/buici-clock/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/x11-clocks/cairo-clock/Makefile b/x11-clocks/cairo-clock/Makefile
index 58f14ceb3dcb..d835db2fb064 100644
--- a/x11-clocks/cairo-clock/Makefile
+++ b/x11-clocks/cairo-clock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cairo-clock
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	x11-clocks net gnome
 MASTER_SITES=	http://macslow.thepimp.net/projects/cairo-clock/
 
diff --git a/x11-clocks/cairo-clock/pkg-plist b/x11-clocks/cairo-clock/pkg-plist
index f1394caa3776..848977325e9e 100644
--- a/x11-clocks/cairo-clock/pkg-plist
+++ b/x11-clocks/cairo-clock/pkg-plist
@@ -212,7 +212,6 @@ bin/cairo-clock
 share/applications/cairo-clock.desktop
 share/pixmaps/cairo-clock.png
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry %%DATADIR%%/themes/zen
 @dirrmtry %%DATADIR%%/themes/tango
diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile
index b5da10c7e503..dfe82b7f1df8 100644
--- a/x11-clocks/dclock/Makefile
+++ b/x11-clocks/dclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dclock
 PORTVERSION=	2.1.2.8
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/d/dclock
diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile
index df8746496023..af585fe9d767 100644
--- a/x11-clocks/emiclock/Makefile
+++ b/x11-clocks/emiclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emiclock
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://download.vector.co.jp/pack/unix/personal/tokei/
 
diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile
index 602522dc226d..a1f9961001e9 100644
--- a/x11-clocks/eyeclock/Makefile
+++ b/x11-clocks/eyeclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eyeclock
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://download.vector.co.jp/pack/unix/personal/tokei/
 DISTNAME=	eyeclk20
diff --git a/x11-clocks/gdesklets-clock/Makefile b/x11-clocks/gdesklets-clock/Makefile
index d03a8db83f9c..bff0f1947341 100644
--- a/x11-clocks/gdesklets-clock/Makefile
+++ b/x11-clocks/gdesklets-clock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clock
 PORTVERSION=	0.32
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
diff --git a/x11-clocks/gdesklets-countdown/Makefile b/x11-clocks/gdesklets-countdown/Makefile
index 23ad6a4ac60b..992341e22f70 100644
--- a/x11-clocks/gdesklets-countdown/Makefile
+++ b/x11-clocks/gdesklets-countdown/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	countdown
 PORTVERSION=	0.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
diff --git a/x11-clocks/gdesklets-ebichuclock/Makefile b/x11-clocks/gdesklets-ebichuclock/Makefile
index 8de285ac4c6c..a6b2f61904ef 100644
--- a/x11-clocks/gdesklets-ebichuclock/Makefile
+++ b/x11-clocks/gdesklets-ebichuclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebichuclock
 PORTVERSION=	0.1.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile
index d024d220f08a..98d3f51b7e01 100644
--- a/x11-clocks/glclock/Makefile
+++ b/x11-clocks/glclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glclock
 DISTVERSION=	6.0b6.0
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.daionet.gr.jp/~masa/archives/
 
diff --git a/x11-clocks/gtubeclock/Makefile b/x11-clocks/gtubeclock/Makefile
index 32678eb6c71e..e5cf1ff262f3 100644
--- a/x11-clocks/gtubeclock/Makefile
+++ b/x11-clocks/gtubeclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtubeclock
 PORTVERSION=	0.9.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.bonnyswan.com/gtubeclock/downloads/
 
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index 5cd2d055edcc..db10fad78723 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdetoys
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-clocks kde misc
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index 5cd2d055edcc..db10fad78723 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdetoys
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-clocks kde misc
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11-clocks/lmclock/Makefile b/x11-clocks/lmclock/Makefile
index 2742a1e5d92b..09d227885c59 100644
--- a/x11-clocks/lmclock/Makefile
+++ b/x11-clocks/lmclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lmclock
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://pantransit.reptiles.org/prog/ \
 		http://critical.ch/distfiles/ \
diff --git a/x11-clocks/mlclock/Makefile b/x11-clocks/mlclock/Makefile
index 91176dab7250..c0c0f2021b12 100644
--- a/x11-clocks/mlclock/Makefile
+++ b/x11-clocks/mlclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mlclock
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www2u.biglobe.ne.jp/~y-miyata/mlvwm/
 
diff --git a/x11-clocks/mouseclock/Makefile b/x11-clocks/mouseclock/Makefile
index 7871ca0cd51e..c5784c684c57 100644
--- a/x11-clocks/mouseclock/Makefile
+++ b/x11-clocks/mouseclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mouseclock
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/clocks
diff --git a/x11-clocks/oclock/Makefile b/x11-clocks/oclock/Makefile
new file mode 100644
index 000000000000..e2b538981c19
--- /dev/null
+++ b/x11-clocks/oclock/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	oclock
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	oclock
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Round clock application for X
+
+XORG_CAT=	app
+USE_XORG=	x11 xmu xext xt
+
+MAN1=		oclock.1
+
+.include <bsd.port.mk>
diff --git a/x11-clocks/oclock/distinfo b/x11-clocks/oclock/distinfo
new file mode 100644
index 000000000000..5e5130ac4adc
--- /dev/null
+++ b/x11-clocks/oclock/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/oclock-1.0.1.tar.bz2) = 91f49547f9ed3cd0137c8b7c3183e360
+SHA256 (xorg/app/oclock-1.0.1.tar.bz2) = 49ab7d4f6402fbbe30714012ee38b49da17789f3a29ac41917987ce18c74217c
+SIZE (xorg/app/oclock-1.0.1.tar.bz2) = 83216
diff --git a/x11-clocks/oclock/pkg-descr b/x11-clocks/oclock/pkg-descr
new file mode 100644
index 000000000000..fe9a1fb4a125
--- /dev/null
+++ b/x11-clocks/oclock/pkg-descr
@@ -0,0 +1,5 @@
+This package contains oclock, which displays the current time on an analog
+display.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-clocks/oclock/pkg-plist b/x11-clocks/oclock/pkg-plist
new file mode 100644
index 000000000000..098c45563a22
--- /dev/null
+++ b/x11-clocks/oclock/pkg-plist
@@ -0,0 +1,3 @@
+bin/oclock
+share/X11/app-defaults/Clock-color
+@dirrmtry share/X11/app-defaults
diff --git a/x11-clocks/osdclock/Makefile b/x11-clocks/osdclock/Makefile
index 8c594be9ada7..c1bbf5653fe7 100644
--- a/x11-clocks/osdclock/Makefile
+++ b/x11-clocks/osdclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	osdclock
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://leftorium.net/software/ \
 		${MASTER_SITE_LOCAL}
diff --git a/x11-clocks/pclock/Makefile b/x11-clocks/pclock/Makefile
index 8102b456644e..050548178ace 100644
--- a/x11-clocks/pclock/Makefile
+++ b/x11-clocks/pclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pclock
 PORTVERSION=	0.13.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks windowmaker afterstep
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/x11-clocks/rclock/Makefile b/x11-clocks/rclock/Makefile
index 5cd32bc2ab3f..54dfda7e029f 100644
--- a/x11-clocks/rclock/Makefile
+++ b/x11-clocks/rclock/Makefile
@@ -11,6 +11,7 @@
 
 PORTNAME=	rclock
 PORTVERSION=	2.7.10
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/%SUBDIR%/ \
 		ftp://mason.primenet.com.au/pub/rxvt/%SUBDIR%/ \
diff --git a/x11-clocks/sanduhr/Makefile b/x11-clocks/sanduhr/Makefile
index b6485301640d..42c51a5bac65 100644
--- a/x11-clocks/sanduhr/Makefile
+++ b/x11-clocks/sanduhr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sanduhr
 PORTVERSION=	1.93
+PORTREVISION=	1
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://seehuhn.de/data/
 
diff --git a/x11-clocks/swisswatch/Makefile b/x11-clocks/swisswatch/Makefile
index b84b72815b32..0db5300ff2ba 100644
--- a/x11-clocks/swisswatch/Makefile
+++ b/x11-clocks/swisswatch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	swisswatch
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 EXTRACT_SUFX=	.tar.Z
diff --git a/x11-clocks/t3d/Makefile b/x11-clocks/t3d/Makefile
index 6d11548407e5..5e011dc720a3 100644
--- a/x11-clocks/t3d/Makefile
+++ b/x11-clocks/t3d/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	t3d
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.jwdt.com/~paysan/
 DISTNAME=	t3d
diff --git a/x11-clocks/tclock/Makefile b/x11-clocks/tclock/Makefile
index 470cd4853474..50ed1b555071 100644
--- a/x11-clocks/tclock/Makefile
+++ b/x11-clocks/tclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tclock
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	ftp://ftp.uni-potsdam.de/pub/X11/tools/clocks/		\
 		ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
diff --git a/x11-clocks/tktz/Makefile b/x11-clocks/tktz/Makefile
index 3b61ba4fc898..8120bbff0e25 100644
--- a/x11-clocks/tktz/Makefile
+++ b/x11-clocks/tktz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tktz
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	x11-clocks tk84
 MASTER_SITES=	http://gromnizki.unixdev.net/soft/
 
diff --git a/x11-clocks/washerdryer/Makefile b/x11-clocks/washerdryer/Makefile
index 1d5d53a8719c..54ccd3c52b00 100644
--- a/x11-clocks/washerdryer/Makefile
+++ b/x11-clocks/washerdryer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	washerdryer
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://lucille.dhs.org/
 DISTNAME=	washerDryer-${PORTVERSION}
diff --git a/x11-clocks/wmbday/Makefile b/x11-clocks/wmbday/Makefile
index 5146f0a7513f..3d19d76b0ad1 100644
--- a/x11-clocks/wmbday/Makefile
+++ b/x11-clocks/wmbday/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	wmbday
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://buzzinhornetz.ath.cx/wmbday/files/
 
diff --git a/x11-clocks/wmbinclock/Makefile b/x11-clocks/wmbinclock/Makefile
index 5b900d95ba40..e4cc4a91c341 100644
--- a/x11-clocks/wmbinclock/Makefile
+++ b/x11-clocks/wmbinclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmbinclock
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://www.inxsoft.net/wmbinclock/
 
diff --git a/x11-clocks/wmblueclock/Makefile b/x11-clocks/wmblueclock/Makefile
index fbc529912b99..d2c5bd7c4ac5 100644
--- a/x11-clocks/wmblueclock/Makefile
+++ b/x11-clocks/wmblueclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmblueclock
 PORTVERSION=	0.0
+PORTREVISION=	1
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/xutils
diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile
index 1825d163f19f..e8306e9bc645 100644
--- a/x11-clocks/wmcalclock/Makefile
+++ b/x11-clocks/wmcalclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmCalClock
 PORTVERSION=	1.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=kris
diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile
index ddf96a770769..33ffbfe279e3 100644
--- a/x11-clocks/wmclock/Makefile
+++ b/x11-clocks/wmclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmclock
 PORTVERSION=	1.0.12.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://www.jmknoble.net/WindowMaker/wmclock/
 
diff --git a/x11-clocks/wmclockmon/Makefile b/x11-clocks/wmclockmon/Makefile
index 989050e4da7d..5d212a7b8dc9 100644
--- a/x11-clocks/wmclockmon/Makefile
+++ b/x11-clocks/wmclockmon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmclockmon
 PORTVERSION=	0.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 
diff --git a/x11-clocks/wmdate/Makefile b/x11-clocks/wmdate/Makefile
index be3199f4d121..51ee1a23e65a 100644
--- a/x11-clocks/wmdate/Makefile
+++ b/x11-clocks/wmdate/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmdate
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks windowmaker afterstep
 MASTER_SITES=	http://solfertje.student.utwente.nl/~dalroi/wmdate/files/
 
diff --git a/x11-clocks/wmfishtime/Makefile b/x11-clocks/wmfishtime/Makefile
index f35c71985f91..e47a19488bb9 100644
--- a/x11-clocks/wmfishtime/Makefile
+++ b/x11-clocks/wmfishtime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmfishtime
 PORTVERSION=	1.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://www.ne.jp/asahi/linux/timecop/software/ \
 		http://atreides.freenix.no/~anders/
diff --git a/x11-clocks/wmfuzzy/Makefile b/x11-clocks/wmfuzzy/Makefile
index 52b6ac21ebfa..efc7a606d164 100644
--- a/x11-clocks/wmfuzzy/Makefile
+++ b/x11-clocks/wmfuzzy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmfuzzy
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://www.manicai.net/comp/wmfuzzy/
 EXTRACT_SUFX=	.tgz
diff --git a/x11-clocks/wmitime/Makefile b/x11-clocks/wmitime/Makefile
index fff17a1cffd0..5a191cec71f2 100644
--- a/x11-clocks/wmitime/Makefile
+++ b/x11-clocks/wmitime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmitime
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	x11-clocks windowmaker afterstep
 MASTER_SITES=	http://dockapps.org/files/22/29/
 
diff --git a/x11-clocks/wmtime/Makefile b/x11-clocks/wmtime/Makefile
index 461b5948986b..dbe703c7d648 100644
--- a/x11-clocks/wmtime/Makefile
+++ b/x11-clocks/wmtime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmtime
 PORTVERSION=	1.0b2
+PORTREVISION=	1
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/ \
 		http://freebsd.unixfreunde.de/sources/ \
diff --git a/x11-clocks/wmtimer/Makefile b/x11-clocks/wmtimer/Makefile
index b283638e9489..462853c69ed5 100644
--- a/x11-clocks/wmtimer/Makefile
+++ b/x11-clocks/wmtimer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmtimer
 PORTVERSION=	2.92
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://www.darkops.net/wmtimer/
 
diff --git a/x11-clocks/wmtz/Makefile b/x11-clocks/wmtz/Makefile
index d39bf635716e..527cb798e42b 100644
--- a/x11-clocks/wmtz/Makefile
+++ b/x11-clocks/wmtz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmtz
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks windowmaker afterstep
 MASTER_SITES=	http://www.geocities.com/jl1n/wmtz/
 
diff --git a/x11-clocks/xalarm/Makefile b/x11-clocks/xalarm/Makefile
index a6d0313312c6..2cde6e917272 100644
--- a/x11-clocks/xalarm/Makefile
+++ b/x11-clocks/xalarm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xalarm
 PORTVERSION=	3.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/x11-clocks/xclock/Makefile b/x11-clocks/xclock/Makefile
new file mode 100644
index 000000000000..23bfdc02bb29
--- /dev/null
+++ b/x11-clocks/xclock/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xclock
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xclock
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Analog and digital clock for X
+
+XORG_CAT=	app
+USE_XORG=	xrender xft xkbfile xt xaw
+
+MAN1=		xclock.1
+
+.include <bsd.port.mk>
diff --git a/x11-clocks/xclock/distinfo b/x11-clocks/xclock/distinfo
new file mode 100644
index 000000000000..e30567695300
--- /dev/null
+++ b/x11-clocks/xclock/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xclock-1.0.2.tar.bz2) = 6b930326f71993fb54b7203902b387cd
+SHA256 (xorg/app/xclock-1.0.2.tar.bz2) = ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d
+SIZE (xorg/app/xclock-1.0.2.tar.bz2) = 104335
diff --git a/x11-clocks/xclock/pkg-descr b/x11-clocks/xclock/pkg-descr
new file mode 100644
index 000000000000..c8261821a87a
--- /dev/null
+++ b/x11-clocks/xclock/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xclock, a program for the X Window System that display
+the time in analog or digital form.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-clocks/xclock/pkg-plist b/x11-clocks/xclock/pkg-plist
new file mode 100644
index 000000000000..23774c3db023
--- /dev/null
+++ b/x11-clocks/xclock/pkg-plist
@@ -0,0 +1,4 @@
+bin/xclock
+share/X11/app-defaults/XClock-color
+share/X11/app-defaults/XClock
+@dirrmtry share/X11/app-defaults
diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile
index 54f0cffba46f..cef70abacad1 100644
--- a/x11-clocks/xdaliclock/Makefile
+++ b/x11-clocks/xdaliclock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdaliclock
 PORTVERSION=	2.23
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.jwz.org/xdaliclock/
 MASTER_SITE_SUBDIR=	applications
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index f63f773b3f7d..828a5b975dce 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-datetime-plugin
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile
index 9e1ea2966c97..5b9897f774a5 100644
--- a/x11-clocks/xfce4-timer-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-timer-plugin
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/x11-clocks/xfce4-timer-plugin/pkg-plist b/x11-clocks/xfce4-timer-plugin/pkg-plist
index 721e5da8eb17..dd78abc85a08 100644
--- a/x11-clocks/xfce4-timer-plugin/pkg-plist
+++ b/x11-clocks/xfce4-timer-plugin/pkg-plist
@@ -10,9 +10,5 @@ share/locale/tr/LC_MESSAGES/xfce4-timer-plugin.mo
 share/xfce4/panel-plugins/xfce4-timer.desktop
 @dirrm share/xfce4/panel-plugins
 @dirrm share/xfce4
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrm libexec/xfce4/panel-plugins
 @dirrm libexec/xfce4
diff --git a/x11-clocks/xmms-alarm/Makefile b/x11-clocks/xmms-alarm/Makefile
index 5c8196e1de9b..302751a8ca32 100644
--- a/x11-clocks/xmms-alarm/Makefile
+++ b/x11-clocks/xmms-alarm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-alarm
 PORTVERSION=	0.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.snika.uklinux.net/xmms-alarm/
 
diff --git a/x11-clocks/xtimer/Makefile b/x11-clocks/xtimer/Makefile
index 764e3bb04666..1a7c0b86cbd6 100644
--- a/x11-clocks/xtimer/Makefile
+++ b/x11-clocks/xtimer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtimer
 PORTVERSION=	0.8089
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.bsddiary.net/xtimer/
 DISTNAME=	${PORTNAME}-8089
diff --git a/x11-clocks/xtu/Makefile b/x11-clocks/xtu/Makefile
index 7389d87f09de..6289d68619af 100644
--- a/x11-clocks/xtu/Makefile
+++ b/x11-clocks/xtu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtu
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://core.de/~coto/projects/xtu/