- Welcome X.org 7.2 \o/.

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

49 files changed, 43 insertions, 112 deletions

diff --git a/x11-fm/FSViewer/Makefile b/x11-fm/FSViewer/Makefile
index 2256a9df73c..3ca486cd724 100644
--- a/x11-fm/FSViewer/Makefile
+++ b/x11-fm/FSViewer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	FSViewer.app
 PORTVERSION=	0.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm windowmaker
 MASTER_SITES=	http://www.bayernline.de/~gscholz/linux/fsviewer/
 
diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index c623cf6dccc..f35c6998793 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asfiles
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-fm afterstep windowmaker
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
 MASTER_SITE_SUBDIR=	apps/ASFiles
diff --git a/x11-fm/binder/Makefile b/x11-fm/binder/Makefile
index 62a6668edd2..418601d2fee 100644
--- a/x11-fm/binder/Makefile
+++ b/x11-fm/binder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	binder
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm windowmaker tkstep80
 MASTER_SITES=	http://www.aaa-int.or.jp/~jfactory/JDE/dist/ \
 		${MASTER_SITE_LOCAL}
diff --git a/x11-fm/cfm/Makefile b/x11-fm/cfm/Makefile
index 2f624f2c0cf..ebd22923967 100644
--- a/x11-fm/cfm/Makefile
+++ b/x11-fm/cfm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cfm
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.rpi.edu/~mullr/cfm/dist/
diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index 5fc7189f8f0..b4c0b6d05e0 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dfm
 PORTVERSION=	0.99.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.kaisersite.de/dfm/
 
diff --git a/x11-fm/dolphin/Makefile b/x11-fm/dolphin/Makefile
index 9068244a8a4..3f00d47ec4b 100644
--- a/x11-fm/dolphin/Makefile
+++ b/x11-fm/dolphin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dolphin
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	x11-fm kde
 MASTER_SITES=	http://enzosworld.gmxhome.de/download/
 
diff --git a/x11-fm/dolphin/pkg-plist b/x11-fm/dolphin/pkg-plist
index da4ae47f2d1..0cd18ed3f17 100644
--- a/x11-fm/dolphin/pkg-plist
+++ b/x11-fm/dolphin/pkg-plist
@@ -60,8 +60,6 @@ share/locale/he/LC_MESSAGES/dolphin.mo
 share/locale/it/LC_MESSAGES/dolphin.mo
 share/locale/pl/LC_MESSAGES/dolphin.mo
 share/locale/ru/LC_MESSAGES/dolphin.mo
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrm share/doc/HTML/en/dolphin
 @dirrm share/apps/dolphin/servicemenus
 @dirrm share/apps/dolphin/icons/hicolor/64x64/actions
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index ff96073acf2..2a36f6208fe 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emelfm2
 PORTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.emelfm2.net/rel/ \
 		${MASTER_SITE_LOCAL}
diff --git a/x11-fm/endeavour/Makefile b/x11-fm/endeavour/Makefile
index b32887a848a..d0ba890c8dc 100644
--- a/x11-fm/endeavour/Makefile
+++ b/x11-fm/endeavour/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	endeavour
 PORTVERSION=	1.13.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
@@ -43,6 +43,8 @@ CFLAGS+=	-DNEED_STRCASESTR
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|make |\$$\(MAKE\) |g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|$(X11BASE)|g' \
+		${WRKSRC}/endeavour/platforms.ini ${WRKSRC}/pconf/platforms.ini
 	@${FIND} ${WRKSRC}/endeavour -type f | ${XARGS} ${REINPLACE_CMD} -e \
 		's|#include <malloc.h>||g ; \
 		 s|#include <asm/types.h>||g ; \
diff --git a/x11-fm/entropyfm/Makefile b/x11-fm/entropyfm/Makefile
index a8f4cd3f075..e3bd9388e66 100644
--- a/x11-fm/entropyfm/Makefile
+++ b/x11-fm/entropyfm/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	entropyfm
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 DISTNAME=	${PORTNAME:S,fm$,,}-${PORTVERSION}
diff --git a/x11-fm/evidence/Makefile b/x11-fm/evidence/Makefile
index 1bdb06359cd..2d1eaabc945 100644
--- a/x11-fm/evidence/Makefile
+++ b/x11-fm/evidence/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	evidence
 PORTVERSION=	0.9.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile
index a57ebffee10..0d627696097 100644
--- a/x11-fm/ezfm/Makefile
+++ b/x11-fm/ezfm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ezfm
 PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm
 MASTER_SITES=	ftp://ftp.ma.utexas.edu/pub/mzou/
 DISTNAME=	EZFM-0.4-src
diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index 8bb2766d25d..2ce5dc73de1 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	filerunner
 PORTVERSION=	2.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm tk84
 MASTER_SITES=	${MASTER_SITE_NETBSD} \
 		http://www.cd.chalmers.se/~hch/
diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile
index d2d24b011d1..8bbdc0fbdba 100644
--- a/x11-fm/fsv/Makefile
+++ b/x11-fm/fsv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fsv
 PORTVERSION=	0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index de342584788..5d0cff95798 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gentoo
 PORTVERSION=	0.11.56
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-fm/gentoo/pkg-plist b/x11-fm/gentoo/pkg-plist
index e212bd339be..a41c07df27e 100644
--- a/x11-fm/gentoo/pkg-plist
+++ b/x11-fm/gentoo/pkg-plist
@@ -242,7 +242,5 @@ etc/gentoorc
 %%NLS%%@dirrmtry share/locale/ru_RU.KOI8-R
 %%NLS%%@dirrmtry share/locale/ru_RU.CP1251/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ru_RU.CP1251
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
 %%NLS%%@dirrmtry share/locale/ja_JP.UTF-8/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ja_JP.UTF-8
diff --git a/x11-fm/gnome-commander/Makefile b/x11-fm/gnome-commander/Makefile
index c5ac261e27c..45df6468be4 100644
--- a/x11-fm/gnome-commander/Makefile
+++ b/x11-fm/gnome-commander/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-commander
 PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-commander/1.0/
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index a00a8964689..09db8cf1e3b 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-commander
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-commander/1.2
diff --git a/x11-fm/gprename/Makefile b/x11-fm/gprename/Makefile
index fdc2b0e22b3..1c520f24486 100644
--- a/x11-fm/gprename/Makefile
+++ b/x11-fm/gprename/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gprename
 PORTVERSION=	2.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-fm/jaffm/Makefile b/x11-fm/jaffm/Makefile
index 805b347a0a4..8e34ead06c6 100644
--- a/x11-fm/jaffm/Makefile
+++ b/x11-fm/jaffm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jaffm
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://binary.is/download/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile
index 620b27b03ef..a0aca6330ad 100644
--- a/x11-fm/krusader/Makefile
+++ b/x11-fm/krusader/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	krusader
 PORTVERSION=	1.70.1
+PORTREVISION=	1
 CATEGORIES=	x11-fm kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=krusader
diff --git a/x11-fm/krusader/pkg-plist b/x11-fm/krusader/pkg-plist
index 5ffebc978b5..04a00e2783d 100644
--- a/x11-fm/krusader/pkg-plist
+++ b/x11-fm/krusader/pkg-plist
@@ -190,26 +190,6 @@ share/locale/uk/LC_MESSAGES/krusader.mo
 share/locale/zh_CN/LC_MESSAGES/krusader.mo
 share/services/iso.protocol
 share/services/krarc.protocol
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/doc/HTML/en/krusader
 @dirrmtry share/config
 @dirrm share/apps/krusader/icons/crystalsvg/32x32/apps
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index 620b27b03ef..a0aca6330ad 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	krusader
 PORTVERSION=	1.70.1
+PORTREVISION=	1
 CATEGORIES=	x11-fm kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=krusader
diff --git a/x11-fm/krusader2/pkg-plist b/x11-fm/krusader2/pkg-plist
index 5ffebc978b5..04a00e2783d 100644
--- a/x11-fm/krusader2/pkg-plist
+++ b/x11-fm/krusader2/pkg-plist
@@ -190,26 +190,6 @@ share/locale/uk/LC_MESSAGES/krusader.mo
 share/locale/zh_CN/LC_MESSAGES/krusader.mo
 share/services/iso.protocol
 share/services/krarc.protocol
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/doc/HTML/en/krusader
 @dirrmtry share/config
 @dirrm share/apps/krusader/icons/crystalsvg/32x32/apps
diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index 886f8af78fe..8f4821c82c9 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mtoolsfm
 PORTVERSION=	1.9.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.core-coutainville.org/MToolsFM/archive/SOURCES/
 DISTNAME=	MToolsFM-${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index da42fb00bf9..cce3ebe7420 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nautilus
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 55542c59aea..7703d0c1438 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -184,71 +184,31 @@ share/mime/packages/nautilus.xml
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/yi/LC_MESSAGES
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrmtry share/locale/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 7a1f7b218bd..010e964206f 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pcmanfm
 PORTVERSION=	0.3.2.2
+PORTREVISION=	1
 CATEGORIES=	x11-fm deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-fm/py-nautilus/Makefile b/x11-fm/py-nautilus/Makefile
index ba8f5ff8839..6f89cdffdd5 100644
--- a/x11-fm/py-nautilus/Makefile
+++ b/x11-fm/py-nautilus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nautilus
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/nautilus-python/${PORTVERSION:R}
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index 69ea2de5053..165ea48ec38 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	rox-filer
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
diff --git a/x11-fm/rox-mime-editor/Makefile b/x11-fm/rox-mime-editor/Makefile
index afb7b56a3b5..ec10f3743d1 100644
--- a/x11-fm/rox-mime-editor/Makefile
+++ b/x11-fm/rox-mime-editor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rox-mime-editor
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 991e301ce57..7b0b2c25b2c 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	rox-session
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index aab8700e667..fbf320ec6c1 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tdfsb
 PORTVERSION=	0.0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.determinate.net/webdata/data/
 
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 8db2ac4feff..fbdd9a6bbfa 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Thunar
 PORTVERSION=	0.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index 900729cd23c..8fd7ccb6261 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkdesk
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	x11-fm tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-fm/twander/Makefile b/x11-fm/twander/Makefile
index 72a795f9fc7..499a5b0ff6a 100644
--- a/x11-fm/twander/Makefile
+++ b/x11-fm/twander/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	twander
 PORTVERSION=	3.210
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.tundraware.com/Software/twander/
 
diff --git a/x11-fm/velocity/Makefile b/x11-fm/velocity/Makefile
index 5dc18f8d77d..46ff339a8bd 100644
--- a/x11-fm/velocity/Makefile
+++ b/x11-fm/velocity/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	velocity
 PORTVERSION=	0.1.0b
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.jarrodkoehler.com/velocity/
 DISTNAME=	velocity-0.1.0beta
diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile
index 837d5587045..fa9c51b241c 100644
--- a/x11-fm/worker/Makefile
+++ b/x11-fm/worker/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	worker
 PORTVERSION=	2.14.4
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.boomerangsworld.de/worker/downloads/
 
diff --git a/x11-fm/worker/pkg-plist b/x11-fm/worker/pkg-plist
index 42b53b0b41e..e63360ab1d5 100644
--- a/x11-fm/worker/pkg-plist
+++ b/x11-fm/worker/pkg-plist
@@ -67,4 +67,3 @@ share/pixmaps/WorkerIcon48.xpm
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/catalogs
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile
index 8399dc40da2..470c10dcf1a 100644
--- a/x11-fm/workplace/Makefile
+++ b/x11-fm/workplace/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	workplace
 PORTVERSION=	1.0.a3
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index fe2d6cdf933..29dc375210c 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	x-files
 PORTVERSION=	2.00b1
+PORTREVISION=	1
 CATEGORIES=	x11-fm tk83
 MASTER_SITES=	http://users.tkk.fi/~mkivinie/X-Files/data/
 DISTNAME=	X-Files-${PORTVERSION}
diff --git a/x11-fm/xcruise/Makefile b/x11-fm/xcruise/Makefile
index 319689359cc..d1c93f89407 100644
--- a/x11-fm/xcruise/Makefile
+++ b/x11-fm/xcruise/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xcruiser
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index 048c13ac229..c8d2232c77f 100644
--- a/x11-fm/xdiskusage/Makefile
+++ b/x11-fm/xdiskusage/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdiskusage
 PORTVERSION=	1.48
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://xdiskusage.sourceforge.net/
 EXTRACT_SUFX=	.tgz
diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index 402b0d6cc49..7b01073f63b 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfe
 PORTVERSION=	0.99
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-fm/xfe/pkg-plist b/x11-fm/xfe/pkg-plist
index f6afb2ad7b5..c62e81156ea 100644
--- a/x11-fm/xfe/pkg-plist
+++ b/x11-fm/xfe/pkg-plist
@@ -1469,16 +1469,5 @@ share/pixmaps/xfw.png
 @dirrm share/xfe/icons/xfe-theme
 @dirrm share/xfe/icons
 @dirrm share/xfe
-@dirrmtry share/pixmaps
 @dirrmtry share/locale/es_AR/LC_MESSAGES
 @dirrmtry share/locale/es_AR
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/es_AR/LC_MESSAGES
-@dirrmtry share/locale/es_AR
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile
index 7fc450474f5..03b2c65eb68 100644
--- a/x11-fm/xfm/Makefile
+++ b/x11-fm/xfm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfm
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
 
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index 84e3a524633..ba7ab1b6018 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xnc
 PORTVERSION=	5.0.4
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.xnc.dubna.su/src-5/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
diff --git a/x11-fm/xnc/pkg-plist b/x11-fm/xnc/pkg-plist
index 07532329285..671734947a6 100644
--- a/x11-fm/xnc/pkg-plist
+++ b/x11-fm/xnc/pkg-plist
@@ -51,6 +51,5 @@ share/doc/xnc/index.html
 @dirrmtry share/applnk/System
 @dirrmtry share/applnk
 @dirrmtry share/applications
-@dirrm share/pixmaps
 @dirrm share/doc/xnc
 @dirrm lib/xnc
diff --git a/x11-fm/xplore/Makefile b/x11-fm/xplore/Makefile
index d0efc886d6a..da23d26a68d 100644
--- a/x11-fm/xplore/Makefile
+++ b/x11-fm/xplore/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xplore
 PORTVERSION=	1.2a
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.musikwissenschaft.uni-mainz.de/~ag/${PORTNAME}/