8406 files changed, 24379 insertions, 19420 deletions

diff --git a/MOVED b/MOVED
index 82b36d194cca..0d64e597d783 100644
--- a/MOVED
+++ b/MOVED
@@ -941,7 +941,6 @@ devel/ulex|devel/ocaml-ulex|2004-03-19|port renamed
 textproc/yaxi|textproc/ocaml-yaxi|2004-03-19|port renamed
 devel/camomile|devel/ocaml-camomile|2004-03-19|port renamed
 archivers/gshar+gunshar|archivers/sharutils|2004-03-19|port renamed
-devel/imake|devel/imake-4|2004-03-19|removed, obsoleted by imake-4 long ago
 net/arpwatch-devel|net-mgmt/arpwatch-devel|2004-03-20|moved to better fitting category
 multimedia/ffmpeg045|multimedia/ffmpeg|2004-03-20|latest stable version is better
 editors/emacs21|editors/emacs|2004-03-20|emacs 21.x moved to default port location
@@ -2952,3 +2951,10 @@ dns/dnscap||2007-05-03|Removed on authors request until it has reached stability
 net-im/libgaim|net-im/libpurple|2007-05-03|Project renamed
 net-im/gaim-devel|net-im/pidgin|2007-05-03|Project renamed
 net-im/gaim-consoleui-devel|net-im/finch|2007-05-03|Project renamed
+devel/imake-6|devel/imake|2007-05-19|Remove hardcoded version from portname
+x11-fonts/xorg-fonts-encodings|x11-fonts/encodings|2007-05-19|Encoding fonts are now distributed separately
+x11/xorg-documents|x11/xorg-docs|2007-05-19|X.org documentation now has its own distfile, rename accordingly
+x11/xorg-manpages|||X.org manual pages are now installed with every single port
+x11/xorg-clients|x11/xorg-apps|2007-05-19|Rename to new xorg-apps meta-port
+x11/libXfont|x11-fonts/libXfont|2007-05-19|Move to the x11-fonts category
+x11-servers/xorg-fontserver|x11-fonts/xfs|2007-05-19|Rename to follow X.org name
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index edaec87e3fe1..282111d5e669 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -373,8 +373,10 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  case the linux X libraries are referenced.
 #
 # USE_FREETYPE	- If set, this port uses the freetype print libraries.
-# USE_GL		- If set, this port uses libGL (not needed with XFree86 4.x
-#				  which already includes this functionality).
+# USE_GL		- A list of Mesa or GL related dependencies needed by the port.
+#				  Supported components are: glut, glu, glw, gl and linux.
+#				  If set to "yes", this is equivalent to "glu". Note that
+#				  glut depends on glu, glw and glu depend on gl.
 # USE_MOTIF		- If set, this port uses a Motif toolkit.  Implies USE_XPM.
 # NO_OPENMOTIF	- If set, this port uses a custom Motif toolkit
 #				  instead of Openmotif.
@@ -470,6 +472,10 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 # USE_LINUX_RPM	- Set to yes to pull in variables and targets useful to Linux
 #				  RPM ports.
 #				  Implies inclusion of bsd.linux-rpm.mk.
+#
+# USE_XORG			- Set to a list of X.org module dependencies.
+#				  Implies inclusion of bsd.xorg.mk.
+#
 # AUTOMATIC_PLIST
 #				- Set to yes to enable automatic packing list generation.
 #				  Currently has no effect unless USE_LINUX_RPM is set.
@@ -530,9 +536,9 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  Default: not set (means /)
 #
 # X11BASE		- Where X11 ports install things.
-#				  Default: ${DESTDIR}/usr/X11R6
+#				  Default: ${DESTDIR}/${LOCALBASE}
 # X11BASE_REL		- Same as X11BASE, but relative to DESTDIR
-#				  Default: /usr/X11R6
+#				  Default: ${LOCALBASE}
 # LOCALBASE		- Where non-X11 ports install things.
 #				  Default: ${DESTDIR}/usr/local
 # LOCALBASE_REL		- Same as LOCALBASE, but relative to DESTDIR
@@ -886,8 +892,8 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 # NO_MTREE		- If set, will not invoke mtree from bsd.port.mk from
 #				  the "install" target.
 # MTREE_FILE	- The name of the mtree file.
-#				  Default: /etc/mtree/BSD.x11.dist if USE_X_PREFIX is set,
-#				  /etc/mtree/BSD.local.dist otherwise.
+#				  Default: ${PORTSDIR}/Templates/BSD.local.dist or
+#				  /etc/mtree/BSD.usr.dist if ${PREFIX} == "/usr".
 # PLIST_DIRS	- Directories to be added to packing list
 # PLIST_FILES	- Files and symbolic links to be added to packing list
 #
@@ -1357,7 +1363,7 @@ DISTNAME?=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSI
 # by individual Makefiles or local system make configuration.
 PORTSDIR?=		/usr/ports
 LOCALBASE?=		/usr/local
-X11BASE?=		/usr/X11R6
+X11BASE?=		${LOCALBASE}
 LINUXBASE?=		/compat/linux
 LOCALBASE_REL:=		${LOCALBASE}
 X11BASE_REL:=		${X11BASE}
@@ -1376,6 +1382,27 @@ TARGETDIR:=		${DESTDIR}${PREFIX}
 .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
 .endif
 
+.if ${OSVERSION} >= 502123
+X_WINDOW_SYSTEM ?= xorg
+.else
+X_WINDOW_SYSTEM ?= xfree86-4
+.endif
+
+.if ${OSVERSION} < 602000
+.if ${X11BASE} != ${LOCALBASE} && !defined(USE_NONDEFAULT_X11BASE)
+.BEGIN:
+	@${ECHO_MSG} "On FreeBSD before 6.2 ports system unfortunately can not set default X11BASE by itself so please help it a bit by setting X11BASE=\$${LOCALBASE} in make.conf."
+	@${ECHO_MSG} "On the other hand, if you do wish to use non-default X11BASE, please set variable USE_NONDEFAULT_X11BASE."
+	@${FALSE}
+.endif
+.endif
+
+.if defined(USE_XORG) || defined(XORG_CAT)
+. if ${X_WINDOW_SYSTEM} == "xorg"
+.include "${PORTSDIR}/Mk/bsd.xorg.mk"
+. endif
+.endif
+
 .if defined(USE_BZIP2)
 EXTRACT_SUFX?=			.tar.bz2
 .elif defined(USE_ZIP)
@@ -1843,22 +1870,22 @@ LIB_DEPENDS+=			ttf.4:${PORTSDIR}/print/freetype
 .endif
 
 .if defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xorg
-X_IMAKE_PORT=		${PORTSDIR}/devel/imake-6
+X_IMAKE_PORT=		${PORTSDIR}/devel/imake
 X_LIBRARIES_PORT=	${PORTSDIR}/x11/xorg-libraries
-X_CLIENTS_PORT=		${PORTSDIR}/x11/xorg-clients
+X_CLIENTS_PORT=		${PORTSDIR}/x11/xorg-apps
 X_SERVER_PORT=		${PORTSDIR}/x11-servers/xorg-server
-X_FONTSERVER_PORT=	${PORTSDIR}/x11-servers/xorg-fontserver
+X_FONTSERVER_PORT=	${PORTSDIR}/x11-fonts/xfs
 X_PRINTSERVER_PORT=	${PORTSDIR}/x11-servers/xorg-printserver
 X_VFBSERVER_PORT=	${PORTSDIR}/x11-servers/xorg-vfbserver
 X_NESTSERVER_PORT=	${PORTSDIR}/x11-servers/xorg-nestserver
-X_FONTS_ENCODINGS_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-encodings
+X_FONTS_ENCODINGS_PORT=	${PORTSDIR}/x11-fonts/encodings
 X_FONTS_MISC_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps
 X_FONTS_100DPI_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-100dpi
 X_FONTS_75DPI_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-75dpi
 X_FONTS_CYRILLIC_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic
 X_FONTS_TTF_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-truetype
 X_FONTS_TYPE1_PORT=	${PORTSDIR}/x11-fonts/xorg-fonts-type1
-X_MANUALS_PORT=		${PORTSDIR}/x11/xorg-manpages
+X_FONTS_ALIAS_PORT=	${PORTSDIR}/x11-fonts/font-alias
 .elif defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xfree86-4
 X_IMAKE_PORT=		${PORTSDIR}/devel/imake-4
 X_LIBRARIES_PORT=	${PORTSDIR}/x11/XFree86-4-libraries
@@ -1875,7 +1902,6 @@ X_FONTS_75DPI_PORT=	${PORTSDIR}/x11-fonts/XFree86-4-font75dpi
 X_FONTS_CYRILLIC_PORT=	${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic
 X_FONTS_TTF_PORT=	${PORTSDIR}/x11-fonts/XFree86-4-fontScalable
 X_FONTS_TYPE1_PORT=	${PORTSDIR}/x11-fonts/XFree86-4-fontScalable
-X_MANUALS_PORT=		${PORTSDIR}/x11/XFree86-4-manuals
 .else
 IGNORE=	cannot install: bad X_WINDOW_SYSTEM setting; valid values are 'xfree86-4' and 'xorg'
 .endif
@@ -1884,19 +1910,63 @@ IGNORE=	cannot install: bad X_WINDOW_SYSTEM setting; valid values are 'xfree86-4
 BUILD_DEPENDS+=			imake:${X_IMAKE_PORT}
 .endif
 
-.if defined(USE_XPM) || defined(USE_GL)
+.if defined(PACKAGE_BUILDING) && defined(USE_DISPLAY)
+BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
+	${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
+	${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}
+.endif
+
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
+
+.if defined(USE_XPM)
 USE_XLIB=			yes
 .endif
 
-.if ${X_WINDOW_SYSTEM:L} == xorg
-XAWVER=				8
-.else
 XAWVER=				7
+PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
+
+.else
+
+.if defined(USE_XPM)
+LIB_DEPENDS+=			Xpm.4:${PORTSDIR}/x11/libXpm
+# XXX - At some point we'll have to fix ports to use USE_XORG to
+# the right value and remove both USE_XPM and USE_XLIB. Hopefully
+# XFree86-4 will be gone in the meantime.
+USE_XLIB=			yes
 .endif
+
+XAWVER=				8
 PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
 
+.endif
+
 PLIST_SUB+=			XAWVER=${XAWVER}
 
+_GL_gl_LIB_DEPENDS=		GL.1:${PORTSDIR}/graphics/libGL
+_GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/graphics/libGLU
+_GL_glw_LIB_DEPENDS=		GLw.1:${PORTSDIR}/graphics/libGLw
+_GL_glut_LIB_DEPENDS=		glut.4:${PORTSDIR}/graphics/libglut
+_GL_linux_RUN_DEPENDS=		${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
+
+.if defined(USE_GL)
+. if ${X_WINDOW_SYSTEM:L} == xfree86-4
+USE_XLIB=	yes
+. else
+.  if ${USE_GL:L} == "yes"
+USE_GL=		glu
+.  endif
+.  for _component in ${USE_GL}
+.   if !defined(_GL_${_component}_LIB_DEPENDS) && \
+		!defined(_GL_${_component}_RUN_DEPENDS)
+IGNORE=	uses unknown GL component
+.   else
+LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
+RUN_DEPENDS+=	${_GL_${_component}_RUN_DEPENDS}
+.   endif
+.  endfor
+. endif
+.endif
+
 .if defined(USE_BISON)
 BUILD_DEPENDS+=	bison:${PORTSDIR}/devel/bison
 .endif
@@ -2208,14 +2278,10 @@ EXTRACT_CMD?=			${GZIP_CMD}
 
 # Figure out where the local mtree file is
 .if !defined(MTREE_FILE) && !defined(NO_MTREE)
-.if ${PREFIX} == ${X11BASE_REL} || defined(USE_X_PREFIX)
-# User may have specified non-standard PREFIX for installing a port that
-# uses X
-MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
-.elif ${PREFIX} == /usr
+.if ${PREFIX} == /usr
 MTREE_FILE=	/etc/mtree/BSD.usr.dist
 .else
-MTREE_FILE=	/etc/mtree/BSD.local.dist
+MTREE_FILE=	${PORTSDIR}/Templates/BSD.local.dist
 .endif
 .endif
 MTREE_CMD?=	/usr/sbin/mtree
@@ -2774,8 +2840,8 @@ VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
 	tcl tcl80 tcl82 tcl83 tcl84 textproc \
 	tk tk80 tk82 tk83 tk84 tkstep80 \
 	ukrainian vietnamese windowmaker www \
-	x11 x11-clocks x11-fm x11-fonts x11-servers x11-themes x11-toolkits \
-	x11-wm xfce zope
+	x11 x11-clocks x11-drivers x11-fm x11-fonts x11-servers x11-themes \
+	x11-toolkits x11-wm xfce zope
 
 check-categories:
 .for cat in ${CATEGORIES}
@@ -3828,7 +3894,7 @@ install-mtree:
 			exit 1; \
 		else \
 			${MTREE_CMD} ${MTREE_ARGS} ${TARGETDIR}/ >/dev/null; \
-			if [ ${MTREE_FILE} = "/etc/mtree/BSD.local.dist" ]; then \
+			if [ ${PREFIX} = ${LOCALBASE_REL} ]; then \
 				cd ${TARGETDIR}/share/nls; \
 				${LN} -shf C POSIX; \
 				${LN} -shf C en_US.US-ASCII; \
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
new file mode 100644
index 000000000000..59ffc2bdb2db
--- /dev/null
+++ b/Mk/bsd.xorg.mk
@@ -0,0 +1,262 @@
+#-*- mode: Fundamental; tab-width: 4; -*-
+# ex:ts=4
+#
+# bsd.xorg.mk - Support for USE_XORG variable. (XXX - this comment sucks)
+#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
+#
+# Complete list of dependencies for xorg ports can be found at :
+# http://people.freebsd.org/~flz/local/xorg/xorg-dep-list
+#
+# RSS feed for X.org individual releases can be found at :
+# http://feed.xbsd.org/xorg/
+#
+# !!! Here be dragons !!! (yeah, here as well...)
+#
+# $FreeBSD$
+#
+
+XORG_Include_MAINTAINER=		x11@FreeBSD.org
+
+# Some notes:
+#
+# app - requires pkgconfig, don't install shared libraries (I guess)
+# data - nothing I could factorize
+# doc - no particular notes
+# driver - input depends on inputproto/randrproto at least
+#          video depends on randrproto/renderproto at least
+# font - don't install .pc file
+# lib - various dependencies, install .pc file
+# proto - install .pc file, no dependencies, needed only at build time for most of them
+# xserver - there's only one atm, I guess everything can fit into the port itself
+
+.if defined(XORG_CAT)
+# Default variables, common to all new modular xorg ports.
+.if !defined(USE_TGZ)
+USE_BZIP2=    	yes
+.endif
+PREFIX?=       	${X11BASE}
+GNU_CONFIGURE= 	yes
+DIST_SUBDIR=	xorg/${XORG_CAT}
+
+MASTER_SITES?=	${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR?=	individual/${XORG_CAT}
+
+CONFIGURE_ARGS+=	--mandir="${PREFIX}/man/"
+
+. if ${XORG_CAT} == "app"
+USE_GNOME+=	pkgconfig
+. endif
+
+. if ${XORG_CAT} == "data"
+# Nothing at the moment.
+. endif
+
+. if ${XORG_CAT} == "driver"
+USE_GNOME+=	pkgconfig
+USE_XORG+=	xorg-server xproto randrproto
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
+.  if ${PORTNAME:M*input*}x != x
+USE_XORG+=	inputproto
+.  elif ${PORTNAME:M*video*}x != x
+USE_XORG+=	fontsproto renderproto
+.  else
+IGNORE=		doesn't contain either "driver" or "input"
+.  endif
+.  if ${PORTNAME:M*-sun*}x != x && ${ARCH} != sparc64
+IGNORE=		is for sparc64 only
+.  endif
+. endif
+
+. if ${XORG_CAT} == "font"
+FONTDIR?=	${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
+NEED_MKFONTFOO=	yes
+
+.  if ${PORTNAME:M*type1*}x != x
+INSTALLS_TTF?=	yes
+.  elif ${PORTNAME:M*ttf*}x != x
+INSTALLS_TTF?=	yes
+.  elif ${PORTNAME:M*encodings*}x != x
+# This is terrific, we want mkfontscale at build time, but don't use it like for the other ports.
+NEED_MKFONTFOO=	no
+BUILD_DEPENDS+=	${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+INSTALLS_TTF?=	no
+.  else
+INSTALLS_TTF?=	no
+.  endif
+
+.  if ${PORTNAME:M*font-util*}x != x
+USE_GNOME+=	gnomehack
+NEED_MKFONTFOO=	no
+.  elif ${INSTALLS_TTF} == "yes"
+USE_GNOME+=	pkgconfig
+BUILD_DEPENDS+=	${X11BASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
+.  else
+BUILD_DEPENDS+=	${X11BASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+.  endif
+
+.  if ${NEED_MKFONTFOO} == "yes"
+BUILD_DEPENDS+=	${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+				${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+RUN_DEPENDS+=	${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+				${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+.  endif
+
+post-install:
+.  if ${INSTALLS_TTF} == "yes"
+.   for _fontdir in ${FONTDIR}
+	@${ECHO_CMD} "@exec fc-cache -v %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec fc-cache -v %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+.   endfor
+.  endif
+.  for _fontdir in ${FONTDIR}
+.   if ${NEED_MKFONTFOO} == "yes"
+	@${ECHO_CMD} "@exec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.scale -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.scale 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.scale; fi" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.dir -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.dir 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.dir; fi" >> ${TMPPLIST}
+.   endif
+	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+.  endfor
+. endif
+
+. if ${XORG_CAT} == "lib"
+USE_GNOME+=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS+=--enable-malloc0returnsnull
+. endif
+
+. if ${XORG_CAT} == "proto"
+USE_GNOME+=	gnomehack
+. endif
+
+. if ${XORG_CAT} == "xserver"
+DISTFILES?=	xorg-server-${PORTVERSION}.tar.bz2
+WRKSRC=		${WRKDIR}/xorg-server-${PORTVERSION}
+USE_GNOME+=	gnomehack
+CONFIGURE_ARGS+=	--with-xkb-path=${X11BASE}/share/X11/xkb
+. endif
+
+.endif
+
+# Might not be useful, need to check this later.
+.if defined(USE_XORG)
+USE_GNOME+=	pkgconfig
+.endif
+
+# Register all xorg .pc files here.
+# foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
+
+XORG_MODULES=	bigreqsproto compositeproto damageproto dmx dmxproto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm 
+
+bigreqsproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto
+compositeproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto
+damageproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/damageproto.pc:${PORTSDIR}/x11/damageproto
+dmx_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx
+dmxproto_BUILD_DEPENDS=		${X11BASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto
+evieproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext
+fixesproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto
+fontcacheproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto
+fontenc_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc
+fontsproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/fontsproto.pc:${PORTSDIR}/x11-fonts/fontsproto
+fontutil_LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util
+glproto_BUILD_DEPENDS=		${X11BASE}/libdata/pkgconfig/glproto.pc:${PORTSDIR}/x11/glproto
+ice_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE
+inputproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/inputproto.pc:${PORTSDIR}/x11/inputproto
+kbproto_BUILD_DEPENDS=		${X11BASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto
+libfs_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS
+oldx_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
+printproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto
+randrproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto
+recordproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto
+renderproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/renderproto.pc:${PORTSDIR}/x11/renderproto
+resourceproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/resourceproto.pc:${PORTSDIR}/x11/resourceproto
+scrnsaverproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/scrnsaverproto.pc:${PORTSDIR}/x11/scrnsaverproto
+sm_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM
+trapproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/trapproto.pc:${PORTSDIR}/x11/trapproto
+videoproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/videoproto.pc:${PORTSDIR}/x11/videoproto
+x11_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
+xau_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
+xaw_LIB_PC_DEPENDS=		${xaw${XAWVER}_LIB_PC_DEPENDS}
+xaw6_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw
+xaw7_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw
+xaw8_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw
+xbitmaps_LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps
+xcmiscproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto
+xcomposite_LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite
+xcursor_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor
+xdamage_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage
+xdmcp_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp
+xevie_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie
+xext_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext
+xextproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xextproto.pc:${PORTSDIR}/x11/xextproto
+xf86bigfontproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xf86bigfontproto.pc:${PORTSDIR}/x11-fonts/xf86bigfontproto
+xf86dgaproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xf86dgaproto.pc:${PORTSDIR}/x11/xf86dgaproto
+xf86driproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xf86driproto.pc:${PORTSDIR}/x11/xf86driproto
+xf86miscproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xf86miscproto.pc:${PORTSDIR}/x11/xf86miscproto
+xf86rushproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xf86rushproto.pc:${PORTSDIR}/x11/xf86rushproto
+xf86vidmodeproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xf86vidmodeproto.pc:${PORTSDIR}/x11/xf86vidmodeproto
+xfixes_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
+xfont_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont
+xfontcache_LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache
+xft_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft
+xi_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi
+xinerama_LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama
+xineramaproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xineramaproto.pc:${PORTSDIR}/x11/xineramaproto
+xkbfile_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
+xkbui_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui
+xmu_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu
+xmuu_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xmuu.pc:${PORTSDIR}/x11-toolkits/libXmu
+xorg-server_LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xorg-server.pc:${PORTSDIR}/x11-servers/xorg-server
+xp_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp
+xpm_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm
+xprintapputil_LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil
+xprintutil_LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil
+xproto_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
+xproxymngproto_BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xproxymngproto.pc:${PORTSDIR}/x11/xproxymanagementprotocol
+xrandr_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr
+xrender_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender
+xres_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres
+xscrnsaver_LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver
+xt_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt
+xtrans_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans
+xtrap_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap
+xtst_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst
+xv_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv
+xvmc_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC
+xxf86dga_LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga
+xxf86misc_LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc
+xxf86vm_LIB_PC_DEPENDS=		${X11BASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm
+
+.for _module in ${USE_XORG:M*\:both:C/\:.*//g}
+. if ${XORG_MODULES:M${_module}} == ""
+IGNORE=				requires unknown xorg module (${_module})
+. endif
+RUN_DEPENDS+=			${${_module}_BUILD_DEPENDS}
+.endfor
+
+.for _module in ${USE_XORG:C/\:.*//g}
+. if ${XORG_MODULES:M${_module}} == ""
+IGNORE=				requires unknown xorg module (${_module})
+. endif
+LIB_PC_DEPENDS+=		${${_module}_LIB_PC_DEPENDS}
+BUILD_DEPENDS+=			${${_module}_BUILD_DEPENDS}
+.endfor
+
+RUN_DEPENDS+=			${LIB_PC_DEPENDS}
+BUILD_DEPENDS+=			${LIB_PC_DEPENDS}
+
+.if !target(check-latest)
+check-latest:
+	@AVAIL_VER=`fetch -qo - http://xorg.freedesktop.org/releases/individual/${XORG_CAT}/ | sed -ne 's/.*${PORTNAME}-\(.*\).tar.bz2\".*/\1/p'` && \
+		${ECHO_CMD} "Available versions for ${PORTNAME} are: $${AVAIL_VER}." && \
+		for ver in $${AVAIL_VER}; do \
+			if [ `pkg_version -t $$ver ${PORTVERSION}` = ">" ]; then \
+				${ECHO_CMD} "${PORTNAME} $$ver is newer than current version."; \
+			fi; \
+		done
+.endif
diff --git a/Tools/scripts/mergebase.sh b/Tools/scripts/mergebase.sh
new file mode 100644
index 000000000000..15fd8fb56395
--- /dev/null
+++ b/Tools/scripts/mergebase.sh
@@ -0,0 +1,156 @@
+#!/bin/sh
+# rev 6
+# $FreeBSD$
+#
+
+X11BASE="/usr/X11R6"
+LOCALBASE="/usr/local"
+
+BACKUPDIR="/usr/tmp/mergebase"
+BACKUPFILE="oldx11base.`date -j +%Y%m%d.%H%M%S`.tar"
+
+echo "This script will attempt to backup ${X11BASE} into"
+echo "${BACKUPDIR}/${BACKUPFILE} and then move the"
+echo "contents onto ${LOCALBASE}. It will then replace ${X11BASE}"
+echo "with a symbolic link, pointing to ${LOCALBASE}. After that,"
+echo "the script will attempt to change some settings in /etc"
+echo "that by default point to both ${X11BASE} and ${LOCALBASE}"
+echo "to remove references to ${X11BASE}; specifically, the files"
+echo "that could get altered are /etc/periodic.conf"
+echo "/etc/manpath.config /etc/rc.conf."
+echo
+echo "Be advised that this script expects default environment,"
+echo "notably it assumes that you have not changed \$X11BASE and"
+echo "\$LOCALBASE variables from their default values and that"
+echo "${X11BASE} is regular directory and not separate mount."
+echo
+echo "If these assumptions are not correct, either edit this script"
+echo "to change \$X11BASE \$LOCALBASE and/or \$BACKUPDIR values or"
+echo "do the merge by hand (perhaps using this script as a rough guide)."
+echo
+
+read -p "Enter 'yes' to continue, anything else will exit script: " answer
+if [ "${answer}x" != "yesx" ]; then
+	echo "Aborted."
+	exit 1
+fi
+
+mrg_done=0
+mpath_done=0
+ppath_done=0
+rcconf_done=0
+
+if [ -d ${X11BASE} -a ! -L ${X11BASE} ]; then
+	lbase_list=`mktemp -t mergebase` || exit 1
+	xbase_list=`mktemp -t mergebase` || exit 1
+	common_list=`mktemp -t mergebase` || exit 1
+	(cd ${LOCALBASE} && find . ! -type d | sort >${lbase_list})
+	(cd ${X11BASE} && find . ! -type d | sort >${xbase_list})
+	comm -1 -2 ${lbase_list} ${xbase_list} >${common_list}
+	if [ -s ${common_list} ]; then
+		echo "CONFLICTING FILES:"
+		cat ${common_list}
+		echo
+		echo -n "Files that exist both in ${LOCALBASE} and ${X11BASE} "
+		echo -n "have been found as shown above. Merging will not "
+		echo "continue."
+		echo -n "While some such files are safe to remove as they "
+		echo -n "will be regenerated (like ${X11BASE}/man/whatis), "
+		echo -n "some you might want to move away somewhere safe, "
+		echo "and some might point to conflicts in ports."
+		echo -n "For this script to continue, you need to either "
+		echo -n "move these files away from ${X11BASE} or delete them. "
+		echo -n "If you don't know what to do about a particular file, "
+		echo "ask on x11@FreeBSD.org mailing list."
+		echo "The list is saved in ${common_list}."
+		rm ${lbase_list} ${xbase_list}
+		exit 1
+	fi
+	rm ${lbase_list} ${xbase_list} ${common_list}
+
+	echo "==> Creating backup of X11BASE in ${BACKUPDIR}..."
+	mkdir -p ${BACKUPDIR}
+	tar -cvf ${BACKUPDIR}/${BACKUPFILE} -C ${X11BASE} .
+	if [ $? -ne 0 ]; then
+		echo "Backup failed."
+		exit 1
+	fi
+
+	echo "==> Merging X11BASE into LOCALBASE..."
+	errfile=`mktemp -t mergebase` || exit 1
+	tar -xpkf ${BACKUPDIR}/${BACKUPFILE} -C ${LOCALBASE} 2>${errfile}
+	if [ `grep -Ev 'File exists$|Error exit delayed from previous errors' ${errfile} | wc -c` -ne 0 ]; then
+		echo "Merge failed. See ${errfile} for more information."
+		exit 1
+	fi
+	rm ${errfile}
+
+	echo "==> Creating compatibility symlink ${X11BASE} -> ${LOCALBASE}..."
+	rm -rf ${X11BASE}
+	ln -s ${LOCALBASE} ${X11BASE}
+	mrg_done=1
+fi
+
+# periodic.conf
+local_periodic=`. /etc/defaults/periodic.conf && source_periodic_confs ; echo ${local_periodic}`
+for lp in ${local_periodic}; do
+	if (expr ${lp} : "^${X11BASE}" >/dev/null); then
+		continue
+	else
+		new_periodic="${new_periodic} ${lp}"
+	fi
+done
+if [ "${local_periodic}x" != "${new_periodic## }x" ]; then
+	echo "==> Removing ${X11BASE}/etc/periodic from periodic setup..."
+	echo "# added by mergebase.sh" >> /etc/periodic.conf
+	echo "local_periodic=\"${new_periodic## }\"" >> /etc/periodic.conf
+	ppath_done=1
+fi
+
+# manpath.config
+if (PATH="/sbin:/bin:/usr/sbin:/usr/bin" manpath -q | grep -q "${X11BASE}");then
+	echo "==> Removing ${X11BASE}/man from MANPATH..."
+	sed -i ".bak.mergebase" -e "s,^[^#]*${X11BASE}.*$,#&," \
+	    /etc/manpath.config
+	mpath_done=1
+fi
+
+# rc.conf
+rcdirs=`. /etc/defaults/rc.conf && source_rc_confs && echo ${local_startup}`
+for rd in ${rcdirs}; do
+	if (expr ${rd} : "${X11BASE}" >/dev/null); then
+		continue
+	else
+		new_rcdirs="${new_rcdirs} ${rd}"
+	fi
+done
+if [ "${rcdirs}x" != "${new_rcdirs## }x" ]; then
+	echo "==> Removing ${X11BASE} from rc sequence..."
+	echo "# added by mergebase.sh" >> /etc/rc.conf
+	echo "local_startup=\"${new_rcdirs## }\"" >> /etc/rc.conf
+	rcconf_done=1
+fi
+
+
+if [ ${mrg_done} -eq 1 ]; then
+	echo
+	echo "The contents of ${X11BASE} has been backed up in ${BACKUPDIR}."
+	echo "Remove it once you are sure nothing has been lost in merge."
+fi
+if [ ${ppath_done} -eq 1 ]; then
+	echo
+	echo "${X11BASE} has been removed from periodic setup. You might"
+	echo "want to review /etc/periodic.conf for changes."
+fi
+if [ ${mpath_done} -eq 1 ]; then
+	echo
+	echo "${X11BASE} has been commented out in /etc/manpath.config."
+	echo "You might want to review the changes there."
+fi
+if [ ${rcconf_done} -eq 1 ]; then
+	echo
+	echo "${X11BASE} has been removed from system initialization (rc)."
+	echo "You might want to check /etc/rc.conf changes."
+fi
+
+echo "Done."
diff --git a/UPDATING b/UPDATING
index 7d8ba0d6d115..813186829c7c 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,109 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20070519:
+  AFFECTS: users of x11/xorg
+  AUTHOR: kris@FreeBSD.org
+
+  Welcome, fearless user!  You are about to embark upon a mystical
+  journey to the world of xorg 7.2.
+  
+  This upgrade procedure is for users of portupgrade.  Users of other
+  upgrade tools should contact the author for the corresponding upgrade
+  method for that tool.
+  
+  It is recommended that you run the xorg 7.2 upgrade inside a script(1)
+  session.  This way, if something goes wrong, you will have hopefully
+  have saved enough information for the developers to debug the problem.
+  Make sure you choose a filesystem with lots of space for the script
+  output.
+  
+  # script xorg-upgrade
+  
+  You may wish to set BATCH=yes in the environment to avoid interactive
+  dialogue boxes.
+  
+  You may want to consider using portupgrade-devel, which fixes some
+  annoying bugs that cause upgrades to incorrectly be marked as failed
+  when they actually completed successfully.  To switch to
+  portupgrade-devel:
+  
+  # portupgrade -f -o ports-mgmt/portupgrade-devel portupgrade
+  # rm -f /usr/ports/INDEX*.db /var/db/pkg/pkgdb.db
+  # pkgdb -fu
+  # portsdb -fu
+
+  If you are an upgrade-test user (big wave!) you were instructed
+  to created a separate tree for the test. You shouldn't forgot
+  to set your PORTSDIR variable to it, and to create INDEXes:
+
+  # setenv PORTSDIR `realpath .`    <- csh-like users
+  # export PORTSDIR=`realpath .`    <- sh-like users
+  # portsdb -u
+
+  It is necessary to set the XORG_UPGRADE environment variable while
+  updating from xorg 6.9 to 7.2.  Once the upgrade is complete this
+  is no longer be required.
+  
+  For users of csh-like shells:
+  # setenv XORG_UPGRADE yes
+  
+  For users of sh-like shells:
+  # export XORG_UPGRADE=yes
+  
+  Unfortunately portupgrade (nor portupgrade-devel) cannot yet handle
+  the rigors of the xorg upgrade without a small bit of help:
+  
+  # portupgrade -Rf libXft
+  Now you are ready to upgrade everything:
+  
+  # portupgrade -a
+  
+  When packages are available (wait for the announcement on ports@), you
+  may prefer to use precompiled packages to speed up the process:
+  
+  # portupgrade -aP
+  
+  Once the upgrade completes successfully, you can delete the
+  xorg-manpages package, which is now orphaned.
+  
+  # pkg_delete xorg-manpages\*
+  
+  The final step is to merge remaining files from /usr/X11R6 into
+  /usr/local (/usr/X11R6 is no longer used with xorg 7.2) and replace
+  /usr/X11R6 with a symlink.
+  
+  A script is provided for your convenience (or you may choose to do
+  this by hand): it will first attempt to back up your /usr/X11R6 into
+  /usr/tmp/mergebase in case something goes wrong, then look for
+  conflicts (files in /usr/X11R6 that would overwrite files in
+  /usr/local).  Depending on your system configuration you may have to
+  resolve some of these conflicts by hand first (if in doubt, ask for
+  help on freebsd-x11@FreeBSD.org).  You may also need to edit the
+  script if the default locations are not correct on your system.
+  
+  # sh /usr/ports/Tools/scripts/mergebase.sh
+  
+  When the merge operation completes successfully, the /usr/X11R6
+  directory hierarchy will be removed and replaced by a symlink to
+  /usr/local.  This symlink is necessary because some binary ports (and
+  some remaining source ports) have hard-coded references to /usr/X11R6.
+  
+  Congratulations, you are done!
+  
+  # exit
+  
+  IF YOU RUN INTO PROBLEMS:
+  
+  # uname -a
+  # ls -l /var/db/pkg
+  # exit
+  
+  and send an email to freebsd-x11@FreeBSD.org with a full description
+  of the problem.  Do not include the above typescript in your email,
+  but bzip2 it and make it available to the developers (e.g. put it
+  online or send it by private email upon request).
+
 20070428:
   AFFECTS: users of print/ghostscript-gnu-{commfont,jpnfont,korfont}
   AUTHOR: hrs@FreeBSD.org
diff --git a/accessibility/at-poke/Makefile b/accessibility/at-poke/Makefile
index 043f6d526d58..d198f3cb8686 100644
--- a/accessibility/at-poke/Makefile
+++ b/accessibility/at-poke/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	at-poke
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 0dd35a399433..dde9bea839e8 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	at-spi
 PORTVERSION=	1.18.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 4c6836264eec..74f5318c15a7 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -151,53 +151,17 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
 @dirrm include/at-spi-1.0/libspi
 @dirrm include/at-spi-1.0/cspi
 @dirrm include/at-spi-1.0
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 9c68eb457dd3..0b552406fb5f 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	atk
 PORTVERSION=	1.18.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	accessibility devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index f919f090957c..d83c44116415 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -117,71 +117,31 @@ share/locale/zh_HK/LC_MESSAGES/atk10.mo
 share/locale/zh_TW/LC_MESSAGES/atk10.mo
 @dirrm include/atk-1.0/atk
 @dirrm include/atk-1.0
-@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/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@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/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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 63f75efac4dc..76bf463cad96 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	dasher
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	accessibility editors x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index da8413d163e0..06fbc78f6920 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -314,36 +314,12 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
 @dirrm share/gnome/help/dasher/C
 @dirrm share/gnome/help/dasher
 @dirrm share/gnome/dasher
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -352,21 +328,7 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/accessibility/gail/Makefile b/accessibility/gail/Makefile
index f01d500351c2..578da3a4fa56 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gail
 PORTVERSION=	1.18.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 976bd49b7df8..ab76b02e098f 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -87,61 +87,23 @@ share/locale/zh_TW/LC_MESSAGES/gail.mo
 @dirrm include/gail-1.0/gail
 @dirrm include/gail-1.0/libgail-util
 @dirrm include/gail-1.0
-@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/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/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/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/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index b628989b9d4d..13727c9218c0 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-mag
 PORTVERSION=	0.14.3
+PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index d5b7d1543ee3..496a35e0dbc5 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -305,38 +305,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
 @dirrm %%DOCSDIR%%
 @dirrm include/gnome-mag-1.0/magnifier
 @dirrm include/gnome-mag-1.0
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
-@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/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
@@ -347,24 +323,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
 @dirrmtry share/locale/ang/LC_MESSAGES
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index fde3c040ed66..bb94572054c4 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnopernicus
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist
index f82bef28fe10..aff614a188e2 100644
--- a/accessibility/gnopernicus/pkg-plist
+++ b/accessibility/gnopernicus/pkg-plist
@@ -188,47 +188,15 @@ share/locale/zh_TW/LC_MESSAGES/gnopernicus.mo
 @dirrm include/gnopernicus-1.0
 @dirrm etc/gnopernicus-1.0/translation_tables
 @dirrm etc/gnopernicus-1.0
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 3dac21946cf3..a437bc1791ea 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gok
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	accessibility sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index 15a59d6c0991..cffba07426da 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -908,51 +908,17 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
 @dirrm share/gnome/gok/am
 @dirrm share/gnome/gok
 @dirrm %%DOCSDIR%%
-@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/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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
diff --git a/accessibility/java-access-bridge/Makefile b/accessibility/java-access-bridge/Makefile
index edce11f69ea9..aecec4cef7af 100644
--- a/accessibility/java-access-bridge/Makefile
+++ b/accessibility/java-access-bridge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	java-access-bridge
 PORTVERSION=	1.18.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility java gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible/Makefile
index 69955160a2fc..63e81307af55 100644
--- a/accessibility/kaccessible/Makefile
+++ b/accessibility/kaccessible/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/accessibility/kdeaccessibility/Makefile b/accessibility/kdeaccessibility/Makefile
index 69955160a2fc..63e81307af55 100644
--- a/accessibility/kdeaccessibility/Makefile
+++ b/accessibility/kdeaccessibility/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/accessibility/kdeaccessibility4/Makefile b/accessibility/kdeaccessibility4/Makefile
index 69955160a2fc..63e81307af55 100644
--- a/accessibility/kdeaccessibility4/Makefile
+++ b/accessibility/kdeaccessibility4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile
index 69955160a2fc..63e81307af55 100644
--- a/accessibility/kmag/Makefile
+++ b/accessibility/kmag/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
index 69955160a2fc..63e81307af55 100644
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile
index 69955160a2fc..63e81307af55 100644
--- a/accessibility/kmouth/Makefile
+++ b/accessibility/kmouth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index d897b0ae19b1..5728db166316 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	orca
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	accessibility x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index e8ffa76ffb90..e438c1af429c 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -270,41 +270,13 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
 @dirrm share/gnome/orca
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/orca
-@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/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/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile
index 85d1b45d0e07..c3f91df00cca 100644
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	accessible
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	accessibility
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/arabic/ae_fonts_mono/Makefile b/arabic/ae_fonts_mono/Makefile
index bb85fbe6743d..dd713e4c28ba 100644
--- a/arabic/ae_fonts_mono/Makefile
+++ b/arabic/ae_fonts_mono/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		ae_fonts_mono
 PORTVERSION=		1.0
+PORTREVISION=	1
 CATEGORIES=		arabic
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	arabeyes
diff --git a/arabic/ae_fonts_ttf/Makefile b/arabic/ae_fonts_ttf/Makefile
index 476554f0bb7b..0732928d5983 100644
--- a/arabic/ae_fonts_ttf/Makefile
+++ b/arabic/ae_fonts_ttf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		ae_fonts1_ttf
 PORTVERSION=		1.1
+PORTREVISION=	1
 CATEGORIES=		arabic x11-fonts
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	arabeyes
diff --git a/arabic/arabtex/Makefile b/arabic/arabtex/Makefile
index b7b2696ea24d..ce3e0faadb9a 100644
--- a/arabic/arabtex/Makefile
+++ b/arabic/arabtex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	arabtex
 PORTVERSION=	3.11
+PORTREVISION=	1
 CATEGORIES=	arabic print
 MASTER_SITES=	ftp://ftp.informatik.uni-stuttgart.de/pub/${PORTNAME}/
 DISTNAME=	arab${PORTVERSION:S/.//}
diff --git a/arabic/kacst_fonts/Makefile b/arabic/kacst_fonts/Makefile
index bf4012d25260..a92cd6c8f25d 100644
--- a/arabic/kacst_fonts/Makefile
+++ b/arabic/kacst_fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		kacst_fonts
 PORTVERSION=		1.5
+PORTREVISION=	1
 CATEGORIES=		arabic
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	arabeyes
diff --git a/arabic/katoob/Makefile b/arabic/katoob/Makefile
index a3ca2904b333..7de450ba76a3 100644
--- a/arabic/katoob/Makefile
+++ b/arabic/katoob/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	katoob
 PORTVERSION=	0.3.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	arabic
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	arabeyes
diff --git a/arabic/katoob/pkg-plist b/arabic/katoob/pkg-plist
index 21f8e7d1dd9c..875bec3b7e43 100644
--- a/arabic/katoob/pkg-plist
+++ b/arabic/katoob/pkg-plist
@@ -14,5 +14,3 @@ share/locale/pl/LC_MESSAGES/katoob.mo
 share/locale/sv/LC_MESSAGES/katoob.mo
 @dirrm share/gnome/katoob/emulator
 @dirrm share/gnome/katoob
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
diff --git a/arabic/kde3-i18n/Makefile b/arabic/kde3-i18n/Makefile
index 39b0ec6c863f..dda67fb11b9f 100644
--- a/arabic/kde3-i18n/Makefile
+++ b/arabic/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	arabic kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile
index 39b0ec6c863f..dda67fb11b9f 100644
--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	arabic kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/arabic/khotot/Makefile b/arabic/khotot/Makefile
index f8ee9c36cdf8..9c5f42295ec7 100644
--- a/arabic/khotot/Makefile
+++ b/arabic/khotot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	khotot
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	arabic
 MASTER_SITES=	#
 DISTFILES=	#
diff --git a/arabic/koffice-i18n/Makefile b/arabic/koffice-i18n/Makefile
index 698731faf648..9912aad84b47 100644
--- a/arabic/koffice-i18n/Makefile
+++ b/arabic/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	arabic kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index d2a8b1c1613f..349568482863 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/archivers/deepforest/Makefile b/archivers/deepforest/Makefile
index 25fe09d0921a..8341926e1d78 100644
--- a/archivers/deepforest/Makefile
+++ b/archivers/deepforest/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	deepforest
 PORTVERSION=	1.0a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers windowmaker tkstep80
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kiri
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index f08cb55d4840..0b324badde91 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	dpkg
 PORTVERSION=	1.13.25
+PORTREVISION=	1
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	dpkg_${PORTVERSION}
diff --git a/archivers/dpkg/pkg-plist b/archivers/dpkg/pkg-plist
index a450f24f7c66..f2d2b0983e3c 100644
--- a/archivers/dpkg/pkg-plist
+++ b/archivers/dpkg/pkg-plist
@@ -89,8 +89,6 @@ sbin/update-alternatives
 %%NLS%%share/locale/nb/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/ne/LC_MESSAGES/dpkg.mo
-%%NLS%%@dirrmtry share/locale/ne/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ne
 %%NLS%%share/locale/nl/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/dpkg.mo
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 142e441f33e0..2df5c684a8f0 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	file-roller
 PORTVERSION=	2.18.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 42a4752a43a4..2c80bfbc8eb9 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -206,65 +206,27 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm libexec/file-roller
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/archivers/freetar/Makefile b/archivers/freetar/Makefile
index 8a868ba43b59..e38947b1951d 100644
--- a/archivers/freetar/Makefile
+++ b/archivers/freetar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freetar
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	archivers gnustep
 MASTER_SITES=	http://download.gna.org/freetar/
 DISTNAME=	FreeTar-${PORTVERSION}
diff --git a/archivers/jzip.org/Makefile b/archivers/jzip.org/Makefile
index 10fbd434f493..a03ed2e6d867 100644
--- a/archivers/jzip.org/Makefile
+++ b/archivers/jzip.org/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jzip.org
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	archivers java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jzipdotorg
diff --git a/archivers/jzlib/Makefile b/archivers/jzlib/Makefile
index 5be3b0fe2822..3024414e038d 100644
--- a/archivers/jzlib/Makefile
+++ b/archivers/jzlib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jzlib
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	archivers java
 MASTER_SITES=	http://www.jcraft.com/jzlib/
 
diff --git a/archivers/kbackup/Makefile b/archivers/kbackup/Makefile
index c0d5bdef4b92..8f76ad2b4131 100644
--- a/archivers/kbackup/Makefile
+++ b/archivers/kbackup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kbackup
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	archivers kde
 MASTER_SITES=	http://www.kde-apps.org/CONTENT/content-files/
 DISTNAME=	44998-${PORTNAME}-${PORTVERSION}
diff --git a/archivers/kio_p7zip/Makefile b/archivers/kio_p7zip/Makefile
index 2a2861347a22..142f9eed8ae9 100644
--- a/archivers/kio_p7zip/Makefile
+++ b/archivers/kio_p7zip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kio_p7zip
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	archivers kde
 MASTER_SITES=	http://www.kde-apps.org/CONTENT/content-files/
 DISTNAME=	17829-${PORTNAME}-${PORTVERSION}
diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile
index aa998ca54877..14a76b134421 100644
--- a/archivers/ocaml-zip/Makefile
+++ b/archivers/ocaml-zip/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	zip
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
 PKGNAMEPREFIX=	ocaml-
diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile
index 8cb4b204f3b2..096461b426d1 100644
--- a/archivers/rox-archive/Makefile
+++ b/archivers/rox-archive/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rox-archive
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index cb508047b5dd..f008ef52de59 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	4.0.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index cb508047b5dd..f008ef52de59 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	4.0.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/
diff --git a/archivers/xarchive/Makefile b/archivers/xarchive/Makefile
index aecbecebfc70..b9011b31b653 100644
--- a/archivers/xarchive/Makefile
+++ b/archivers/xarchive/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xarchive
 PORTVERSION=	0.2.8.6
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/archivers/zipper/Makefile b/archivers/zipper/Makefile
index fd4946b855e9..5adaf314175f 100644
--- a/archivers/zipper/Makefile
+++ b/archivers/zipper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zipper
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	archivers gnustep
 MASTER_SITES=	http://xanthippe.dyndns.org/Zipper/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/astro/boinc-einsteinathome/Makefile b/astro/boinc-einsteinathome/Makefile
index ae69b152a84a..68b73325402a 100644
--- a/astro/boinc-einsteinathome/Makefile
+++ b/astro/boinc-einsteinathome/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	boinc-einsteinathome
 PORTVERSION=	4.09
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://einstein.phys.uwm.edu/app_test/FreeBSD/
diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile
index 7990a6fbeb67..9a314f70983d 100644
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	boinc-setiathome-enhanced
 PORTVERSION=	5.13
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://home.tiscali.nl/rladan/distfiles/
 
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 7304beff46e4..a678d200f277 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	celestia
 PORTVERSION=	1.4.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	celestia
diff --git a/astro/celestia/pkg-plist b/astro/celestia/pkg-plist
index 39f737c5b139..911ac39d9010 100644
--- a/astro/celestia/pkg-plist
+++ b/astro/celestia/pkg-plist
@@ -320,7 +320,6 @@ share/locale/pt_br/LC_MESSAGES/celestia.mo
 share/locale/ru/LC_MESSAGES/celestia.mo
 share/pixmaps/celestia.png
 @exec mkdir -p %D/share/celestia/textures/hires
-@dirrmtry share/pixmaps
 @dirrm share/celestia/textures/medres
 @dirrm share/celestia/textures/lores
 @dirrm share/celestia/textures/hires
@@ -334,9 +333,3 @@ share/pixmaps/celestia.png
 @dirrm share/celestia
 @dirrmtry share/locale/pt_br/LC_MESSAGES
 @dirrmtry share/locale/pt_br
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
diff --git a/astro/gaia/Makefile b/astro/gaia/Makefile
index ae86b4c791d4..98bc9ce12a75 100644
--- a/astro/gaia/Makefile
+++ b/astro/gaia/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaia
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gaia-clean
diff --git a/astro/gkrellmoon/Makefile b/astro/gkrellmoon/Makefile
index da80912bc424..85b50197790d 100644
--- a/astro/gkrellmoon/Makefile
+++ b/astro/gkrellmoon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmoon
 PORTVERSION=	0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gkrellmoon
diff --git a/astro/gkrellmoon2/Makefile b/astro/gkrellmoon2/Makefile
index 97be80ad46f5..f74bc55baf01 100644
--- a/astro/gkrellmoon2/Makefile
+++ b/astro/gkrellmoon2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmoon2
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gkrellmoon
diff --git a/astro/gkrellsun/Makefile b/astro/gkrellsun/Makefile
index ae8ebf80eaaf..16ae3c97f910 100644
--- a/astro/gkrellsun/Makefile
+++ b/astro/gkrellsun/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellsun
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro
 MASTER_SITES=	http://nwalsh.com/hacks/gkrellsun/
 
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index e682a46cb8f0..bf57066cbeb9 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glunarclock
 PORTVERSION=	0.32.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/astro/glunarclock/pkg-plist b/astro/glunarclock/pkg-plist
index 6081838f728e..c81b6a182c06 100644
--- a/astro/glunarclock/pkg-plist
+++ b/astro/glunarclock/pkg-plist
@@ -38,19 +38,7 @@ share/locale/wa/LC_MESSAGES/glunarclock-%%VERSION%%.mo
 @dirrm share/gnome/help/glunarclock-applet-2/C
 @dirrm share/gnome/help/glunarclock-applet-2
 @dirrm share/gnome/glunarclock
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrmtry share/locale/ast_ES/LC_MESSAGES
 @dirrmtry share/locale/ast_ES
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index b70dab3f6698..f83a901b3387 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpsdrive
 PORTVERSION=	2.09
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	astro
 MASTER_SITES=	http://www.ganter.at/software/ \
 		http://www.ostertag.name/gpsdrive.de/
diff --git a/astro/gpsman/Makefile b/astro/gpsman/Makefile
index f7a90ba0e4e9..128d4e1a39ac 100644
--- a/astro/gpsman/Makefile
+++ b/astro/gpsman/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpsman
 PORTVERSION=	6.3.1
+PORTREVISION=	1
 CATEGORIES=	astro tk84
 MASTER_SITES=	http://www.ncc.up.pt/gpsman/gpsmanhtml/
 MASTER_SITE_SUBDIR=	science/cartography
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index f2d4312038f4..1bded039d969 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nightfall
 PORTVERSION=	1.52
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	http://www.la-samhna.de/nightfall/
 
diff --git a/astro/nova/Makefile b/astro/nova/Makefile
index 886440e4e57f..02cf46d85de6 100644
--- a/astro/nova/Makefile
+++ b/astro/nova/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	nova
 PORTVERSION=	0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/astro/openmap/Makefile b/astro/openmap/Makefile
index 2f7e63334d3b..43f1aaa84c0d 100644
--- a/astro/openmap/Makefile
+++ b/astro/openmap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openmap
 PORTVERSION=	4.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro java devel graphics
 MASTER_SITES=	http://openmap.bbn.com/src/
 
diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile
index 58a63b772d43..6bdb525b55e8 100644
--- a/astro/openuniverse/Makefile
+++ b/astro/openuniverse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openuniverse
 PORTVERSION=	1.0.b3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openuniverse
diff --git a/astro/orsa/Makefile b/astro/orsa/Makefile
index cec9947599ad..1c1cc7d14d0b 100644
--- a/astro/orsa/Makefile
+++ b/astro/orsa/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	orsa
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,6 +23,7 @@ LIB_DEPENDS=	gsl.9:${PORTSDIR}/math/gsl \
 
 USE_AUTOTOOLS=	libtool:15
 USE_QT_VER=	3
+USE_GL=		gl
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/astro/planets/Makefile b/astro/planets/Makefile
index 4dab67c53804..0228a5a885b3 100644
--- a/astro/planets/Makefile
+++ b/astro/planets/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	planets
 PORTVERSION=	0.1.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	http://planets.homedns.org/dist/ \
 		http://sheepkiller.nerim.net/ports/${PORTNAME}/
diff --git a/astro/position/Makefile b/astro/position/Makefile
index 7da5a60d678d..8d7d367fb1df 100644
--- a/astro/position/Makefile
+++ b/astro/position/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	position
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	astro gnustep
 MASTER_SITES=	http://www.gnustep.it/enrico/position/
 
diff --git a/astro/pp3/Makefile b/astro/pp3/Makefile
index a81e4461288b..b20a6d103a18 100644
--- a/astro/pp3/Makefile
+++ b/astro/pp3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pp3
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/astro/ptiger/Makefile b/astro/ptiger/Makefile
index 1124566c74cc..7597abbe0a0b 100644
--- a/astro/ptiger/Makefile
+++ b/astro/ptiger/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ptiger
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	astro tk84
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	tkgeomap
diff --git a/astro/rmap/Makefile b/astro/rmap/Makefile
index 2fa6f4a3728a..35f01a2aee3d 100644
--- a/astro/rmap/Makefile
+++ b/astro/rmap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rmap
 PORTVERSION=	1.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	astro
 MASTER_SITES=	http://www.reza.net/rmap/
 
diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile
index 68bf2ab78d74..ac91143d68b4 100644
--- a/astro/roadmap/Makefile
+++ b/astro/roadmap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	roadmap
 PORTVERSION=	1.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro
 MASTER_SITES=	http://roadmap.digitalomaha.net/roadmap/
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/.r/rc/:S/./_/g}_src
diff --git a/astro/saoimage/Makefile b/astro/saoimage/Makefile
index 62f4578c868f..dad6dd6e82a8 100644
--- a/astro/saoimage/Makefile
+++ b/astro/saoimage/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	saoimage
 PORTVERSION=	1.35.1
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://tdc-www.harvard.edu/software/saoimage/
 
diff --git a/astro/sattrack/Makefile b/astro/sattrack/Makefile
index 5654c6748133..50e32bf870ba 100644
--- a/astro/sattrack/Makefile
+++ b/astro/sattrack/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sattrack
 PORTVERSION=	3.1.6
+PORTREVISION=	1
 CATEGORIES=	astro hamradio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
diff --git a/astro/spacechart/Makefile b/astro/spacechart/Makefile
index 7851cc815903..773097653f85 100644
--- a/astro/spacechart/Makefile
+++ b/astro/spacechart/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spacechart
 PORTVERSION=	0.9.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/astro/starplot/Makefile b/astro/starplot/Makefile
index 0d4abc0cbbe4..454b2e16c714 100644
--- a/astro/starplot/Makefile
+++ b/astro/starplot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	starplot
 PORTVERSION=	0.95.4
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://starplot.org/downloads/
 
diff --git a/astro/stars/Makefile b/astro/stars/Makefile
index c027c854090e..231e5aac816d 100644
--- a/astro/stars/Makefile
+++ b/astro/stars/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stars
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://hpux.connect.org.uk/ftp/hpux/X11/Demos/${PORTNAME}-${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src-11.00
diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index cebf8b63868c..dcf6aeb98a48 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stellarium
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/astro/stellarium/pkg-plist b/astro/stellarium/pkg-plist
index e2944d6ce68d..91b89ffe3f2b 100644
--- a/astro/stellarium/pkg-plist
+++ b/astro/stellarium/pkg-plist
@@ -399,31 +399,5 @@ share/locale/zh_TW/LC_MESSAGES/stellarium.mo
 @dirrm %%DATADIR%%/textures/landscapes
 @dirrm %%DATADIR%%/textures
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index fd652df4b2b5..a964b6c2d69f 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	sunclock
 PORTVERSION=	3.56
+PORTREVISION=	1
 CATEGORIES=	astro x11-clocks
 MASTER_SITES=	ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \
 		http://mbsd.msk.ru/dist/
diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile
index 0fcfd2ea55fb..fee6a9fba095 100644
--- a/astro/tkgeomap/Makefile
+++ b/astro/tkgeomap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkgeomap
 PORTVERSION=	2.11.2
+PORTREVISION=	1
 CATEGORIES=	astro tk84
 MASTER_SITES=	SF
 
diff --git a/astro/wmglobe/Makefile b/astro/wmglobe/Makefile
index 599fd72369e0..08224eb5e973 100644
--- a/astro/wmglobe/Makefile
+++ b/astro/wmglobe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmglobe
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro windowmaker
 MASTER_SITES=	http://hamete.org/static/wmg/
 
diff --git a/astro/wmjupiter/Makefile b/astro/wmjupiter/Makefile
index 34dad5b10c7a..7da9ad1aa238 100644
--- a/astro/wmjupiter/Makefile
+++ b/astro/wmjupiter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmjupiter
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro windowmaker
 MASTER_SITES=	http://www.inxsoft.net/wmjupiter/
 
diff --git a/astro/wmmoonclock/Makefile b/astro/wmmoonclock/Makefile
index ebb9a34dea55..f2a28a1b69cf 100644
--- a/astro/wmmoonclock/Makefile
+++ b/astro/wmmoonclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmMoonClock
 PORTVERSION=	1.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro windowmaker
 MASTER_SITES=	http://dockapps.org/files/14/21/
 
diff --git a/astro/wmsolar/Makefile b/astro/wmsolar/Makefile
index b81e7342f94f..a5b7f729f567 100644
--- a/astro/wmsolar/Makefile
+++ b/astro/wmsolar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmsolar
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro windowmaker
 MASTER_SITES=	http://www.inxsoft.net/wmsolar/
 
diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile
index ae6818f6f0eb..aa89a23b948a 100644
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmspaceweather
 PORTVERSION=	1.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro windowmaker
 MASTER_SITES=	http://dockapps.org/files/15/22/
 DISTNAME=	wmSpaceWeather-${PORTVERSION}
diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile
index 90544a6cddd5..d0fa61ff3cc7 100644
--- a/astro/wmsun/Makefile
+++ b/astro/wmsun/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	wmsun
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	astro windowmaker
 MASTER_SITES=	http://dockapps.org/files/16/23/
 DISTNAME=	wmSun-1.03
diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index dce6976a2f0a..27144a97fd99 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xearth
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	ftp://cag.lcs.mit.edu/pub/tuna/ \
 		${MASTER_SITE_XCONTRIB:S/$/:xcontrib/} \
diff --git a/astro/xeartk/Makefile b/astro/xeartk/Makefile
index 7e47935b12f4..76966ae9e5fb 100644
--- a/astro/xeartk/Makefile
+++ b/astro/xeartk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xeartk
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	astro tk84
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	tkgeomap
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 0356a878499e..0e01b5725244 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xephem
 PORTVERSION=	3.7.2
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	# http://www.clearskyinstitute.com/xephem/
 
diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile
index 714fb49bb0ff..9e903d9f239b 100644
--- a/astro/xglobe/Makefile
+++ b/astro/xglobe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xglobe
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=kris
diff --git a/astro/xmoontool/Makefile b/astro/xmoontool/Makefile
index e5e9a9a94379..66116fc8c289 100644
--- a/astro/xmoontool/Makefile
+++ b/astro/xmoontool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmoontool
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://www.senax.net/xmoontool/
 
diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile
index 48beff4a93e9..6029c3196830 100644
--- a/astro/xphoon/Makefile
+++ b/astro/xphoon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xphoon
 PORTVERSION=	2000.06.13
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index 680e4211f2bf..14918736fb47 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xplanet
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/astro/xrmap/Makefile b/astro/xrmap/Makefile
index 7f0891eec209..e46f674f28c1 100644
--- a/astro/xrmap/Makefile
+++ b/astro/xrmap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xrmap
 PORTVERSION=	2.33
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro
 MASTER_SITES=	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/:data \
 		ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/:src
diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index 079ac7578523..ee1023aaeedf 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtide
 PORTVERSION=	2.9.3
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	ftp://ftp.flaterco.com/xtide/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/astro/xworld/Makefile b/astro/xworld/Makefile
index 0bf85e220bbb..c3365a3a5528 100644
--- a/astro/xworld/Makefile
+++ b/astro/xworld/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xworld
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	ftp://gutemine.geo.uni-koeln.de/pub/xworld/ \
 		ftp://ftp.Uni-Koeln.DE/misc/
diff --git a/audio/akode-plugins-polypaudio/Makefile b/audio/akode-plugins-polypaudio/Makefile
index 4eb23c20f00f..38648e9c22bc 100644
--- a/audio/akode-plugins-polypaudio/Makefile
+++ b/audio/akode-plugins-polypaudio/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=   akode-plugins-${PORTNAMESUFX}
 PORTVERSION=    2.0.1
+PORTREVISION=	1
 PORTEPOCH=  1
 CATEGORIES= audio kde
 MASTER_SITES=   ${MASTER_SITE_GENTOO}
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 25c6d8a3dd96..f9a959cf021f 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	1.4.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/amarok-kde4/pkg-plist b/audio/amarok-kde4/pkg-plist
index 2a8bc3eb5503..aa9582c59192 100644
--- a/audio/amarok-kde4/pkg-plist
+++ b/audio/amarok-kde4/pkg-plist
@@ -1046,46 +1046,10 @@ share/servicetypes/amarok_codecinstall.desktop
 share/servicetypes/amarok_plugin.desktop
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
-@dirrmtry share/locale/uz/LC_MESSAGES
-@dirrmtry share/locale/uz
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
 @dirrmtry share/locale/se/LC_MESSAGES
 @dirrmtry share/locale/se
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/tg/LC_MESSAGES
-@dirrmtry share/locale/tg
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
 @dirrm share/doc/HTML/sv/amarok
 @dirrm share/doc/HTML/ru/amarok
 @dirrm share/doc/HTML/pt_BR/amarok
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 25c6d8a3dd96..f9a959cf021f 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	1.4.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist
index 2a8bc3eb5503..aa9582c59192 100644
--- a/audio/amarok/pkg-plist
+++ b/audio/amarok/pkg-plist
@@ -1046,46 +1046,10 @@ share/servicetypes/amarok_codecinstall.desktop
 share/servicetypes/amarok_plugin.desktop
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
-@dirrmtry share/locale/uz/LC_MESSAGES
-@dirrmtry share/locale/uz
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
 @dirrmtry share/locale/se/LC_MESSAGES
 @dirrmtry share/locale/se
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/tg/LC_MESSAGES
-@dirrmtry share/locale/tg
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
 @dirrm share/doc/HTML/sv/amarok
 @dirrm share/doc/HTML/ru/amarok
 @dirrm share/doc/HTML/pt_BR/amarok
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index f7ebdca9bde7..b0aa85e78a97 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aqualung
 DISTVERSION=	0.9beta7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index 86c3a0ece430..00efcf19a130 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ardour
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://ardour.org/files/releases/
 DISTFILES=	ardour-${DISTVERSION}.tar.bz2
diff --git a/audio/ardour/pkg-plist b/audio/ardour/pkg-plist
index 07a91e88bb48..ccc542e88e2a 100644
--- a/audio/ardour/pkg-plist
+++ b/audio/ardour/pkg-plist
@@ -142,7 +142,5 @@ share/locale/pt_PT/LC_MESSAGES/gtk_ardour.mo
 @dirrmtry share/locale/el_GR
 @dirrmtry share/locale/ru_RU/LC_MESSAGES
 @dirrmtry share/locale/ru_RU
-@dirrmtry share/locale/fr_FR/LC_MESSAGES
-@dirrmtry share/locale/fr_FR
 @dirrmtry share/locale/de_DE/LC_MESSAGES
 @dirrmtry share/locale/de_DE
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index 371978eaf4cb..ccc2b0210b45 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	arts
 PORTVERSION=	1.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile
index e4a07411140a..7791288e4c4a 100644
--- a/audio/ascd/Makefile
+++ b/audio/ascd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ascd
 PORTVERSION=	0.13.2
+PORTREVISION=	1
 CATEGORIES=	audio afterstep windowmaker
 MASTER_SITES=	http://worldserver.oleane.com/rsn/Archives/
 DISTFILES=	${DISTNAME}-src.tgz ${DATAFILES}
diff --git a/audio/asmix/Makefile b/audio/asmix/Makefile
index 1356c6694a13..640f21b75a6c 100644
--- a/audio/asmix/Makefile
+++ b/audio/asmix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asmix
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	audio afterstep
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asmix/
 
diff --git a/audio/asmixer/Makefile b/audio/asmixer/Makefile
index d506900324e7..1e253f7a7dbf 100644
--- a/audio/asmixer/Makefile
+++ b/audio/asmixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asmixer
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	audio afterstep
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asmixer/
 
diff --git a/audio/aube/Makefile b/audio/aube/Makefile
index d50ad395902c..c8e01a562002 100644
--- a/audio/aube/Makefile
+++ b/audio/aube/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aube
 PORTVERSION=	0.30.3
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.metadecks.org/software/aube/download/
 
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index e0928e75e776..35ef2dc983e8 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	audacity
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index bd930904d371..c607bb678b7b 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	audacity
 PORTVERSION=	1.2.4b
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index f4febdb82f38..006add6ddeb7 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	autozen
 PORTVERSION=	2.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.springdaemons.com/soft/
 
diff --git a/audio/aylet/Makefile b/audio/aylet/Makefile
index 675cc0807627..fcf15fbb77b3 100644
--- a/audio/aylet/Makefile
+++ b/audio/aylet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aylet
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.ibiblio.org/pub/Linux/apps/sound/players/ \
 		http://critical.ch/distfiles/ \
diff --git a/audio/azrael/Makefile b/audio/azrael/Makefile
index d322bef4437f..8f3fa9199a73 100644
--- a/audio/azrael/Makefile
+++ b/audio/azrael/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	azrael
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	azrael
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 849cd76cf917..e08b3518ffca 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	beast
 PORTVERSION=	0.6.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	ftp://beast.gtk.org/pub/beast/v0.6/ \
 		http://beast.gtk.org/beast-ftp/v0.6/
diff --git a/audio/beast/pkg-plist b/audio/beast/pkg-plist
index ab736b4e986f..ebb1401bf559 100644
--- a/audio/beast/pkg-plist
+++ b/audio/beast/pkg-plist
@@ -305,15 +305,5 @@ share/mime/packages/beast.xml
 @dirrm share/gnome/bse
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@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
diff --git a/audio/bebocd/Makefile b/audio/bebocd/Makefile
index 8e0c58d0d801..d0ac8dfff778 100644
--- a/audio/bebocd/Makefile
+++ b/audio/bebocd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bebocd
 PORTVERSION=	0.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/bmp-faad/Makefile b/audio/bmp-faad/Makefile
index 09753f2ab08a..b4e842aa1e2c 100644
--- a/audio/bmp-faad/Makefile
+++ b/audio/bmp-faad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	faad2
 PORTVERSION=	2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	faac
diff --git a/audio/bmp-fc/Makefile b/audio/bmp-fc/Makefile
index 0fc8fa0a9d0c..76a905e64d2d 100644
--- a/audio/bmp-fc/Makefile
+++ b/audio/bmp-fc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bmp-fc
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	xmms-fc
diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile
index 03a9ff313da3..69824a11ecd6 100644
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flac
 PORTVERSION=	20040316
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://ccm.sherry.jp/tmp/
 PKGNAMEPREFIX=	bmp-
diff --git a/audio/bmp-htmlplaylist/Makefile b/audio/bmp-htmlplaylist/Makefile
index 86862ef8590c..0c6d836bcd73 100644
--- a/audio/bmp-htmlplaylist/Makefile
+++ b/audio/bmp-htmlplaylist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bmp-htmlplaylist
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/bmp-plugins/ \
 		${MASTER_SITE_LOCAL}
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index 08857dcbe43c..e74c59ca6028 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	mac
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SFE
 MASTER_SITE_SUBDIR=	mac-port
diff --git a/audio/bmp-modplug/Makefile b/audio/bmp-modplug/Makefile
index ab673a7c5730..0d282a71ebe4 100644
--- a/audio/bmp-modplug/Makefile
+++ b/audio/bmp-modplug/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	modplug
 PORTVERSION=	2.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	audio
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/FreeBSD/distfiles/ \
 		http://ftp.osuosl.org/pub/FreeBSD/distfiles/ \
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index ea447843a026..5a3186225711 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	musepack
 PORTVERSION=	1.2
+PORTREVISION=	1
 PORTREIVIOSN=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://files.musepack.net/linux/plugins/
diff --git a/audio/bmp-scrobbler/Makefile b/audio/bmp-scrobbler/Makefile
index fc708e55ad68..ab9f77f3f144 100644
--- a/audio/bmp-scrobbler/Makefile
+++ b/audio/bmp-scrobbler/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	bmp-scrobbler
-PORTREVISION=	3
+PORTREVISION=	4
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	BMP plugin for Audioscrobbler.com
diff --git a/audio/bmp-songchange/Makefile b/audio/bmp-songchange/Makefile
index ba008b1ec829..40858b6cfda1 100644
--- a/audio/bmp-songchange/Makefile
+++ b/audio/bmp-songchange/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bmp-songchange
 PORTVERSION=	0.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/bmp-plugins/
 
diff --git a/audio/bmp-wma/Makefile b/audio/bmp-wma/Makefile
index 980537d05399..049a9e0f82dd 100644
--- a/audio/bmp-wma/Makefile
+++ b/audio/bmp-wma/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bmp-wma
 PORTVERSION=	0.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.nixp.ru/pub/files/
 
diff --git a/audio/cantus/Makefile b/audio/cantus/Makefile
index d23f741bde3a..974c0ee18240 100644
--- a/audio/cantus/Makefile
+++ b/audio/cantus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cantus
 PORTVERSION=	1.07
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
diff --git a/audio/cantus/pkg-plist b/audio/cantus/pkg-plist
index 4c2ba75104d6..0bca5d484842 100644
--- a/audio/cantus/pkg-plist
+++ b/audio/cantus/pkg-plist
@@ -22,6 +22,5 @@ share/pixmaps/cantus/warning.xpm
 share/pixmaps/cantus/addrecursive.xpm
 share/gnome/apps/Applications/cantus.desktop
 @dirrm share/pixmaps/cantus
-@dirrmtry share/pixmaps
 @dirrm doc/Cantus
 @dirrm doc
diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index 3644f6b7ab49..d4430c6c243d 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cantus_3
 PORTVERSION=	3.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://dl.debain.org/${PORTNAME}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
diff --git a/audio/cantus_3/pkg-plist b/audio/cantus_3/pkg-plist
index 08dc71f8ccdb..4e47af908f52 100644
--- a/audio/cantus_3/pkg-plist
+++ b/audio/cantus_3/pkg-plist
@@ -21,5 +21,3 @@ share/locale/pl/LC_MESSAGES/cantus_3.mo
 @dirrm share/gnome/help/cantus_3/
 @dirrm share/doc/cantus_3
 @dirrm lib/cantus_3/
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index 79112612fec6..a37f825875d6 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cddb
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	audio gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gsburn
diff --git a/audio/cdplayer.app/Makefile b/audio/cdplayer.app/Makefile
index e9cf163812f3..b3810438ab8f 100644
--- a/audio/cdplayer.app/Makefile
+++ b/audio/cdplayer.app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cdplayer.app
 PORTVERSION=	1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://freebsd.aeternal.net/ports/
 DISTNAME=	CDPlayer.app-${PORTVERSION}
diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile
index 1ce261e7b540..1b7267c89841 100644
--- a/audio/cheesetracker/Makefile
+++ b/audio/cheesetracker/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cheesetracker
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cheesetronic
diff --git a/audio/coverhunter/Makefile b/audio/coverhunter/Makefile
index ac362e53cea7..8a3e9aed8243 100644
--- a/audio/coverhunter/Makefile
+++ b/audio/coverhunter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		coverhunter
 PORTVERSION=		0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=		audio graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/cowbell/Makefile b/audio/cowbell/Makefile
index 0b7d783d79fa..926508d7aa24 100644
--- a/audio/cowbell/Makefile
+++ b/audio/cowbell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cowbell
 PORTVERSION=	0.2.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://more-cowbell.org/releases/
 
diff --git a/audio/cplay/Makefile b/audio/cplay/Makefile
index aad25d60215e..0397a746ad0f 100644
--- a/audio/cplay/Makefile
+++ b/audio/cplay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cplay
 PORTVERSION=	1.49
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://mask.tf.hut.fi/~flu/hacks/cplay/
 
diff --git a/audio/cplay/pkg-plist b/audio/cplay/pkg-plist
index 34f02dd83850..2421e0558273 100644
--- a/audio/cplay/pkg-plist
+++ b/audio/cplay/pkg-plist
@@ -5,5 +5,3 @@ share/locale/de/LC_MESSAGES/cplay.mo
 share/locale/hu/LC_MESSAGES/cplay.mo
 share/locale/pl/LC_MESSAGES/cplay.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
diff --git a/audio/csound-manual/Makefile b/audio/csound-manual/Makefile
index 47603874aa6d..4ce22e5770ab 100644
--- a/audio/csound-manual/Makefile
+++ b/audio/csound-manual/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	csound-manual
 PORTVERSION=	4.23
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.kevindumpscore.com/download/ \
 		ftp://ftp.cs.bath.ac.uk/pub/dream/documentation/manuals/
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 83799cc0728e..72d36b073dd9 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	csound
 PORTVERSION=	4.23
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/cynthiune/Makefile b/audio/cynthiune/Makefile
index 21fe05e3f1b8..2cf68e39c061 100644
--- a/audio/cynthiune/Makefile
+++ b/audio/cynthiune/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cynthiune
 PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnustep
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/c/cynthiune.app
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 00d62f4b1717..92bb0f594e39 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dap
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.cee.hw.ac.uk/~richardk/downloads/
 EXTRACT_SUFX=.tgz
diff --git a/audio/dekagen/Makefile b/audio/dekagen/Makefile
index cb05521902ac..ee1ec3731164 100644
--- a/audio/dekagen/Makefile
+++ b/audio/dekagen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dekagen
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.ibiblio.org/pub/linux/apps/sound/convert/
 
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 1e98809cc7d7..90b391dc016b 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	denemo
 PORTVERSION=	0.7.6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/denemo/pkg-plist b/audio/denemo/pkg-plist
index 9f38658881a8..025dfe4100fc 100644
--- a/audio/denemo/pkg-plist
+++ b/audio/denemo/pkg-plist
@@ -162,5 +162,4 @@ share/pixmaps/denemo.png
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
 @dirrm include/denemo
diff --git a/audio/dino/Makefile b/audio/dino/Makefile
index 91aa561f7699..e3f053a5d305 100644
--- a/audio/dino/Makefile
+++ b/audio/dino/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dino
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	dino
diff --git a/audio/dream/Makefile b/audio/dream/Makefile
index b8d12017a012..e984f9d4163c 100644
--- a/audio/dream/Makefile
+++ b/audio/dream/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	dream
 PORTVERSION=	1.6.25
+PORTREVISION=	1
 CATEGORIES=	audio hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	drm
diff --git a/audio/drumpiler/Makefile b/audio/drumpiler/Makefile
index b4af194e5848..e85a1615ffe0 100644
--- a/audio/drumpiler/Makefile
+++ b/audio/drumpiler/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	drumpiler
 PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index f376698e6c36..59874a45cb1c 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	2.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/easytag-devel/pkg-plist b/audio/easytag-devel/pkg-plist
index 5c74a372fd31..f88c834c5a2a 100644
--- a/audio/easytag-devel/pkg-plist
+++ b/audio/easytag-devel/pkg-plist
@@ -24,13 +24,3 @@ share/locale/zh_CN/LC_MESSAGES/easytag.mo
 @dirrm share/gnome/easytag
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@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
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 1fe748967d54..d44357de837c 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/easytag/pkg-plist b/audio/easytag/pkg-plist
index 6433274c8e5e..fc5037f73330 100644
--- a/audio/easytag/pkg-plist
+++ b/audio/easytag/pkg-plist
@@ -17,18 +17,7 @@ share/locale/ru/LC_MESSAGES/easytag.mo
 share/locale/sv/LC_MESSAGES/easytag.mo
 share/locale/uk/LC_MESSAGES/easytag.mo
 share/pixmaps/EasyTAG.xpm
-@dirrmtry share/pixmaps
 @dirrmtry share/gnome/apps/Multimedia
 @dirrmtry share/gnome/apps
 @dirrmtry share/gnome
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
diff --git a/audio/eawplus/Makefile b/audio/eawplus/Makefile
index 9cef1c0610f7..150b37e10d75 100644
--- a/audio/eawplus/Makefile
+++ b/audio/eawplus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eawplus
 PORTVERSION=	12.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nork
diff --git a/audio/ecawave/Makefile b/audio/ecawave/Makefile
index d23b0ef9f992..f8701c282cd5 100644
--- a/audio/ecawave/Makefile
+++ b/audio/ecawave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ecawave
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://ecasound.seul.org/download/
 
diff --git a/audio/emms/Makefile b/audio/emms/Makefile
index 822951589776..9f4a30f3133f 100644
--- a/audio/emms/Makefile
+++ b/audio/emms/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emms
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	audio elisp
 MASTER_SITES=	http://www.gnu.org/software/emms/releases/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/audio/emphasis/Makefile b/audio/emphasis/Makefile
index 677a981a6517..540d0c96ac26 100644
--- a/audio/emphasis/Makefile
+++ b/audio/emphasis/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	emphasis
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/audio/enscribe/Makefile b/audio/enscribe/Makefile
index 4a217469de9f..1fe4661d0abb 100644
--- a/audio/enscribe/Makefile
+++ b/audio/enscribe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		enscribe
 PORTVERSION=		0.0.4
+PORTREVISION=		1
 CATEGORIES=		audio graphics
 MASTER_SITES=		http://www.coppercloudmusic.com/enscribe/
 EXTRACT_SUFX=		.tgz
diff --git a/audio/ermixer/Makefile b/audio/ermixer/Makefile
index 01be2f49eda7..c84bb926b54e 100644
--- a/audio/ermixer/Makefile
+++ b/audio/ermixer/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	ermixer
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	0
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/audio/esperanza/Makefile b/audio/esperanza/Makefile
index d47ec14c6e91..c91a0e4834e7 100644
--- a/audio/esperanza/Makefile
+++ b/audio/esperanza/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	esperanza
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://xmms2.xmms.se/~tru/esperanza/0.2/
 
diff --git a/audio/etktab/Makefile b/audio/etktab/Makefile
index c01101fa2cb8..a10a9bf68826 100644
--- a/audio/etktab/Makefile
+++ b/audio/etktab/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	etktab
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	audio tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	etktab
diff --git a/audio/euphoria/Makefile b/audio/euphoria/Makefile
index 06dd1b41bb62..36c7d761bdf3 100644
--- a/audio/euphoria/Makefile
+++ b/audio/euphoria/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	euphoria
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/audio/exaile-devel/Makefile b/audio/exaile-devel/Makefile
index 7aa63f2be5cc..81b4aa8278c6 100644
--- a/audio/exaile-devel/Makefile
+++ b/audio/exaile-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	exaile
 DISTVERSION=	0.2.9
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.exaile.org/files/ GENTOO/distfiles
 DISTNAME=	${PORTNAME}_${DISTVERSION}
diff --git a/audio/exaile-devel/pkg-plist b/audio/exaile-devel/pkg-plist
index de0b06fd78d7..8ed5ad4c4bc0 100644
--- a/audio/exaile-devel/pkg-plist
+++ b/audio/exaile-devel/pkg-plist
@@ -116,4 +116,3 @@ share/pixmaps/exaile.png
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
 @dirrmtry share/locale/zh_CN
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index 7aa63f2be5cc..81b4aa8278c6 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	exaile
 DISTVERSION=	0.2.9
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.exaile.org/files/ GENTOO/distfiles
 DISTNAME=	${PORTNAME}_${DISTVERSION}
diff --git a/audio/exaile/pkg-plist b/audio/exaile/pkg-plist
index de0b06fd78d7..8ed5ad4c4bc0 100644
--- a/audio/exaile/pkg-plist
+++ b/audio/exaile/pkg-plist
@@ -116,4 +116,3 @@ share/pixmaps/exaile.png
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
 @dirrmtry share/locale/zh_CN
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 1f7f56e80e93..7a4d432c5ff1 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	extace
 PORTVERSION=	1.9.6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/fdmf/Makefile b/audio/fdmf/Makefile
index 2799e7619547..9eca8b1940b7 100644
--- a/audio/fdmf/Makefile
+++ b/audio/fdmf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fdmf
 DISTVERSION=	0.0.9r
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://w140.com/audio/ CENKES
 
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index 4879b5d5aa8b..3b8574427b37 100644
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	festalon
 PORTVERSION=	0.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/festalon/ \
 		http://critical.ch/distfiles/ \
diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile
index a7819cca0e90..08d7e386d899 100644
--- a/audio/festival+OGI/Makefile
+++ b/audio/festival+OGI/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	festival+OGI
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTFILES=	festival-${PORTVERSION}.tar.gz \
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 00e4285cba1f..e3cf0d0c42d5 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	festival
 PORTVERSION=	1.96
+PORTREVISION=	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/audio/festlex-ifd/Makefile b/audio/festlex-ifd/Makefile
index 7e60e2ce690b..500d1b743e43 100644
--- a/audio/festlex-ifd/Makefile
+++ b/audio/festlex-ifd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	festlex-ifd
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	it-festival
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index ca9d43a928a4..e26a4e4b43e6 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	festlex-oald
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index 8f2c031b8220..2f81865d1b05 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	festlex-ogi
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	OGIlexicon-2.2
diff --git a/audio/festogi-italian/Makefile b/audio/festogi-italian/Makefile
index eaaa95d65d73..70e31f65a1e0 100644
--- a/audio/festogi-italian/Makefile
+++ b/audio/festogi-italian/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	festogi-italian
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	it-festival
diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
index 7bb71cacd4b4..79c787f0c490 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	festogi-spanish
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	audio accessibility spanish
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	OGIspanish-${PORTVERSION}
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index 52dbd5aba43f..6ad6a9ba8c62 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	festvox-abc
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	audio accessibility spanish
 MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_abc_di-${PORTVERSION}
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index fb26aa7d8009..e677f263b481 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	festvox_aec
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_aec_di-2.0
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index 686078a8570b..d366ada67746 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	festvox-don
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL}
 MASTER_SITE_SUBDIR=	1.4.1
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index 61dcd42aa850..45a1d917c143 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	festvox-el11
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio accessibility spanish
 MASTER_SITES=	${MASTER_SITE_FESTIVAL}
 MASTER_SITE_SUBDIR=	1.4.1
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index 6b4bac96fd4f..029f1b67d397 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	festvox-jph
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_jph_di-2.0
diff --git a/audio/festvox-lp/Makefile b/audio/festvox-lp/Makefile
index 34ec26c1d5bf..e292199c197b 100644
--- a/audio/festvox-lp/Makefile
+++ b/audio/festvox-lp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	festvox-lp
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	it-festival
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index d20d383b4b5e..9cc3e2cbdee6 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	festvox-mwm
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_mwm_di-2.0
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index 2454e65f54bd..cfad6b67a74e 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	festvox-ogirab
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_ogirab_di-2.0
diff --git a/audio/festvox-pc/Makefile b/audio/festvox-pc/Makefile
index a73316e25097..3c2745bf3194 100644
--- a/audio/festvox-pc/Makefile
+++ b/audio/festvox-pc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	festvox-pc
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	it-festival
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index 9d1fbe2fda16..0704f1d51f0c 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	festvox-rab16
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index c600a086b38d..cfe85dcbefce 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	festvox-rab8
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index e21aac691bf7..c139fa841c0b 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	festvox-tll
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	${MASTER_SITE_FESTIVAL_OGI}
 DISTNAME=	voice_tll_di-2.0
diff --git a/audio/fluidsynth-dssi/Makefile b/audio/fluidsynth-dssi/Makefile
index eeecc681d58e..5a867f6d41a6 100644
--- a/audio/fluidsynth-dssi/Makefile
+++ b/audio/fluidsynth-dssi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fluidsynth-dssi
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dssi
diff --git a/audio/freebirth/Makefile b/audio/freebirth/Makefile
index 09fb3451e463..7e8b407ce46e 100644
--- a/audio/freebirth/Makefile
+++ b/audio/freebirth/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freebirth
 PORTVERSION=	0.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.bitmechanic.com/projects/freebirth/
 
diff --git a/audio/gai-album/Makefile b/audio/gai-album/Makefile
index 3d4fc37966ab..27a9dd5c05c9 100644
--- a/audio/gai-album/Makefile
+++ b/audio/gai-album/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gai-album
 PORTVERSION=	0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gai
diff --git a/audio/gai-visual-audio/Makefile b/audio/gai-visual-audio/Makefile
index 969419bcb191..869d994585dc 100644
--- a/audio/gai-visual-audio/Makefile
+++ b/audio/gai-visual-audio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gai-visual-audio
 PORTVERSION=	0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gai
diff --git a/audio/gaim-festival/Makefile b/audio/gaim-festival/Makefile
index 6ec7c02c41bf..61353494bfde 100644
--- a/audio/gaim-festival/Makefile
+++ b/audio/gaim-festival/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	festival
 PORTVERSION=	1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	festival-gaim
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
index a4c9779e8735..75ea0690234f 100644
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gbsplay
 PORTVERSION=	0.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.cgarbs.de/stuff/ \
 		http://download.berlios.de/gbsplay/ \
diff --git a/audio/gdam/Makefile b/audio/gdam/Makefile
index 46e3cf77f0b1..4094d2d34ff0 100644
--- a/audio/gdam/Makefile
+++ b/audio/gdam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdam
 PORTVERSION=	0.942
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/gdrdao/Makefile b/audio/gdrdao/Makefile
index 3d77b2659fa0..12104317d53f 100644
--- a/audio/gdrdao/Makefile
+++ b/audio/gdrdao/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gdrdao
 PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	danfe
diff --git a/audio/ghostess/Makefile b/audio/ghostess/Makefile
index 809a77be079a..00062c673531 100644
--- a/audio/ghostess/Makefile
+++ b/audio/ghostess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostess
 PORTVERSION=	20061127
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://home.jps.net/~musound/
 
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index 4e03fa1013ce..4d2d16ed4724 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gimmix
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	gimmix
diff --git a/audio/gimmix/pkg-plist b/audio/gimmix/pkg-plist
index 3577c335ec8a..84d209fb7bce 100644
--- a/audio/gimmix/pkg-plist
+++ b/audio/gimmix/pkg-plist
@@ -5,7 +5,6 @@ share/applications/gimmix.desktop
 share/pixmaps/gimmix.png
 share/pixmaps/gimmix_logo_small.png
 share/pixmaps/gimmix_playlist.png
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/audio/gkrellmms/Makefile b/audio/gkrellmms/Makefile
index cb1475979af8..a61336fd650b 100644
--- a/audio/gkrellmms/Makefile
+++ b/audio/gkrellmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmms
 PORTVERSION=	0.5.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile
index f854c4d7109e..78eea93c3306 100644
--- a/audio/gkrellmms2/Makefile
+++ b/audio/gkrellmms2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmms
 PORTVERSION=	2.1.22
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
diff --git a/audio/gkrellmss/Makefile b/audio/gkrellmss/Makefile
index dcd5c6b2a721..263473433375 100644
--- a/audio/gkrellmss/Makefile
+++ b/audio/gkrellmss/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmss
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.bsd-geek.de/FreeBSD/distfiles/
 
diff --git a/audio/gkrellmss2/Makefile b/audio/gkrellmss2/Makefile
index e9f5a0a96d04..0526d2585196 100644
--- a/audio/gkrellmss2/Makefile
+++ b/audio/gkrellmss2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmss
 PORTVERSION=	2.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellmss/
 
diff --git a/audio/gkrellmvolume/Makefile b/audio/gkrellmvolume/Makefile
index 0dcdd2d17b38..2570d5e73ea5 100644
--- a/audio/gkrellmvolume/Makefile
+++ b/audio/gkrellmvolume/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmvolume
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 DISTNAME=	volume-${PORTVERSION}
diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile
index 62aa1bffee09..4c0e013164fe 100644
--- a/audio/gkrellmvolume2/Makefile
+++ b/audio/gkrellmvolume2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmvolume
 PORTVERSION=	2.1.13
-PORTREVISION=	3
+PORTREVISION=	4
 #PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index b0ff0cc4c9de..753becde6074 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glame
 PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,6 +21,7 @@ LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		guile.15:${PORTSDIR}/lang/guile
 
+USE_XORG=	xbitmaps
 USE_XLIB=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui
 USE_GCC=	3.4
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index a5b42d2402c5..c2a79e2d328d 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glurp
 PORTVERSION=	0.11.6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/gmidimonitor/Makefile b/audio/gmidimonitor/Makefile
index dd41c2faa757..8dfeef4d5c5e 100644
--- a/audio/gmidimonitor/Makefile
+++ b/audio/gmidimonitor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gmidimonitor
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://files.bountysource.com/file/download/583/
 
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile
index 47283f56e0f0..8e2a49e18bd5 100644
--- a/audio/gmixer/Makefile
+++ b/audio/gmixer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmixer
 PORTVERSION=	0.98c
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	cpiazza
diff --git a/audio/gmixer/pkg-plist b/audio/gmixer/pkg-plist
index f41a301d8bc2..deec029b5a8a 100644
--- a/audio/gmixer/pkg-plist
+++ b/audio/gmixer/pkg-plist
@@ -1,3 +1,2 @@
 bin/gmixer
 share/pixmaps/gmixer.xpm
-@dirrm share/pixmaps
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index f0da64e01a79..1c0605585607 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gmpc
 PORTVERSION=	0.13.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.qballcow.nl/programs/gmpc-0.13/
diff --git a/audio/gmpccaa/Makefile b/audio/gmpccaa/Makefile
index 8bafe81d9ed7..3142b0578ec1 100644
--- a/audio/gmpccaa/Makefile
+++ b/audio/gmpccaa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmpccaa
 PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.qballcow.nl/programs/gmpc-0.13/Plugins/
 
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index 0ea1ff584254..ee1b231a8d3a 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnapster
 PORTVERSION=	1.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnapster
diff --git a/audio/gnomad2/Makefile b/audio/gnomad2/Makefile
index 46502c22a56e..171d9d4ac75b 100644
--- a/audio/gnomad2/Makefile
+++ b/audio/gnomad2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomad2
 PORTVERSION=	2.8.11
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/gnomad2/pkg-plist b/audio/gnomad2/pkg-plist
index 1f45dcc8bba5..caca89cd910d 100644
--- a/audio/gnomad2/pkg-plist
+++ b/audio/gnomad2/pkg-plist
@@ -15,14 +15,5 @@ share/locale/sv/LC_MESSAGES/gnomad2.mo
 share/pixmaps/gnomad2-logo.png
 @dirrmtry share/locale/sco/LC_MESSAGES
 @dirrmtry share/locale/sco
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
 @dirrm share/application-registry
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 7533e54b00ae..d33274ad7f9b 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-audio
 PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-audio/2.0
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index e1d2e120f09b..614fc9c762e6 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-media
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index c13219fb927f..f4f92bed5986 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -591,57 +591,15 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm include/gnome-media/profiles
 @dirrm include/gnome-media
 @dirrm include/cddb-slave2
-@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/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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index ade3ab14a1e6..1f6fa711cc4d 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		gnomoradio
 PORTVERSION=		0.15.1
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		audio net
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/gnowavcut/Makefile b/audio/gnowavcut/Makefile
index fca5c5d3897f..f45ff8e41163 100644
--- a/audio/gnowavcut/Makefile
+++ b/audio/gnowavcut/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnowavcut
 PORTVERSION=	0.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://gnowavcut.good-day.net/src/
 
diff --git a/audio/gnuitar/Makefile b/audio/gnuitar/Makefile
index f3004297cc41..e6d1129e283a 100644
--- a/audio/gnuitar/Makefile
+++ b/audio/gnuitar/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=		gnuitar
 PORTVERSION=		0.3.2
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		audio multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/gnuitar/pkg-plist b/audio/gnuitar/pkg-plist
index c691cebccbad..a56cfca1e3b7 100644
--- a/audio/gnuitar/pkg-plist
+++ b/audio/gnuitar/pkg-plist
@@ -1,3 +1,2 @@
 bin/gnuitar
 share/pixmaps/gnuitar.xpm
-@dirrmtry share/pixmaps
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index 405121d3ed21..61c6d56a8cbd 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cdplayer
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	audio gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gsburn
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 8d1dc8a2b08d..06e8c1fb8d99 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	goobox
 PORTVERSION=	0.9.93
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/audio/goobox/pkg-plist b/audio/goobox/pkg-plist
index a006a0d2afce..5cf5511492fb 100644
--- a/audio/goobox/pkg-plist
+++ b/audio/goobox/pkg-plist
@@ -44,25 +44,5 @@ share/locale/zh_TW/LC_MESSAGES/goobox.mo
 @dirrm share/gnome/help/goobox
 @dirrm share/gnome/goobox/glade
 @dirrm share/gnome/goobox
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 26d044239af8..8f3697fdff47 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gqmpeg
 PORTVERSION=	0.91.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index bfe363288e2f..2488dbc18757 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gqmpeg
 PORTVERSION=	0.20.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES+=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index 4c471c177eee..ed62d7764db1 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gqradio
 PORTVERSION=	1.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=gqmpeg
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 418925d17362..f6cc0ed502bc 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grip
 PORTVERSION=	3.2.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/grip/pkg-plist b/audio/grip/pkg-plist
index d79a9f8ef3f8..e0dd0fa4ea9f 100644
--- a/audio/grip/pkg-plist
+++ b/audio/grip/pkg-plist
@@ -65,15 +65,5 @@ share/locale/zh_HK/LC_MESSAGES/grip-2.2.mo
 share/locale/zh_TW/LC_MESSAGES/grip-2.2.mo
 @dirrm share/gnome/help/grip/C
 @dirrm share/gnome/help/grip
-@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/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index a4a27a7b9101..0e00ebe3f7a2 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gspeakers
 PORTVERSION=	0.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/gstreamer-monkeysaudio/Makefile b/audio/gstreamer-monkeysaudio/Makefile
index 7b300ea11afb..bfe021502861 100644
--- a/audio/gstreamer-monkeysaudio/Makefile
+++ b/audio/gstreamer-monkeysaudio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.8.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	audio
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst${PKGNAMESUFFIX}/
 PKGNAMESUFFIX=	-monkeysaudio
diff --git a/audio/gstreamer-plugins-a52dec/Makefile b/audio/gstreamer-plugins-a52dec/Makefile
index bfa8183455a8..0c4922c415f8 100644
--- a/audio/gstreamer-plugins-a52dec/Makefile
+++ b/audio/gstreamer-plugins-a52dec/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer ATSC A/52 stream aka AC-3 (dvd audio) plugin
diff --git a/audio/gstreamer-plugins-a52dec80/Makefile b/audio/gstreamer-plugins-a52dec80/Makefile
index 7386a55c3150..eab36b66cee6 100644
--- a/audio/gstreamer-plugins-a52dec80/Makefile
+++ b/audio/gstreamer-plugins-a52dec80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-a52dec80/Makefile,v 1.2 2006/02/23 18:05:29 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer ATSC A/52 stream aka AC-3 (dvd audio) plugin
diff --git a/audio/gstreamer-plugins-artsd80/Makefile b/audio/gstreamer-plugins-artsd80/Makefile
index 49b7f342f066..a0761b8e6f31 100644
--- a/audio/gstreamer-plugins-artsd80/Makefile
+++ b/audio/gstreamer-plugins-artsd80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-artsd80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer kde audio system plugin
diff --git a/audio/gstreamer-plugins-audiofile80/Makefile b/audio/gstreamer-plugins-audiofile80/Makefile
index 3ac04fe0c50d..2e823c8f32e3 100644
--- a/audio/gstreamer-plugins-audiofile80/Makefile
+++ b/audio/gstreamer-plugins-audiofile80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-audiofile80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer SGI audio file plugin
diff --git a/audio/gstreamer-plugins-cdaudio/Makefile b/audio/gstreamer-plugins-cdaudio/Makefile
index 0b73161a4944..fbdbf17ff196 100644
--- a/audio/gstreamer-plugins-cdaudio/Makefile
+++ b/audio/gstreamer-plugins-cdaudio/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer frontend to libcdaudio
diff --git a/audio/gstreamer-plugins-cdaudio80/Makefile b/audio/gstreamer-plugins-cdaudio80/Makefile
index b74c2982b515..b8cac0cc4039 100644
--- a/audio/gstreamer-plugins-cdaudio80/Makefile
+++ b/audio/gstreamer-plugins-cdaudio80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-cdaudio80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer audio cd playing plugin
diff --git a/audio/gstreamer-plugins-cdparanoia/Makefile b/audio/gstreamer-plugins-cdparanoia/Makefile
index d3aee515e075..6a9290a61c2f 100644
--- a/audio/gstreamer-plugins-cdparanoia/Makefile
+++ b/audio/gstreamer-plugins-cdparanoia/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer CDDA extraction (aka audio ripping) plugin
diff --git a/audio/gstreamer-plugins-cdparanoia80/Makefile b/audio/gstreamer-plugins-cdparanoia80/Makefile
index 0d2b435b61e9..61d0ca72733f 100644
--- a/audio/gstreamer-plugins-cdparanoia80/Makefile
+++ b/audio/gstreamer-plugins-cdparanoia80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-cdparanoia80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer CDDA extraction (aka audio ripping) plugin
diff --git a/audio/gstreamer-plugins-esound/Makefile b/audio/gstreamer-plugins-esound/Makefile
index 623f93c3bc4b..88a8cfd50057 100644
--- a/audio/gstreamer-plugins-esound/Makefile
+++ b/audio/gstreamer-plugins-esound/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer enlightenment sound library plugin
diff --git a/audio/gstreamer-plugins-esound80/Makefile b/audio/gstreamer-plugins-esound80/Makefile
index 957f8f97c302..fa31e7609ba9 100644
--- a/audio/gstreamer-plugins-esound80/Makefile
+++ b/audio/gstreamer-plugins-esound80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-esound80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer enlightenment sound library plugin
diff --git a/audio/gstreamer-plugins-faac/Makefile b/audio/gstreamer-plugins-faac/Makefile
index 0bd3a4fa752a..8452fc3e556a 100644
--- a/audio/gstreamer-plugins-faac/Makefile
+++ b/audio/gstreamer-plugins-faac/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC encoder plugin
diff --git a/audio/gstreamer-plugins-faac80/Makefile b/audio/gstreamer-plugins-faac80/Makefile
index 96a1df9d352f..4b5cbd94fd3b 100644
--- a/audio/gstreamer-plugins-faac80/Makefile
+++ b/audio/gstreamer-plugins-faac80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-faac80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC encoder plugin
diff --git a/audio/gstreamer-plugins-faad/Makefile b/audio/gstreamer-plugins-faad/Makefile
index c615e2f99d1a..315bcfdc5579 100644
--- a/audio/gstreamer-plugins-faad/Makefile
+++ b/audio/gstreamer-plugins-faad/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC decoder plugin
diff --git a/audio/gstreamer-plugins-faad80/Makefile b/audio/gstreamer-plugins-faad80/Makefile
index f229bb4561de..0b45d1154d6b 100644
--- a/audio/gstreamer-plugins-faad80/Makefile
+++ b/audio/gstreamer-plugins-faad80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-faad80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer MPEG-2 and MPEG-4 ACC decoder plugin
diff --git a/audio/gstreamer-plugins-flac/Makefile b/audio/gstreamer-plugins-flac/Makefile
index 8799ddf01027..d7dc6a1393e6 100644
--- a/audio/gstreamer-plugins-flac/Makefile
+++ b/audio/gstreamer-plugins-flac/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer free lossless audio encoder/decoder plugin
diff --git a/audio/gstreamer-plugins-flac80/Makefile b/audio/gstreamer-plugins-flac80/Makefile
index 3dbd4d549d3c..41c2e8006a30 100644
--- a/audio/gstreamer-plugins-flac80/Makefile
+++ b/audio/gstreamer-plugins-flac80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-flac80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer free lossless audio encoder/decoder plugin
diff --git a/audio/gstreamer-plugins-fluendo-mp3/Makefile b/audio/gstreamer-plugins-fluendo-mp3/Makefile
index 1a0c327f92da..43546a55d8ea 100644
--- a/audio/gstreamer-plugins-fluendo-mp3/Makefile
+++ b/audio/gstreamer-plugins-fluendo-mp3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gstreamer-plugins-fluendo-mp3
 PORTVERSION=	0.10.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://core.fluendo.com/gstreamer/src/gst-fluendo-mp3/
 DISTNAME=	gst-fluendo-mp3-${PORTVERSION}
diff --git a/audio/gstreamer-plugins-gsm/Makefile b/audio/gstreamer-plugins-gsm/Makefile
index 321b5d6a2463..bb3d5de30b48 100644
--- a/audio/gstreamer-plugins-gsm/Makefile
+++ b/audio/gstreamer-plugins-gsm/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer gsm encoding/decoding plugin
diff --git a/audio/gstreamer-plugins-gsm80/Makefile b/audio/gstreamer-plugins-gsm80/Makefile
index b1ab6e23c799..4f18a743b7c1 100644
--- a/audio/gstreamer-plugins-gsm80/Makefile
+++ b/audio/gstreamer-plugins-gsm80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-gsm80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer gsm encoding/decoding plugin
diff --git a/audio/gstreamer-plugins-ivorbis/Makefile b/audio/gstreamer-plugins-ivorbis/Makefile
index 83f70ee96fe3..3578948cc99f 100644
--- a/audio/gstreamer-plugins-ivorbis/Makefile
+++ b/audio/gstreamer-plugins-ivorbis/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer integer only Ogg Vorbis decoder plugin
diff --git a/audio/gstreamer-plugins-ivorbis80/Makefile b/audio/gstreamer-plugins-ivorbis80/Makefile
index db7d62e6f1e9..ce1da04f4c12 100644
--- a/audio/gstreamer-plugins-ivorbis80/Makefile
+++ b/audio/gstreamer-plugins-ivorbis80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-ivorbis80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer integer only Ogg Vorbis decoder plugin
diff --git a/audio/gstreamer-plugins-jack/Makefile b/audio/gstreamer-plugins-jack/Makefile
index d014642c1d0d..21b4a4fb62ee 100644
--- a/audio/gstreamer-plugins-jack/Makefile
+++ b/audio/gstreamer-plugins-jack/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer low-latency audio server plugin
diff --git a/audio/gstreamer-plugins-jack80/Makefile b/audio/gstreamer-plugins-jack80/Makefile
index 5872ea29ac64..4597fe9b2282 100644
--- a/audio/gstreamer-plugins-jack80/Makefile
+++ b/audio/gstreamer-plugins-jack80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-jack80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer low-latency audio server plugin
diff --git a/audio/gstreamer-plugins-ladspa/Makefile b/audio/gstreamer-plugins-ladspa/Makefile
index 71d3918979bf..cd4350596635 100644
--- a/audio/gstreamer-plugins-ladspa/Makefile
+++ b/audio/gstreamer-plugins-ladspa/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer ladspa (Linux Audio Developer's Simple Plugin API) plugin
diff --git a/audio/gstreamer-plugins-ladspa80/Makefile b/audio/gstreamer-plugins-ladspa80/Makefile
index 5efa6b4507d7..793f87df2fb3 100644
--- a/audio/gstreamer-plugins-ladspa80/Makefile
+++ b/audio/gstreamer-plugins-ladspa80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-ladspa80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer ladspa (Linux Audio Developer's Simple Plugin API) plugin
diff --git a/audio/gstreamer-plugins-lame/Makefile b/audio/gstreamer-plugins-lame/Makefile
index 334a42066c22..8b4d47c0c171 100644
--- a/audio/gstreamer-plugins-lame/Makefile
+++ b/audio/gstreamer-plugins-lame/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer mp3 encode plugin
diff --git a/audio/gstreamer-plugins-lame80/Makefile b/audio/gstreamer-plugins-lame80/Makefile
index fc1cbff1091d..35212d468342 100644
--- a/audio/gstreamer-plugins-lame80/Makefile
+++ b/audio/gstreamer-plugins-lame80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-lame80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer mp3 encode plugin
diff --git a/audio/gstreamer-plugins-mad/Makefile b/audio/gstreamer-plugins-mad/Makefile
index 03cbfa26c105..aa7e2848be00 100644
--- a/audio/gstreamer-plugins-mad/Makefile
+++ b/audio/gstreamer-plugins-mad/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer mp3 decoder plugin
diff --git a/audio/gstreamer-plugins-mad80/Makefile b/audio/gstreamer-plugins-mad80/Makefile
index 7d98a1ab9143..764c93da095c 100644
--- a/audio/gstreamer-plugins-mad80/Makefile
+++ b/audio/gstreamer-plugins-mad80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-mad80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer mp3 decoder plugin
diff --git a/audio/gstreamer-plugins-mikmod80/Makefile b/audio/gstreamer-plugins-mikmod80/Makefile
index 9fbf872f1d27..2ff20eaa0244 100644
--- a/audio/gstreamer-plugins-mikmod80/Makefile
+++ b/audio/gstreamer-plugins-mikmod80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-mikmod80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer mikmod sound plugin
diff --git a/audio/gstreamer-plugins-moodbar/Makefile b/audio/gstreamer-plugins-moodbar/Makefile
index 304c9eade876..ca8e5a3008e7 100644
--- a/audio/gstreamer-plugins-moodbar/Makefile
+++ b/audio/gstreamer-plugins-moodbar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gstreamer-plugins-moodbar
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://pwsp.net/~qbob/ \
 		http://redundancy.redundancy.org/mirror/
diff --git a/audio/gstreamer-plugins-musepack/Makefile b/audio/gstreamer-plugins-musepack/Makefile
index b005a714ac99..a004376de8e2 100644
--- a/audio/gstreamer-plugins-musepack/Makefile
+++ b/audio/gstreamer-plugins-musepack/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer musepack mpc encoder/decoder plugin
diff --git a/audio/gstreamer-plugins-musepack80/Makefile b/audio/gstreamer-plugins-musepack80/Makefile
index a463d03f278f..902cc6350d55 100644
--- a/audio/gstreamer-plugins-musepack80/Makefile
+++ b/audio/gstreamer-plugins-musepack80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-musepack80/Makefile,v 1.1 2006/01/20 02:55:53 ahze Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer musepack mpc encoder/decoder plugin
diff --git a/audio/gstreamer-plugins-musicbrainz/Makefile b/audio/gstreamer-plugins-musicbrainz/Makefile
index 0215e52437a9..4fd0836b8f31 100644
--- a/audio/gstreamer-plugins-musicbrainz/Makefile
+++ b/audio/gstreamer-plugins-musicbrainz/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer CD index/audio metadata plugin
diff --git a/audio/gstreamer-plugins-musicbrainz80/Makefile b/audio/gstreamer-plugins-musicbrainz80/Makefile
index c8568c9f0725..75e3ca51b9de 100644
--- a/audio/gstreamer-plugins-musicbrainz80/Makefile
+++ b/audio/gstreamer-plugins-musicbrainz80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-musicbrainz80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer CD index/audio metadata plugin
diff --git a/audio/gstreamer-plugins-nas80/Makefile b/audio/gstreamer-plugins-nas80/Makefile
index e15370501d46..b4433fc0f752 100644
--- a/audio/gstreamer-plugins-nas80/Makefile
+++ b/audio/gstreamer-plugins-nas80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-nas80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	GStreamer NAS (Network Audio System) plugin
diff --git a/audio/gstreamer-plugins-ogg/Makefile b/audio/gstreamer-plugins-ogg/Makefile
index cbb88447ae3f..f909cc02dbef 100644
--- a/audio/gstreamer-plugins-ogg/Makefile
+++ b/audio/gstreamer-plugins-ogg/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Ogg bitstream plugin
diff --git a/audio/gstreamer-plugins-ogg80/Makefile b/audio/gstreamer-plugins-ogg80/Makefile
index 98923cc55586..921b0e5c4a4f 100644
--- a/audio/gstreamer-plugins-ogg80/Makefile
+++ b/audio/gstreamer-plugins-ogg80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-ogg80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Ogg bitstream plugin
diff --git a/audio/gstreamer-plugins-polyp80/Makefile b/audio/gstreamer-plugins-polyp80/Makefile
index 6266c0d54794..1ef6b7891e35 100644
--- a/audio/gstreamer-plugins-polyp80/Makefile
+++ b/audio/gstreamer-plugins-polyp80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-polyp80/Makefile,v 1.3 2006/04/22 03:46:50 marcus Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer polypaudio sound server plugin
diff --git a/audio/gstreamer-plugins-pulse/Makefile b/audio/gstreamer-plugins-pulse/Makefile
index a8414f0d0a6c..e3c88e2870e1 100644
--- a/audio/gstreamer-plugins-pulse/Makefile
+++ b/audio/gstreamer-plugins-pulse/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gstreamer-plugins
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/gst-pulse/
 PKGNAMESUFFIX=	-pulse
diff --git a/audio/gstreamer-plugins-shout2/Makefile b/audio/gstreamer-plugins-shout2/Makefile
index e7adf90ffe8a..92632368e973 100644
--- a/audio/gstreamer-plugins-shout2/Makefile
+++ b/audio/gstreamer-plugins-shout2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer icecast plugin
diff --git a/audio/gstreamer-plugins-shout280/Makefile b/audio/gstreamer-plugins-shout280/Makefile
index f5840f2333d7..ab16ebf1fcd7 100644
--- a/audio/gstreamer-plugins-shout280/Makefile
+++ b/audio/gstreamer-plugins-shout280/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-shout280/Makefile,v 1.1 2006/01/20 02:55:54 ahze Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer icecast plugin
diff --git a/audio/gstreamer-plugins-shout80/Makefile b/audio/gstreamer-plugins-shout80/Makefile
index 5c8d57fa136f..827d7fd51714 100644
--- a/audio/gstreamer-plugins-shout80/Makefile
+++ b/audio/gstreamer-plugins-shout80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-shout80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer icecast plugin
diff --git a/audio/gstreamer-plugins-sidplay/Makefile b/audio/gstreamer-plugins-sidplay/Makefile
index cce443b95275..ec34788bc80d 100644
--- a/audio/gstreamer-plugins-sidplay/Makefile
+++ b/audio/gstreamer-plugins-sidplay/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Commodore SID decoder plugin
diff --git a/audio/gstreamer-plugins-sidplay80/Makefile b/audio/gstreamer-plugins-sidplay80/Makefile
index 242b1643b9b6..b8b08503139e 100644
--- a/audio/gstreamer-plugins-sidplay80/Makefile
+++ b/audio/gstreamer-plugins-sidplay80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-sidplay80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Commodore SID decoder plugin
diff --git a/audio/gstreamer-plugins-smoothwave80/Makefile b/audio/gstreamer-plugins-smoothwave80/Makefile
index f26f49cd8096..4e6acadd14ad 100644
--- a/audio/gstreamer-plugins-smoothwave80/Makefile
+++ b/audio/gstreamer-plugins-smoothwave80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-smoothwave80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer visualisation plugin
diff --git a/audio/gstreamer-plugins-sndfile80/Makefile b/audio/gstreamer-plugins-sndfile80/Makefile
index 42fc5a09d624..2c708abe6d78 100644
--- a/audio/gstreamer-plugins-sndfile80/Makefile
+++ b/audio/gstreamer-plugins-sndfile80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-sndfile80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer sndfile plugin
diff --git a/audio/gstreamer-plugins-spc/Makefile b/audio/gstreamer-plugins-spc/Makefile
index 48812ceb4d85..5c211d80c5bf 100644
--- a/audio/gstreamer-plugins-spc/Makefile
+++ b/audio/gstreamer-plugins-spc/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer OpenSPC frontend
diff --git a/audio/gstreamer-plugins-speex/Makefile b/audio/gstreamer-plugins-speex/Makefile
index cd5c8280d623..d74c50f7c327 100644
--- a/audio/gstreamer-plugins-speex/Makefile
+++ b/audio/gstreamer-plugins-speex/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer speex voice plugin
diff --git a/audio/gstreamer-plugins-speex80/Makefile b/audio/gstreamer-plugins-speex80/Makefile
index 71855f6c5ba0..50e33cfea3b5 100644
--- a/audio/gstreamer-plugins-speex80/Makefile
+++ b/audio/gstreamer-plugins-speex80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-speex80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer speex voice plugin
diff --git a/audio/gstreamer-plugins-vorbis/Makefile b/audio/gstreamer-plugins-vorbis/Makefile
index a737d13f96a3..550c9f4ad41a 100644
--- a/audio/gstreamer-plugins-vorbis/Makefile
+++ b/audio/gstreamer-plugins-vorbis/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer vorbis encoder/decoder plugin
diff --git a/audio/gstreamer-plugins-vorbis80/Makefile b/audio/gstreamer-plugins-vorbis80/Makefile
index 0e66c55312e0..c2ec2469e4e4 100644
--- a/audio/gstreamer-plugins-vorbis80/Makefile
+++ b/audio/gstreamer-plugins-vorbis80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/audio/gstreamer-plugins-vorbis80/Makefile,v 1.2 2006/02/23 18:05:35 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer vorbis encoder/decoder plugin
diff --git a/audio/gstreamer-plugins-wavpack/Makefile b/audio/gstreamer-plugins-wavpack/Makefile
index fe687a2821e3..9d1d89403f5c 100644
--- a/audio/gstreamer-plugins-wavpack/Makefile
+++ b/audio/gstreamer-plugins-wavpack/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 GST_PLUGIN=	wavpack
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index 5d8e4e742e17..0389578887ae 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtick
 PORTVERSION=	0.3.14
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.antcom.de/gtick/download/ CENKES
 
diff --git a/audio/gtkgep/Makefile b/audio/gtkgep/Makefile
index 9c5ff3e8810c..4a1874e4b7ed 100644
--- a/audio/gtkgep/Makefile
+++ b/audio/gtkgep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkgep
 PORTVERSION=	0.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://finarfinek.republika.pl/download/
 
diff --git a/audio/gtkguitune/Makefile b/audio/gtkguitune/Makefile
index 53fbb566e092..077352f4096a 100644
--- a/audio/gtkguitune/Makefile
+++ b/audio/gtkguitune/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkguitune
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/harpin_floh/mysoft/
 
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 88e921dfe9b7..3957e42f5a5e 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkpod
 PORTVERSION=	0.99.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/guspat/Makefile b/audio/guspat/Makefile
index 7601933146c6..1e5a0143c937 100644
--- a/audio/guspat/Makefile
+++ b/audio/guspat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	guspat
 PORTVERSION=	20000706
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.linet.gr.jp/~tamuki/timidity/eawplus/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
diff --git a/audio/gx2osd/Makefile b/audio/gx2osd/Makefile
index cf094d2ecb07..ccd7e9d3e877 100644
--- a/audio/gx2osd/Makefile
+++ b/audio/gx2osd/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gx2osd
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	 http://eclipser.no-ip.org/
 
diff --git a/audio/gxmms2/Makefile b/audio/gxmms2/Makefile
index c4ba195d1280..f1a8ed48a294 100644
--- a/audio/gxmms2/Makefile
+++ b/audio/gxmms2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gxmms2
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://wejp.k.vu/projects/xmms2/
 
diff --git a/audio/hexter/Makefile b/audio/hexter/Makefile
index 730eddc00518..2f1a8e1b6e39 100644
--- a/audio/hexter/Makefile
+++ b/audio/hexter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hexter
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dssi
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index a36b14e7ad1f..0bdebc24cfbf 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hydrogen
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -101,8 +102,6 @@ pre-install:
 	${FIND} data -type d ! -empty | ${SORT} -r | \
 		${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
 	@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
-	@${ECHO_CMD} '@dirrmtry man/ru.KOI8-R/man1' >> ${PLIST}
-	@${ECHO_CMD} '@dirrmtry man/ru.KOI8-R' >> ${PLIST}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hydrogen ${WRKSRC}/hydrogenPlayer ${PREFIX}/bin
diff --git a/audio/jack-keyboard/Makefile b/audio/jack-keyboard/Makefile
index 13a21bbe66d6..68c826cb3db7 100644
--- a/audio/jack-keyboard/Makefile
+++ b/audio/jack-keyboard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jack-keyboard
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index f0f9318653f3..1d5e106a174d 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jack-rack
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jack-rack
diff --git a/audio/jack-rack/pkg-plist b/audio/jack-rack/pkg-plist
index 5545c14bd335..67e4a6d932ad 100644
--- a/audio/jack-rack/pkg-plist
+++ b/audio/jack-rack/pkg-plist
@@ -14,4 +14,3 @@ share/pixmaps/jack-rack-icon.png
 @dirrmtry share/applications
 @dirrmtry share/dtds
 @dirrm share/jack-rack
-@dirrmtry share/pixmaps
diff --git a/audio/jamboree/Makefile b/audio/jamboree/Makefile
index c584bd60d136..04206e268ea0 100644
--- a/audio/jamboree/Makefile
+++ b/audio/jamboree/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jamboree
 PORTVERSION=	0.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
diff --git a/audio/jamboree/pkg-plist b/audio/jamboree/pkg-plist
index 650e57727f39..3c3f01bcf2c6 100644
--- a/audio/jamboree/pkg-plist
+++ b/audio/jamboree/pkg-plist
@@ -38,15 +38,3 @@ share/locale/sr/LC_MESSAGES/jamboree.mo
 share/locale/sr@Latn/LC_MESSAGES/jamboree.mo
 share/locale/sv/LC_MESSAGES/jamboree.mo
 @dirrm share/gnome/jamboree
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/audio/jamin/Makefile b/audio/jamin/Makefile
index 1ae01c3c382e..6491b6af6624 100644
--- a/audio/jamin/Makefile
+++ b/audio/jamin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jamin
 PORTVERSION=	0.95.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jamin
diff --git a/audio/java-xmms2/Makefile b/audio/java-xmms2/Makefile
index 045870f84694..3368d1cb1138 100644
--- a/audio/java-xmms2/Makefile
+++ b/audio/java-xmms2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio java
 PKGNAMEPREFIX=	java-
 
diff --git a/audio/jid3lib/Makefile b/audio/jid3lib/Makefile
index fd1031264ca4..5131ac6f74f2 100644
--- a/audio/jid3lib/Makefile
+++ b/audio/jid3lib/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	jid3lib
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	audio java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	javamusictag
diff --git a/audio/jmusic/Makefile b/audio/jmusic/Makefile
index 2192d0978d2f..17fbcd925ec3 100644
--- a/audio/jmusic/Makefile
+++ b/audio/jmusic/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jmusic
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	audio java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 49eb735b50c3..38c8b4d49bf1 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	juk
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/audio/jxm/Makefile b/audio/jxm/Makefile
index cd6ce9e44d66..1c645949ef4a 100644
--- a/audio/jxm/Makefile
+++ b/audio/jxm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jxm
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	javaxm
diff --git a/audio/k3bmonkeyaudioplugin/Makefile b/audio/k3bmonkeyaudioplugin/Makefile
index 9ac5c1a9bcd8..a8f56fa01434 100644
--- a/audio/k3bmonkeyaudioplugin/Makefile
+++ b/audio/k3bmonkeyaudioplugin/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	k3bmonkeyaudioplugin
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	k3b
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index d471048a2bfe..cb7eab20d278 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kid3
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index d471048a2bfe..cb7eab20d278 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kid3
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/klira/Makefile b/audio/klira/Makefile
index b72198743827..a113bd2d6895 100644
--- a/audio/klira/Makefile
+++ b/audio/klira/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	klira
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/kmp/Makefile b/audio/kmp/Makefile
index aa404225b212..7ecb52fb1974 100644
--- a/audio/kmp/Makefile
+++ b/audio/kmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kmp
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://mercury.chem.pitt.edu/~shank/ \
 		http://www.threadbox.net/files/
diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile
index bba6e8fef753..b82eef74b5ba 100644
--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ksmp3play
 PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=ksmp3play
diff --git a/audio/lash/Makefile b/audio/lash/Makefile
index 9928a0a5f7b2..152000e7a2cc 100644
--- a/audio/lash/Makefile
+++ b/audio/lash/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lash
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.savannah.gnu.org/releases/lash/
 
diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile
index bef206227b1e..6d3a23f68f1c 100644
--- a/audio/last.fm/Makefile
+++ b/audio/last.fm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	last.fm
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	audio net
 MASTER_SITES=	http://static.last.fm/client/Linux/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 980f8fa6d440..50aed92b78d4 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgpod
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkpod
diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index e21a93390bba..adac9e8f6d32 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libworkman
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jim
diff --git a/audio/lindele/Makefile b/audio/lindele/Makefile
index 72de80ee154f..3afef4bffe0f 100644
--- a/audio/lindele/Makefile
+++ b/audio/lindele/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		lindele
 PORTVERSION=		0.1.1
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		audio
 MASTER_SITES=		http://download.gna.org/${PORTNAME}/
 
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 69e9d71458bf..f71fca7e61c9 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	liteamp
 PORTVERSION=	0.2.3.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://kldp.net/frs/download.php/547/
 
diff --git a/audio/liteamp/pkg-plist b/audio/liteamp/pkg-plist
index 7faf25930cb9..613d7b7761b0 100644
--- a/audio/liteamp/pkg-plist
+++ b/audio/liteamp/pkg-plist
@@ -29,5 +29,3 @@ share/gnome/pixmaps/liteamp/vol_mute.png
 share/gnome/pixmaps/liteamp/vol_up.png
 share/gnome/applications/liteamp.desktop
 @dirrm share/gnome/pixmaps/liteamp
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index d6f57154a135..bf9ed022fb03 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lmms
 PORTVERSION=	20061204
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jylefort
diff --git a/audio/lplayer/Makefile b/audio/lplayer/Makefile
index ec3a5dd6ba36..8fa65b923a83 100644
--- a/audio/lplayer/Makefile
+++ b/audio/lplayer/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	lplayer
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index 9891443069b7..bf31f599bd5a 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	madman
 PORTVERSION=	0.93
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	madman
diff --git a/audio/mbox/Makefile b/audio/mbox/Makefile
index b684abaf166d..b7cc49248ea4 100644
--- a/audio/mbox/Makefile
+++ b/audio/mbox/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	mbox
 PORTVERSION=	0.5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mbox.wz.cz/src/
 
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index 8da175c60874..ca86638bb99f 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mhwaveedit
 PORTVERSION=	1.4.11
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.gna.org/mhwaveedit/
 
diff --git a/audio/midimountain/Makefile b/audio/midimountain/Makefile
index b14cb008cde5..c656eb72bda3 100644
--- a/audio/midimountain/Makefile
+++ b/audio/midimountain/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	midimountain
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.midimountain.com/download/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index f4efc061c77a..31efd39eb04a 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mixer.app
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/audio/mixmos/Makefile b/audio/mixmos/Makefile
index be112ebd1a42..3474287462b3 100644
--- a/audio/mixmos/Makefile
+++ b/audio/mixmos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mixmos
 PORTVERSION=	0.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_TUCOWS}
 
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index 44cd04c82d41..c96e84ad7602 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mixxx
 PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,6 +27,7 @@ LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
 USE_X_PREFIX=	yes
 USE_QT_VER=	3
 HAS_CONFIGURE=	yes
+USE_GL=		yes
 
 CONFIGURE_WRKSRC=	${WRKSRC}/src
 BUILD_WRKSRC=	${WRKSRC}/src
diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index 9e8ff0c7d3a8..dc8df40fde50 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mma
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mellowood.ca/${PORTNAME}/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index c974397e9809..f0410b8f78db 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mp3blaster
 PORTVERSION=	3.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/mp3c/Makefile b/audio/mp3c/Makefile
index 864d74790353..b82d999c37ce 100644
--- a/audio/mp3c/Makefile
+++ b/audio/mp3c/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mp3c
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.wspse.de/linux/wspse/:src
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src \
diff --git a/audio/mp3c/pkg-plist b/audio/mp3c/pkg-plist
index 38d5dceb3fa5..feb6bc7d1566 100644
--- a/audio/mp3c/pkg-plist
+++ b/audio/mp3c/pkg-plist
@@ -5,7 +5,3 @@ share/locale/es/LC_MESSAGES/mp3c.mo
 share/locale/it/LC_MESSAGES/mp3c.mo
 share/locale/pl/LC_MESSAGES/mp3c.mo
 share/locale/pt/LC_MESSAGES/mp3c.mo
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
diff --git a/audio/mp3stat/Makefile b/audio/mp3stat/Makefile
index fe56015afe97..367ba138d357 100644
--- a/audio/mp3stat/Makefile
+++ b/audio/mp3stat/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mp3stat
 PORTVERSION=	2.6.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	https://signal-lost.homeip.net/files/ \
 			http://www.alaskaparadise.com/freebsd/
diff --git a/audio/mp3towav-bundle/Makefile b/audio/mp3towav-bundle/Makefile
index 9176037e7c06..8e48ac2b6fb8 100644
--- a/audio/mp3towav-bundle/Makefile
+++ b/audio/mp3towav-bundle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mp3towav
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	audio gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gsburn
diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index ef88ded552aa..42892462d4fd 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpdcon
 PORTVERSION=	1.1.99
+PORTREVISION=	1
 CATEGORIES=	audio gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/mpeglib_artsplug/Makefile b/audio/mpeglib_artsplug/Makefile
index c5b18cada626..e60c49b27b96 100644
--- a/audio/mpeglib_artsplug/Makefile
+++ b/audio/mpeglib_artsplug/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpeglib_artsplug
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index 0530168d2d7f..cfd5d7971355 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	muine
 PORTVERSION=	0.8.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://muine-player.org/releases/
 
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 4632f99e3b91..10bae9be46e1 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	MuSE
 PORTVERSION=	0.9.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.dyne.org/muse/releases/ \
 		http://www.ljudmila.org/~jaromil/muse/releases/
diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile
index 06c01b3f4b27..5ce2d1512890 100644
--- a/audio/musicbox-tag-editor/Makefile
+++ b/audio/musicbox-tag-editor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		musicbox-tag-editor
 PORTVERSION=		0.2.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	musicbox
diff --git a/audio/musiccontrol/Makefile b/audio/musiccontrol/Makefile
index 3b854d2420eb..cff74cd83652 100644
--- a/audio/musiccontrol/Makefile
+++ b/audio/musiccontrol/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	musiccontrol
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	audio java
 MASTER_SITES=	http://borderworlds.dk/projects/mc/
 DISTNAME=	MusicControl-0.3
diff --git a/audio/mutemix/Makefile b/audio/mutemix/Makefile
index cc9fbd6f1840..3c29079f7da7 100644
--- a/audio/mutemix/Makefile
+++ b/audio/mutemix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mutemix
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.v-i-t.de/mirkos_hp/pub/
 EXTRACT_SUFX=	.py
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index b9df4dc21b66..149d031d738a 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nas
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://nas.codebrilliance.com/nas/
 EXTRACT_SUFX=	.src.tar.gz
diff --git a/audio/nekobee/Makefile b/audio/nekobee/Makefile
index abbc0cc5068d..7c5735bf1ad4 100644
--- a/audio/nekobee/Makefile
+++ b/audio/nekobee/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nekobee
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://static.nekosynth.co.uk/releases/
 
diff --git a/audio/nogger/Makefile b/audio/nogger/Makefile
index 801041070383..1ec42fb7be06 100644
--- a/audio/nogger/Makefile
+++ b/audio/nogger/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nogger
 PORTVERSION=	0.8.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://www.bsd-geek.de/FreeBSD/distfiles/
 
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index d147ea013e32..cf69a22d62e6 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ocp
 PORTVERSION=	0.1.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://stian.lunafish.org/ocp/ \
 		http://critical.ch/distfiles/ \
diff --git a/audio/opmixer/Makefile b/audio/opmixer/Makefile
index c3c2173a1c51..bf9cedd383cc 100644
--- a/audio/opmixer/Makefile
+++ b/audio/opmixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opmixer
 PORTVERSION=	0.75
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	optronic
diff --git a/audio/osdmixer/Makefile b/audio/osdmixer/Makefile
index eefddb5f9282..15436adf2412 100644
--- a/audio/osdmixer/Makefile
+++ b/audio/osdmixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osdmixer
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
 
diff --git a/audio/p5-Xmms/Makefile b/audio/p5-Xmms/Makefile
index 88e024459e02..88199eda0ffe 100644
--- a/audio/p5-Xmms/Makefile
+++ b/audio/p5-Xmms/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	Xmms
 PORTVERSION=	0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Xmms
diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index 22bbbb21581e..dd68a3c1b7ff 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pacpl
 PORTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SFE
 
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index e379c0446fa7..a920cabd7680 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	paman
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/paman/
 
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index e8d2bc134f8f..c2f846af76e0 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pd
 DISTVERSION=	0.40-2
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	.src
 CATEGORIES=	audio
 MASTER_SITES=	http://www-crca.ucsd.edu/~msp/Software/
diff --git a/audio/phatbeat/Makefile b/audio/phatbeat/Makefile
index 887fab5e0a69..c3eb6103c758 100644
--- a/audio/phatbeat/Makefile
+++ b/audio/phatbeat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		phatbeat
 PORTVERSION=		1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		audio
 MASTER_SITES=		http://www.postreal.org/files/
 DISTNAME=		PhatBeat-${PORTVERSION}
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 4f690b5f1abd..b3c439053246 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	picard
 DISTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	https://helixcommunity.org/frs/download.php/2252/
 
diff --git a/audio/polypaudio/Makefile b/audio/polypaudio/Makefile
index a3f6eb354a7b..e492ead98cc1 100644
--- a/audio/polypaudio/Makefile
+++ b/audio/polypaudio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	polypaudio
 PORTVERSION=	0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 #MASTER_SITES=	http://0pointer.de/lennart/projects/polypaudio/
 
diff --git a/audio/praat/Makefile b/audio/praat/Makefile
index f2cfa1f2c14f..ee3d179201e4 100644
--- a/audio/praat/Makefile
+++ b/audio/praat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	praat
 PORTVERSION=	4.4.10
+PORTREVISION=	1
 CATEGORIES=	audio science
 MASTER_SITES=	http://www.neuro.mcw.edu/~bacon/Ports/distfiles/Praat/4410/
 DISTNAME=	praat4410_sources
diff --git a/audio/prokyon3/Makefile b/audio/prokyon3/Makefile
index 0070273fda5f..c5a05b8efc9f 100644
--- a/audio/prokyon3/Makefile
+++ b/audio/prokyon3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	prokyon3
 PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index afc9b5126eee..3e950b6a6868 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 09c0a9ab2bd4..35d87e0695c8 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	karaoke
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pykaraoke
diff --git a/audio/py-sdl_mixer/Makefile b/audio/py-sdl_mixer/Makefile
index 6cab526eec2c..f0a9c369c5b7 100644
--- a/audio/py-sdl_mixer/Makefile
+++ b/audio/py-sdl_mixer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_mixer
 PORTVERSION=	0.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio python
 MASTER_SITES=	http://download.gna.org/pysdlmixer/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index 04d1ca661d10..37ddb006cbeb 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms
 PORTVERSION=	2.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio python
 MASTER_SITES=	http://people.via.ecp.fr/~flo/2002/PyXMMS/dist/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile
index bd8fec67745b..ea16fdf197ed 100644
--- a/audio/pysol-sound-server/Makefile
+++ b/audio/pysol-sound-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pysol-sound-server
 PORTVERSION=	3.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio games
 MASTER_SITES=	http://www.pysol.org/download/pysol/ \
 		ftp://ftp.is.co.za/linux/distributions/gentoo/distfiles/
diff --git a/audio/q-audio/Makefile b/audio/q-audio/Makefile
index fd0f1ce2d249..fa9fbe4796ca 100644
--- a/audio/q-audio/Makefile
+++ b/audio/q-audio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	audio
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	q-lang
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index 8c2fe415c696..a8c30c7528dd 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qjackctl
 PORTVERSION=	0.2.22
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	qjackctl
diff --git a/audio/quelcom/Makefile b/audio/quelcom/Makefile
index 2904e90c5261..ba5b2cddfae6 100644
--- a/audio/quelcom/Makefile
+++ b/audio/quelcom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	quelcom
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.etse.urv.es/~dmanye/quelcom/src/
 
diff --git a/audio/quelcom/pkg-plist b/audio/quelcom/pkg-plist
index e9e2100f78ce..ab2728c67d5f 100644
--- a/audio/quelcom/pkg-plist
+++ b/audio/quelcom/pkg-plist
@@ -16,5 +16,3 @@ lib/libqwav.so
 share/locale/ca/LC_MESSAGES/quelcom.mo
 share/locale/es/LC_MESSAGES/quelcom.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile
index cb03a811a4c1..19373014a29a 100644
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	raop_play
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	raop-play
diff --git a/audio/rat/Makefile b/audio/rat/Makefile
index c1bc686afa8a..1282f9036d8e 100644
--- a/audio/rat/Makefile
+++ b/audio/rat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rat
 PORTVERSION=	4.2.25
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mbone audio ipv6 tk84
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/releases/${PORTVERSION}/ \
 		http://www.icir.org/hodson/ucl-mirror/
diff --git a/audio/rat30/Makefile b/audio/rat30/Makefile
index 636213f08b19..ffc96d611e3f 100644
--- a/audio/rat30/Makefile
+++ b/audio/rat30/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rat
 PORTVERSION=	3.0.35
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mbone audio
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/releases/${PORTVERSION}/
 
diff --git a/audio/rbscrobbler/Makefile b/audio/rbscrobbler/Makefile
index d0bc97fe8f11..c59841847c2e 100644
--- a/audio/rbscrobbler/Makefile
+++ b/audio/rbscrobbler/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	rbscrobbler
 PORTVERSION=	0.0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://ftp.osuosl.org/pub/FreeBSD/distfiles/
 
diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile
index 6a262860226f..18f74bb08648 100644
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rezound
 DISTVERSION=	0.12.1beta
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index ffb508fa8a8c..47f4ba3fb82b 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index 747e8bddf4f3..7a6bb704c3a2 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -433,41 +433,9 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
 @dirrm lib/rhythmbox/plugins
 @dirrm lib/rhythmbox
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index ffb508fa8a8c..47f4ba3fb82b 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 747e8bddf4f3..7a6bb704c3a2 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -433,41 +433,9 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
 @dirrm lib/rhythmbox/plugins
 @dirrm lib/rhythmbox
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/audio/ripperx/Makefile b/audio/ripperx/Makefile
index ca3dc736f595..79242d062ee5 100644
--- a/audio/ripperx/Makefile
+++ b/audio/ripperx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ripperx
 PORTVERSION=	2.7.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ripperx
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 3622c7ee73f9..d0f6b20df87d 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rosegarden
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.cannam.demon.co.uk/rosegarden/distribution/
 DISTNAME=	${PORTNAME}-2.1pl2
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index 411bf840eb1d..77a475937793 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rsynth
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio accessibility
 MASTER_SITES=	ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/synthesis/
 
diff --git a/audio/ruby-musicextras/Makefile b/audio/ruby-musicextras/Makefile
index b2a80c3cb3b9..32b4ea789475 100644
--- a/audio/ruby-musicextras/Makefile
+++ b/audio/ruby-musicextras/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	musicextras
 PORTVERSION=	0.6.8
+PORTREVISION=	1
 CATEGORIES=	audio ruby
 MASTER_SITES=	http://www.divineinvasion.net/musicextras/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/audio/ruby-xmms/Makefile b/audio/ruby-xmms/Makefile
index 424c98c99ccc..6352690a3800 100644
--- a/audio/ruby-xmms/Makefile
+++ b/audio/ruby-xmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio ruby
 MASTER_SITES=	http://www.pablotron.org/download/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/audio/schism/Makefile b/audio/schism/Makefile
index 4797ee18f71e..c7bd8a22ff2e 100644
--- a/audio/schism/Makefile
+++ b/audio/schism/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	schism
 DISTVERSION=	0.2a
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://rigelseven.com/schism/dl/ \
 		http://critical.ch/distfiles/ \
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index 2389c13cef0c..f6eff43faac5 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME?=	scrobbler
 PORTVERSION=	0.3.8.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://static.audioscrobbler.com/plugins/ \
 		http://www.pipian.com/stuffforchat/
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index b980de68fed2..e8b66e244a7d 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_mixer
 PORTVERSION=	1.2.7
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index d0c738d71af6..deb636640de6 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_sound
 PORTVERSION=	1.0.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	http://www.icculus.org/SDL_sound/downloads/
 DISTNAME=	SDL_sound-${PORTVERSION}
diff --git a/audio/shellac/Makefile b/audio/shellac/Makefile
index f370a85d1bad..222dd9ae2232 100644
--- a/audio/shellac/Makefile
+++ b/audio/shellac/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	shellac
 PORTVERSION=	20060412
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	http://hem.bredband.net/b298027/
 
diff --git a/audio/sidplayer/Makefile b/audio/sidplayer/Makefile
index 7e92256deecf..8a8868553954 100644
--- a/audio/sidplayer/Makefile
+++ b/audio/sidplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sidplayer
 PORTVERSION=	4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://sidplayer.cebix.net/downloads/ \
 		http://critical.ch/distfiles/ \
diff --git a/audio/snack/Makefile b/audio/snack/Makefile
index 169fd5b3da0c..faf1415e7956 100644
--- a/audio/snack/Makefile
+++ b/audio/snack/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	snack
 PORTVERSION=	2.2.10
+PORTREVISION=	1
 CATEGORIES=	audio tcl84 tk84
 MASTER_SITES=	http://www.speech.kth.se/snack/dist/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 759788a7101b..5ae6527c75d0 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		snd
 PORTVERSION=		7.8
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/snett/Makefile b/audio/snett/Makefile
index 4bf5328c8b1f..5c7e77898cc0 100644
--- a/audio/snett/Makefile
+++ b/audio/snett/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	snett
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	audio ruby
 MASTER_SITES=	ftp://ftp.code-monkey.de/pub/snett/
 
diff --git a/audio/snowstar/Makefile b/audio/snowstar/Makefile
index 2a2cc7ae9bf1..b4e8328f7090 100644
--- a/audio/snowstar/Makefile
+++ b/audio/snowstar/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	snowstar
 PORTVERSION=	0.75.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fenner
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 9a45c4d2ae91..5dee6011f9b7 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	solfege
 PORTVERSION=	3.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index cc38592a8511..0966c330f843 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sonata
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/sonata/pkg-plist b/audio/sonata/pkg-plist
index 3730ee69435d..463b8669cf16 100644
--- a/audio/sonata/pkg-plist
+++ b/audio/sonata/pkg-plist
@@ -25,4 +25,3 @@ share/pixmaps/sonatacd.png
 share/pixmaps/sonatacd_large.png
 @dirrmtry share/applications
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/pixmaps
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index db994cb79f0a..02b0e4973acd 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	sound-juicer
 PORTVERSION=	2.16.4
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index acdf2e1d1db3..5310f1442d23 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -142,53 +142,17 @@ share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
 @dirrm share/gnome/help/sound-juicer/C/figures
 @dirrm share/gnome/help/sound-juicer/C
 @dirrm share/gnome/help/sound-juicer
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 21c87a74c12a..5622a91fef52 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	soundtracker
 PORTVERSION=	0.6.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.soundtracker.org/dl/%SUBDIR%/
 MASTER_SITE_SUBDIR=	v${PORTVERSION:R}
diff --git a/audio/specimen/Makefile b/audio/specimen/Makefile
index d6cb5562c89f..7dde441405c8 100644
--- a/audio/specimen/Makefile
+++ b/audio/specimen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	specimen
 DISTVERSION=	0.5.2-rc1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://zhevny.com/specimen/files/
 
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 81be4de479b2..33e56e0450bc 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spiralloops
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.pawfal.org/Software/SpiralLoops/dload/
 DISTNAME=	SpiralLoops-${PORTVERSION}
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index f1915d30f236..99931cc5f0a5 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spiralsynth
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.pawfal.org/Software/SpiralSynth/dload/
 DISTNAME=	SpiralSynth-${PORTVERSION}
diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile
index 791a4ea28aa1..4a168ed4d0fb 100644
--- a/audio/spiralsynthmodular/Makefile
+++ b/audio/spiralsynthmodular/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spiralsynthmodular
 PORTVERSION=	0.2.2a
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	spiralmodular
diff --git a/audio/splaytk/Makefile b/audio/splaytk/Makefile
index 208d86d9c175..ab0650f8aa17 100644
--- a/audio/splaytk/Makefile
+++ b/audio/splaytk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		splaytk
 PORTVERSION=		2.0
+PORTREVISION=	1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/sound/players
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index ef4bac87a97c..fd3ab322db8f 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		streamtuner
 PORTVERSION=		0.99.99
-PORTREVISION=		6
+PORTREVISION=		7
 CATEGORIES=		audio www
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/streamtuner/pkg-plist b/audio/streamtuner/pkg-plist
index 421ec793b11e..49b9461ba2df 100644
--- a/audio/streamtuner/pkg-plist
+++ b/audio/streamtuner/pkg-plist
@@ -108,5 +108,3 @@ share/locale/pt/LC_MESSAGES/streamtuner.mo
 %%PYTHON%%@dirrm share/gnome/streamtuner/python/scripts
 %%PYTHON%%@dirrm share/gnome/streamtuner/python
 @dirrm share/gnome/streamtuner
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
diff --git a/audio/swami/Makefile b/audio/swami/Makefile
index 846c8270da93..7fcc2dbdeb00 100644
--- a/audio/swami/Makefile
+++ b/audio/swami/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	swami
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 3f55053cfaee..1e80ee5adb49 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sweep
 PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/sweep/pkg-plist b/audio/sweep/pkg-plist
index d6afb21593c3..d722fd84f35e 100644
--- a/audio/sweep/pkg-plist
+++ b/audio/sweep/pkg-plist
@@ -44,9 +44,3 @@ share/locale/ru/LC_MESSAGES/sweep.mo
 @dirrm include/sweep
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index 5fdc7146b796..b8afe4a538ac 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tagtool
 PORTVERSION=	0.12.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/tagtool/pkg-plist b/audio/tagtool/pkg-plist
index fedebe592342..64a458628f9e 100644
--- a/audio/tagtool/pkg-plist
+++ b/audio/tagtool/pkg-plist
@@ -37,10 +37,6 @@ share/locale/ua/LC_MESSAGES/tagtool.mo
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/ua/LC_MESSAGES
 @dirrmtry share/locale/ua
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/48x48/apps
diff --git a/audio/teamspeak_client/Makefile b/audio/teamspeak_client/Makefile
index 53019340ea3d..ab5fe98e1a5a 100644
--- a/audio/teamspeak_client/Makefile
+++ b/audio/teamspeak_client/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	teamspeak_client
 PORTVERSION=	2.0.32
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.freenet.de/pub/4players/teamspeak.org/releases/:main \
 		http://www.gsoft.com.au/~doconnor/:misc
diff --git a/audio/tempest_for_eliza/Makefile b/audio/tempest_for_eliza/Makefile
index 0ec1fb2856ce..f9e93e7fa7a3 100644
--- a/audio/tempest_for_eliza/Makefile
+++ b/audio/tempest_for_eliza/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tempest_for_eliza
 PORTVERSION=	1.0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.erikyyy.de/tempest/
 
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 951eb49237cc..fabd63a4de98 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	terminatorx
 PORTVERSION=	3.82
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://terminatorx.org/dist/
 DISTNAME=	terminatorX-${PORTVERSION}
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index d11612d299e7..ec59b1db27bf 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	thunar-media-tags-plugin
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	audio xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/audio/thunar-media-tags-plugin/pkg-plist b/audio/thunar-media-tags-plugin/pkg-plist
index c7f468516ca9..7437c63526e6 100644
--- a/audio/thunar-media-tags-plugin/pkg-plist
+++ b/audio/thunar-media-tags-plugin/pkg-plist
@@ -15,16 +15,4 @@ share/locale/pa/LC_MESSAGES/thunar-media-tags-plugin.mo
 share/locale/pl/LC_MESSAGES/thunar-media-tags-plugin.mo
 share/locale/ru/LC_MESSAGES/thunar-media-tags-plugin.mo
 share/locale/zh_TW/LC_MESSAGES/thunar-media-tags-plugin.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@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 lib/thunarx-1
diff --git a/audio/timemachine/Makefile b/audio/timemachine/Makefile
index 70d233cf4179..bcd66d4c57ab 100644
--- a/audio/timemachine/Makefile
+++ b/audio/timemachine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	timemachine
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://plugin.org.uk/timemachine/
 
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 5dafc3d62368..d8dc315020aa 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	timidity++
 PORTVERSION=	2.13.2
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES+=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=timidity
diff --git a/audio/trommler/Makefile b/audio/trommler/Makefile
index d96ceaab32b3..d906682ee6aa 100644
--- a/audio/trommler/Makefile
+++ b/audio/trommler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	trommler
 PORTVERSION=	3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://muth.org/Robert/Trommler/
 DISTNAME=	trommler.3.4
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index d2621c6e3e26..75f8239dc67b 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tunesbrowser
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://crazney.net/programs/itunes/files/
 
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 627b9eac03cb..7862dee0dfe6 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tuxguitar
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	audio java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index fe604d640dd4..e9fb63897d64 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmms-uade
 PORTVERSION=	2.03
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://zakalwe.fi/uade/uade2/ \
 		http://critical.ch/distfiles/
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index 6328fabca0ce..f68945deb3a7 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vat
 PORTVERSION=	4.0b2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mbone tk83
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
 DISTFILES=	vatsrc-4.0b2.tar.gz
diff --git a/audio/volumecontrol.app/Makefile b/audio/volumecontrol.app/Makefile
index fa2f23b6fd33..e9ef164a764e 100644
--- a/audio/volumecontrol.app/Makefile
+++ b/audio/volumecontrol.app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	volumecontrol
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	audio gnustep
 MASTER_SITES=	http://www.linuks.mine.nu/volumecontrol/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/audio/wavbreaker/Makefile b/audio/wavbreaker/Makefile
index c7409b39c80e..eb112a77d881 100644
--- a/audio/wavbreaker/Makefile
+++ b/audio/wavbreaker/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	wavbreaker
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://huli.org/wavbreaker/
 
diff --git a/audio/whysynth/Makefile b/audio/whysynth/Makefile
index 39413c839457..2d4452a472c1 100644
--- a/audio/whysynth/Makefile
+++ b/audio/whysynth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	whysynth
 PORTVERSION=	20070418
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://home.jps.net/~musound/
 
diff --git a/audio/wmalbum/Makefile b/audio/wmalbum/Makefile
index 52c5fdf69175..6fa0702fe137 100644
--- a/audio/wmalbum/Makefile
+++ b/audio/wmalbum/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmalbum
 PORTVERSION=	0.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wmalbum
diff --git a/audio/wmcdplay/Makefile b/audio/wmcdplay/Makefile
index ed2327b33920..aea500aa7d13 100644
--- a/audio/wmcdplay/Makefile
+++ b/audio/wmcdplay/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmcdplay
 PORTVERSION=	1.0b1
+PORTREVISION=	1
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Vista/2471/files/
 DISTNAME=	wmcdplay-1.0-beta1
diff --git a/audio/wmfmixer/Makefile b/audio/wmfmixer/Makefile
index f8c2fc88ba02..70ae7f3ecdf7 100644
--- a/audio/wmfmixer/Makefile
+++ b/audio/wmfmixer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmfmixer
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio windowmaker afterstep
 MASTER_SITES=	http://www.finik.net/files/ \
 		http://www.linuks.mine.nu/dockapp/
diff --git a/audio/wmix/Makefile b/audio/wmix/Makefile
index 92a0dbf7b920..214b21f7f93e 100644
--- a/audio/wmix/Makefile
+++ b/audio/wmix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmix
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://www.ne.jp/asahi/linux/timecop/software/
 
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index 7f9646471a29..2de918f3fce8 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmmixer
 PORTVERSION=	1.0b1
+PORTREVISION=	1
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Vista/2471/files/
 DISTNAME=	${PORTNAME}-1.0-beta1
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 6fdcb2f52888..00283aac1bc5 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	wmmp3
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://www.dotfiles.com/software/wmmp3/
 
diff --git a/audio/wmrecord/Makefile b/audio/wmrecord/Makefile
index 523d32884438..9bbd060e685c 100644
--- a/audio/wmrecord/Makefile
+++ b/audio/wmrecord/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmrecord
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://linkinnovations.linux.tucows.com/files/x11/dock/ \
 		http://www.bsd-geek.de/FreeBSD/distfiles/
diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile
index eefacb0eea7b..0a148d82506b 100644
--- a/audio/wmsmixer/Makefile
+++ b/audio/wmsmixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmsmixer
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://www.hibernaculum.net/download/
 
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index 080d2fd6eb33..a70d757e0c2f 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmusic
 PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://home.jtan.com/~john/wmusic/
 
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index 83c221741454..6412d8fd26ee 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	workman
 PORTVERSION=	1.3a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications/WorkMan
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index 116528b092a8..1ea4a25943e7 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wsoundprefs
 PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	WSoundPrefs-${PORTVERSION}
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index fd9d3b44ab8c..041699e27f00 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wsoundserver
 PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	WSoundServer-${PORTVERSION}
diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index 6d41f9affe73..3d3c26f50e35 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x11amp
 PORTVERSION=	0.9.b1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cs.tu-berlin.de/pub/misc/x11amp/0.9/ \
 		ftp://ftp.x11amp.bz.nu/x11amp/0.9/ \
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 380e82cc5133..f1b8b0394a2d 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xanalyser
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	audio hamradio
 MASTER_SITES=	http://arvin.schnell-web.net/xanalyser/ \
 		${MASTER_SITE_LOCAL}
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 520f808f37f5..3b3d2ed44989 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcd
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	audio tk82
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jmz
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index 26f7f4d5616d..4e36cfa854e0 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcdplayer
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CD player for X
 
 USE_IMAKE=	yes
+USE_XORG=	xbitmaps
 MAN1=		xcdplayer.1
 
 PLIST_FILES=	bin/xcdplayer lib/X11/app-defaults/XCdplayer
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 1cfc88dabcb0..4f36e7e033f0 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-mixer
 PORTVERSION=	4.4.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index 65f66875eb43..3ef0b258f86c 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-mpc-plugin
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-mpc-plugin/
 DIST_SUBDIR=	xfce4
diff --git a/audio/xfce4-mpc-plugin/pkg-plist b/audio/xfce4-mpc-plugin/pkg-plist
index f7fb72a4f94e..273dec4ca557 100644
--- a/audio/xfce4-mpc-plugin/pkg-plist
+++ b/audio/xfce4-mpc-plugin/pkg-plist
@@ -5,9 +5,5 @@ share/locale/pl/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/xfce4/panel-plugins/xfce4-mpc-plugin.desktop
 @dirrmtry share/xfce4/panel-plugins
 @dirrmtry share/xfce4
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrmtry libexec/xfce4/panel-plugins
 @dirrmtry libexec/xfce4
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 5e8c68bd0b4d..2c6a8e859410 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xhippo
 PORTVERSION=	3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index d58f25975b43..33ec52a95746 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmcd
 PORTVERSION=	3.3.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/3.3.2/src/
 
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index e689dc423d8c..808e4c5420d5 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmix
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/sound/mixers
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index 8c169561af17..02e936c74fc2 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmixer
 PORTVERSION=	0.9.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://mpx.freeshell.net/
 
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index 42df0585e30d..9681bb8c4ea8 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmmix
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmmix/1.2.2/src/
 
diff --git a/audio/xmms-a52dec/Makefile b/audio/xmms-a52dec/Makefile
index b776dda345e2..e683983b993b 100644
--- a/audio/xmms-a52dec/Makefile
+++ b/audio/xmms-a52dec/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-a52dec
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmms-a52dec
diff --git a/audio/xmms-ahx/Makefile b/audio/xmms-ahx/Makefile
index c095ecca6fd8..4675e40e6b7f 100644
--- a/audio/xmms-ahx/Makefile
+++ b/audio/xmms-ahx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-ahx
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile
index d5d5eb821f4c..5a74b4b664b0 100644
--- a/audio/xmms-arts_output/Makefile
+++ b/audio/xmms-arts_output/Makefile
@@ -8,7 +8,7 @@
 PKGNAMEPREFIX=	xmms-
 PORTNAME=	arts_output
 PORTVERSION=	0.7.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://havardk.xmms.org/plugins/arts_output/
 
diff --git a/audio/xmms-audiofile/Makefile b/audio/xmms-audiofile/Makefile
index a7aaff1ea07a..ceda3d748363 100644
--- a/audio/xmms-audiofile/Makefile
+++ b/audio/xmms-audiofile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-audiofile
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.68k.org/~michael/xmms/
 
diff --git a/audio/xmms-bonk/Makefile b/audio/xmms-bonk/Makefile
index 13d34d621489..cc724c2fd3b5 100644
--- a/audio/xmms-bonk/Makefile
+++ b/audio/xmms-bonk/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xmms-bonk
 PORTVERSION=	0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.proustmedia.de/bonk-xmms/
 DISTNAME=	bonk-xmms-${PORTVERSION}
diff --git a/audio/xmms-cdread/Makefile b/audio/xmms-cdread/Makefile
index e8905f9c2c84..7219e22805bd 100644
--- a/audio/xmms-cdread/Makefile
+++ b/audio/xmms-cdread/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-cdread
 PORTVERSION=	0.14a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/willem/
 
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index d792cf25850a..48abbb4fc4d0 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	crossfade
 PORTVERSION=	0.3.12
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.eisenlohr.org/xmms-crossfade/ CENKES
 PKGNAMEPREFIX=	${APP}-
diff --git a/audio/xmms-crystality/Makefile b/audio/xmms-crystality/Makefile
index 4cf0b771720c..d6bdd09ef7b4 100644
--- a/audio/xmms-crystality/Makefile
+++ b/audio/xmms-crystality/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	crystality
 PORTVERSION=	0.92
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GENTOO} \
 		http://jkp-se.lunar-linux.org/lunar/cache/
diff --git a/audio/xmms-defx/Makefile b/audio/xmms-defx/Makefile
index 1d7dd59a2fd0..6cc806c09e64 100644
--- a/audio/xmms-defx/Makefile
+++ b/audio/xmms-defx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-defx
 PORTVERSION=	0.9.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	defx
diff --git a/audio/xmms-efxmms/Makefile b/audio/xmms-efxmms/Makefile
index 39c65b3fb886..2e705f4f40f8 100644
--- a/audio/xmms-efxmms/Makefile
+++ b/audio/xmms-efxmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-efxmms
 PORTVERSION=	0.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	efxmms
diff --git a/audio/xmms-eq/Makefile b/audio/xmms-eq/Makefile
index c96cd7497826..cc604a66b03f 100644
--- a/audio/xmms-eq/Makefile
+++ b/audio/xmms-eq/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eq
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	equ
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 1116cc63e308..bae75e093e7b 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	faad2
 PORTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	faac
diff --git a/audio/xmms-fc/Makefile b/audio/xmms-fc/Makefile
index 461c18965ed2..c3d160ce6278 100644
--- a/audio/xmms-fc/Makefile
+++ b/audio/xmms-fc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-fc
 PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 7221e256fd6b..066bebc3236d 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-flac
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	flac
diff --git a/audio/xmms-fxt/Makefile b/audio/xmms-fxt/Makefile
index 34dad1e9cc21..2d3fb055654c 100644
--- a/audio/xmms-fxt/Makefile
+++ b/audio/xmms-fxt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-fxt
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile
index f95443fd166c..1c7c8b9956a8 100644
--- a/audio/xmms-imms/Makefile
+++ b/audio/xmms-imms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imms
 PORTVERSION=	1.2a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/xmms-infopipe/Makefile b/audio/xmms-infopipe/Makefile
index 9177ff22f677..ea1d45ad325c 100644
--- a/audio/xmms-infopipe/Makefile
+++ b/audio/xmms-infopipe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-infopipe
 PORTVERSION=	1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.beastwithin.org/users/wwwwolf/code/xmms/
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index 3d98283029f9..e119529240c1 100644
--- a/audio/xmms-jack/Makefile
+++ b/audio/xmms-jack/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	jack
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmms-jack
diff --git a/audio/xmms-jackasyn/Makefile b/audio/xmms-jackasyn/Makefile
index 7d4be861afe3..01ffed8907bc 100644
--- a/audio/xmms-jackasyn/Makefile
+++ b/audio/xmms-jackasyn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jackasyn
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://gige.xdv.org/libjackasyn/download/
 PKGNAMEPREFIX=	xmms-
diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile
index 19b0d6ad8d0c..044a73621b4f 100644
--- a/audio/xmms-kde/Makefile
+++ b/audio/xmms-kde/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-kde
 PORTVERSION=	3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/xmms-kj/Makefile b/audio/xmms-kj/Makefile
index b62cd484a3d6..aeec56557e09 100644
--- a/audio/xmms-kj/Makefile
+++ b/audio/xmms-kj/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-kj
 PORTVERSION=	0.95
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.csse.monash.edu.au/~timf/
 DISTNAME=	kint_xmms-${PORTVERSION}
diff --git a/audio/xmms-ladspa/Makefile b/audio/xmms-ladspa/Makefile
index d9645df38b73..211e52c59310 100644
--- a/audio/xmms-ladspa/Makefile
+++ b/audio/xmms-ladspa/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xmms-ladspa
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ecs.soton.ac.uk/~njl98r/code/ladspa/ \
 		${MASTER_SITE_LOCAL}
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index 501a1b1f90d9..6a91b195ad33 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-liveice
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://star.arm.ac.uk/~spm/software/
 DISTNAME=	liveice-xmms
diff --git a/audio/xmms-mac/Makefile b/audio/xmms-mac/Makefile
index 796d4c412982..a9100f069d59 100644
--- a/audio/xmms-mac/Makefile
+++ b/audio/xmms-mac/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mac
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mac-port
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index ffb02035de5c..684315c46d86 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-mad
 PORTVERSION=	0.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmms-mad
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index c4fbdd66ea5d..410eab069438 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xmms-mailnotify
 PORTVERSION=	0.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile
index e9a0d317af41..9d8fbb2494e9 100644
--- a/audio/xmms-midi/Makefile
+++ b/audio/xmms-midi/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xmms-midi
 PORTVERSION=	0.03
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://dl.fkb.wormulon.net/xmms-midi/ \
 				http://dl.kel.wormulon.net/xmms-midi/
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 590605fb30be..2a58997f6733 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	modplug
 PORTVERSION=	2.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	audio
 MASTER_SITES=	SFE
 MASTER_SITE_SUBDIR=	${PORTNAME}-${PKGNAMEPREFIX:S/-//}
diff --git a/audio/xmms-mp3cue/Makefile b/audio/xmms-mp3cue/Makefile
index 112dffd89368..cf68532906fe 100644
--- a/audio/xmms-mp3cue/Makefile
+++ b/audio/xmms-mp3cue/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-mp3cue
 PORTVERSION=	0.94
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://brianvictor.tripod.com/
 DISTNAME=	XMMS-mp3cue-${PORTVERSION}
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index 6af268707e08..741e41091c8f 100644
--- a/audio/xmms-musepack/Makefile
+++ b/audio/xmms-musepack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-musepack
 PORTVERSION=	1.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://dl.slik.org/musepack/
 
diff --git a/audio/xmms-nas/Makefile b/audio/xmms-nas/Makefile
index bd32b46389e8..a0a9e5584925 100644
--- a/audio/xmms-nas/Makefile
+++ b/audio/xmms-nas/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-nas
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/willem/
 
diff --git a/audio/xmms-nsf/Makefile b/audio/xmms-nsf/Makefile
index 6b689e344547..bb862a19bfe9 100644
--- a/audio/xmms-nsf/Makefile
+++ b/audio/xmms-nsf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-nsf
 PORTVERSION=	0.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://optronic.sourceforge.net/files/ \
 		http://critical.ch/distfiles/ \
diff --git a/audio/xmms-openspc/Makefile b/audio/xmms-openspc/Makefile
index fec511004b6c..226800cfc284 100644
--- a/audio/xmms-openspc/Makefile
+++ b/audio/xmms-openspc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openspc
 PORTVERSION=	0.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://critical.ch/distfiles/ \
 		http://energy.critical.ch/distfiles/
diff --git a/audio/xmms-osssurround/Makefile b/audio/xmms-osssurround/Makefile
index 9f21d738368f..48ce9d1df30d 100644
--- a/audio/xmms-osssurround/Makefile
+++ b/audio/xmms-osssurround/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-osssurround
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmms-a52dec
diff --git a/audio/xmms-pipe/Makefile b/audio/xmms-pipe/Makefile
index f14fb2a2a806..0ee611f53fbd 100644
--- a/audio/xmms-pipe/Makefile
+++ b/audio/xmms-pipe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmms-pipe
 PORTVERSION=	0.5.6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://rooster.stanford.edu/~ben/xmmspipe/files/
 DISTNAME=	xmmspipe-${PORTVERSION}
diff --git a/audio/xmms-quix3dn/Makefile b/audio/xmms-quix3dn/Makefile
index 39c2edf6700b..458265e7d532 100644
--- a/audio/xmms-quix3dn/Makefile
+++ b/audio/xmms-quix3dn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-quix3dn
 PORTVERSION=	4.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alex
diff --git a/audio/xmms-sapplug/Makefile b/audio/xmms-sapplug/Makefile
index b90e5c8d298d..e5208cd2b65d 100644
--- a/audio/xmms-sapplug/Makefile
+++ b/audio/xmms-sapplug/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-sapplug
 DISTVERSION=	0.3f
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://critical.ch/distfiles/ \
 		http://energy.critical.ch/distfiles/ \
diff --git a/audio/xmms-scrobbler/Makefile b/audio/xmms-scrobbler/Makefile
index 35ae5006e368..40ae4f36e4d9 100644
--- a/audio/xmms-scrobbler/Makefile
+++ b/audio/xmms-scrobbler/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmms-scrobbler
-PORTREVISION=	3
+PORTREVISION=	4
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	XMMS plugin for Audioscrobbler.com
diff --git a/audio/xmms-sexypsf/Makefile b/audio/xmms-sexypsf/Makefile
index db7eebeddd4f..a2bf529896da 100644
--- a/audio/xmms-sexypsf/Makefile
+++ b/audio/xmms-sexypsf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-sexypsf
 PORTVERSION=	0.4.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/sexypsf/ \
 		http://critical.ch/distfiles/ \
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index be5c8c333325..5905758f5d89 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmms-shn
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.etree.org/shnutils/xmms-shn/dist/src/
 
diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
index 908955f2c54f..65f60970da3c 100644
--- a/audio/xmms-sid/Makefile
+++ b/audio/xmms-sid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-sid
 PORTVERSION=	0.7.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.tnsp.org/xs-files/
 
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index fea582fe94e0..ccfd9bcdbc7a 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-sndfile
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/xmms_sndfile/
 DISTNAME=	xmms_sndfile-${PORTVERSION}
diff --git a/audio/xmms-sndstretch/Makefile b/audio/xmms-sndstretch/Makefile
index 3bc4e679ccbe..13e692fd9133 100644
--- a/audio/xmms-sndstretch/Makefile
+++ b/audio/xmms-sndstretch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sndstretch
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/harpin_floh/mysoft/
 PKGNAMEPREFIX=	xmms-
diff --git a/audio/xmms-speex/Makefile b/audio/xmms-speex/Makefile
index d0e2da10e332..9d3ce5c8999e 100644
--- a/audio/xmms-speex/Makefile
+++ b/audio/xmms-speex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-speex
 PORTVERSION=	0.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://jzb.rapanden.dk/pub/
 DISTNAME=	speex-xmms-${PORTVERSION}
diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index bf07327c2441..092fb332dcbc 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-tfmx
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/xmms-uade/Makefile b/audio/xmms-uade/Makefile
index fe604d640dd4..e9fb63897d64 100644
--- a/audio/xmms-uade/Makefile
+++ b/audio/xmms-uade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmms-uade
 PORTVERSION=	2.03
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://zakalwe.fi/uade/uade2/ \
 		http://critical.ch/distfiles/
diff --git a/audio/xmms-volnorm/Makefile b/audio/xmms-volnorm/Makefile
index 9bd733848bba..050fbfdd93e6 100644
--- a/audio/xmms-volnorm/Makefile
+++ b/audio/xmms-volnorm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	volnorm
 PORTVERSION=	0.8.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/xmms-wma/Makefile b/audio/xmms-wma/Makefile
index b83c1d722784..6ffa112c6475 100644
--- a/audio/xmms-wma/Makefile
+++ b/audio/xmms-wma/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmms-wma
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://mcmcc.bat.ru/xmms-wma/
 
diff --git a/audio/xmms-xf86audio/Makefile b/audio/xmms-xf86audio/Makefile
index 2ae1f0684852..f7ae296423cd 100644
--- a/audio/xmms-xf86audio/Makefile
+++ b/audio/xmms-xf86audio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-xf86audio
 PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.devin.com/xmms-xf86audio/download/
 
diff --git a/audio/xmms-xymms/Makefile b/audio/xmms-xymms/Makefile
index 1c43e3e7582e..c7a665d9f2c7 100644
--- a/audio/xmms-xymms/Makefile
+++ b/audio/xmms-xymms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xymms
 DISTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/xmmsctrl/Makefile b/audio/xmmsctrl/Makefile
index a9646398ad97..1fce64a01216 100644
--- a/audio/xmmsctrl/Makefile
+++ b/audio/xmmsctrl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmmsctrl
 PORTVERSION=	1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://user.it.uu.se/~adavid/utils/
 
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index a7117d56470d..37aa1d8a87e7 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmp
 PORTVERSION=	2.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index 8017e76d2551..e33632f8bb07 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmradio
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://core.de/~coto/radio/
 
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index f0ce82d51d19..4a25cc0bf4f5 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xsidplay
 PORTVERSION=	1.6.5.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio emulators
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
diff --git a/audio/xspeakfree/Makefile b/audio/xspeakfree/Makefile
index 70232501eefe..d52027cd4048 100644
--- a/audio/xspeakfree/Makefile
+++ b/audio/xspeakfree/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xspeakfree
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	mbone net audio
 MASTER_SITES=	http://www.liquidx.org/distfiles/
 
diff --git a/audio/xsynth-dssi/Makefile b/audio/xsynth-dssi/Makefile
index 3e191b20e9c8..7a23341abd1c 100644
--- a/audio/xsynth-dssi/Makefile
+++ b/audio/xsynth-dssi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xsynth-dssi
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dssi
diff --git a/audio/xtuner/Makefile b/audio/xtuner/Makefile
index e92381229861..bbf847e4f68c 100644
--- a/audio/xtuner/Makefile
+++ b/audio/xtuner/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtuner
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
 DISTNAME=	Xtuner-${PORTVERSION}
diff --git a/audio/xvmixer/Makefile b/audio/xvmixer/Makefile
index f4919f4f9cd1..40e83c699d9a 100644
--- a/audio/xvmixer/Makefile
+++ b/audio/xvmixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xvmixer
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.auxio.org/pub/mirrors/step.polymtl.ca/pub/Xview/apps/xvmixer/
 
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index 0f1c68ca2948..f1744777b927 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xwave
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index f6dc1d32fdd5..9a48514279cd 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yammi
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index 316c45872f76..c643fdc10d98 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yamt
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index f9f001f05fc5..66aa0898ff4b 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zinf
 PORTVERSION=	2.2.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index 01be3d5e82d8..74f157ad4ef2 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zynaddsubfx
 PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	zynaddsubfx
diff --git a/benchmarks/autobench/Makefile b/benchmarks/autobench/Makefile
index 78a28acee205..febc92d9dfbf 100644
--- a/benchmarks/autobench/Makefile
+++ b/benchmarks/autobench/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	autobench
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	benchmarks www
 MASTER_SITES=	http://www.xenoclast.org/autobench/downloads/
 
diff --git a/benchmarks/dbs/Makefile b/benchmarks/dbs/Makefile
index 84e720a1a1d9..e98a1822f154 100644
--- a/benchmarks/dbs/Makefile
+++ b/benchmarks/dbs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dbs
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.kusa.ac.jp/~yukio-m/dbs/software1.1.5/ \
 		${MASTER_SITE_LOCAL}
diff --git a/benchmarks/gsbench/Makefile b/benchmarks/gsbench/Makefile
index 3a4d681187b5..eb5b58224561 100644
--- a/benchmarks/gsbench/Makefile
+++ b/benchmarks/gsbench/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gsbench
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	benchmarks gnustep
 MASTER_SITES=	http://www.nice.ch/~phip/
 DISTNAME=	GSBench-${PORTVERSION}
diff --git a/benchmarks/gtkperf/Makefile b/benchmarks/gtkperf/Makefile
index 4c186017e9bb..1d7430440849 100644
--- a/benchmarks/gtkperf/Makefile
+++ b/benchmarks/gtkperf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		gtkperf
 PORTVERSION=		0.40
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		benchmarks
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/benchmarks/gtkperf/pkg-plist b/benchmarks/gtkperf/pkg-plist
index 0fc1cccfa88c..3667bc507576 100644
--- a/benchmarks/gtkperf/pkg-plist
+++ b/benchmarks/gtkperf/pkg-plist
@@ -6,6 +6,5 @@ doc/gtkperf/INSTALL
 doc/gtkperf/README
 doc/gtkperf/TODO
 share/pixmaps/duck.png
-@dirrmtry share/pixmaps
 @dirrm doc/gtkperf
 @dirrm doc
diff --git a/benchmarks/hpl/Makefile b/benchmarks/hpl/Makefile
index 59a2cdac25af..cfd6b53b9dd9 100644
--- a/benchmarks/hpl/Makefile
+++ b/benchmarks/hpl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hpl
 PORTVERSION=	1.0a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.netlib.org/benchmark/hpl/ \
 		ftp://ftp.hipecs.hokudai.ac.jp/netlib/benchmark/hpl/
diff --git a/benchmarks/imb/Makefile b/benchmarks/imb/Makefile
index d557fab81066..e43e20afa3ee 100644
--- a/benchmarks/imb/Makefile
+++ b/benchmarks/imb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imb
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	benchmarks parallel
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://cache-www.intel.com/cd/00/00/32/71/
diff --git a/benchmarks/mdtest/Makefile b/benchmarks/mdtest/Makefile
index f2e1c4a5b13c..3d8fbb652c2b 100644
--- a/benchmarks/mdtest/Makefile
+++ b/benchmarks/mdtest/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mdtest
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.llnl.gov/icc/lc/siop/downloads/
 
diff --git a/benchmarks/pnetmark/Makefile b/benchmarks/pnetmark/Makefile
index e51dfd957930..1a0a9dd62186 100644
--- a/benchmarks/pnetmark/Makefile
+++ b/benchmarks/pnetmark/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pnetmark
 PORTVERSION=	0.0.6
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	${PNET_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PNET_MASTER_SITE_SUBDIR}
diff --git a/benchmarks/scimark2/Makefile b/benchmarks/scimark2/Makefile
index 042b4bd092aa..ba7ab8f0da20 100644
--- a/benchmarks/scimark2/Makefile
+++ b/benchmarks/scimark2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scimark2
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	benchmarks java
 MASTER_SITES=	http://math.nist.gov/scimark2/
 PKGNAMESUFFIX=	-java
diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile
index 0f8a9c1cf929..80ee4d8ca3e3 100644
--- a/benchmarks/xengine/Makefile
+++ b/benchmarks/xengine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xengine
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.kazu.kz/freebsd/
 DISTFILES=	part01.gz patch1.gz
diff --git a/biology/L-Breeder/Makefile b/biology/L-Breeder/Makefile
index 39c96044318d..0c6fbc1f92c3 100644
--- a/biology/L-Breeder/Makefile
+++ b/biology/L-Breeder/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	LBreeder
 PORTVERSION=	1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	biology
 MASTER_SITES=	http://www.simonyi.ox.ac.uk/dawkins/software/yan/L-Breeder/
 DISTNAME=	${PORTNAME}-source
diff --git a/biology/adun/Makefile b/biology/adun/Makefile
index 70118deea485..7491feeaedac 100644
--- a/biology/adun/Makefile
+++ b/biology/adun/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	adun
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	biology gnustep
 MASTER_SITES=	http://download.gna.org/adun/
 DISTNAME=	Adun${PORTVERSION}
diff --git a/biology/artemis/Makefile b/biology/artemis/Makefile
index c4998b28dd7c..ee85444fc5ef 100644
--- a/biology/artemis/Makefile
+++ b/biology/artemis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	artemis
 PORTVERSION=	7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology java
 MASTER_SITES=	http://www.sanger.ac.uk/Software/Artemis/v${PORTVERSION}/
 DISTNAME=	artemis_compiled_v${PORTVERSION}_${PORTREVISION}
diff --git a/biology/artemis/distinfo b/biology/artemis/distinfo
index 804338297593..3355a8ea32d4 100644
--- a/biology/artemis/distinfo
+++ b/biology/artemis/distinfo
@@ -1,3 +1,3 @@
-MD5 (artemis_compiled_v7_1.tar.gz) = f81f52a99a7c7b40c2a5289e71e0ea03
-SHA256 (artemis_compiled_v7_1.tar.gz) = d770c48464be5903107379775765883f7827833be7339d90d3dc8e1430c0646e
-SIZE (artemis_compiled_v7_1.tar.gz) = 4055125
+MD5 (artemis_compiled_v7_2.tar.gz) = f81f52a99a7c7b40c2a5289e71e0ea03
+SHA256 (artemis_compiled_v7_2.tar.gz) = d770c48464be5903107379775765883f7827833be7339d90d3dc8e1430c0646e
+SIZE (artemis_compiled_v7_2.tar.gz) = 4055125
diff --git a/biology/biococoa/Makefile b/biology/biococoa/Makefile
index 92374d11797d..c49584bbd5cb 100644
--- a/biology/biococoa/Makefile
+++ b/biology/biococoa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	biococoa
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	biology gnustep
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/b/biococoa.app
diff --git a/biology/biojava/Makefile b/biology/biojava/Makefile
index 5b27da842616..9d693b4d5072 100644
--- a/biology/biojava/Makefile
+++ b/biology/biojava/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	biojava
 DISTVERSION=	1.5-beta2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	biology java
 MASTER_SITES=	http://www.biojava.org/download/bj15b/all/:source	\
diff --git a/biology/boinc-simap/Makefile b/biology/boinc-simap/Makefile
index b765a9f23046..4c9da0ba6961 100644
--- a/biology/boinc-simap/Makefile
+++ b/biology/boinc-simap/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	boinc-simap
 PORTVERSION=	${SIMAP_VERSION}.${HMMER_VERSION}
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	http://boinc.bio.wzw.tum.de/boincsimap/download/
 DISTNAME=	${SIMAP_BINARY} ${HMMER_BINARY}
diff --git a/biology/embassy/Makefile b/biology/embassy/Makefile
index bdabee8ee1b0..93d67cee5f74 100644
--- a/biology/embassy/Makefile
+++ b/biology/embassy/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	embassy
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://emboss.open-bio.org/pub/EMBOSS/ \
 		ftp://ftp.uk.embnet.org/pub/EMBOSS/ \
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index 2fdecddae40f..bc9016cc0d67 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emboss
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://emboss.open-bio.org/pub/EMBOSS/ \
 		ftp://ftp.uk.embnet.org/pub/EMBOSS/ \
diff --git a/biology/garlic/Makefile b/biology/garlic/Makefile
index 7a6a15a906d3..210279060ebc 100644
--- a/biology/garlic/Makefile
+++ b/biology/garlic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	garlic
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	http://garlic.mefos.hr/sources/garlic-${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/biology/genpak/Makefile b/biology/genpak/Makefile
index 7e71a07bd9c8..3ac7d7c088f2 100644
--- a/biology/genpak/Makefile
+++ b/biology/genpak/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	genpak
 PORTVERSION=	0.26
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology
 MASTER_SITES=	http://www.bioinformatics.org/genpak/download/
 DISTNAME=	gp-${PORTVERSION}
diff --git a/biology/gperiodic/Makefile b/biology/gperiodic/Makefile
index e3d318199230..e49c771662a2 100644
--- a/biology/gperiodic/Makefile
+++ b/biology/gperiodic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gperiodic
 PORTVERSION=	2.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology
 MASTER_SITES=	http://koti.welho.com/jfrantz/software/
 
diff --git a/biology/gperiodic/pkg-plist b/biology/gperiodic/pkg-plist
index eaf00bcb6513..db8a172e1e3b 100644
--- a/biology/gperiodic/pkg-plist
+++ b/biology/gperiodic/pkg-plist
@@ -11,5 +11,3 @@ share/locale/pl/LC_MESSAGES/gperiodic.mo
 share/locale/sv/LC_MESSAGES/gperiodic.mo
 share/locale/tr/LC_MESSAGES/gperiodic.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
diff --git a/biology/jalview/Makefile b/biology/jalview/Makefile
index 9596bb7d00e5..f7f974292de0 100644
--- a/biology/jalview/Makefile
+++ b/biology/jalview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jalview
 PORTVERSION=	2.07
+PORTREVISION=	1
 CATEGORIES=	biology java
 MASTER_SITES=	http://www.jalview.org/source/
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/}
diff --git a/biology/kinemage/Makefile b/biology/kinemage/Makefile
index 4cdf21027885..aaee515e2745 100644
--- a/biology/kinemage/Makefile
+++ b/biology/kinemage/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kinemage
 PORTVERSION=	5.79
+PORTREVISION=	1
 CATEGORIES=	biology
 # There is no distfile to fetch here, just a dir of badly formatted sources
 #MASTER_SITES=	ftp://kinemage.biochem.duke.edu/OPEN_SOURCE/
diff --git a/biology/lsysexp/Makefile b/biology/lsysexp/Makefile
index 383d1e411121..dac8bf722cde 100644
--- a/biology/lsysexp/Makefile
+++ b/biology/lsysexp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lsysexp
 PORTVERSION=	0.67
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	biology
 MASTER_SITES=	http://coscorrosa.com/programs/${PORTNAME}/download/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/biology/molden/Makefile b/biology/molden/Makefile
index e3f721e4a781..1d8b3661b115 100644
--- a/biology/molden/Makefile
+++ b/biology/molden/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	molden
 PORTVERSION=	4.5
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/biology/molden/distinfo b/biology/molden/distinfo
index 040963ee046e..7268a4f6579c 100644
--- a/biology/molden/distinfo
+++ b/biology/molden/distinfo
@@ -1,3 +1,3 @@
-MD5 (molden-4.5/molden4.5.tar.Z) = 2706a205de011f2dca042f8c7fe95834
-SHA256 (molden-4.5/molden4.5.tar.Z) = 84b6905ec786bde9af8bfa6439b0c066b65a98028ffaf1ebc543e58b31fe2ca7
-SIZE (molden-4.5/molden4.5.tar.Z) = 3605279
+MD5 (molden-4.5_1/molden4.5.tar.Z) = 2706a205de011f2dca042f8c7fe95834
+SHA256 (molden-4.5_1/molden4.5.tar.Z) = 84b6905ec786bde9af8bfa6439b0c066b65a98028ffaf1ebc543e58b31fe2ca7
+SIZE (molden-4.5_1/molden4.5.tar.Z) = 3605279
diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile
index 643c83de3c40..ba50ca954b8b 100644
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ncbi-toolkit
 PORTVERSION=	2006.05.07	# containing BLAST v2.2.14
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools/old/${PORTVERSION:S/.//g}/
 DISTNAME=	ncbi
diff --git a/biology/p5-Bio-Das/Makefile b/biology/p5-Bio-Das/Makefile
index ff7ae0854f05..868337eaa4da 100644
--- a/biology/p5-Bio-Das/Makefile
+++ b/biology/p5-Bio-Das/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Bio-Das
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	http://www.biodas.org/download/Bio::Das/ \
 		${MASTER_SITE_PERL_CPAN}
diff --git a/biology/p5-Bio-Phylo/Makefile b/biology/p5-Bio-Phylo/Makefile
index 96d4d20471e8..3cd6454e72a8 100644
--- a/biology/p5-Bio-Phylo/Makefile
+++ b/biology/p5-Bio-Phylo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Bio-Phylo
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Bio
diff --git a/biology/p5-bioperl-devel/Makefile b/biology/p5-bioperl-devel/Makefile
index a5bedc037594..ec32aeaa90a4 100644
--- a/biology/p5-bioperl-devel/Makefile
+++ b/biology/p5-bioperl-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bioperl
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	http://bioperl.org/DIST/
 PKGNAMEPREFIX=	p5-
diff --git a/biology/p5-bioperl-run-devel/Makefile b/biology/p5-bioperl-run-devel/Makefile
index b6738ab318ac..10d10f59033b 100644
--- a/biology/p5-bioperl-run-devel/Makefile
+++ b/biology/p5-bioperl-run-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bioperl-run
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	http://bioperl.org/DIST/
 PKGNAMEPREFIX=	p5-
@@ -14,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mauricio@arareko.net
 COMMENT=	Wrapper modules for common bioinformatics tools (developer release)
 
-BUILD_DEPENDS=	p5-bioperl=1.5.1:${PORTSDIR}/biology/p5-bioperl-devel \
+BUILD_DEPENDS=	p5-bioperl=1.5.1_1:${PORTSDIR}/biology/p5-bioperl-devel \
 		${SITE_PERL}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/biology/p5-bioperl-run/Makefile b/biology/p5-bioperl-run/Makefile
index 2e81e0d0d882..2decb02726d5 100644
--- a/biology/p5-bioperl-run/Makefile
+++ b/biology/p5-bioperl-run/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bioperl-run
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	http://bioperl.org/DIST/ \
 		${MASTER_SITE_PERL_CPAN}
@@ -15,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mauricio@arareko.net
 COMMENT=	Wrapper modules for common bioinformatics tools
 
-BUILD_DEPENDS=	p5-bioperl=1.4:${PORTSDIR}/biology/p5-bioperl \
+BUILD_DEPENDS=	p5-bioperl=1.4_1:${PORTSDIR}/biology/p5-bioperl \
 		${SITE_PERL}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/biology/p5-bioperl/Makefile b/biology/p5-bioperl/Makefile
index ef6f01a65d10..7b2cbc1d6974 100644
--- a/biology/p5-bioperl/Makefile
+++ b/biology/p5-bioperl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bioperl
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	biology perl5
 MASTER_SITES=	http://bioperl.org/DIST/ \
 		${MASTER_SITE_PERL_CPAN}
diff --git a/biology/phylip/Makefile b/biology/phylip/Makefile
index bfd1b0407eb5..9e21481d7033 100644
--- a/biology/phylip/Makefile
+++ b/biology/phylip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phylip
 PORTVERSION=	3.66
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://evolution.genetics.washington.edu/pub/phylip/ \
diff --git a/biology/platon/Makefile b/biology/platon/Makefile
index fe2338f4610c..2fa1e0481200 100644
--- a/biology/platon/Makefile
+++ b/biology/platon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	platon
 PORTVERSION=	2007.01.09
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://xraysoft.chem.uu.nl/pub/unix/
 DISTNAME=	platon
diff --git a/biology/povchem/Makefile b/biology/povchem/Makefile
index 0536e1e852a8..b6e9d4d064fd 100644
--- a/biology/povchem/Makefile
+++ b/biology/povchem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	povchem
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology graphics
 MASTER_SITES=	http://www.chemicalgraphics.com/paul/PC_Dist/v1.00/
 DISTFILES=	povchem.c \
diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile
index 39252c9bd9f7..dd40c86556d6 100644
--- a/biology/protomol/Makefile
+++ b/biology/protomol/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	protomol
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/biology/pymol/Makefile b/biology/pymol/Makefile
index cc0bf319a59d..77cc58f9e6f3 100644
--- a/biology/pymol/Makefile
+++ b/biology/pymol/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	pymol
 PORTVERSION=	0.99rc6
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pymol
diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile
index 93283da28967..bea4f4e3a1b6 100644
--- a/biology/rasmol/Makefile
+++ b/biology/rasmol/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rasmol
 PORTVERSION=	2.7.2.1.1
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.bernstein-plus-sons.com/software/
 DISTNAME=	RasMol_${PORTVERSION}
diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index e1b630d628b0..6cbc32c036b4 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	seaview
 PORTVERSION=	2006.02.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/biology/treeviewx/Makefile b/biology/treeviewx/Makefile
index 5b835cd769a3..44d599a230a8 100644
--- a/biology/treeviewx/Makefile
+++ b/biology/treeviewx/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	treeviewx
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/download/${PORTVERSION:S/.1//}/
 DISTNAME=	tv-${PORTVERSION}
diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index 3fe6f3d62af0..5d37c87ca9a8 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdrawchem
 PORTVERSION=	1.9.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdrawchem
diff --git a/biology/xmolwt/Makefile b/biology/xmolwt/Makefile
index 0ce0b99716ff..519a59dcf0c8 100644
--- a/biology/xmolwt/Makefile
+++ b/biology/xmolwt/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xmolwt
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology
 MASTER_SITES=	http://www.st.hirosaki-u.ac.jp/~rmiya/xmolwt/
 
diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
index fef589a83a29..d349a970d2a6 100644
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	alliance
 PORTVERSION=	5.0.20060509
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www-asim.lip6.fr/pub/alliance/distribution/5.0/ \
 		${MASTER_SITE_LOCAL}
diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index e225a53c75e5..527d7cf2f9a6 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	astk
 DISTVERSION=	1.5.0-1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 .if !defined(CLIENT_SEUL)
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index cc4ddea5875b..b81661f5a58c 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	brlcad
 PORTVERSION=	7.8.4
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	brlcad
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index a3c1a0693a0b..9e6c5acb3067 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CalculiX
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile
index d25296236f23..f69b527de8d4 100644
--- a/cad/chipmunk/Makefile
+++ b/cad/chipmunk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	chipmunk
 PORTVERSION=	5.64
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
 DISTFILES=	psys-1.59.tar.gz log-5.64.tar.gz netcmp-1.13.tar.gz \
diff --git a/cad/cider/Makefile b/cad/cider/Makefile
index 5fc2cf10bba2..58bd9aa186f2 100644
--- a/cad/cider/Makefile
+++ b/cad/cider/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cider
 PORTVERSION=	1.b1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mita
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 46326fb61565..862b7545a9d0 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dinotrace
 DISTVERSION=	9.3b
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.veripool.com/ftp/
 EXTRACT_SUFX=	.tgz
diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 15fbf454d521..48d33f96b567 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	electric-ng
 PORTVERSION=	8.04
+PORTREVISION=	1
 CATEGORIES=	cad java
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/-ng//}
diff --git a/cad/electric/Makefile b/cad/electric/Makefile
index e24713e18858..52abcdf2d322 100644
--- a/cad/electric/Makefile
+++ b/cad/electric/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	electric
 PORTVERSION=	7.0.0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/cad/fandango/Makefile b/cad/fandango/Makefile
index 592b86462c04..1173e86772ba 100644
--- a/cad/fandango/Makefile
+++ b/cad/fandango/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	fandango
 PORTVERSION=	0.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	elcad
diff --git a/cad/feappv/Makefile b/cad/feappv/Makefile
index eef1bfeff092..e05228d49f7a 100644
--- a/cad/feappv/Makefile
+++ b/cad/feappv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	feappv
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad science
 MASTER_SITES=	http://www.ce.berkeley.edu/~rlt/feappv/
 MASTER_SITE_SUBDIR=	feap
diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile
index d89fcc864768..f673fa9a1d7b 100644
--- a/cad/freehdl/Makefile
+++ b/cad/freehdl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freehdl
 PORTVERSION=	0.0.4
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://cran.mit.edu/~enaroska/
 
diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile
index f4609caad5ca..ffd9b9c0f98b 100644
--- a/cad/geda-gattrib/Makefile
+++ b/cad/geda-gattrib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gattrib
 PORTVERSION=	20070216
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/
diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index f76e290a7fab..17e8cf1d1ddf 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gschem
 PORTVERSION=	20070216
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/
diff --git a/cad/geda-gschem/pkg-plist b/cad/geda-gschem/pkg-plist
index 11996d0de873..424815d3dd2e 100644
--- a/cad/geda-gschem/pkg-plist
+++ b/cad/geda-gschem/pkg-plist
@@ -63,8 +63,6 @@ bin/gschem
 %%NLS%%@dirrmtry share/locale/ja_JP
 %%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/it_IT
-%%NLS%%@dirrmtry share/locale/fr_FR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr_FR
 %%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/de_DE
 @dirrmtry %%DATADIR%%/scheme
diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile
index 61c75043918e..1ea7b28ed954 100644
--- a/cad/geda-netlist/Makefile
+++ b/cad/geda-netlist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netlist
 PORTVERSION=	20070216
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/
diff --git a/cad/geda-symcheck/Makefile b/cad/geda-symcheck/Makefile
index 5c9d5d20bbe1..f44e05f0a67e 100644
--- a/cad/geda-symcheck/Makefile
+++ b/cad/geda-symcheck/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	symcheck
 PORTVERSION=	20070216
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index ab816467c072..13afd98ab33d 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	utils
 PORTVERSION=	20070216
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 52326a0cf25c..5fbc62080704 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geda
 PORTVERSION=	20070216
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	# empty
 DISTFILES=	# none
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index 3b6bbceddf73..3302d4f5ff95 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gerbv
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 52532fa9ef00..ad3694ad2ccc 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gmsh
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index 787c49bf9572..2da529df9602 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gspiceui
 PORTVERSION=	0.8.90
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index b4be33ff2e14..7595d6d7d159 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtkwave
 PORTVERSION=	2.0.0.p5
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index 1e2a7e7bacf3..646996af06a2 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gwave
 PORTVERSION=	20060606
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://geda.seul.org/dist/
 
diff --git a/cad/impact/Makefile b/cad/impact/Makefile
index 865b2d782718..16ba38d774bf 100644
--- a/cad/impact/Makefile
+++ b/cad/impact/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	impact
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	cad java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/cad/irsim/Makefile b/cad/irsim/Makefile
index 4f35d7641fb6..a9c888e7672e 100644
--- a/cad/irsim/Makefile
+++ b/cad/irsim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	irsim
 PORTVERSION=	9.7.47
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/irsim/archive/
 EXTRACT_SUFX=	.tgz
diff --git a/cad/jspice3/Makefile b/cad/jspice3/Makefile
index d447b59ff90a..4383654b4ebc 100644
--- a/cad/jspice3/Makefile
+++ b/cad/jspice3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jspice3
 PORTVERSION=	2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 MASTER_SITES=	http://www.wrcad.com/ftp/pub/	\
 		ftp://ftp.srware.com/pub/
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index dfacb0f3e45a..d2c96a139083 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		kicad
 DISTVERSION=		2007-01-15
+PORTREVISION=		1
 CATEGORIES=		cad
 MASTER_SITES=		ftp://iut-tice.ujf-grenoble.fr/cao/:dat		\
 			ftp://ftp.lis.inpg.fr/uploads/kicad/:dat	\
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index dfacb0f3e45a..d2c96a139083 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		kicad
 DISTVERSION=		2007-01-15
+PORTREVISION=		1
 CATEGORIES=		cad
 MASTER_SITES=		ftp://iut-tice.ujf-grenoble.fr/cao/:dat		\
 			ftp://ftp.lis.inpg.fr/uploads/kicad/:dat	\
diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index 7ccfd23e981b..5fe7dd7bef0b 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	klayout
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	hrs
diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile
index 37837053e004..9a07c103cd58 100644
--- a/cad/leocad/Makefile
+++ b/cad/leocad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	leocad
 PORTVERSION=	0.73
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 6a062dde5502..bb6a24bde317 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgeda
 PORTVERSION=	20070216
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 27781b9678dc..0055457f0539 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	magic
 PORTVERSION=	7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	http://vlsi.cornell.edu/magic/
 
diff --git a/cad/mars/Makefile b/cad/mars/Makefile
index ab47ad9570f5..617abf44a69e 100644
--- a/cad/mars/Makefile
+++ b/cad/mars/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mars
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/sdag/MaRS/
 DISTNAME=	MaRS-${PORTVERSION}
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index 39420f94bca3..9772e34d199f 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netgen
 PORTVERSION=	4.4
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.hpfem.jku.at/cgi/download.cgi?ID=
 DISTNAME=	ngs${PORTVERSION:S/.//g}
@@ -20,6 +21,7 @@ USE_GCC=	3.3+
 USE_GMAKE=	yes
 USE_TK=		yes
 USE_TK_BUILD=	yes
+USE_GL=		yes
 
 ALL_TARGET=	ng
 
diff --git a/cad/opencascade-tutorial/Makefile b/cad/opencascade-tutorial/Makefile
index 6491ff428b31..2c1ecf892d52 100644
--- a/cad/opencascade-tutorial/Makefile
+++ b/cad/opencascade-tutorial/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		opencascade-tutorial
 PORTVERSION=		6.2
+PORTREVISION=	1
 CATEGORIES=		cad
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index cf0dbfc32aa9..ca0bc60c5a93 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		opencascade
 PORTVERSION=		6.2
+PORTREVISION=		1
 CATEGORIES=		cad science
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry
@@ -21,7 +22,8 @@ RUN_DEPENDS=	${LOCALBASE}/include/stlport/algorithm:${PORTSDIR}/devel/stlport	\
 LIB_DEPENDS=	itcl.${ITCL_VER}:${PORTSDIR}/lang/itcl		\
 		itk.${ITK_VER}:${PORTSDIR}/x11-toolkits/itk	\
 		tix${TIX_VER}:${PORTSDIR}/x11-toolkits/tix	\
-		fltk.1:${PORTSDIR}/x11-toolkits/fltk
+		fltk.1:${PORTSDIR}/x11-toolkits/fltk		\
+		dps.0:${PORTSDIR}/x11/dgs
 
 USE_BZIP2=	yes
 USE_BISON=	yes
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index be829d6f3c9e..7913feeca911 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oregano
 PORTVERSION=	0.60.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad gnome
 MASTER_SITES=	http://gforge.lug.fi.uba.ar/frs/download.php/84/
 
diff --git a/cad/oregano/pkg-plist b/cad/oregano/pkg-plist
index 71f28b6e6fd3..f31d00e576dd 100644
--- a/cad/oregano/pkg-plist
+++ b/cad/oregano/pkg-plist
@@ -77,9 +77,3 @@ share/mime/packages/oregano.xml
 @dirrm share/gnome/help/oregano
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 33cde892cd52..71b4f4b319f7 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pcb
 PORTVERSION=	20060822
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index 5cad8fee93cc..dbba7e4995f2 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pdnmesh
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
 		${MASTER_SITE_SUNSITE:S/$/:sun/}
diff --git a/cad/pythoncad/Makefile b/cad/pythoncad/Makefile
index 3b2f1c57b51f..f947640bec7a 100644
--- a/cad/pythoncad/Makefile
+++ b/cad/pythoncad/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pythoncad
 PORTVERSION=	32
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.pythoncad.org/releases/
 DISTNAME=	PythonCAD-DS1-R${PORTVERSION}
diff --git a/cad/qcad-partslib/Makefile b/cad/qcad-partslib/Makefile
index 47f01a5fcc57..282dcba7e481 100644
--- a/cad/qcad-partslib/Makefile
+++ b/cad/qcad-partslib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qcad-partslib
 PORTVERSION=	2.0.1.2.1
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.ribbonsoft.com/archives/partlibrary/
 DISTNAME=	partlibrary-${PORTVERSION:S/.1$/-1/}
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index f39932b97cb2..df38c0c754df 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qcad
 PORTVERSION=	2.0.5.0.1
+PORTREVISION=	1
 #PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.ribbonsoft.com/archives/qcad/
diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index df00d8deda10..0a65b80b98d9 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qfsm
 PORTVERSION=	0.43
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/cad/qucs/Makefile b/cad/qucs/Makefile
index 1a0c49b2893f..cf876272b783 100644
--- a/cad/qucs/Makefile
+++ b/cad/qucs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qucs
 PORTVERSION=	0.0.11
+PORTREVISION=	1
 CATEGORIES=	cad science
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/cad/slffea/Makefile b/cad/slffea/Makefile
index 5a1048e83480..2ad219d57640 100644
--- a/cad/slffea/Makefile
+++ b/cad/slffea/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	slffea
 PORTVERSION=	1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 8b594f173165..3a14cea0dc80 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spice
 PORTVERSION=	3f5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 MASTER_SITES=	http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:sources
 DISTFILES=	spice3f5${EXTRACT_SUFX}:sources	\
diff --git a/cad/tclspice/Makefile b/cad/tclspice/Makefile
index 32f0107a2a7e..a5d7376659e1 100644
--- a/cad/tclspice/Makefile
+++ b/cad/tclspice/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tclspice
 PORTVERSION=	0.2.18
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tclspice
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index bffff20691ac..751c2685143e 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkgate
 PORTVERSION=	1.8.7
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://gadoid.ices.cmu.edu/pub/tkgate/
 EXTRACT_SUFX=	.tgz
diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile
index 8889aa35fc55..9448affb6840 100644
--- a/cad/transcalc/Makefile
+++ b/cad/transcalc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	transcalc
 PORTVERSION=	0.14
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	http://transcalc.sourceforge.net/
 
diff --git a/cad/varkon/Makefile b/cad/varkon/Makefile
index 91251e512e47..72e8f3f70724 100644
--- a/cad/varkon/Makefile
+++ b/cad/varkon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	varkon
 PORTVERSION=	1.17D
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.tech.oru.se/cad/varkon/pub/linux/:sources \
 		http://www.tech.oru.se/cad/varkon/:docs
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 1c6b8aef6264..81dfcbc298ae 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	vipec
 PORTVERSION=	3.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index c775ab0b3b5c..844cf0c3762c 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcircuit
 PORTVERSION=	3.4.22
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/xcircuit/archive/ \
diff --git a/cad/z88/Makefile b/cad/z88/Makefile
index 441f3e01a342..5cad4877a40f 100644
--- a/cad/z88/Makefile
+++ b/cad/z88/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	z88
 PORTVERSION=	11.0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.uni-bayreuth.de/pub/uni-bayreuth/LS-CAD/Version11/unix/:srcs \
 		ftp://ftp.uni-bayreuth.de/pub/uni-bayreuth/LS-CAD/Version11/manual//:dcs
@@ -18,7 +19,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A compact Finite Element Analysis System
 
 NO_WRKSUBDIR=	yes
-USE_GL=		yes
+USE_GL=		glu glw
 USE_MOTIF=	yes
 
 #These defaults can be changed in z88.fcd too
diff --git a/chinese/BBMan/Makefile b/chinese/BBMan/Makefile
index dc15f6d039b5..cdbbe03bd80f 100644
--- a/chinese/BBMan/Makefile
+++ b/chinese/BBMan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	BBMan
 PORTVERSION=	1.7.7.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/chinese/CJK/Makefile b/chinese/CJK/Makefile
index d1cb57c21497..2dcc5a666ff0 100644
--- a/chinese/CJK/Makefile
+++ b/chinese/CJK/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CJK
 PORTVERSION=	4.7.0
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	http://cjk.ffii.org/ \
 		ftp://freebsd.csie.ntu.edu.tw/users/rafan/
diff --git a/chinese/CJKUnifonts/Makefile b/chinese/CJKUnifonts/Makefile
index 21b0a9f2969e..88bbed313b49 100644
--- a/chinese/CJKUnifonts/Makefile
+++ b/chinese/CJKUnifonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CJKUnifonts
 PORTVERSION=	0.1.20060928
+PORTREVISION=	1
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	ftp://yilan.twbbs.org/distfiles/:uming \
 		http://ftp.debian.org/debian/pool/main/t/ttf-arphic-uming/:uming \
diff --git a/chinese/acroread-zh_CN/Makefile b/chinese/acroread-zh_CN/Makefile
index ce47bde87841..5e725e1d0a5c 100644
--- a/chinese/acroread-zh_CN/Makefile
+++ b/chinese/acroread-zh_CN/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	chinese print linux
 PKGNAMEPREFIX=	zh_CN-
 
diff --git a/chinese/acroread-zh_TW/Makefile b/chinese/acroread-zh_TW/Makefile
index 18b385bdd3f7..cbb53f8d4247 100644
--- a/chinese/acroread-zh_TW/Makefile
+++ b/chinese/acroread-zh_TW/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	chinese print linux
 PKGNAMEPREFIX=	zh_TW-
 
diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile
index 409b8dfc0050..937e9908f2bf 100644
--- a/chinese/arphicttf/Makefile
+++ b/chinese/arphicttf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	arphicttf
 PORTVERSION=	2.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	LOCAL/rafan/chinese/
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/chinese/aterm/Makefile b/chinese/aterm/Makefile
index adaec36f4915..23ebd28559cd 100644
--- a/chinese/aterm/Makefile
+++ b/chinese/aterm/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	aterm
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	chinese x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile
index 044a967bf01c..6de6d48b0118 100644
--- a/chinese/auto-cn-l10n/Makefile
+++ b/chinese/auto-cn-l10n/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	auto-cn-l10n
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
 DISTNAME=	zh-${PORTNAME}-${PORTVERSION}
diff --git a/chinese/calligra-l10n-zh_CN/Makefile b/chinese/calligra-l10n-zh_CN/Makefile
index bc56586813cf..2f45ea95c377 100644
--- a/chinese/calligra-l10n-zh_CN/Makefile
+++ b/chinese/calligra-l10n-zh_CN/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/chinese/calligra-l10n-zh_TW/Makefile b/chinese/calligra-l10n-zh_TW/Makefile
index ad67689576bd..9e7867050399 100644
--- a/chinese/calligra-l10n-zh_TW/Makefile
+++ b/chinese/calligra-l10n-zh_TW/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/chinese/chinput3/Makefile b/chinese/chinput3/Makefile
index 2a31595761b7..0309736f92de 100644
--- a/chinese/chinput3/Makefile
+++ b/chinese/chinput3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chinput
 PORTVERSION=	3.0.2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://ftp.jaist.ac.jp/pub/FreeBSD/distfiles/ \
 		http://www.gtlib.gatech.edu/pub/FreeBSD/distfiles/
diff --git a/chinese/chinput3/pkg-plist b/chinese/chinput3/pkg-plist
index 23dc738565ac..780ac2a060f2 100644
--- a/chinese/chinput3/pkg-plist
+++ b/chinese/chinput3/pkg-plist
@@ -29,5 +29,3 @@ share/locale/zh_CN/LC_MESSAGES/zwincontrol.mo
 @dirrm lib/Chinput/im/bin
 @dirrm lib/Chinput/im
 @dirrm lib/Chinput
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
diff --git a/chinese/cmexfonts/Makefile b/chinese/cmexfonts/Makefile
index fc486c0f9b23..6b0b172609f2 100644
--- a/chinese/cmexfonts/Makefile
+++ b/chinese/cmexfonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cmexfonts
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/fonts
diff --git a/chinese/cwtex/Makefile b/chinese/cwtex/Makefile
index 37e6fce8ede7..0832e0aab915 100644
--- a/chinese/cwtex/Makefile
+++ b/chinese/cwtex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cwtex
 PORTVERSION=	16.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	http://ftp.ussg.iu.edu/FreeBSD/distfiles/ \
 		http://ftp.nara.wide.ad.jp/pub/FreeBSD/distfiles/
diff --git a/chinese/cwtexttf/Makefile b/chinese/cwtexttf/Makefile
index 204667c76e75..6eedbe0b4cf4 100644
--- a/chinese/cwtexttf/Makefile
+++ b/chinese/cwtexttf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cwtexttf
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	http://ftp.wustl.edu/pub/FreeBSD/distfiles/ \
 		http://ftp.jaist.ac.jp/pub/FreeBSD/distfiles/
diff --git a/chinese/cxterm/Makefile b/chinese/cxterm/Makefile
index b3fc8cbacefd..b9205f79485e 100644
--- a/chinese/cxterm/Makefile
+++ b/chinese/cxterm/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cxterm
 PORTVERSION=	5.0.3
+PORTREVISION=	1
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/x-win/cxterm/
 DISTNAME=	cxterm5.0.p3
diff --git a/chinese/dfsongsd/Makefile b/chinese/dfsongsd/Makefile
index d6fe60aa2f22..1b0a0a0e39d5 100644
--- a/chinese/dfsongsd/Makefile
+++ b/chinese/dfsongsd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dfsongsd
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	# empty
 DISTNAME=	DFSongSd.ttf
diff --git a/chinese/docproj/Makefile b/chinese/docproj/Makefile
index b6990aef411c..acf7d9ec9191 100644
--- a/chinese/docproj/Makefile
+++ b/chinese/docproj/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	docproj
 PORTVERSION=	0.1.20060303
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	zh-
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index ad0b460dade6..a1ceb2cc9525 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fcitx
 PORTVERSION=	3.4.2
+PORTREVISION=	1
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://www.fcitx.org/download/ \
 		${MASTER_SITE_LOCAL} \
diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile
index 60d277fce804..b7aa81324340 100644
--- a/chinese/fireflyttf/Makefile
+++ b/chinese/fireflyttf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fireflyttf
 PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES?=	http://firefly.idv.tw/apt/firefly-font/ \
 		http://www.study-area.org/apt/firefly-font/
diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 3ce766317637..405dbd486afd 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcin
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
 		http://ftp.twaren.net/local-distfiles/gcin/:main \
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 3ce766317637..405dbd486afd 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcin
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
 		http://ftp.twaren.net/local-distfiles/gcin/:main \
diff --git a/chinese/gugod-clean/Makefile b/chinese/gugod-clean/Makefile
index 5716e9231d48..baee2482e0e2 100644
--- a/chinese/gugod-clean/Makefile
+++ b/chinese/gugod-clean/Makefile
@@ -5,6 +5,7 @@
 
 PORTNAME=	gugod-clean
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/gugod/
 
diff --git a/chinese/hanzim/Makefile b/chinese/hanzim/Makefile
index ed6a25016114..90d1db012f16 100644
--- a/chinese/hanzim/Makefile
+++ b/chinese/hanzim/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	hanzim
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese tk84
 MASTER_SITES=	http://kamares.ucsd.edu/~arobert/Files/Chinese/
 MASTER_SITE_SUBDIR=	. Old
diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile
index 1858e7af3674..911374757a39 100644
--- a/chinese/iiimf-le-newpy/Makefile
+++ b/chinese/iiimf-le-newpy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-newpy
 PORTVERSION=	12.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile
index 9cbfde096cc7..aabf15abcb3b 100644
--- a/chinese/iiimf-le-xcin/Makefile
+++ b/chinese/iiimf-le-xcin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iiimf-le-xcin
 PORTVERSION=	0.1.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://people.redhat.com/llch/iiimf-xcin/${PORTVERSION}/
 EXTRACT_SUFX=	-11.src.rpm
diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile
index 98a1066cdc11..dd3bd267bf8f 100644
--- a/chinese/kcfonts/Makefile
+++ b/chinese/kcfonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kcfonts
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
diff --git a/chinese/kde3-i18n-zh_CN/Makefile b/chinese/kde3-i18n-zh_CN/Makefile
index c01988988ef9..a99656b84121 100644
--- a/chinese/kde3-i18n-zh_CN/Makefile
+++ b/chinese/kde3-i18n-zh_CN/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/chinese/kde3-i18n-zh_TW/Makefile b/chinese/kde3-i18n-zh_TW/Makefile
index 1701c03eb370..8098d55a84e4 100644
--- a/chinese/kde3-i18n-zh_TW/Makefile
+++ b/chinese/kde3-i18n-zh_TW/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/chinese/kde4-l10n-zh_CN/Makefile b/chinese/kde4-l10n-zh_CN/Makefile
index c01988988ef9..a99656b84121 100644
--- a/chinese/kde4-l10n-zh_CN/Makefile
+++ b/chinese/kde4-l10n-zh_CN/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/chinese/kde4-l10n-zh_TW/Makefile b/chinese/kde4-l10n-zh_TW/Makefile
index 1701c03eb370..8098d55a84e4 100644
--- a/chinese/kde4-l10n-zh_TW/Makefile
+++ b/chinese/kde4-l10n-zh_TW/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/chinese/koffice-i18n-zh_CN/Makefile b/chinese/koffice-i18n-zh_CN/Makefile
index bc56586813cf..2f45ea95c377 100644
--- a/chinese/koffice-i18n-zh_CN/Makefile
+++ b/chinese/koffice-i18n-zh_CN/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/chinese/koffice-i18n-zh_TW/Makefile b/chinese/koffice-i18n-zh_TW/Makefile
index ad67689576bd..9e7867050399 100644
--- a/chinese/koffice-i18n-zh_TW/Makefile
+++ b/chinese/koffice-i18n-zh_TW/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/chinese/koffice-kde4-l10n-zh_CN/Makefile b/chinese/koffice-kde4-l10n-zh_CN/Makefile
index bc56586813cf..2f45ea95c377 100644
--- a/chinese/koffice-kde4-l10n-zh_CN/Makefile
+++ b/chinese/koffice-kde4-l10n-zh_CN/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/chinese/koffice-kde4-l10n-zh_TW/Makefile b/chinese/koffice-kde4-l10n-zh_TW/Makefile
index ad67689576bd..9e7867050399 100644
--- a/chinese/koffice-kde4-l10n-zh_TW/Makefile
+++ b/chinese/koffice-kde4-l10n-zh_TW/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/chinese/kon2/Makefile b/chinese/kon2/Makefile
index a0ba7ae3f032..abfab83f996a 100644
--- a/chinese/kon2/Makefile
+++ b/chinese/kon2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 
 MASTERDIR=	${.CURDIR}/../../japanese/kon2-16dot
 CATEGORIES=	chinese
diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index f7dadad289d6..4f3353631fc5 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtabe
 PORTVERSION=	0.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	ftp://cle.linux.org.tw/pub/xcin/cvs/
 
diff --git a/chinese/mingunittf/Makefile b/chinese/mingunittf/Makefile
index e913d52e8088..1a6baedf9aa5 100644
--- a/chinese/mingunittf/Makefile
+++ b/chinese/mingunittf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mingunittf
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	http://www.info.gov.hk/digital21/chi/hkscs/download/
 DISTNAME=	ming_uni.ttf
diff --git a/chinese/miniChinput/Makefile b/chinese/miniChinput/Makefile
index 7896f678604a..94d12a75fdcc 100644
--- a/chinese/miniChinput/Makefile
+++ b/chinese/miniChinput/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	miniChinput
 PORTVERSION=	0.1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	minichinput
diff --git a/chinese/moefonts-cid/Makefile b/chinese/moefonts-cid/Makefile
index a1745363c6de..493ebdb6e465 100644
--- a/chinese/moefonts-cid/Makefile
+++ b/chinese/moefonts-cid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moefonts-cid
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese print
 MASTER_SITES=	ftp://ftp.ora.com/pub/examples/nutshell/cjkv/adobe/samples/
 DISTFILES=	MOEKai-Regular MOESung-Regular
diff --git a/chinese/moettf/Makefile b/chinese/moettf/Makefile
index a37ccefb4b60..ab202141cc5e 100644
--- a/chinese/moettf/Makefile
+++ b/chinese/moettf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moettf
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	http://ftp.riken.go.jp/pub/FreeBSD/distfiles/zh-moettf/ \
 		http://ftp.math.uni-bielefeld.de/pub/unix/FreeBSD/distfiles/zh-moettf/
diff --git a/chinese/mplayer-fonts/Makefile b/chinese/mplayer-fonts/Makefile
index 6e2fe63ff3d5..557b51ba1f1b 100644
--- a/chinese/mplayer-fonts/Makefile
+++ b/chinese/mplayer-fonts/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	mplayer-fonts
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	chinese multimedia
 MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/mplayer/
 DISTFILES=	${SUBFONT_DISTNAME}.tar.bz2 \
diff --git a/chinese/msttf/Makefile b/chinese/msttf/Makefile
index 6c8a485fb6c6..8761831f8721 100644
--- a/chinese/msttf/Makefile
+++ b/chinese/msttf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	msttf
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	#
 DISTFILES=	${MSTTF_SIMHEI} ${MSTTF_SIMSUN} ${MSTTF_TAHOMA}
diff --git a/chinese/ntuttf/Makefile b/chinese/ntuttf/Makefile
index 5162224ae779..8b6e06755e30 100644
--- a/chinese/ntuttf/Makefile
+++ b/chinese/ntuttf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ntuttf
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	ftp://cle.linux.org.tw/pub/fonts/ttf/unicode/ntu/ \
 		ftp://freebsd.sinica.edu.tw/pub/statue/ntuttf/
diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile
index 0fb10eef6397..1ee91796fdab 100644
--- a/chinese/opendesktop-fonts/Makefile
+++ b/chinese/opendesktop-fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opendesktop-fonts
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES?=	ftp://ftp.opendesktop.org.tw/odp/ODOFonts/OpenFonts/ \
 		LOCAL/chinsan/fonts
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index d43786fd0622..89f9894eeb90 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oxim
 PORTVERSION=	1.1.2.90
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 MASTER_SITES=	ftp://ftp.opendesktop.org.tw/odp/OXIM/Source/ \
 		ftp://apt.nc.hcc.edu.tw/pub/mirror/opendesktop.org.tw/OXIM/Source/ \
diff --git a/chinese/p5-Lingua-ZH-Keywords/Makefile b/chinese/p5-Lingua-ZH-Keywords/Makefile
index 7405c3ae7bab..4bafb1705dd8 100644
--- a/chinese/p5-Lingua-ZH-Keywords/Makefile
+++ b/chinese/p5-Lingua-ZH-Keywords/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Lingua-ZH-Keywords
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Lingua
diff --git a/chinese/p5-Lingua-ZH-Summarize/Makefile b/chinese/p5-Lingua-ZH-Summarize/Makefile
index 7c997ef89b99..3c8191193237 100644
--- a/chinese/p5-Lingua-ZH-Summarize/Makefile
+++ b/chinese/p5-Lingua-ZH-Summarize/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Lingua-ZH-Summarize
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Lingua
diff --git a/chinese/p5-Lingua-ZH-TaBE/Makefile b/chinese/p5-Lingua-ZH-TaBE/Makefile
index 8cb1753c0847..64d092407f34 100644
--- a/chinese/p5-Lingua-ZH-TaBE/Makefile
+++ b/chinese/p5-Lingua-ZH-TaBE/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	Lingua-ZH-TaBE
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Lingua
diff --git a/chinese/p5-Lingua-ZH-Toke/Makefile b/chinese/p5-Lingua-ZH-Toke/Makefile
index 5e8407538e9e..74d278d063fe 100644
--- a/chinese/p5-Lingua-ZH-Toke/Makefile
+++ b/chinese/p5-Lingua-ZH-Toke/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	Lingua-ZH-Toke
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Lingua
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index 0140856b62be..b2cb54ab9809 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pcmanx
 PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese net gnome
 MASTER_SITES=	http://pcmanx.csie.net/release/
 DISTNAME=	${PORTNAME}-gtk2-${PORTVERSION}
diff --git a/chinese/pcmanx/pkg-plist b/chinese/pcmanx/pkg-plist
index 1353606d8bef..16c196863396 100644
--- a/chinese/pcmanx/pkg-plist
+++ b/chinese/pcmanx/pkg-plist
@@ -15,7 +15,6 @@ lib/libpcmanx_core.so.0
 share/applications/pcmanx.desktop
 share/pixmaps/pcmanx.png
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
 @dirrmtry %%DATADIR%%/nancy_bot
 @dirrmtry %%DATADIR%%/script
 @dirrm %%DATADIR%%
diff --git a/chinese/pyDict/Makefile b/chinese/pyDict/Makefile
index 8812922ec037..716b05af667c 100644
--- a/chinese/pyDict/Makefile
+++ b/chinese/pyDict/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pyDict
 PORTVERSION=	0.2.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese
 MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/pyDict/
 
diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile
index 013437e99a4b..82fb2a426329 100644
--- a/chinese/qterm/Makefile
+++ b/chinese/qterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qterm
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.yuanjue.net/download/
diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile
index 52ee171e8ad3..4d320beae400 100644
--- a/chinese/reciteword/Makefile
+++ b/chinese/reciteword/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	reciteword
 PORTVERSION=	0.8.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese
 MASTER_SITES=	http://reciteword.cosoft.org.cn/reciteword/download/ \
 		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
diff --git a/chinese/scim-chewing/Makefile b/chinese/scim-chewing/Makefile
index 4291df2854a5..360e2edae8ea 100644
--- a/chinese/scim-chewing/Makefile
+++ b/chinese/scim-chewing/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-chewing
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese
 MASTER_SITES=	http://chewing.csie.net/download/scim/
 
diff --git a/chinese/scim-chewing/pkg-plist b/chinese/scim-chewing/pkg-plist
index 743e65122526..e81cd2ec4603 100644
--- a/chinese/scim-chewing/pkg-plist
+++ b/chinese/scim-chewing/pkg-plist
@@ -7,5 +7,3 @@ lib/scim-1.0/1.4.0/SetupUI/chewing-imengine-setup.so
 share/locale/zh_TW/LC_MESSAGES/scim-chewing.mo
 share/scim/icons/scim-chewing-swap-colors.png
 share/scim/icons/scim-chewing.png
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index f74c474082ce..e2f69181dea6 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-pinyin
 PORTVERSION=	0.5.91
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
diff --git a/chinese/scim-pinyin/pkg-plist b/chinese/scim-pinyin/pkg-plist
index d4f774e3a4cf..adf3ab1d8063 100644
--- a/chinese/scim-pinyin/pkg-plist
+++ b/chinese/scim-pinyin/pkg-plist
@@ -33,9 +33,3 @@ share/scim/icons/smart-pinyin.png
 %%SKIM%%share/apps/skim/pics/smart-pinyin.png
 %%SKIM%%@cwd %%PREFIX%%
 @dirrm share/scim/pinyin
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile
index 34d4fa8af6cc..e69a6986356b 100644
--- a/chinese/scim-tables/Makefile
+++ b/chinese/scim-tables/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-tables
 PORTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
diff --git a/chinese/srecite/Makefile b/chinese/srecite/Makefile
index 5397faa7bab7..c58ec98c8897 100644
--- a/chinese/srecite/Makefile
+++ b/chinese/srecite/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	srecite
 PORTVERSION=	0.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/chinese/stardict-dict-zh_CN/Makefile b/chinese/stardict-dict-zh_CN/Makefile
index 17038468fe2b..48f7251bc624 100644
--- a/chinese/stardict-dict-zh_CN/Makefile
+++ b/chinese/stardict-dict-zh_CN/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_CN
 PORTVERSION=	2.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
diff --git a/chinese/stardict2-dict-zh_CN/Makefile b/chinese/stardict2-dict-zh_CN/Makefile
index 17038468fe2b..48f7251bc624 100644
--- a/chinese/stardict2-dict-zh_CN/Makefile
+++ b/chinese/stardict2-dict-zh_CN/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_CN
 PORTVERSION=	2.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
diff --git a/chinese/stardict2-dict-zh_TW/Makefile b/chinese/stardict2-dict-zh_TW/Makefile
index ed16c3b315ba..c9c9f0dfc6b5 100644
--- a/chinese/stardict2-dict-zh_TW/Makefile
+++ b/chinese/stardict2-dict-zh_TW/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_TW
 PORTVERSION=	2.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
diff --git a/chinese/tk83/Makefile b/chinese/tk83/Makefile
index dfb24715540d..0b7ac4d70202 100644
--- a/chinese/tk83/Makefile
+++ b/chinese/tk83/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.3.0
+PORTREVISION=	1
 CATEGORIES=	chinese x11-toolkits tk83
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_3
diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile
index 5ac3bb1d447b..a1438f92ce0f 100644
--- a/chinese/ttfm/Makefile
+++ b/chinese/ttfm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ttfm
 PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese print
 MASTER_SITES=	LOCAL/rafan/chinese
 
diff --git a/chinese/vflib/Makefile b/chinese/vflib/Makefile
index 8451fc2b33c4..b9a7f062da1a 100644
--- a/chinese/vflib/Makefile
+++ b/chinese/vflib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vflib
 PORTVERSION=	${VFLIB_VERSION}
+PORTREVISION=	1
 CATEGORIES=	chinese print
 MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/keith/VFlib2/ \
 		ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/
diff --git a/chinese/wangttf/Makefile b/chinese/wangttf/Makefile
index 78a3bae61784..8791eb53b734 100644
--- a/chinese/wangttf/Makefile
+++ b/chinese/wangttf/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	wangttf
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	http://cle.linux.org.tw/fonts/wangfonts/:main \
 		http://cle.linux.org.tw/fonts/truetype/:another \
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index e8f38b379b39..e463d9647207 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wenju
 PORTVERSION=	1.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wenju
diff --git a/chinese/xemacs/Makefile b/chinese/xemacs/Makefile
index 1162a6d557db..88e9aa848573 100644
--- a/chinese/xemacs/Makefile
+++ b/chinese/xemacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs
 PORTVERSION=	20.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese editors
 MASTER_SITES=	ftp://ftp.tnt.uni-hannover.de/pub/editors/xemacs/20.4/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-mule${EXTRACT_SUFX}
diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile
index 67f331eca042..d2e910636054 100644
--- a/chinese/xpdf/Makefile
+++ b/chinese/xpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	20040727
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN} \
diff --git a/chinese/xsim/Makefile b/chinese/xsim/Makefile
index 1d59e84486ad..da34e58bf618 100644
--- a/chinese/xsim/Makefile
+++ b/chinese/xsim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xsim
 PORTVERSION=	0.3.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/comms/acfax/Makefile b/comms/acfax/Makefile
index 7d56caa6bccc..a196687f0e8a 100644
--- a/comms/acfax/Makefile
+++ b/comms/acfax/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	acfax
 PORTVERSION=	0.981011
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	ftp://ftp.funet.fi/pub/ham/unix/Linux/misc/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/^0.//}
diff --git a/comms/asmodem/Makefile b/comms/asmodem/Makefile
index ab980f53f063..8c4432de4e0f 100644
--- a/comms/asmodem/Makefile
+++ b/comms/asmodem/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asmodem
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
 MASTER_SITE_SUBDIR=	apps/asmodem
diff --git a/comms/atslog/Makefile b/comms/atslog/Makefile
index bbacf721ff18..c4ee4d40e94e 100644
--- a/comms/atslog/Makefile
+++ b/comms/atslog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	atslog
 PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	BERLIOS
 
diff --git a/comms/cutecom/Makefile b/comms/cutecom/Makefile
index f78e8d342e54..cc32e8d8b667 100644
--- a/comms/cutecom/Makefile
+++ b/comms/cutecom/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	cutecom
 PORTVERSION=	0.14.1
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://cutecom.sourceforge.net/
 
diff --git a/comms/echolinux/Makefile b/comms/echolinux/Makefile
index 565514da63c9..670b055785bf 100644
--- a/comms/echolinux/Makefile
+++ b/comms/echolinux/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	echolinux
 PORTVERSION=	0.17a
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cqinet
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 915e074279ae..21f5b19f8886 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		efax-gtk
 PORTVERSION=		3.0.12
+PORTREVISION=		1
 CATEGORIES=		comms
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +21,6 @@ RUN_DEPENDS=		ggv:${PORTSDIR}/print/ggv
 
 USE_GHOSTSCRIPT_RUN=	yes
 USE_GNOME=		gtk20
-USE_X_PREFIX=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--mandir=${X11BASE}/man
 MAN1=			efax.1 efix.1 efax-gtk.1
diff --git a/comms/efax-gtk/pkg-plist b/comms/efax-gtk/pkg-plist
index d8cfc3c63f41..ce4aadbcd7af 100644
--- a/comms/efax-gtk/pkg-plist
+++ b/comms/efax-gtk/pkg-plist
@@ -3,4 +3,18 @@ bin/efax-0.9a
 bin/efix-0.9a
 etc/efax-gtkrc
 share/applications/efax-gtk.desktop
+share/locale/bg/LC_MESSAGES/efax-gtk.mo
+share/locale/ca/LC_MESSAGES/efax-gtk.mo
+share/locale/de/LC_MESSAGES/efax-gtk.mo
+share/locale/el/LC_MESSAGES/efax-gtk.mo
+share/locale/en_GB/LC_MESSAGES/efax-gtk.mo
+share/locale/he/LC_MESSAGES/efax-gtk.mo
+share/locale/hu/LC_MESSAGES/efax-gtk.mo
+share/locale/it/LC_MESSAGES/efax-gtk.mo
+share/locale/pl/LC_MESSAGES/efax-gtk.mo
+share/locale/ru/LC_MESSAGES/efax-gtk.mo
+share/locale/sq/LC_MESSAGES/efax-gtk.mo
+share/locale/sv/LC_MESSAGES/efax-gtk.mo
+share/locale/zh_CN/LC_MESSAGES/efax-gtk.mo
+share/locale/zh_TW/LC_MESSAGES/efax-gtk.mo
 @dirrmtry share/applications
diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index 0ff251c7cc3e..1c74356aa46d 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	efax-0.9a
 PORTVERSION=	001114a7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	http://shino.pos.to/linux/
 
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 3b015b4938b0..b25de2f711ef 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fldigi
 PORTVERSION=	1.24
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	.src
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/LinuxApps/ \
diff --git a/comms/gfax/Makefile b/comms/gfax/Makefile
index 9aca3853d50f..5e7b7f6a90e1 100644
--- a/comms/gfax/Makefile
+++ b/comms/gfax/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gfax
 PORTVERSION=	0.7.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms print gnome
 MASTER_SITES=	http://gfax.cowlug.org/
 
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 56027fe88816..12bab946f56b 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghfaxviewer
 PORTVERSION=	0.22.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	halifax
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index 7a1dff216400..b1907d631c2f 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmfsk
 PORTVERSION=	0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms audio hamradio
 MASTER_SITES=	http://gmfsk.connect.fi/
 
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 336566034384..7477d34720cd 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnokii
 PORTVERSION=	0.6.14
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.gnokii.org/download/gnokii/ \
diff --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist
index e362192e1b6c..919929b406ea 100644
--- a/comms/gnokii/pkg-plist
+++ b/comms/gnokii/pkg-plist
@@ -160,13 +160,3 @@ sbin/mgnokiidev
 %%X11%%@dirrm share/xgnokii/help/pl_PL
 %%X11%%@dirrm share/xgnokii/help
 %%X11%%@dirrm share/xgnokii
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sl
diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index 60ccd0f05eb2..ca0b8078281e 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gpredict
 PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	groundstation
diff --git a/comms/gpredict/pkg-plist b/comms/gpredict/pkg-plist
index 45175bc9695d..7bbc3dfef646 100644
--- a/comms/gpredict/pkg-plist
+++ b/comms/gpredict/pkg-plist
@@ -44,7 +44,6 @@ share/pixmaps/gpredict/maps/nasa-topo_800.png
 @dirrm share/pixmaps/gpredict/maps
 @dirrm share/pixmaps/gpredict/icons
 @dirrm share/pixmaps/gpredict
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
 @dirrmtry locale
diff --git a/comms/gpsk31/Makefile b/comms/gpsk31/Makefile
index 7e3c05bf34cc..8a7abc96161b 100644
--- a/comms/gpsk31/Makefile
+++ b/comms/gpsk31/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gpsk31
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.qsl.net/pg4i/download/
 
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index f7b27646b50e..5de869a7cc53 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	grig
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	groundstation
diff --git a/comms/grig/pkg-plist b/comms/grig/pkg-plist
index 9df9ce4f74c7..d9efd004c548 100644
--- a/comms/grig/pkg-plist
+++ b/comms/grig/pkg-plist
@@ -10,6 +10,5 @@ share/pixmaps/grig/grig-logo.png
 share/pixmaps/grig/ic910.png
 share/pixmaps/grig/smeter.png
 @dirrm share/pixmaps/grig
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%
 @dirrmtry locale
diff --git a/comms/gscmxx/Makefile b/comms/gscmxx/Makefile
index 84514688caab..4d96f3f10811 100644
--- a/comms/gscmxx/Makefile
+++ b/comms/gscmxx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gscmxx
 PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/comms/gscmxx/pkg-plist b/comms/gscmxx/pkg-plist
index 17b56f3a5ab1..b8dc4e31c1e3 100644
--- a/comms/gscmxx/pkg-plist
+++ b/comms/gscmxx/pkg-plist
@@ -38,4 +38,3 @@ share/gscmxx/i18n/italian
 @dirrm share/gscmxx
 @dirrm share/pixmaps/gscmxx/groups
 @dirrm share/pixmaps/gscmxx
-@dirrmtry share/pixmaps
diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile
index 51d20f3152b6..9b1f07a56ffc 100644
--- a/comms/hamfax/Makefile
+++ b/comms/hamfax/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	hamfax
 PORTVERSION=	0.6.4
+PORTREVISION=	1
 CATEGORIES=	comms audio hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hamfax
diff --git a/comms/hf/Makefile b/comms/hf/Makefile
index 9a5fe0612446..30523d455783 100644
--- a/comms/hf/Makefile
+++ b/comms/hf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hf
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hfterm
diff --git a/comms/java-commapi-freebsd/Makefile b/comms/java-commapi-freebsd/Makefile
index f5bc58c61261..de8eb7b773df 100644
--- a/comms/java-commapi-freebsd/Makefile
+++ b/comms/java-commapi-freebsd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	java-commapi-freebsd
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	comms java
 MASTER_SITES=	http://www.syncrontech.org/freebsd/
 DISTNAME=	freebsd-commapi-${PORTVERSION}
diff --git a/comms/java-commapi/Makefile b/comms/java-commapi/Makefile
index d0ccce7e3f3b..2a83b38fef4e 100644
--- a/comms/java-commapi/Makefile
+++ b/comms/java-commapi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	java-commapi
 PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms java
 MASTER_SITES=	#
 DISTNAME=	comm${PORTVERSION}
diff --git a/comms/kallers/Makefile b/comms/kallers/Makefile
index df2aaad350cd..fab8baf3c41c 100644
--- a/comms/kallers/Makefile
+++ b/comms/kallers/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kallers
 PORTVERSION=	0.3.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	comms kde
 MASTER_SITES=	http://www.nadmm.com/kallers/src/
 
diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index 81be8ec55fe1..b550494abbe6 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	klog
 PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	klog
diff --git a/comms/kmobiletools/Makefile b/comms/kmobiletools/Makefile
index ec805fc73dfb..33bd826574cf 100644
--- a/comms/kmobiletools/Makefile
+++ b/comms/kmobiletools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kmobiletools
 PORTVERSION=	0.4.3.3
+PORTREVISION=	1
 CATEGORIES=	comms kde
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	kmobiletools
diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile
index c57ae0f5925f..628d785d7c29 100644
--- a/comms/kpsk/Makefile
+++ b/comms/kpsk/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kpsk
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms kde hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kpsk
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index d2a8b1c1613f..349568482863 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/comms/ktrack/Makefile b/comms/ktrack/Makefile
index d93e69cd577a..a68751877906 100644
--- a/comms/ktrack/Makefile
+++ b/comms/ktrack/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ktrack
 PORTVERSION=	0.3.0r1
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ktrack
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index 846571d6fdc9..a576d8a997b7 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	linpsk
 PORTVERSION=	0.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index b8dd94ddad01..5c365f676fa1 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	linrad
 PORTVERSION=	2.28
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.nitehawk.com/sm5bsz/linuxdsp/archive/\
 		http://g7rau.demon.co.uk/sm5bsz/linuxdsp/archive/\
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 3a20213fdbb7..16f6ef55b951 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lirc
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lirc
diff --git a/comms/ncid/Makefile b/comms/ncid/Makefile
index ad5eeef70ba3..7de5ce267209 100644
--- a/comms/ncid/Makefile
+++ b/comms/ncid/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ncid
 PORTVERSION=	0.67
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/comms/py-lirc/Makefile b/comms/py-lirc/Makefile
index cab21b9e3fd1..ede501127071 100644
--- a/comms/py-lirc/Makefile
+++ b/comms/py-lirc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lirc
 PORTVERSION=	0.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pylirc
diff --git a/comms/qfaxreader/Makefile b/comms/qfaxreader/Makefile
index d06e4fa7c6fc..30b350d341ca 100644
--- a/comms/qfaxreader/Makefile
+++ b/comms/qfaxreader/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	qfaxreader
 DISTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	comms graphics print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index 9081df205e42..84f4608f02fb 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qsstv
 PORTVERSION=	6.0a
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://users.telenet.be/on4qz/snapshots/download/
 EXTRACT_SUFX=	.tgz
diff --git a/comms/rxtx/Makefile b/comms/rxtx/Makefile
index 157de03b76b8..a0e4349251dc 100644
--- a/comms/rxtx/Makefile
+++ b/comms/rxtx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rxtx
 PORTVERSION=	2.1.7r2
+PORTREVISION=	1
 CATEGORIES=	comms java
 MASTER_SITES=	ftp://jarvi.dsl.frii.com/pub/rxtx/
 PKGNAMESUFFIX=	-${JAVA_PORT:S/java\///}
diff --git a/comms/seyon/Makefile b/comms/seyon/Makefile
index 1ea8f32c2adc..0da39b78358d 100644
--- a/comms/seyon/Makefile
+++ b/comms/seyon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	seyon
 PORTVERSION=	2.14b
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://sipb.mit.edu/pub/seyon/
 DISTNAME=	Seyon-${PORTVERSION}
diff --git a/comms/soundmodem/Makefile b/comms/soundmodem/Makefile
index 516a48e907da..ebabbd4f87da 100644
--- a/comms/soundmodem/Makefile
+++ b/comms/soundmodem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	soundmodem
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.baycom.org/~tom/ham/soundmodem/ \
 		http://chronos.org.uk/distfiles/
diff --git a/comms/syncterm/Makefile b/comms/syncterm/Makefile
index 0e488ea7e468..712d98acf593 100644
--- a/comms/syncterm/Makefile
+++ b/comms/syncterm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	syncterm
 PORTVERSION=	0.8.20061020
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/comms/tilp/Makefile b/comms/tilp/Makefile
index ba7fdf3f7c42..d38c8732e590 100644
--- a/comms/tilp/Makefile
+++ b/comms/tilp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tilp
 PORTVERSION=	6.79
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tilp
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index e14a357ee148..96f6f493ed86 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tilp2
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tilp
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index bf3e86597959..14083962875f 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkhylafax
 PORTVERSION=	3.2b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms tk84
 MASTER_SITES=	ftp://ftp.hylafax.org/contrib/tkhylafax/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
diff --git a/comms/tkscanfax/Makefile b/comms/tkscanfax/Makefile
index eeafc7449918..41abdc5cf2d8 100644
--- a/comms/tkscanfax/Makefile
+++ b/comms/tkscanfax/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkscanfax
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	comms tk83
 MASTER_SITES=	http://shino.pos.to/linux/tkscanfax/
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index e183766c1c3e..2a3f8a6ad2c4 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	trustedqsl
 PORTVERSION=	1.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	trustedqsl
diff --git a/comms/twpsk/Makefile b/comms/twpsk/Makefile
index 02ef5ee43659..eaa86d8f9bf5 100644
--- a/comms/twpsk/Makefile
+++ b/comms/twpsk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	twpsk
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.ibiblio.org/pub/linux/apps/ham/
 
diff --git a/comms/viewfax/Makefile b/comms/viewfax/Makefile
index 3c53fe78fb86..b3f18fbb3cb5 100644
--- a/comms/viewfax/Makefile
+++ b/comms/viewfax/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	viewfax
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.ping.de/pub/unix/ \
 		ftp://ftp.leo.org/historic/comp/os/unix/networking/mgetty/
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 9da56d76cb17..032721b39b05 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wsjt
 PORTVERSION=	5.9.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	wsjt
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 348d76eb13d1..000b5365ff0c 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xastir
 PORTVERSION=	1.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xastir
diff --git a/comms/xcept/Makefile b/comms/xcept/Makefile
index aebc0e3eb533..cda1dc4bc1c9 100644
--- a/comms/xcept/Makefile
+++ b/comms/xcept/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcept
 PORTVERSION=	2.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	joerg
diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile
index 835e23292e68..708d2087d44e 100644
--- a/comms/xdx/Makefile
+++ b/comms/xdx/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xdx
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://pg4i.chronos.org.uk/download/ \
 		http://www.qsl.net/pg4i/download/
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 0013204ad972..ef79329078ca 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xlog
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://pg4i.chronos.org.uk/download/ \
 		http://www.qsl.net/pg4i/download/
diff --git a/comms/xlog/pkg-plist b/comms/xlog/pkg-plist
index a9bba05105c9..ad674567efcf 100644
--- a/comms/xlog/pkg-plist
+++ b/comms/xlog/pkg-plist
@@ -71,4 +71,3 @@ share/pixmaps/xlog/xlog.xpm
 @dirrmtry share/applications
 @dirrmtry share/mime/packages
 @dirrmtry share/mime
-@dirrmtry share/pixmaps
diff --git a/comms/xnecview/Makefile b/comms/xnecview/Makefile
index 12de63b93850..90199bddf00f 100644
--- a/comms/xnecview/Makefile
+++ b/comms/xnecview/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xnecview
 PORTVERSION=	1.35
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://wwwhome.cs.utwente.nl/%7Eptdeboer/ham/xnecview/
 EXTRACT_SUFX=	.tgz
diff --git a/comms/xwota/Makefile b/comms/xwota/Makefile
index 0b0e90e6fce5..1c09696aee2b 100644
--- a/comms/xwota/Makefile
+++ b/comms/xwota/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xwota
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://people.fabaris.it/iz0ete/xwota/ \
 		${MASTER_SITE_LOCAL}
diff --git a/comms/yawmppp/Makefile b/comms/yawmppp/Makefile
index 1726cc98e077..ac8c080cc956 100644
--- a/comms/yawmppp/Makefile
+++ b/comms/yawmppp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yawmppp
 PORTVERSION=	2.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms windowmaker
 MASTER_SITES=	ftp://ftp.seul.org/pub/yawmppp/
 
diff --git a/converters/gbase/Makefile b/converters/gbase/Makefile
index 3fdb8e1b8b54..04081c6dcffc 100644
--- a/converters/gbase/Makefile
+++ b/converters/gbase/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gbase
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	converters
 MASTER_SITES=	http://www.hibernaculum.net/download/
 
diff --git a/converters/ktextdecode/Makefile b/converters/ktextdecode/Makefile
index aacec41e2644..9f21a35b97fb 100644
--- a/converters/ktextdecode/Makefile
+++ b/converters/ktextdecode/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ktextdecode
 PORTVERSION=	3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	converters kde
 MASTER_SITES=	http://osmirrors.cerias.purdue.edu/pub/FreeBSD/ports/local-distfiles/markus/
 
diff --git a/converters/mule-ucs/Makefile b/converters/mule-ucs/Makefile
index bd074c4f9545..6251a0f9586c 100644
--- a/converters/mule-ucs/Makefile
+++ b/converters/mule-ucs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mule-ucs
 PORTVERSION=	0.85.r3
+PORTREVISION=	1
 CATEGORIES=	converters elisp
 MASTER_SITES=	${MASTER_SITE_M17N}
 MASTER_SITE_SUBDIR=	mule/Mule-UCS/test
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 65be848c2ddc..1ac63c6ffc1c 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdeview
 PORTVERSION=	0.5.20
+PORTREVISION=	1
 CATEGORIES=	converters tcl84 tk84
 MASTER_SITES=	http://www.fpx.de/fp/Software/UUDeview/download/
 DISTNAME=	uudeview-${PORTVERSION}
diff --git a/databases/adstudio/Makefile b/databases/adstudio/Makefile
index d0e723c1f0a6..04302bba0116 100644
--- a/databases/adstudio/Makefile
+++ b/databases/adstudio/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	adstudio
 PORTVERSION=	4.7.2
+PORTREVISION=	1
 CATEGORIES=	databases devel java
 MASTER_SITES=	http://download.aquafold.com/download/v${PORTVERSION}/linux/
 DISTNAME=	ads-linux-novm-${PORTVERSION}
diff --git a/databases/animenfo-client-gtk/Makefile b/databases/animenfo-client-gtk/Makefile
index 35e269750bf2..c3097d8664e9 100644
--- a/databases/animenfo-client-gtk/Makefile
+++ b/databases/animenfo-client-gtk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	animenfo
 PORTVERSION=	20020819
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.animenfo.com/extension/files/
 PKGNAMESUFFIX=	-client-gui-gtk${PKGNAMESUFFIX2}
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index 223ae0234b66..8b246e26c845 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bbdb
 PORTVERSION=	2.34
+PORTREVISION=	1
 CATEGORIES=	databases elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index edc4c964f351..972d608758eb 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clip
 DISTVERSION=	1.1.16-1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases lang
 MASTER_SITES=	ftp://ftp.linux.ru.net/mirrors/clip/	\
 		ftp://www.cis.by/pub/clip/pub/clip/	\
diff --git a/databases/dbXML/Makefile b/databases/dbXML/Makefile
index e78ea3435843..b533a7bba623 100644
--- a/databases/dbXML/Makefile
+++ b/databases/dbXML/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dbXML
 PORTVERSION=	1.0b2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}-core
diff --git a/databases/dbmetrix/Makefile b/databases/dbmetrix/Makefile
index 6e7c17f33630..900073632861 100644
--- a/databases/dbmetrix/Makefile
+++ b/databases/dbmetrix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dbmetrix
 PORTVERSION=	0.1.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.tamos.net/pub/dbMetrix/ \
 		ftp://ftp.upc.es/pub/linux/sunsite/X11/gtkbuffet/apps/dbmetrix/ \
diff --git a/databases/emma/Makefile b/databases/emma/Makefile
index f3c444cb4a09..88d3780a3a9c 100644
--- a/databases/emma/Makefile
+++ b/databases/emma/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emma
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fastflo.de/files/emma/downloads/python_src/
 
diff --git a/databases/erlang-mysql/Makefile b/databases/erlang-mysql/Makefile
index 328fcfa0b776..58bcd3564f32 100644
--- a/databases/erlang-mysql/Makefile
+++ b/databases/erlang-mysql/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mysql
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://support.process-one.net/doc/download/attachments/415/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/erlang-mysql/
diff --git a/databases/erserver/Makefile b/databases/erserver/Makefile
index 4ca210b1820f..91b4ba0545cb 100644
--- a/databases/erserver/Makefile
+++ b/databases/erserver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erserver
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	ftp://gborg.postgresql.org/pub/erserver/stable/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 2c4d6a27b9c7..b52359e4b864 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	1.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index c68e1f0f7850..24eba2ad71dc 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -1066,55 +1066,17 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 @dirrm include/evolution-data-server-%%VERSION%%/exchange
 @dirrm include/evolution-data-server-%%VERSION%%/camel
 @dirrm include/evolution-data-server-%%VERSION%%
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
-@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/databases/flamerobin/Makefile b/databases/flamerobin/Makefile
index 040fa3795a84..9d5c5b025d30 100644
--- a/databases/flamerobin/Makefile
+++ b/databases/flamerobin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flamerobin
 PORTVERSION=	0.7.6
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/databases/flamerobin/pkg-plist b/databases/flamerobin/pkg-plist
index cf99eae9cbf8..391dff062a6b 100644
--- a/databases/flamerobin/pkg-plist
+++ b/databases/flamerobin/pkg-plist
@@ -41,4 +41,3 @@ share/pixmaps/flamerobin.png
 @dirrm %%DATADIR%%/conf-defs
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/databases/fortytwo-bdb/Makefile b/databases/fortytwo-bdb/Makefile
index ad12dfe80bc2..c90f2c7233b6 100644
--- a/databases/fortytwo-bdb/Makefile
+++ b/databases/fortytwo-bdb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bdb
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	databases gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fortytwo
diff --git a/databases/gbib/Makefile b/databases/gbib/Makefile
index 66ef80ca2484..2e17fafb6d60 100644
--- a/databases/gbib/Makefile
+++ b/databases/gbib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gbib
 PORTVERSION=	0.1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases editors gnome
 MASTER_SITES=	ftp://ftp.seul.org/pub/gbib/src/ \
 		http://www.unixpages.org/distfiles/
diff --git a/databases/gdl2/Makefile b/databases/gdl2/Makefile
index b74251ff5ecd..1b513ca7bca2 100644
--- a/databases/gdl2/Makefile
+++ b/databases/gdl2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdl2
 PORTVERSION=	0.10.1
+PORTREVISION=	1
 CATEGORIES=	databases gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	libs
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 57c03fe2d8f3..1bd65f448c4a 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	glom
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index f9bd0bb892b1..88bcda3abfc4 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -53,13 +53,7 @@ share/mime/packages/glom.xml
 @dirrm share/gnome/glom/doc/examples
 @dirrm share/gnome/glom/doc
 @dirrm share/gnome/glom
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/databases/gmysql/Makefile b/databases/gmysql/Makefile
index 97324e433ef0..3cccc0d12beb 100644
--- a/databases/gmysql/Makefile
+++ b/databases/gmysql/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmysql
 PORTVERSION=	0.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
 
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 034ae753e325..50c19c6d7c32 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-db
 PORTVERSION=	0.2.96
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-db/0.2
diff --git a/databases/gnome-db/pkg-plist b/databases/gnome-db/pkg-plist
index f15e14489af8..b85a8396e885 100644
--- a/databases/gnome-db/pkg-plist
+++ b/databases/gnome-db/pkg-plist
@@ -177,29 +177,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-db.mo
 @dirrm %%DOCSDIR%%
 @dirrm include/libgnomedb-%%VERSION%%/gnome-db
 @dirrm include/libgnomedb-%%VERSION%%
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index d9a3022117c6..68abbd1c219b 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	6.2.1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://grass.itc.it/grass62/source/ \
@@ -40,6 +41,7 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_XLIB=	yes
+USE_GL=		yes
 USE_FREETYPE=	yes
 USE_TCL=	yes
 USE_TCL_BUILD=	yes
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 974a985dbbdb..a854aa43a045 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtksql
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://membres.lycos.fr/bbrox/GtkSQL/
 
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index b035a649ac07..da78e85c6945 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	hk_classes
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hk-classes
diff --git a/databases/hsqldb/Makefile b/databases/hsqldb/Makefile
index 8f056d62c8e6..29dbd42e562a 100644
--- a/databases/hsqldb/Makefile
+++ b/databases/hsqldb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hsqldb
 PORTVERSION=	1.8.0.7
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	SF
 DISTNAME=	hsqldb_${PORTVERSION:S/./_/g}
diff --git a/databases/isql-viewer/Makefile b/databases/isql-viewer/Makefile
index f7a8b938010b..ba35c1fd5c02 100644
--- a/databases/isql-viewer/Makefile
+++ b/databases/isql-viewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	isql-viewer
 PORTVERSION=	2.1.8
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:isql/} \
 		${MASTER_SITE_APACHE:S/$/:bsf/}
diff --git a/databases/jakarta-commons-dbutils/Makefile b/databases/jakarta-commons-dbutils/Makefile
index bc85fca24f35..9225d6f95048 100644
--- a/databases/jakarta-commons-dbutils/Makefile
+++ b/databases/jakarta-commons-dbutils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-dbutils
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	commons/dbutils/source
diff --git a/databases/jasperreports/Makefile b/databases/jasperreports/Makefile
index ed4e661e2b72..208b61f93c1c 100644
--- a/databases/jasperreports/Makefile
+++ b/databases/jasperreports/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jasperreports
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	databases print java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/databases/jdbc-oracle8i/Makefile b/databases/jdbc-oracle8i/Makefile
index 9eb0bab28627..0654c1fc1913 100644
--- a/databases/jdbc-oracle8i/Makefile
+++ b/databases/jdbc-oracle8i/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oracle8i
 PORTVERSION=	8.1.7.1
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	jdbc-
diff --git a/databases/jdbc-oracle9i/Makefile b/databases/jdbc-oracle9i/Makefile
index b7bdf5eb3426..9d6cc0fc4c9e 100644
--- a/databases/jdbc-oracle9i/Makefile
+++ b/databases/jdbc-oracle9i/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oracle9i
 PORTVERSION=	9.2.0.5
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	jdbc-
diff --git a/databases/jrobin/Makefile b/databases/jrobin/Makefile
index 713934028841..124a3a63573f 100644
--- a/databases/jrobin/Makefile
+++ b/databases/jrobin/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jrobin
 PORTVERSION=	1.5.4
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index c071de9d95b2..d48590c463a2 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kbibtex
 PORTVERSION=	0.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases kde
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~fischer/${PORTNAME}/download/
 
diff --git a/databases/keximdb/Makefile b/databases/keximdb/Makefile
index 0e5ba8031a91..4737c802ca0f 100644
--- a/databases/keximdb/Makefile
+++ b/databases/keximdb/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		keximdb
 PORTVERSION=		1.1.0
+PORTREVISION=	1
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-1.6.1/src
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index 7d981aafd3fc..86b364de3dab 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kmysqladmin
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.alwins-world.de/programs/download/kmysqladmin/
 
diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index f6c93f75df4b..b0eb215f97fa 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		knoda
 PORTVERSION=		0.8.1
+PORTREVISION=	1
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/databases/ksqlanalyzer/Makefile b/databases/ksqlanalyzer/Makefile
index 0064f0666e26..6edd51ad5e61 100644
--- a/databases/ksqlanalyzer/Makefile
+++ b/databases/ksqlanalyzer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ksqlanalyzer
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases kde
 MASTER_SITES=	http://www.kpage.de/download/
 
diff --git a/databases/ksqlshell/Makefile b/databases/ksqlshell/Makefile
index 39aac9037522..1f602242a1e2 100644
--- a/databases/ksqlshell/Makefile
+++ b/databases/ksqlshell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ksqlshell
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases kde
 MASTER_SITES=	http://www.ksqlshell.de/
 
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index a99f7fafd8bc..d3919468bdbf 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgda
 PORTVERSION=	0.2.96
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
diff --git a/databases/libgda/pkg-plist b/databases/libgda/pkg-plist
index 18c1135dd87a..195f9aa7a656 100644
--- a/databases/libgda/pkg-plist
+++ b/databases/libgda/pkg-plist
@@ -213,25 +213,3 @@ share/locale/uk/LC_MESSAGES/libgda.mo
 @dirrm include/libgda-%%VERSION%%/gda++
 @dirrm include/libgda-%%VERSION%%/gda
 @dirrm include/libgda-%%VERSION%%
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@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/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 5f1cca419f6f..75da5884c391 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgda2
 PORTVERSION=	1.2.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index 62469342236d..f14263451fbd 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -162,33 +162,3 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
 @dirrm include/libgda-%%VERSION%%/libgda
 @dirrm include/libgda-%%VERSION%%
 @dirrm etc/libgda
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 5011b1831930..694f16b53133 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgda3
 PORTVERSION=	1.9.102
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index fa73f702de4c..e40eaac353eb 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -219,39 +219,7 @@ share/locale/zh_TW/LC_MESSAGES/libgda-3.mo
 @dirrm include/libgda-%%VERSION%%/libgda
 @dirrm include/libgda-%%VERSION%%
 @dirrm etc/libgda
-@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/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/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 631d76db28a8..80f5d48adb60 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgdamm
 PORTVERSION=	1.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.3
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index f6c870ded075..8ca35d2e7df3 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgnomedb
 PORTVERSION=	1.9.102
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index f45b33bf9e5d..cb5a90e9b64c 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -193,41 +193,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnomedb-3.mo
 @dirrm include/libgnomedb-%%VERSION%%/libgnomedb/data-entries
 @dirrm include/libgnomedb-%%VERSION%%/libgnomedb
 @dirrm include/libgnomedb-%%VERSION%%
-@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/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/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/databases/lsdb/Makefile b/databases/lsdb/Makefile
index 8c7bba71727d..5b1bc26c0b13 100644
--- a/databases/lsdb/Makefile
+++ b/databases/lsdb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lsdb
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	databases elisp
 MASTER_SITES=	http://downloads.sourceforge.jp/lsdb/${SFJP_RELEASE_ID}/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/databases/mrtg-mysql-load/Makefile b/databases/mrtg-mysql-load/Makefile
index a4e400050a8c..202c6ac55c29 100644
--- a/databases/mrtg-mysql-load/Makefile
+++ b/databases/mrtg-mysql-load/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mrtg-mysql-load
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases net-mgmt
 MASTER_SITES=	http://www.bitbybit.dk/mysql/mrtg-mysql-load/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/databases/mylibrary/Makefile b/databases/mylibrary/Makefile
index fdbaf634b5ea..cfd2e8ac124d 100644
--- a/databases/mylibrary/Makefile
+++ b/databases/mylibrary/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mylibrary
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	databases gnustep
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles/
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index cf9edcd44b1f..c9679202c18e 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mysql-connector-java
 PORTVERSION=	5.0.5
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-J
diff --git a/databases/mysql-connector-java50/Makefile b/databases/mysql-connector-java50/Makefile
index cf9edcd44b1f..c9679202c18e 100644
--- a/databases/mysql-connector-java50/Makefile
+++ b/databases/mysql-connector-java50/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mysql-connector-java
 PORTVERSION=	5.0.5
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-J
diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index 017ce78af1f4..8f51a86792d0 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mysql-navigator
 PORTVERSION=	1.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/-//}
diff --git a/databases/mysql-query-browser/Makefile b/databases/mysql-query-browser/Makefile
index 45fe9e08048a..d9c5cf6b7d13 100644
--- a/databases/mysql-query-browser/Makefile
+++ b/databases/mysql-query-browser/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mysql-query-browser
 PORTVERSION=	1.1.18
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQLAdministrationSuite
diff --git a/databases/mysqlcc/Makefile b/databases/mysqlcc/Makefile
index 72c6fbbba4d5..ce58447eef1a 100644
--- a/databases/mysqlcc/Makefile
+++ b/databases/mysqlcc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mysqlcc
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://sunsite.dk/pub/databases/mysql/Downloads/MySQLCC/ \
 		http://mysql.mirrors.pair.com/Downloads/MySQLCC/ \
diff --git a/databases/ocaml-sqlite3/Makefile b/databases/ocaml-sqlite3/Makefile
index 26033c5a5a75..b5884fbb534a 100644
--- a/databases/ocaml-sqlite3/Makefile
+++ b/databases/ocaml-sqlite3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sqlite3
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://metamatix.org/~ocaml/
 PKGNAMEPREFIX=	ocaml-
diff --git a/databases/p5-GraphViz-DBI/Makefile b/databases/p5-GraphViz-DBI/Makefile
index 4200a3f69c70..9d3fa18d2dd1 100644
--- a/databases/p5-GraphViz-DBI/Makefile
+++ b/databases/p5-GraphViz-DBI/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GraphViz-DBI
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GraphViz
diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index c0ee48b32aa0..1c2dfe7ebcd6 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	SQL-Translator
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	SQL
diff --git a/databases/pgaccess/Makefile b/databases/pgaccess/Makefile
index 66894aa0176b..4f151634666f 100644
--- a/databases/pgaccess/Makefile
+++ b/databases/pgaccess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pgaccess
 PORTVERSION=	0.99.0.20040219
+PORTREVISION=	1
 CATEGORIES=	databases tcl${TCLVERSION:S/.//} tk${TCLVERSION:S/.//}
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pgaccess
diff --git a/databases/pgadmin3-12/Makefile b/databases/pgadmin3-12/Makefile
index 522ef378295c..84c0d5aca8d7 100644
--- a/databases/pgadmin3-12/Makefile
+++ b/databases/pgadmin3-12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pgadmin3
 PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	pgadmin3/release/v${PORTVERSION}/src
diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile
index bb5a3f618084..855cc92d8778 100644
--- a/databases/pgworksheet/Makefile
+++ b/databases/pgworksheet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pgworksheet
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/619/
 
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index a4046db0b7b0..583c9ec4928c 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phpMyAdmin
 DISTVERSION=	2.10.1
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index a4046db0b7b0..583c9ec4928c 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phpMyAdmin
 DISTVERSION=	2.10.1
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
diff --git a/databases/postgis-jdbc/Makefile b/databases/postgis-jdbc/Makefile
index 82dec0f8b2bb..b634e8e2ee2d 100644
--- a/databases/postgis-jdbc/Makefile
+++ b/databases/postgis-jdbc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postgis-jdbc
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	http://postgis.refractions.net/download/
 DISTNAME=	postgis-${PORTVERSION}
diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile
index e4d4b7b0d0ce..5f069acdd73f 100644
--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	postgresql
 PORTVERSION=	8.2.504
 DISTVERSIONSUFFIX=.src
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases java
 MASTER_SITES=	http://jdbc.postgresql.org/download/
 PKGNAMESUFFIX=	-jdbc
diff --git a/databases/postgresql-tcltk/Makefile b/databases/postgresql-tcltk/Makefile
index 67f3e4b28c1f..24e5cfb99d03 100644
--- a/databases/postgresql-tcltk/Makefile
+++ b/databases/postgresql-tcltk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postgresql
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	databases tcl${TCLVERSION:C/[^0-9]//g}
 PKGNAMESUFFIX=	-tcltk
 
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 21d07124fb05..6d50ce6d4c94 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.3.19
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql73-server/pkg-plist-client b/databases/postgresql73-server/pkg-plist-client
index 90e2968da13d..364b988dfe7c 100644
--- a/databases/postgresql73-server/pkg-plist-client
+++ b/databases/postgresql73-server/pkg-plist-client
@@ -400,10 +400,4 @@ lib/libpq.so.3
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
 @dirrm include/postgresql
diff --git a/databases/postgresql73-server/pkg-plist-server b/databases/postgresql73-server/pkg-plist-server
index 5dd14cf54c20..0b0bd241ac2d 100644
--- a/databases/postgresql73-server/pkg-plist-server
+++ b/databases/postgresql73-server/pkg-plist-server
@@ -67,12 +67,6 @@ share/postgresql/conversion_create.sql
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
 @unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
 @unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
 @unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index ee4366d2d432..4491397fcd10 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.17
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql74-server/pkg-plist-client b/databases/postgresql74-server/pkg-plist-client
index 87f92f7721aa..1b5e27ee4867 100644
--- a/databases/postgresql74-server/pkg-plist-client
+++ b/databases/postgresql74-server/pkg-plist-client
@@ -456,12 +456,4 @@ share/postgresql/pg_service.conf.sample
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
 @dirrm include/postgresql
diff --git a/databases/postgresql74-server/pkg-plist-server b/databases/postgresql74-server/pkg-plist-server
index 617d1b05e789..00e8e1089757 100644
--- a/databases/postgresql74-server/pkg-plist-server
+++ b/databases/postgresql74-server/pkg-plist-server
@@ -86,12 +86,6 @@ share/postgresql/sql_features.txt
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
 @unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
 @unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
 @unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 94ea0548ba20..45a0e5736969 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	8.0.13
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql80-server/pkg-plist-client b/databases/postgresql80-server/pkg-plist-client
index 2e9d60f8a6ad..67388127be12 100644
--- a/databases/postgresql80-server/pkg-plist-client
+++ b/databases/postgresql80-server/pkg-plist-client
@@ -513,19 +513,3 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/pl
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql80-server/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server
index 321ce81f1c65..6d29d6e48d05 100644
--- a/databases/postgresql80-server/pkg-plist-server
+++ b/databases/postgresql80-server/pkg-plist-server
@@ -131,20 +131,6 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
 share/postgresql/timezone/Africa/Abidjan
 share/postgresql/timezone/Africa/Accra
 share/postgresql/timezone/Africa/Addis_Ababa
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 298e7edbaad1..99168a307663 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	8.1.9
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql81-server/pkg-plist-client b/databases/postgresql81-server/pkg-plist-client
index 8ca10c20173c..4ca20c5d16ae 100644
--- a/databases/postgresql81-server/pkg-plist-client
+++ b/databases/postgresql81-server/pkg-plist-client
@@ -527,19 +527,3 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/pl
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server
index 37cdeac1d2db..16ae86fe0d29 100644
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@@ -132,20 +132,6 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
 share/postgresql/timezone/Africa/Abidjan
 share/postgresql/timezone/Africa/Accra
 share/postgresql/timezone/Africa/Addis_Ababa
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 2ad47887b150..6bbaefa68ff1 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	8.2.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql82-server/pkg-plist-client b/databases/postgresql82-server/pkg-plist-client
index 38e92046904b..b11019cc0bfb 100644
--- a/databases/postgresql82-server/pkg-plist-client
+++ b/databases/postgresql82-server/pkg-plist-client
@@ -531,19 +531,3 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/pl
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql82-server/pkg-plist-server b/databases/postgresql82-server/pkg-plist-server
index d8bd88056874..d45dcc56c228 100644
--- a/databases/postgresql82-server/pkg-plist-server
+++ b/databases/postgresql82-server/pkg-plist-server
@@ -128,20 +128,6 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
 share/postgresql/postgres.shdescription
 share/postgresql/timezone/Africa/Abidjan
 share/postgresql/timezone/Africa/Accra
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 2ad47887b150..6bbaefa68ff1 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	8.2.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql83-server/pkg-plist-client b/databases/postgresql83-server/pkg-plist-client
index 38e92046904b..b11019cc0bfb 100644
--- a/databases/postgresql83-server/pkg-plist-client
+++ b/databases/postgresql83-server/pkg-plist-client
@@ -531,19 +531,3 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/pl
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server
index d8bd88056874..d45dcc56c228 100644
--- a/databases/postgresql83-server/pkg-plist-server
+++ b/databases/postgresql83-server/pkg-plist-server
@@ -128,20 +128,6 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
 share/postgresql/postgres.shdescription
 share/postgresql/timezone/Africa/Abidjan
 share/postgresql/timezone/Africa/Accra
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 2ad47887b150..6bbaefa68ff1 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	8.2.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client
index 38e92046904b..b11019cc0bfb 100644
--- a/databases/postgresql84-server/pkg-plist-client
+++ b/databases/postgresql84-server/pkg-plist-client
@@ -531,19 +531,3 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/pl
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index d8bd88056874..d45dcc56c228 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -128,20 +128,6 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
 share/postgresql/postgres.shdescription
 share/postgresql/timezone/Africa/Abidjan
 share/postgresql/timezone/Africa/Accra
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 2ad47887b150..6bbaefa68ff1 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	8.2.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql90-server/pkg-plist-client b/databases/postgresql90-server/pkg-plist-client
index 38e92046904b..b11019cc0bfb 100644
--- a/databases/postgresql90-server/pkg-plist-client
+++ b/databases/postgresql90-server/pkg-plist-client
@@ -531,19 +531,3 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/pl
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server
index d8bd88056874..d45dcc56c228 100644
--- a/databases/postgresql90-server/pkg-plist-server
+++ b/databases/postgresql90-server/pkg-plist-server
@@ -128,20 +128,6 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
 share/postgresql/postgres.shdescription
 share/postgresql/timezone/Africa/Abidjan
 share/postgresql/timezone/Africa/Accra
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 2ad47887b150..6bbaefa68ff1 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	8.2.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql91-server/pkg-plist-client b/databases/postgresql91-server/pkg-plist-client
index 38e92046904b..b11019cc0bfb 100644
--- a/databases/postgresql91-server/pkg-plist-client
+++ b/databases/postgresql91-server/pkg-plist-client
@@ -531,19 +531,3 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/pl
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server
index d8bd88056874..d45dcc56c228 100644
--- a/databases/postgresql91-server/pkg-plist-server
+++ b/databases/postgresql91-server/pkg-plist-server
@@ -128,20 +128,6 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
 share/postgresql/postgres.shdescription
 share/postgresql/timezone/Africa/Abidjan
 share/postgresql/timezone/Africa/Accra
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 2ad47887b150..6bbaefa68ff1 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	8.2.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client
index 38e92046904b..b11019cc0bfb 100644
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@@ -531,19 +531,3 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/pl
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index d8bd88056874..d45dcc56c228 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -128,20 +128,6 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/cs
-%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ko
-%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sk
-%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/ro
-%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/sl
-%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_CN
-%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%GETTEXT%%@dirrmtry share/locale/zh_TW
 share/postgresql/postgres.shdescription
 share/postgresql/timezone/Africa/Abidjan
 share/postgresql/timezone/Africa/Accra
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index f1cd25eed043..50da5e080026 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	sql
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	databases devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/databases/pydbdesigner/Makefile b/databases/pydbdesigner/Makefile
index 8a40be5f6f66..ddfb84aaf71e 100644
--- a/databases/pydbdesigner/Makefile
+++ b/databases/pydbdesigner/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pydbdesigner
 PORTVERSION=	0.1.4.1
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/databases/qt-ibase-plugin/Makefile b/databases/qt-ibase-plugin/Makefile
index 0d09dfe83148..699dd03a4c54 100644
--- a/databases/qt-ibase-plugin/Makefile
+++ b/databases/qt-ibase-plugin/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qt-${DB}-plugin
 PORTVERSION=	3.3.8
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
diff --git a/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile
index dcd8667092f4..2c2aa921e36f 100644
--- a/databases/qt-mysql-plugin/Makefile
+++ b/databases/qt-mysql-plugin/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qt-${DB}-plugin
 PORTVERSION=	3.3.8
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile
index 06b39e217368..cd380d0d07da 100644
--- a/databases/qt-odbc-plugin/Makefile
+++ b/databases/qt-odbc-plugin/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qt-${DB}-plugin
 PORTVERSION=	3.3.8
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile
index 6b59be2ee81b..768ae4904a4f 100644
--- a/databases/qt-pgsql-plugin/Makefile
+++ b/databases/qt-pgsql-plugin/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qt-${DB}-plugin
 PORTVERSION=	3.3.8
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile
index 84884ba6faf6..1f8fd3641926 100644
--- a/databases/qt-sqlite-plugin/Makefile
+++ b/databases/qt-sqlite-plugin/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qt-${DB}-plugin
 PORTVERSION=	3.3.8
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index b47d0a0b395e..f5eecc410faf 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	sqsh
 PORTVERSION=	2.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=		sqsh
diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index 4a2d8ebdf699..0c3176e8f62b 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squirrel
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index 6307054592b3..f36475304261 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tora
 PORTVERSION=	1.3.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/databases/wmjsql/Makefile b/databases/wmjsql/Makefile
index f78ea7d58573..a9526fcb4aaa 100644
--- a/databases/wmjsql/Makefile
+++ b/databases/wmjsql/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmjsql
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	databases windowmaker
 MASTER_SITES=	http://www.dockapps.org/files/42/73/ \
 		http://freebsd.nsu.ru/distfiles/
diff --git a/databases/xmbase-grok/Makefile b/databases/xmbase-grok/Makefile
index a8b5bda7cec2..4b14a4163c4c 100644
--- a/databases/xmbase-grok/Makefile
+++ b/databases/xmbase-grok/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmbase-grok
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://grok.ftp.fu-berlin.de/ \
 		ftp://bitrot.de/pub/grok/
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 64509373a844..f3fd0237617d 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmysqladmin
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Contrib/Old-Versions
diff --git a/deskutils/abacus/Makefile b/deskutils/abacus/Makefile
index 7b8f3197bc21..b9307905453c 100644
--- a/deskutils/abacus/Makefile
+++ b/deskutils/abacus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	abacus
 PORTVERSION=	0.9.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	http://tahoe.inesc.pt/~aml/abacus/
 
diff --git a/deskutils/adesklets/Makefile b/deskutils/adesklets/Makefile
index 4e7627dd3581..a5607e259555 100644
--- a/deskutils/adesklets/Makefile
+++ b/deskutils/adesklets/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	adesklets
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/affiche/Makefile b/deskutils/affiche/Makefile
index 6662dec4e445..485fe687f971 100644
--- a/deskutils/affiche/Makefile
+++ b/deskutils/affiche/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	affiche
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.collaboration-world.com/affiche.data/releases/Stable/
 DISTNAME=	Affiche-${PORTVERSION}
diff --git a/deskutils/akamaru/Makefile b/deskutils/akamaru/Makefile
index 8ab5c905bc84..deeb4c1d5125 100644
--- a/deskutils/akamaru/Makefile
+++ b/deskutils/akamaru/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	akamaru
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://people.freedesktop.org/~krh/
 DISTNAME=	${PORTNAME}
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 7b1485542768..e72de0b652fb 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	alacarte
 PORTVERSION=	0.11.3
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index a821c20878b3..05fdec35e5b6 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -80,52 +80,22 @@ share/locale/vi/LC_MESSAGES/alacarte.mo
 share/locale/zh_CN/LC_MESSAGES/alacarte.mo
 share/locale/zh_HK/LC_MESSAGES/alacarte.mo
 share/locale/zh_TW/LC_MESSAGES/alacarte.mo
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
-@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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
 @dirrm share/gnome/alacarte
diff --git a/deskutils/alexandria/Makefile b/deskutils/alexandria/Makefile
index d025d213d3d8..d020b1c74270 100644
--- a/deskutils/alexandria/Makefile
+++ b/deskutils/alexandria/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alexandria
 PORTVERSION=	0.6.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/alexandria/pkg-plist b/deskutils/alexandria/pkg-plist
index 7b12ce316a9e..2f433b558197 100644
--- a/deskutils/alexandria/pkg-plist
+++ b/deskutils/alexandria/pkg-plist
@@ -131,9 +131,3 @@ share/locale/sv/LC_MESSAGES/alexandria.mo
 @dirrm %%RUBY_SITELIBDIR%%/alexandria/macui
 @dirrm %%RUBY_SITELIBDIR%%/alexandria/book_providers
 @dirrm %%RUBY_SITELIBDIR%%/alexandria
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/deskutils/appwrapper/Makefile b/deskutils/appwrapper/Makefile
index 9bbc42ccdb12..dbcce24f0bbc 100644
--- a/deskutils/appwrapper/Makefile
+++ b/deskutils/appwrapper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	appwrapper
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/aspostit/Makefile b/deskutils/aspostit/Makefile
index e960a4335e24..151d6639265a 100644
--- a/deskutils/aspostit/Makefile
+++ b/deskutils/aspostit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aspostit
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
 MASTER_SITE_SUBDIR=	apps/aspostit
diff --git a/deskutils/autocutsel/Makefile b/deskutils/autocutsel/Makefile
index 0834927dc57f..6c312539bdb8 100644
--- a/deskutils/autocutsel/Makefile
+++ b/deskutils/autocutsel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	autocutsel
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	autocutsel
diff --git a/deskutils/babytrans/Makefile b/deskutils/babytrans/Makefile
index 45ecb33f04c7..7faaa13feec5 100644
--- a/deskutils/babytrans/Makefile
+++ b/deskutils/babytrans/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	babytrans
 PORTVERSION=	0.9.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	http://fjolliton.free.fr/babytrans/
 
diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index db4635eb08aa..4c4e0a156b60 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		basket
 PORTVERSION=		1.0.1
+PORTREVISION=		1
 CATEGORIES=		deskutils kde
 MASTER_SITES=		http://basket.kde.org/downloads/
 
diff --git a/deskutils/basket/pkg-plist b/deskutils/basket/pkg-plist
index 86c2a2927381..f15d1e19d8f6 100644
--- a/deskutils/basket/pkg-plist
+++ b/deskutils/basket/pkg-plist
@@ -143,18 +143,8 @@ share/services/basketthumbcreator.desktop
 %%KONTACT%%share/services/kontact/basket.desktop
 %%KONTACT%%share/services/kontact/basket_v4.desktop
 %%KONTACT%%@dirrmtry share/services/kontact
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
 @dirrmtry share/locale/pl_PL/LC_MESSAGES
 @dirrmtry share/locale/pl_PL
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrm share/doc/HTML/en/basket
 @dirrmtry share/config/magic
 @dirrmtry share/config
diff --git a/deskutils/blogtk/Makefile b/deskutils/blogtk/Makefile
index 87865feccd98..cf19152bb7da 100644
--- a/deskutils/blogtk/Makefile
+++ b/deskutils/blogtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blogtk
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index 1f4a0290afdf..1ec7373afbc9 100644
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bmp-docklet
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils audio
 MASTER_SITES=	http://mark.xnull.de/bmp-docklet/ \
 		${MASTER_SITE_LOCAL}
diff --git a/deskutils/buoh/Makefile b/deskutils/buoh/Makefile
index 3275aa6f9c7f..ce661d18e161 100644
--- a/deskutils/buoh/Makefile
+++ b/deskutils/buoh/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	buoh
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	deskutils www gnome
 MASTER_SITES=	http://buoh.steve-o.org/downloads/
 
diff --git a/deskutils/cartotheque/Makefile b/deskutils/cartotheque/Makefile
index 9f490295e171..5ee60bb467e7 100644
--- a/deskutils/cartotheque/Makefile
+++ b/deskutils/cartotheque/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cartotheque
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://stefan.agentfarms.net/Download/GNUstep/Prototypes/
 DISTNAME=	Cartotheque-${PORTVERSION}
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index f93cf9070de5..84bdf7911378 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cdcat
 PORTVERSION=	1.01b	# >1.01 as b doesn't stay for 'beta'
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://cdcat.sourceforge.net/
diff --git a/deskutils/charmap/Makefile b/deskutils/charmap/Makefile
index 348347242d9e..5fb44118619d 100644
--- a/deskutils/charmap/Makefile
+++ b/deskutils/charmap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	charmap
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.nongnu.org/charmap/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/deskutils/checkrdf/Makefile b/deskutils/checkrdf/Makefile
index 3ee13a2b7cb2..bdcebb10556c 100644
--- a/deskutils/checkrdf/Makefile
+++ b/deskutils/checkrdf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	checkrdf
 PORTVERSION=	39.4444
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	checkrdf
diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile
index b0857be8171c..5f0c5a030877 100644
--- a/deskutils/chmsee/Makefile
+++ b/deskutils/chmsee/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chmsee
 PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://chmsee.gro.clinux.org/
 
diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index 126350deed1c..f9ea6ac0f726 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	conduit
 PORTVERSION=	0.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	http://files.conduit-project.org/releases/
 
diff --git a/deskutils/conduit/pkg-plist b/deskutils/conduit/pkg-plist
index de89b9652aca..bf5c39d8f88b 100644
--- a/deskutils/conduit/pkg-plist
+++ b/deskutils/conduit/pkg-plist
@@ -59,7 +59,6 @@ share/pixmaps/conduit-icon.png
 @dirrm %%DATADIR%%/contrib/EXIF-15-FEB-04
 @dirrm %%DATADIR%%/contrib
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/conduit/datatypes
 @dirrm %%PYTHON_SITELIBDIR%%/conduit
diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile
index 345a44e96eec..b5f553710e13 100644
--- a/deskutils/contacts/Makefile
+++ b/deskutils/contacts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	contacts
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://projects.o-hand.com/sources/contacts/ \
 		http://smyru.petronet.pl/freebsd/
diff --git a/deskutils/contacts/pkg-plist b/deskutils/contacts/pkg-plist
index b65fe6f77e6d..6b70544a5be1 100644
--- a/deskutils/contacts/pkg-plist
+++ b/deskutils/contacts/pkg-plist
@@ -4,6 +4,5 @@ share/applications/contacts.desktop
 share/locale/et/LC_MESSAGES/Contacts.mo
 share/locale/fr/LC_MESSAGES/Contacts.mo
 share/pixmaps/oh-contacts.png
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
 @dirrm %%DATADIR%%
diff --git a/deskutils/cycle/Makefile b/deskutils/cycle/Makefile
index 479e0a637f04..7ceca56fccdc 100644
--- a/deskutils/cycle/Makefile
+++ b/deskutils/cycle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cycle
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils biology python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/cycle/pkg-plist b/deskutils/cycle/pkg-plist
index 3f64386d7034..bce517118ed7 100644
--- a/deskutils/cycle/pkg-plist
+++ b/deskutils/cycle/pkg-plist
@@ -29,14 +29,6 @@ share/locale/es/LC_MESSAGES/cycle.mo
 share/locale/gl/LC_MESSAGES/cycle.mo
 share/locale/ru/LC_MESSAGES/cycle.mo
 share/locale/sk/LC_MESSAGES/cycle.mo
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 %%DOCSDIR%%/README.html
 %%DOCSDIR%%/README_de.html
 %%DOCSDIR%%/README_ru.html
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index f763d16f3712..9887d170ba7f 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	deskbar-applet
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index 8856f3c53b2d..f4f75074f823 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -326,49 +326,15 @@ share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
 @dirrmtry %%PYTHON_LIBDIR%%
 @dirrm lib/deskbar-applet/handlers
 @dirrm lib/deskbar-applet
-@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/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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/deskutils/displaycalibrator/Makefile b/deskutils/displaycalibrator/Makefile
index 7b96c5013c13..d170b5d0f099 100644
--- a/deskutils/displaycalibrator/Makefile
+++ b/deskutils/displaycalibrator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	displaycalibrator
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.linuks.mine.nu/displaycalibrator/
 
diff --git a/deskutils/dlume/Makefile b/deskutils/dlume/Makefile
index 56b606996e48..f92f47a9fe07 100644
--- a/deskutils/dlume/Makefile
+++ b/deskutils/dlume/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dlume
 PORTVERSION=	0.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://clay.ll.pl/download/
 
diff --git a/deskutils/doodle/Makefile b/deskutils/doodle/Makefile
index 84da5bd67529..82eeebba0f61 100644
--- a/deskutils/doodle/Makefile
+++ b/deskutils/doodle/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	doodle
 PORTVERSION=	0.6.6
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://gnunet.org/doodle/download/
 
diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile
index 48f98a7fd485..797f3f5194c3 100644
--- a/deskutils/dragstack/Makefile
+++ b/deskutils/dragstack/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		dragstack
 PORTVERSION=		1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=		deskutils kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 2c65bb92fc3c..3157e986b081 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drivel
 PORTVERSION=	2.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist
index 42f07a101b0c..0633affae583 100644
--- a/deskutils/drivel/pkg-plist
+++ b/deskutils/drivel/pkg-plist
@@ -72,21 +72,5 @@ share/mime/packages/drivel.xml
 @dirrm share/gnome/drivel
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/deskutils/estickies/Makefile b/deskutils/estickies/Makefile
index 5b27c7049dae..3ff309fa7fce 100644
--- a/deskutils/estickies/Makefile
+++ b/deskutils/estickies/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	estickies
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/deskutils/etask/Makefile b/deskutils/etask/Makefile
index 3cf93610efd1..3d640adeddcc 100644
--- a/deskutils/etask/Makefile
+++ b/deskutils/etask/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	etask
 PORTVERSION=	0.3.91
+PORTREVISION=	1
 CATEGORIES=	deskutils elisp
 MASTER_SITES=	http://members.chello.at/rene.weichselbaum/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/deskutils/etoile-dictionaryreader/Makefile b/deskutils/etoile-dictionaryreader/Makefile
index d0fe61b037c9..d7d5e39449ae 100644
--- a/deskutils/etoile-dictionaryreader/Makefile
+++ b/deskutils/etoile-dictionaryreader/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dictionaryreader
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/deskutils/etoile-extendedworkspacekit/Makefile b/deskutils/etoile-extendedworkspacekit/Makefile
index c0eebef1b141..fcb5fcaf970f 100644
--- a/deskutils/etoile-extendedworkspacekit/Makefile
+++ b/deskutils/etoile-extendedworkspacekit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	extendedworkspacekit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/deskutils/etoile-hardware/Makefile b/deskutils/etoile-hardware/Makefile
index d32c19dfc878..4a7bb7a41d6d 100644
--- a/deskutils/etoile-hardware/Makefile
+++ b/deskutils/etoile-hardware/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hardware
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/deskutils/etoile-lookandbehavior/Makefile b/deskutils/etoile-lookandbehavior/Makefile
index 6f27e93e6b22..1ea02e1fbce5 100644
--- a/deskutils/etoile-lookandbehavior/Makefile
+++ b/deskutils/etoile-lookandbehavior/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lookandbehavior
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/deskutils/etoile-menuserver/Makefile b/deskutils/etoile-menuserver/Makefile
index 53d027e96f4c..cb67073355ea 100644
--- a/deskutils/etoile-menuserver/Makefile
+++ b/deskutils/etoile-menuserver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	menuserver
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/deskutils/etoile-panekit/Makefile b/deskutils/etoile-panekit/Makefile
index 11abe53bb700..7f7e004e5361 100644
--- a/deskutils/etoile-panekit/Makefile
+++ b/deskutils/etoile-panekit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	panekit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/deskutils/etoile-servicesbarkit/Makefile b/deskutils/etoile-servicesbarkit/Makefile
index b5140144678a..d0ef35e41881 100644
--- a/deskutils/etoile-servicesbarkit/Makefile
+++ b/deskutils/etoile-servicesbarkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	servicesbarkit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/deskutils/etoile-systemconfig/Makefile b/deskutils/etoile-systemconfig/Makefile
index 4d7ce984c70a..fc5ecefdc366 100644
--- a/deskutils/etoile-systemconfig/Makefile
+++ b/deskutils/etoile-systemconfig/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	systemconfig
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/deskutils/etoile-trackerkit/Makefile b/deskutils/etoile-trackerkit/Makefile
index 260ffbfa9991..a05a639359ce 100644
--- a/deskutils/etoile-trackerkit/Makefile
+++ b/deskutils/etoile-trackerkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	trackerkit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/deskutils/etoile-ui/Makefile b/deskutils/etoile-ui/Makefile
index 8f453e85460a..e9a1eaf37595 100644
--- a/deskutils/etoile-ui/Makefile
+++ b/deskutils/etoile-ui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ui
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/deskutils/everygui/Makefile b/deskutils/everygui/Makefile
index 9621f6b69403..7d783725b213 100644
--- a/deskutils/everygui/Makefile
+++ b/deskutils/everygui/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	everygui
 PORTVERSION=	0.99.b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	everygui
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index c169110b7c4c..f78143843cb6 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jescs
 PORTVERSION=	2.9.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/evolution-jescs/pkg-plist b/deskutils/evolution-jescs/pkg-plist
index caf6129a2b6f..c32edfe77471 100644
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@@ -39,29 +39,9 @@ share/locale/zh_HK/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 @dirrm share/gnome/evolution-jescs/glade
 @dirrm share/gnome/evolution-jescs
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @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
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index a875012288e2..82c3a288188f 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	fbreader
 DISTVERSIONPREFIX=	sources-
 DISTVERSION=	0.8.2c
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.fbreader.org/ CENKES
 EXTRACT_SUFX=	.tgz
diff --git a/deskutils/fbreader/pkg-plist b/deskutils/fbreader/pkg-plist
index b6e032aee1e1..e89990829580 100644
--- a/deskutils/fbreader/pkg-plist
+++ b/deskutils/fbreader/pkg-plist
@@ -76,4 +76,3 @@ share/zlibrary/keynames-qt4.xml
 @dirrm share/zlibrary/encodings
 @dirrm share/zlibrary
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/deskutils/freemind/Makefile b/deskutils/freemind/Makefile
index ca59cf3a6fb0..1140a2d5b407 100644
--- a/deskutils/freemind/Makefile
+++ b/deskutils/freemind/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freemind
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils editors java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/deskutils/fusenshi/Makefile b/deskutils/fusenshi/Makefile
index 624fd56e8b96..4bde0a4b6764 100644
--- a/deskutils/fusenshi/Makefile
+++ b/deskutils/fusenshi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fusenshi
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.ongs.co.jp/projects/fusenshi/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/gaddr/Makefile b/deskutils/gaddr/Makefile
index addd818c45cd..81f6b75606ae 100644
--- a/deskutils/gaddr/Makefile
+++ b/deskutils/gaddr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaddr
 PORTVERSION=	1.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
 
diff --git a/deskutils/ganttproject/Makefile b/deskutils/ganttproject/Makefile
index 42e1702e3bee..54426d3d0a09 100644
--- a/deskutils/ganttproject/Makefile
+++ b/deskutils/ganttproject/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ganttproject
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	deskutils java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index 8282fdbfa644..14f0c02bae58 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		gcal
 PORTVERSION=		3.01
-PORTREVISION=		4
+PORTREVISION=		5
 CATEGORIES=		deskutils
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/gcal/pkg-plist b/deskutils/gcal/pkg-plist
index c8ff79d4e5d5..aed1110bba63 100644
--- a/deskutils/gcal/pkg-plist
+++ b/deskutils/gcal/pkg-plist
@@ -143,5 +143,3 @@ share/locale/sv/LC_MESSAGES/gcal.mo
 @dirrm %%DATADIR%%/misc/daily
 @dirrm %%DATADIR%%/misc
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
diff --git a/deskutils/gdeskcal-skins/Makefile b/deskutils/gdeskcal-skins/Makefile
index 6663ad85efb3..95c7c1993122 100644
--- a/deskutils/gdeskcal-skins/Makefile
+++ b/deskutils/gdeskcal-skins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdeskcal-skins
 PORTVERSION=	0.56
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils python gnome
 MASTER_SITES=	http://www.pycage.de/download/skins/gdeskcal/
 DISTNAME=
diff --git a/deskutils/gdeskcal/Makefile b/deskutils/gdeskcal/Makefile
index 87184f177d07..865cb3812ea4 100644
--- a/deskutils/gdeskcal/Makefile
+++ b/deskutils/gdeskcal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdeskcal
 PORTVERSION=	0.57.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils python gnome
 MASTER_SITES=	http://www.pycage.de/download/
 DISTNAME=	gDeskCal-${PORTVERSION:S/./_/g}
diff --git a/deskutils/gdeskcal/pkg-plist b/deskutils/gdeskcal/pkg-plist
index eef2330b773d..191d32eecfda 100644
--- a/deskutils/gdeskcal/pkg-plist
+++ b/deskutils/gdeskcal/pkg-plist
@@ -99,25 +99,3 @@ share/locale/zh_CN/LC_MESSAGES/gdeskcal.mo
 @dirrm share/gnome/gdeskcal/code/planner
 @dirrm share/gnome/gdeskcal/code
 @dirrm share/gnome/gdeskcal
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/de_AT/LC_MESSAGES
-@dirrmtry share/locale/de_AT
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/deskutils/gdesklets-recentlyused/Makefile b/deskutils/gdesklets-recentlyused/Makefile
index 1669238443ee..454c33f10775 100644
--- a/deskutils/gdesklets-recentlyused/Makefile
+++ b/deskutils/gdesklets-recentlyused/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	recentlyused
 PORTVERSION=	0.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile
index 7ad55a6f451a..b972bf473e83 100644
--- a/deskutils/gdesklets-starterbar/Makefile
+++ b/deskutils/gdesklets-starterbar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	starterbar
 PORTVERSION=	0.31.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index e20e7a64ad4d..c88a696d1624 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdesklets
 PORTVERSION=	0.35.4
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.gdesklets.org/downloads/ \
 		http://www.pycage.de/download/${PORTNAME}/ \
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index aff4b3d9b0d9..7abc70cff434 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -654,36 +654,8 @@ share/mime/packages/gdesklets.xml
 @dirrm lib/gdesklets
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
-@dirrmtry share/locale/vi/LC_MESSAGES
-@dirrmtry share/locale/vi
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
 @dirrmtry share/icons/gnome/48x48/mimetypes
diff --git a/deskutils/gemcal/Makefile b/deskutils/gemcal/Makefile
index 7cf7f2a68fc9..870553f90f60 100644
--- a/deskutils/gemcal/Makefile
+++ b/deskutils/gemcal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gemcal
 PORTVERSION=	20051120
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.quickhack.net/mhc/arc/
 DISTNAME=	mhc-current-snap${PORTVERSION}
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 2b143cf103e6..fd3828d1e8cf 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	genius
 PORTVERSION=	0.7.7
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://ftp.5z.com/pub/genius/
diff --git a/deskutils/gimmie/Makefile b/deskutils/gimmie/Makefile
index 8e7b0647ee59..311509794686 100644
--- a/deskutils/gimmie/Makefile
+++ b/deskutils/gimmie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gimmie
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.beatniksoftware.com/gimmie/releases/
 
diff --git a/deskutils/gkrellm-gtodo/Makefile b/deskutils/gkrellm-gtodo/Makefile
index e3e795bd510a..1c1c0168a6ec 100644
--- a/deskutils/gkrellm-gtodo/Makefile
+++ b/deskutils/gkrellm-gtodo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtodo
 PORTVERSION=	0.2.5.a
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	http://voidtrance.home.comcast.net/ \
 		http://depot.fsck.ch/mirror/distfiles/
diff --git a/deskutils/gkrellm-reminder2/Makefile b/deskutils/gkrellm-reminder2/Makefile
index 368e0ec0ecdd..08e6546eec31 100644
--- a/deskutils/gkrellm-reminder2/Makefile
+++ b/deskutils/gkrellm-reminder2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	reminder
 PORTVERSION=	2.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/Plugins/ \
 		http://depot.fsck.ch/mirror/distfiles/
diff --git a/deskutils/gkrellm-timers/Makefile b/deskutils/gkrellm-timers/Makefile
index 077e5decc6fc..53271f1a9017 100644
--- a/deskutils/gkrellm-timers/Makefile
+++ b/deskutils/gkrellm-timers/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	timers
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://triq.net/gkrellm_timers/ \
 		http://depot.fsck.ch/mirror/distfiles/
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index b36c791a6766..57d534dafc15 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glabels
 PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/gmcal/Makefile b/deskutils/gmcal/Makefile
index 1df39c842f20..235d24626624 100644
--- a/deskutils/gmcal/Makefile
+++ b/deskutils/gmcal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmcal
 PORTVERSION=	0.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libmcal
diff --git a/deskutils/gnochm/Makefile b/deskutils/gnochm/Makefile
index 3a3e76e04a4c..f4c6876ec499 100644
--- a/deskutils/gnochm/Makefile
+++ b/deskutils/gnochm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnochm
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	deskutils python gnome
 MASTER_SITES=	SF
 
diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index 02023ca474da..67599888e4e3 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-blog
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-blog/0.8
diff --git a/deskutils/gnome-menu-editor/Makefile b/deskutils/gnome-menu-editor/Makefile
index 214609d243c0..90213f25afd3 100644
--- a/deskutils/gnome-menu-editor/Makefile
+++ b/deskutils/gnome-menu-editor/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-menu-editor
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	http://manny.cluecoder.org/packages/gnome-menu-editor/
 
diff --git a/deskutils/gnome-menu-editor/pkg-plist b/deskutils/gnome-menu-editor/pkg-plist
index 45ce0313f159..d414b408d7ba 100644
--- a/deskutils/gnome-menu-editor/pkg-plist
+++ b/deskutils/gnome-menu-editor/pkg-plist
@@ -29,25 +29,5 @@ share/locale/uk/LC_MESSAGES/gnome-menu-editor.mo
 share/locale/vi/LC_MESSAGES/gnome-menu-editor.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-menu-editor.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-menu-editor.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 69ddefbd68d1..5eb07c9d671a 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-pim
 PORTVERSION=	1.4.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.jroger.in-berlin.de/gnome-pim/
 DIST_SUBDIR=	gnome
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 17d87d41ffc4..1a6a6ac68250 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-utils
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 9b7a6dc73357..13ed5f5e2db5 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -376,53 +376,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/doc/gdict
 @dirrm include/gdict-1.0/gdict
 @dirrm include/gdict-1.0
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 2acbb153432b..654e76d130f4 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnotime
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 PORTREVISON=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/deskutils/gnustep-notebook/Makefile b/deskutils/gnustep-notebook/Makefile
index 8e3134c245aa..9e6e965a8b9f 100644
--- a/deskutils/gnustep-notebook/Makefile
+++ b/deskutils/gnustep-notebook/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	notebook
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://notebook.cowgar.com/NoteBook/releases/ \
 		http://io.debian.net/~tar/debian/notebook/
diff --git a/deskutils/gnustep-wrapper/Makefile b/deskutils/gnustep-wrapper/Makefile
index 2932c80fba8a..642e7c4d97dd 100644
--- a/deskutils/gnustep-wrapper/Makefile
+++ b/deskutils/gnustep-wrapper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wrapper
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 #MASTER_SITES=	ftp://ftp.raffael.ch/software/GNUstepWrapper/
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/deskutils/gnuwash/Makefile b/deskutils/gnuwash/Makefile
index 9822a5195c3f..de41328d3fd7 100644
--- a/deskutils/gnuwash/Makefile
+++ b/deskutils/gnuwash/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnuwash
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/g/gnuwash.app
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index 1f274f006a30..b4403c9989c7 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gourmet
 PORTVERSION=	0.11.2
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	grecipe-manager
diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile
index 878877ecddb5..52bc47ede52b 100644
--- a/deskutils/griffith/Makefile
+++ b/deskutils/griffith/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	griffith
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	CENKES BERLIOS
 
diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile
index 3729826e73fa..248163716860 100644
--- a/deskutils/gruler/Makefile
+++ b/deskutils/gruler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gruler
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	http://linuxadvocate.org/projects/gruler/downloads/
 
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index de7b23a2bd33..667f73cbc19b 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtimer
 PORTVERSION=	1.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.k5n.us/files/ \
 		http://www.cknudsen.com/gtimer/
diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile
index 81b5e3dff98b..780503a6ef8e 100644
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkjournal
 PORTVERSION=	0.3.5.b
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.alaskaparadise.com/freebsd/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
diff --git a/deskutils/gtodo/Makefile b/deskutils/gtodo/Makefile
index e0cc6a26c39b..98505a73c422 100644
--- a/deskutils/gtodo/Makefile
+++ b/deskutils/gtodo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtodo
 PORTVERSION=	0.14
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtodo
diff --git a/deskutils/gtweakui/Makefile b/deskutils/gtweakui/Makefile
index 6f80cc31d3af..feef01614106 100644
--- a/deskutils/gtweakui/Makefile
+++ b/deskutils/gtweakui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gTweakUI
 PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtweakui
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index e09c5fc5df4c..213638df9bd5 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gucharmap
 PORTVERSION=	1.10.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index e1f9719a4843..d6a03d9cd255 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -179,53 +179,17 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 @dirrm share/gnome/help/gucharmap/C
 @dirrm share/gnome/help/gucharmap
 @dirrm include/gucharmap
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/deskutils/gworkspace-clipbook/Makefile b/deskutils/gworkspace-clipbook/Makefile
index 02db72fdd6ba..54552bb49464 100644
--- a/deskutils/gworkspace-clipbook/Makefile
+++ b/deskutils/gworkspace-clipbook/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gworkspace
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://io.debian.net/~tar/debian/gworkspace/
 PKGNAMESUFFIX=	-clipbook${PKGNAMESUFFIX2}
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index b13dc08e46d6..9e06774c5a31 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gworkspace
 PORTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/
 PKGNAMESUFFIX=	-gwmetadata${PKGNAMESUFFIX2}
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index e968224d7780..dfb1c5b4e370 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gworkspace
 PORTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/
 
diff --git a/deskutils/gxmessage/Makefile b/deskutils/gxmessage/Makefile
index f8e12694970b..296ba7095079 100644
--- a/deskutils/gxmessage/Makefile
+++ b/deskutils/gxmessage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxmessage
 PORTVERSION=	2.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://homepages.ihug.co.nz/~trmusson/stuff/
 
diff --git a/deskutils/helpviewer/Makefile b/deskutils/helpviewer/Makefile
index 3a3cc07b7922..e1697f57ab50 100644
--- a/deskutils/helpviewer/Makefile
+++ b/deskutils/helpviewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	helpviewer
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.roard.com/helpviewer/download/
 DISTNAME=	HelpViewer-${PORTVERSION}
diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index c6b6b98907f8..cb5098706807 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kronolith
 PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index 4733d120146a..d245a10c1bf9 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mnemo
 PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index dffdf08643e2..dc35f091c439 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nag
 PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde4-kronolith/Makefile
index c6b6b98907f8..cb5098706807 100644
--- a/deskutils/horde4-kronolith/Makefile
+++ b/deskutils/horde4-kronolith/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kronolith
 PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/deskutils/horde4-mnemo/Makefile b/deskutils/horde4-mnemo/Makefile
index 4733d120146a..d245a10c1bf9 100644
--- a/deskutils/horde4-mnemo/Makefile
+++ b/deskutils/horde4-mnemo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mnemo
 PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile
index dffdf08643e2..dc35f091c439 100644
--- a/deskutils/horde4-nag/Makefile
+++ b/deskutils/horde4-nag/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nag
 PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/deskutils/hot-babe/Makefile b/deskutils/hot-babe/Makefile
index 7c95a6a5cf37..81058bbe421f 100644
--- a/deskutils/hot-babe/Makefile
+++ b/deskutils/hot-babe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hot-babe
 PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	http://dindinx.net/hotbabe/downloads/ \
 		${MASTER_SITE_LOCAL}
diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile
index 481a64da6190..e5c86a6d413a 100644
--- a/deskutils/howm/Makefile
+++ b/deskutils/howm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	howm
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://howm.sourceforge.jp/a/
 
diff --git a/deskutils/ical/Makefile b/deskutils/ical/Makefile
index 019dbe7f3e89..33341fe28f16 100644
--- a/deskutils/ical/Makefile
+++ b/deskutils/ical/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ical
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils tk84
 MASTER_SITES=	ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/
 
diff --git a/deskutils/ithought/Makefile b/deskutils/ithought/Makefile
index 81c118933431..dde04667d834 100644
--- a/deskutils/ithought/Makefile
+++ b/deskutils/ithought/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ithought
 PORTVERSION=	a5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/karamba/Makefile b/deskutils/karamba/Makefile
index b6ca63aa9a17..e2cf55c87ac4 100644
--- a/deskutils/karamba/Makefile
+++ b/deskutils/karamba/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	karamba
 PORTVERSION=	0.17
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.efd.lth.se/~d98hk/karamba/src/
 
diff --git a/deskutils/katapult/Makefile b/deskutils/katapult/Makefile
index 77107f08915f..e0923a8483a9 100644
--- a/deskutils/katapult/Makefile
+++ b/deskutils/katapult/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	katapult
 PORTVERSION=	0.3.1.3
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://superb-east.dl.sourceforge.net/sourceforge/katapult/
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/deskutils/katapult/pkg-plist b/deskutils/katapult/pkg-plist
index 6cbf972c8eee..042e02f5bc91 100644
--- a/deskutils/katapult/pkg-plist
+++ b/deskutils/katapult/pkg-plist
@@ -68,12 +68,6 @@ share/servicetypes/katapultdisplay.desktop
 @dirrmtry share/services
 @dirrmtry share/nls/en_US.US-ASCII
 @dirrmtry share/nls/POSIX
-@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/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/64x64/apps
diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile
index 06fe9ded80a6..c50bf170b6cf 100644
--- a/deskutils/kbirthday/Makefile
+++ b/deskutils/kbirthday/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kbirthday
 PORTVERSION=	0.7.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://www.gfai.de/~jaham/download/ \
 		http://freshmeat.net/redir/kbirthday/32531/url_tgz/
diff --git a/deskutils/kblticker/Makefile b/deskutils/kblticker/Makefile
index 5240993e9cf2..de5675c777b9 100644
--- a/deskutils/kblticker/Makefile
+++ b/deskutils/kblticker/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=		kblticker
 PORTVERSION=		0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=		deskutils kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index d2a8b1c1613f..349568482863 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/deskutils/kchm/Makefile b/deskutils/kchm/Makefile
index 1d28f93a09a0..831d1dbee1a9 100644
--- a/deskutils/kchm/Makefile
+++ b/deskutils/kchm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kchm
 PORTVERSION=	0.6.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=kchmnew
diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
index 39afdc80ffac..4054e2750a3a 100644
--- a/deskutils/kchmviewer-kde4/Makefile
+++ b/deskutils/kchmviewer-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kchmviewer
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index 39afdc80ffac..4054e2750a3a 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kchmviewer
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 97eb74d0d2ce..372c7bd2879a 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 97eb74d0d2ce..372c7bd2879a 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 97eb74d0d2ce..372c7bd2879a 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/deskutils/kdissert/Makefile b/deskutils/kdissert/Makefile
index f458f64198ca..19ff4ac5d286 100644
--- a/deskutils/kdissert/Makefile
+++ b/deskutils/kdissert/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdissert
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://freehackers.org/~tnagy/kdissert/ \
 		http://bsdguru.org/distfiles/
diff --git a/deskutils/kickpim/Makefile b/deskutils/kickpim/Makefile
index c282b63b04f0..009c96e67eff 100644
--- a/deskutils/kickpim/Makefile
+++ b/deskutils/kickpim/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kickpim
 PORTVERSION=		0.5.3
-PORTREVISION=		4
+PORTREVISION=		5
 CATEGORIES=		deskutils kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/kickpim/pkg-plist b/deskutils/kickpim/pkg-plist
index 5626ae084886..0db8e49d5b4b 100644
--- a/deskutils/kickpim/pkg-plist
+++ b/deskutils/kickpim/pkg-plist
@@ -26,8 +26,6 @@ share/locale/fr/LC_MESSAGES/kickpim.mo
 share/locale/it/LC_MESSAGES/kickpim.mo
 share/locale/nl/LC_MESSAGES/kickpim.mo
 share/locale/pl/LC_MESSAGES/kickpim.mo
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrm share/doc/HTML/en/kickpim
 @dirrmtry share/doc/HTML/en
 @dirrmtry share/doc/HTML
diff --git a/deskutils/klipoquery/Makefile b/deskutils/klipoquery/Makefile
index 1af8adaaf536..bcbab2de5b45 100644
--- a/deskutils/klipoquery/Makefile
+++ b/deskutils/klipoquery/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	klipoquery
 PORTVERSION=	0.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://www.michael-vonrueden.de/${PORTNAME}/
 
diff --git a/deskutils/kluje/Makefile b/deskutils/kluje/Makefile
index fe4e44fec489..e8ca957cb0c4 100644
--- a/deskutils/kluje/Makefile
+++ b/deskutils/kluje/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kluje
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile
index 6a0e9b234a25..d194d8b6a40d 100644
--- a/deskutils/kmatrix3d/Makefile
+++ b/deskutils/kmatrix3d/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		kmatrix3d
 PORTVERSION=		0.1
+PORTREVISION=	1
 CATEGORIES=		deskutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/knowit/Makefile b/deskutils/knowit/Makefile
index 89345b6b78f6..a8d349a2ec7b 100644
--- a/deskutils/knowit/Makefile
+++ b/deskutils/knowit/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	knowit
 PORTVERSION=	0.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	http://knowit.sourceforge.net/files/
 
diff --git a/deskutils/knowit/pkg-plist b/deskutils/knowit/pkg-plist
index 9da10a0fd96a..c5dd8187ba18 100644
--- a/deskutils/knowit/pkg-plist
+++ b/deskutils/knowit/pkg-plist
@@ -24,7 +24,3 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/knowit.mo
 @dirrm share/apps/knowit
 @dirrmtry share/applnk/Applications
 @dirrmtry share/applnk
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile
index 9453f6b223ac..562d52d780e3 100644
--- a/deskutils/kompose/Makefile
+++ b/deskutils/kompose/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kompose
 PORTVERSION=	0.5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://download.berlios.de/kompose/
 
diff --git a/deskutils/kooldock/Makefile b/deskutils/kooldock/Makefile
index 149fdd9dce76..fa9f0bae3862 100644
--- a/deskutils/kooldock/Makefile
+++ b/deskutils/kooldock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		kooldock
 PORTVERSION=		0.4.6
+PORTREVISION=		1
 CATEGORIES=		deskutils
 MASTER_SITES=		http://www.kde-apps.org/CONTENT/content-files/ \
 			http://www.kde-look.org/CONTENT/content-files/ \
diff --git a/deskutils/krefty/Makefile b/deskutils/krefty/Makefile
index f0d7d4394a45..d6ebb8003458 100644
--- a/deskutils/krefty/Makefile
+++ b/deskutils/krefty/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	krefty
 PORTVERSION=	0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://codeworks.gnomedia.com/krefty/
 
diff --git a/deskutils/kronolith/Makefile b/deskutils/kronolith/Makefile
index c6b6b98907f8..cb5098706807 100644
--- a/deskutils/kronolith/Makefile
+++ b/deskutils/kronolith/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kronolith
 PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile
index 06250667c99c..2eb4c30bf8e8 100644
--- a/deskutils/krss/Makefile
+++ b/deskutils/krss/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	krss
 PORTVERSION=	2.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile
index 276555bb645c..85d4c500be84 100644
--- a/deskutils/ksmoothdock/Makefile
+++ b/deskutils/ksmoothdock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ksmoothdock
 PORTVERSION=	4.5
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}_automake-1.9
diff --git a/deskutils/ktagebuch/Makefile b/deskutils/ktagebuch/Makefile
index 130f198449e5..4299e1af5e4c 100644
--- a/deskutils/ktagebuch/Makefile
+++ b/deskutils/ktagebuch/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		ktagebuch
 PORTVERSION=		0.74
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		deskutils kde
 MASTER_SITES=		http://www.theblessing.net/programming/${PORTNAME}/
 
diff --git a/deskutils/kuake/Makefile b/deskutils/kuake/Makefile
index a1adbc2419bc..24540722f669 100644
--- a/deskutils/kuake/Makefile
+++ b/deskutils/kuake/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kuake
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://199.231.140.154/software/${PORTNAME}/
 
diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile
index e968348ea06f..174006b8e24d 100644
--- a/deskutils/lightning-thunderbird/Makefile
+++ b/deskutils/lightning-thunderbird/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	sunbird
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
@@ -61,7 +62,6 @@ post-patch:
 pre-install:
 	${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 	${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
 	${ECHO_CMD} '@dirrmtry lib/sunbird/plugins' >> ${PLIST}
 	${ECHO_CMD} '@dirrmtry lib/sunbird' >> ${PLIST}
diff --git a/deskutils/lightning-xpi/Makefile b/deskutils/lightning-xpi/Makefile
index 3715917764ac..3b0227b6839e 100644
--- a/deskutils/lightning-xpi/Makefile
+++ b/deskutils/lightning-xpi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lightning
 PORTVERSION=	${ARCH_PORTVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile
index e968348ea06f..174006b8e24d 100644
--- a/deskutils/lightning/Makefile
+++ b/deskutils/lightning/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	sunbird
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
@@ -61,7 +62,6 @@ post-patch:
 pre-install:
 	${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 	${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
 	${ECHO_CMD} '@dirrmtry lib/sunbird/plugins' >> ${PLIST}
 	${ECHO_CMD} '@dirrmtry lib/sunbird' >> ${PLIST}
diff --git a/deskutils/ljit/Makefile b/deskutils/ljit/Makefile
index 5fc05bcdc5bc..d278da22ec27 100644
--- a/deskutils/ljit/Makefile
+++ b/deskutils/ljit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ljit
 PORTVERSION=	0.2.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils
 MASTER_SITES=	http://kir.vtx.ru/ljit/dl/ \
 		http://freebsd.nsu.ru/distfiles/
diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index d938fd363807..a77b082fba36 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	logjam
 PORTVERSION=	4.5.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	http://logjam.danga.com/download/
 
diff --git a/deskutils/mcatalog/Makefile b/deskutils/mcatalog/Makefile
index 6fba383c5eef..53a4ccdd625f 100644
--- a/deskutils/mcatalog/Makefile
+++ b/deskutils/mcatalog/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mcatalog
 PORTVERSION=	0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.mcatalog.net/releases/
 
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index 94b92e43de3c..5649b1a0da4e 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mdh
 PORTVERSION=	1.9.59
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.gozer.org/my_stuff/gtk/gtk/mdh/
 
diff --git a/deskutils/metabar/Makefile b/deskutils/metabar/Makefile
index 270c7e66ce1c..190bf53a1b06 100644
--- a/deskutils/metabar/Makefile
+++ b/deskutils/metabar/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	metabar
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/mhc/Makefile b/deskutils/mhc/Makefile
index 8f78cae87dcc..14a44214c77d 100644
--- a/deskutils/mhc/Makefile
+++ b/deskutils/mhc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mhc
 PORTVERSION=	20051120
+PORTREVISION=	1
 CATEGORIES=	deskutils elisp
 MASTER_SITES=	http://www.quickhack.net/mhc/arc/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/deskutils/mnemo/Makefile b/deskutils/mnemo/Makefile
index 4733d120146a..d245a10c1bf9 100644
--- a/deskutils/mnemo/Makefile
+++ b/deskutils/mnemo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mnemo
 PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/deskutils/moregroupware/Makefile b/deskutils/moregroupware/Makefile
index 381772b9cfe5..ffe4812ab30d 100644
--- a/deskutils/moregroupware/Makefile
+++ b/deskutils/moregroupware/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	moregroupware
 PORTVERSION=	0.7.4
+PORTREVISION=	1
 CATEGORIES=	deskutils www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	moregroupware
diff --git a/deskutils/mrundlg/Makefile b/deskutils/mrundlg/Makefile
index ff1f1e8b55cd..7b3c2dacf2d6 100644
--- a/deskutils/mrundlg/Makefile
+++ b/deskutils/mrundlg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mrundlg
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://matt.sixxgate.com/files/
 
diff --git a/deskutils/multi-backgrounds-daemon/Makefile b/deskutils/multi-backgrounds-daemon/Makefile
index fd31736ec0b9..642af1eea824 100644
--- a/deskutils/multi-backgrounds-daemon/Makefile
+++ b/deskutils/multi-backgrounds-daemon/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	multi-backgrounds-daemon
 PORTVERSION=	0.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://jeanschu.free.fr/multi-backgrounds-daemon/
 
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index eadd33870758..dd2e60ffc90c 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME?=	multisync
 PORTVERSION=	0.82
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	multisync
diff --git a/deskutils/mywiki/Makefile b/deskutils/mywiki/Makefile
index f95b0538cc7f..0885b7770a73 100644
--- a/deskutils/mywiki/Makefile
+++ b/deskutils/mywiki/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mywiki
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/MyLibrary/
 DISTNAME=	MyWiki-${PORTVERSION}
diff --git a/deskutils/nag/Makefile b/deskutils/nag/Makefile
index dffdf08643e2..dc35f091c439 100644
--- a/deskutils/nag/Makefile
+++ b/deskutils/nag/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nag
 PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/deskutils/narval/Makefile b/deskutils/narval/Makefile
index a712c02200e7..4e8619a62cb1 100644
--- a/deskutils/narval/Makefile
+++ b/deskutils/narval/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	narval
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils python
 MASTER_SITES=	ftp://ftp.logilab.org/pub/narval/ \
 		http://www.logilab.org/ftp/pub/narval/
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 0f0435364a54..1315d8e6f50e 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nautilus-actions
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://ftp2.grumz.net/grumz/
 
diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist
index 9d25dff6b730..3ca1f4709e3f 100644
--- a/deskutils/nautilus-actions/pkg-plist
+++ b/deskutils/nautilus-actions/pkg-plist
@@ -37,17 +37,5 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-actions.mo
 share/nautilus-actions/nact/nautilus-actions-config.glade
 @dirrm share/nautilus-actions/nact
 @dirrm share/nautilus-actions
-@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/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index cce5415997b1..dd839110079e 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	nautilus-locked-folder
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils security
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav
diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile
index 351750815e68..7ca2bd329d2a 100644
--- a/deskutils/nautilus-open-terminal/Makefile
+++ b/deskutils/nautilus-open-terminal/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nautilus-open-terminal
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME
 
diff --git a/deskutils/nautilus-open-terminal/pkg-plist b/deskutils/nautilus-open-terminal/pkg-plist
index f8848d67dec0..897bd8ab2880 100644
--- a/deskutils/nautilus-open-terminal/pkg-plist
+++ b/deskutils/nautilus-open-terminal/pkg-plist
@@ -47,39 +47,9 @@ share/locale/uk/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/vi/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @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/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index 519338b5cdd2..08daa82f3290 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nautilus-sendto
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME
 
diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist
index a7f63be29d6f..7e45d575c8eb 100644
--- a/deskutils/nautilus-sendto/pkg-plist
+++ b/deskutils/nautilus-sendto/pkg-plist
@@ -55,40 +55,10 @@ share/locale/uk/LC_MESSAGES/nautilus-sendto.mo
 share/locale/vi/LC_MESSAGES/nautilus-sendto.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-sendto.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/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/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrm share/gnome/nautilus-sendto/glade
 @dirrm share/gnome/nautilus-sendto
 @dirrm lib/nautilus-sendto/plugins
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 4cc725a4df57..6c84285bb9e8 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	notification-daemon
 PORTVERSION=	0.3.7
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/notification-daemon/
 
diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index de0dc08aaa32..f6773c12c91c 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ontv
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/ontv/pkg-plist b/deskutils/ontv/pkg-plist
index 1eda48a7ea3a..074077865516 100644
--- a/deskutils/ontv/pkg-plist
+++ b/deskutils/ontv/pkg-plist
@@ -107,19 +107,5 @@ share/locale/zh_CN/LC_MESSAGES/ontv.mo
 @dirrm share/gnome/ontv
 @dirrm %%PYTHON_SITELIBDIR%%/ontv/keybinder
 @dirrm %%PYTHON_SITELIBDIR%%/ontv
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @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
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index f538799a4aa5..44111261c2bf 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	orage
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/deskutils/orage/pkg-plist b/deskutils/orage/pkg-plist
index f8b1414da388..41aff9ccc528 100644
--- a/deskutils/orage/pkg-plist
+++ b/deskutils/orage/pkg-plist
@@ -459,8 +459,6 @@ share/xfce4/panel-plugins/orageclock.desktop
 @dirrmtry libexec/xfce4/panel-plugins
 @dirrmtry libexec/xfce4
 @dirrmtry share/applications
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
 @dirrm share/orage/doc/C/images
 @dirrm share/orage/doc/C
 @dirrm share/orage/doc
diff --git a/deskutils/org-mode.el/Makefile b/deskutils/org-mode.el/Makefile
index 03a8aa7feb04..98f4d35207f4 100644
--- a/deskutils/org-mode.el/Makefile
+++ b/deskutils/org-mode.el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	org-mode.el
 PORTVERSION=	4.64
+PORTREVISION=	1
 CATEGORIES=	deskutils elisp
 MASTER_SITES=	http://staff.science.uva.nl/~dominik/Tools/org/ \
 		http://web.student.chalmers.se/~kaiw/FreeBSD/disfiles/
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index fba1b9af6a23..168249f5ba28 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	pinot
 PORTVERSION=	0.72
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 #MASTER_SITES=	http://www.chez.com/colinf/pinot/	\
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index b5242521846e..ee9b7bfa3960 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	plan
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES+=	deskutils
 MASTER_SITES=	ftp://plan.ftp.fu-berlin.de/
 MASTER_SITE_SUBDIR=	applications
diff --git a/deskutils/planner.el/Makefile b/deskutils/planner.el/Makefile
index 5e5506e13eb3..baee3bc785a1 100644
--- a/deskutils/planner.el/Makefile
+++ b/deskutils/planner.el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	planner.el
 PORTVERSION=	3.41
+PORTREVISION=	1
 CATEGORIES=	deskutils elisp
 MASTER_SITES=	http://download.gna.org/planner-el/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index 0bb48022bd77..348fdca06b04 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	planner
 PORTVERSION=	0.14.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.14
diff --git a/deskutils/planner/pkg-plist b/deskutils/planner/pkg-plist
index 7dd8f6f786a7..341d39aeedd3 100644
--- a/deskutils/planner/pkg-plist
+++ b/deskutils/planner/pkg-plist
@@ -257,10 +257,6 @@ share/mime/application/x-planner.xml
 share/mime/packages/planner.xml
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrm share/gnome/planner/ui
diff --git a/deskutils/plopfolio/Makefile b/deskutils/plopfolio/Makefile
index 0e004ee19b2d..3c14cbe27783 100644
--- a/deskutils/plopfolio/Makefile
+++ b/deskutils/plopfolio/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	plopfolio
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	usr-apps
diff --git a/deskutils/preferencepanes/Makefile b/deskutils/preferencepanes/Makefile
index 32b56c93e83f..6d171aeb3c12 100644
--- a/deskutils/preferencepanes/Makefile
+++ b/deskutils/preferencepanes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	preferencepanes
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.gnustep.it/enrico/system-preferences/
 DISTNAME=	systempreferences-${PORTVERSION}
diff --git a/deskutils/preferences.app/Makefile b/deskutils/preferences.app/Makefile
index 68b73333c671..1aaa043a5eda 100644
--- a/deskutils/preferences.app/Makefile
+++ b/deskutils/preferences.app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	preferences
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	prefsapp
diff --git a/deskutils/pybookreader/Makefile b/deskutils/pybookreader/Makefile
index a34538cafd28..d83369ef2008 100644
--- a/deskutils/pybookreader/Makefile
+++ b/deskutils/pybookreader/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pybookreader
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index 53840f2aa3db..698d59c8730b 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pypanel
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pypanel
diff --git a/deskutils/qrfcview/Makefile b/deskutils/qrfcview/Makefile
index b6949f8f783a..d1360be0767e 100644
--- a/deskutils/qrfcview/Makefile
+++ b/deskutils/qrfcview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qrfcview
 PORTVERSION=	0.62
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	CENKES BERLIOS
 EXTRACT_SUFX=	.tgz
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 5d6f3d7bc6ef..899141db0147 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	recoll
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
 
diff --git a/deskutils/remember.el/Makefile b/deskutils/remember.el/Makefile
index 855639d7e821..84f2519b540f 100644
--- a/deskutils/remember.el/Makefile
+++ b/deskutils/remember.el/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	remember.el
 PORTVERSION=	1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils elisp
 MASTER_SITES=	http://download.gna.org/remember-el/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/deskutils/rox-memo/Makefile b/deskutils/rox-memo/Makefile
index 251df643a62e..c792b77d6e92 100644
--- a/deskutils/rox-memo/Makefile
+++ b/deskutils/rox-memo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rox-memo
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index 37cb0552ce98..4170dd7d4724 100644
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rubrica
 PORTVERSION=	1.0.17
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index f458f64198ca..19ff4ac5d286 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdissert
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://freehackers.org/~tnagy/kdissert/ \
 		http://bsdguru.org/distfiles/
diff --git a/deskutils/sliderule/Makefile b/deskutils/sliderule/Makefile
index 650bf3bd7fe7..b4b32d91ad13 100644
--- a/deskutils/sliderule/Makefile
+++ b/deskutils/sliderule/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sliderule
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	joerg
diff --git a/deskutils/snotes/Makefile b/deskutils/snotes/Makefile
index 8b224790d27f..903402303103 100644
--- a/deskutils/snotes/Makefile
+++ b/deskutils/snotes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snotes
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	s-notes
diff --git a/deskutils/splashsetter/Makefile b/deskutils/splashsetter/Makefile
index 8175d72ba501..eab9917440f5 100644
--- a/deskutils/splashsetter/Makefile
+++ b/deskutils/splashsetter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	splashsetter
 PORTVERSION=	0.6.5.2
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://webonaut.com/distfiles/${PORTNAME}/
 
diff --git a/deskutils/sugarcrm/Makefile b/deskutils/sugarcrm/Makefile
index 9c1bd7f46728..cc026c3022f9 100644
--- a/deskutils/sugarcrm/Makefile
+++ b/deskutils/sugarcrm/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	sugarcrm
 PORTVERSION=	4.5.1b
+PORTREVISION=	1
 CATEGORIES=	deskutils www
 MASTER_SITES=	${SCRM_DISPATCHER}/:src \
 		${DOC_DISPATCHER}/:userdoc \
diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile
index e968348ea06f..174006b8e24d 100644
--- a/deskutils/sunbird/Makefile
+++ b/deskutils/sunbird/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	sunbird
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
@@ -61,7 +62,6 @@ post-patch:
 pre-install:
 	${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 	${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
 	${ECHO_CMD} '@dirrmtry lib/sunbird/plugins' >> ${PLIST}
 	${ECHO_CMD} '@dirrmtry lib/sunbird' >> ${PLIST}
diff --git a/deskutils/superkaramba-lwp/Makefile b/deskutils/superkaramba-lwp/Makefile
index e0eb43b34b01..ddc15e854faa 100644
--- a/deskutils/superkaramba-lwp/Makefile
+++ b/deskutils/superkaramba-lwp/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		lwp
 PORTVERSION=		14.6
+PORTREVISION=	1
 CATEGORIES=		deskutils kde
 MASTER_SITES=		http://www.message.co.nz/~matt-sarah/ \
 			http://mirror1.liquidweather.net/ \
diff --git a/deskutils/superswitcher/Makefile b/deskutils/superswitcher/Makefile
index 4cba4c58146c..5acb0981a84a 100644
--- a/deskutils/superswitcher/Makefile
+++ b/deskutils/superswitcher/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	superswitcher
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	browserbookapp
diff --git a/deskutils/systempreferences/Makefile b/deskutils/systempreferences/Makefile
index af5435bd8d87..40d7ff1c9e74 100644
--- a/deskutils/systempreferences/Makefile
+++ b/deskutils/systempreferences/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	systempreferences
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://www.gnustep.it/enrico/system-preferences/
 
diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index e5a0ddc21cfe..19d6d4c93735 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	taskjuggler
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.taskjuggler.org/download/
 
diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index 2c2ef883732a..2d580ca547a5 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	timer-applet
 PORTVERSION=	1.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	timerapplet
diff --git a/deskutils/timer-applet/pkg-plist b/deskutils/timer-applet/pkg-plist
index 04ec9a57fd8a..1359518a71a9 100644
--- a/deskutils/timer-applet/pkg-plist
+++ b/deskutils/timer-applet/pkg-plist
@@ -24,9 +24,3 @@ share/locale/tr/LC_MESSAGES/timer-applet.mo
 @dirrm share/gnome/help/timer-applet
 @dirrm share/gnome/omf/timer-applet
 @dirrm share/gnome/pixmaps/timer-applet
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 72a9bd9faf81..1609d7e1e595 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	tomboy
 PORTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist
index 9d7ff85f672d..366014aa91bf 100644
--- a/deskutils/tomboy/pkg-plist
+++ b/deskutils/tomboy/pkg-plist
@@ -164,48 +164,16 @@ share/locale/vi/LC_MESSAGES/tomboy.mo
 share/locale/zh_CN/LC_MESSAGES/tomboy.mo
 share/locale/zh_HK/LC_MESSAGES/tomboy.mo
 share/locale/zh_TW/LC_MESSAGES/tomboy.mo
-@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/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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrm share/gnome/omf/tomboy
 @dirrm share/gnome/help/tomboy/uk/figures
 @dirrm share/gnome/help/tomboy/uk
diff --git a/deskutils/toolbox/Makefile b/deskutils/toolbox/Makefile
index bb048109e369..3814354c414e 100644
--- a/deskutils/toolbox/Makefile
+++ b/deskutils/toolbox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	toolbox
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://ftp.azc.uam.mx/mirrors/gnu/savannah/files/toolbox/Release.pkg/0.8/ \
 		${MASTER_SITE_LOCAL}
diff --git a/deskutils/toolboxkit/Makefile b/deskutils/toolboxkit/Makefile
index 67e3d8c39429..29eec70e9421 100644
--- a/deskutils/toolboxkit/Makefile
+++ b/deskutils/toolboxkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	toolbox
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://ftp.azc.uam.mx/mirrors/gnu/savannah/files/toolbox/Release.pkg/0.8/ \
 		${MASTER_SITE_LOCAL}
diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile
index f6e47a9a362d..fc6726070ae4 100644
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	tpb
 PORTVERSION=	0.6.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index 24b23aea3d8d..ab0285ccb1bf 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	treeline
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://www.bellz.org/treeline/ \
 		http://depot.fsck.ch/mirror/distfiles/
diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile
index a29fd10a33d0..36562d6e9e6f 100644
--- a/deskutils/tuxcards/Makefile
+++ b/deskutils/tuxcards/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tuxcards
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.tifskom.de/tux/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/deskutils/vym/Makefile b/deskutils/vym/Makefile
index 261f554e369c..febbd58b930d 100644
--- a/deskutils/vym/Makefile
+++ b/deskutils/vym/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vym
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/wmpinboard/Makefile b/deskutils/wmpinboard/Makefile
index 1d75933f686b..3beb6d68a8d5 100644
--- a/deskutils/wmpinboard/Makefile
+++ b/deskutils/wmpinboard/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmpinboard
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils afterstep windowmaker
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/deskutils/wyrd/Makefile b/deskutils/wyrd/Makefile
index d779c0f28a2f..4d5a21ba185c 100644
--- a/deskutils/wyrd/Makefile
+++ b/deskutils/wyrd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wyrd
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.eecs.umich.edu/~pelzlpj/wyrd/
 
diff --git a/deskutils/xcalendar/Makefile b/deskutils/xcalendar/Makefile
index 9150a18420a2..5d92b1036721 100644
--- a/deskutils/xcalendar/Makefile
+++ b/deskutils/xcalendar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcalendar
 PORTVERSION=	4.0.2006
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 DISTNAME=	${PORTNAME}-4.0+i18n
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
index 47c726b9355a..49345f15cbba 100644
--- a/deskutils/xchm/Makefile
+++ b/deskutils/xchm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xchm
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/xchm/pkg-plist b/deskutils/xchm/pkg-plist
index 5e82f621012e..48fbab01e817 100644
--- a/deskutils/xchm/pkg-plist
+++ b/deskutils/xchm/pkg-plist
@@ -25,4 +25,3 @@ share/pixmaps/xchmdoc-128.xpm
 share/pixmaps/xchmdoc-16.xpm
 share/pixmaps/xchmdoc-32.xpm
 share/pixmaps/xchmdoc-48.xpm
-@dirrmtry share/pixmaps
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 8ba4f7fc62e4..6934d417df9b 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-notes-plugin
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index c0eecb991c5e..e3d9cc16ea3e 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-xkb-plugin
 PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/deskutils/xmaddressbook/Makefile b/deskutils/xmaddressbook/Makefile
index 6e45287386f7..31dcf1a5a1c5 100644
--- a/deskutils/xmaddressbook/Makefile
+++ b/deskutils/xmaddressbook/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmaddressbook
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	office
diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile
index a1d275d545a2..631165ef63cf 100644
--- a/deskutils/xmdiary/Makefile
+++ b/deskutils/xmdiary/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmdiary
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	office
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index f2da1cd70665..fc03f5ec88ef 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xneur
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	russian
 MASTER_SITES=	http://dists.xneur.ru/release-0.5.0/tgz/ CENKES
 
diff --git a/deskutils/xopps/Makefile b/deskutils/xopps/Makefile
index cb7b588cdd24..a2765cbba566 100644
--- a/deskutils/xopps/Makefile
+++ b/deskutils/xopps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xopps
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://cvsup.theplanet.com/distfiles/ \
 		http://dl.droso.net/ports/
diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index 7432be92d622..c5fc05ab8796 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpad
 PORTVERSION=	2.11
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/xpad/pkg-plist b/deskutils/xpad/pkg-plist
index 8a912632f42e..740bda4936c8 100644
--- a/deskutils/xpad/pkg-plist
+++ b/deskutils/xpad/pkg-plist
@@ -22,17 +22,6 @@ share/locale/vi/LC_MESSAGES/xpad.mo
 share/locale/zh_CN/LC_MESSAGES/xpad.mo
 share/locale/zh_TW/LC_MESSAGES/xpad.mo
 share/pixmaps/xpad.png
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@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
diff --git a/deskutils/xpostit/Makefile b/deskutils/xpostit/Makefile
index 6abe19aa6fb5..a3bbdd7666bc 100644
--- a/deskutils/xpostit/Makefile
+++ b/deskutils/xpostit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpostit
 PORTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/deskutils/xpostitPlus/Makefile b/deskutils/xpostitPlus/Makefile
index 6c4285a54933..ed10c1971163 100644
--- a/deskutils/xpostitPlus/Makefile
+++ b/deskutils/xpostitPlus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XPostitPlus
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	office
diff --git a/deskutils/xrolo/Makefile b/deskutils/xrolo/Makefile
index 75918b682d92..92936efd49b0 100644
--- a/deskutils/xrolo/Makefile
+++ b/deskutils/xrolo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xrolo
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://ftp.uni-potsdam.de/pub/X11/open-look/ \
 		ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
diff --git a/deskutils/xwrits/Makefile b/deskutils/xwrits/Makefile
index b3b1e7988b1a..0240abe00e71 100644
--- a/deskutils/xwrits/Makefile
+++ b/deskutils/xwrits/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xwrits
 PORTVERSION=	2.24
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.lcdf.org/xwrits/
 
diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile
index 6e2aa585e32f..74184b10c56d 100644
--- a/deskutils/zorro/Makefile
+++ b/deskutils/zorro/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zorro
 PORTVERSION=	1.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils tk84
 MASTER_SITES=	ftp://ftp.nuug.no/pub/anders/distfiles/ \
 		http://atreides.freenix.no/~anders/ \
diff --git a/devel/Makefile b/devel/Makefile
index 2ea5d3f03dca..5affdbbde8f1 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -344,6 +344,7 @@
     SUBDIR += gauche-sdl
     SUBDIR += gaul
     SUBDIR += gazpacho
+    SUBDIR += gccmakedep
     SUBDIR += gccxml
     SUBDIR += gconf
     SUBDIR += gconf2
@@ -456,8 +457,8 @@
     SUBDIR += icu2
     SUBDIR += id-utils
     SUBDIR += ifd-test
+    SUBDIR += imake
     SUBDIR += imake-4
-    SUBDIR += imake-6
     SUBDIR += inilib
     SUBDIR += initutil
     SUBDIR += invitation_to_ruby
@@ -2192,6 +2193,7 @@
     SUBDIR += xfce4-dev-tools
     SUBDIR += xlslib
     SUBDIR += xmake
+    SUBDIR += xorg-macros
     SUBDIR += xparam
     SUBDIR += xtl
     SUBDIR += xtla
diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index 68e3df8459ac..b91bb960eba8 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	SpecTcl
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/devel/acovea-gtk/Makefile b/devel/acovea-gtk/Makefile
index ff4a92195843..fb3807174572 100644
--- a/devel/acovea-gtk/Makefile
+++ b/devel/acovea-gtk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	acovea-gtk
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.coyotegulch.com/distfiles/
 
diff --git a/devel/adabindx/Makefile b/devel/adabindx/Makefile
index 6c72cff21504..749202472b16 100644
--- a/devel/adabindx/Makefile
+++ b/devel/adabindx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	adabindx
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://home.arcor.de/hfvogt/
 
diff --git a/devel/adasdl/Makefile b/devel/adasdl/Makefile
index 618c8aeb9cbc..f228e1343d8a 100644
--- a/devel/adasdl/Makefile
+++ b/devel/adasdl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=      adasdl
 PORTVERSION=   20010504
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=    ${PORTNAME}
diff --git a/devel/adime/Makefile b/devel/adime/Makefile
index 6785ab13d8fd..4b55f4f7eb6d 100644
--- a/devel/adime/Makefile
+++ b/devel/adime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	adime
 PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/agide/Makefile b/devel/agide/Makefile
index 70f7eca244a3..43872988a31e 100644
--- a/devel/agide/Makefile
+++ b/devel/agide/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	agide
 PORTVERSION=	0.124
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	a-a-p
diff --git a/devel/aifad/Makefile b/devel/aifad/Makefile
index 4fd66ec8eb0d..073df519ce1d 100644
--- a/devel/aifad/Makefile
+++ b/devel/aifad/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	aifad
 PORTVERSION=	1.0.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml.info/ocaml_sources/
 
diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 7821e6bb113b..6cdffb696f20 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	allegro
 DISTVERSION=	4.3.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 103f120d47e7..edcacb269338 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	allegro
 DISTVERSION=	4.2.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 67f4b95d59f0..06146be664f1 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	anjuta
 PORTVERSION=	1.2.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile
index 89883a3df11f..4d4f3faadacc 100644
--- a/devel/antlr/Makefile
+++ b/devel/antlr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	antlr
 PORTVERSION=	2.7.6
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.antlr.org/download/
 
diff --git a/devel/antlrworks/Makefile b/devel/antlrworks/Makefile
index 054fa6541fc9..63a57b8dffde 100644
--- a/devel/antlrworks/Makefile
+++ b/devel/antlrworks/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	antlrworks
 PORTVERSION=	1.0b9
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.antlr.org/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index bd787b97d752..aff0fa90da3d 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apache-ant
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:bin,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%/,hq/:man,} \
diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile
index 239dfe948b3e..5bba1e5c905f 100644
--- a/devel/argouml/Makefile
+++ b/devel/argouml/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	argouml
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://argouml-downloads.tigris.org/nonav/argouml-${PORTVERSION}/
 DISTNAME=	ArgoUML-${PORTVERSION}
diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile
index 351bcfc3e386..362fa03758b1 100644
--- a/devel/arm-elf-binutils/Makefile
+++ b/devel/arm-elf-binutils/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	binutils
 PORTVERSION=	2.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
diff --git a/devel/arm-elf-binutils/pkg-plist b/devel/arm-elf-binutils/pkg-plist
index de0e3cd90b3b..fa19ff31720c 100644
--- a/devel/arm-elf-binutils/pkg-plist
+++ b/devel/arm-elf-binutils/pkg-plist
@@ -65,10 +65,6 @@ share/locale/tr/LC_MESSAGES/ld.mo
 share/locale/tr/LC_MESSAGES/opcodes.mo
 share/locale/zh_CN/LC_MESSAGES/bfd.mo
 share/locale/zh_CN/LC_MESSAGES/binutils.mo
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrm arm-elf/bin
 @dirrm arm-elf/lib/ldscripts
 @dirrm arm-elf/lib
diff --git a/devel/as31/Makefile b/devel/as31/Makefile
index 97b91c909c21..02ab135bfcf7 100644
--- a/devel/as31/Makefile
+++ b/devel/as31/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	as31
 PORTVERSION=	2.0.b3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.pjrc.com/tech/8051/tools/
 DISTNAME=	${PORTNAME}_beta3
diff --git a/devel/astah-community/Makefile b/devel/astah-community/Makefile
index ec476e707cb0..997de7b351bd 100644
--- a/devel/astah-community/Makefile
+++ b/devel/astah-community/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jude-community
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	# you have to register yourself as a member to download
 DISTNAME=	${PORTNAME}-${PORTVERSION:S!.!_!g}
diff --git a/devel/autodia/Makefile b/devel/autodia/Makefile
index 8ebf7bcc44db..851e766e58c6 100644
--- a/devel/autodia/Makefile
+++ b/devel/autodia/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	autodia
 PORTVERSION=	2.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tree/TEEJAY
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index a362b2babeef..6b06cd222ca9 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -46,7 +46,6 @@ post-patch:
 		${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \
 		${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in \
 	)
-	@${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in
 
 pre-su-install:
 	@${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
diff --git a/devel/automake110/files/patch-aclocal.in b/devel/automake110/files/patch-aclocal.in
index 55e48977e3ac..5a3af1e7f9d4 100644
--- a/devel/automake110/files/patch-aclocal.in
+++ b/devel/automake110/files/patch-aclocal.in
@@ -1,17 +1,15 @@
 --- aclocal.in.orig	Sun Oct 15 09:19:37 2006
-+++ aclocal.in	Tue Dec  5 13:19:21 2006
++++ aclocal.in	Sun May  6 13:56:37 2007
 @@ -32,3 +32,3 @@
  {
 -  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
 +  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
    unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
-@@ -58,4 +58,4 @@
+@@ -58,3 +58,3 @@
  my @user_includes = ();
 -my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
--my @system_includes = ('@datadir@/aclocal');
 +my @automake_includes = ("@datadir@/aclocal$APIPVERSION");
-+my @system_includes = ('@datadir@/aclocal', '%%X11BASE%%/share/aclocal');
- 
+ my @system_includes = ('@datadir@/aclocal');
 @@ -650,3 +650,3 @@
  
 -  my $traces = ($ENV{AUTOM4TE} || 'autom4te');
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index a9b8bb00a4d6..fda87bb524d2 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.4.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -34,10 +34,6 @@ post-patch:
 	@${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake${BUILD_VERSION}.texi
 	@${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi >/dev/null 2>&1 || true
 
-pre-configure:
-	@${REINPLACE_CMD} -i -e "s,%%X11BASE%%,${X11BASE}," \
-		${WRKSRC}/aclocal.in
-
 pre-su-install:
 	@${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
 	@${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION}
diff --git a/devel/automake14/files/patch-aclocal.in b/devel/automake14/files/patch-aclocal.in
index 0e2c5263bc0e..49c6f2251c52 100644
--- a/devel/automake14/files/patch-aclocal.in
+++ b/devel/automake14/files/patch-aclocal.in
@@ -1,16 +1,11 @@
 --- aclocal.in.orig	Thu Jul 25 09:51:42 2002
-+++ aclocal.in	Fri May 14 09:40:13 2004
-@@ -36,3 +36,4 @@
++++ aclocal.in	Sun May  6 13:50:18 2007
+@@ -36,3 +36,3 @@
  # Note also that the versioned directory is handled later.
 -$acdir = "@datadir@/aclocal";
 +$acdir = "@datadir@/aclocal14";
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
  $default_acdir = $acdir;
-@@ -111,2 +112,3 @@
- local (@dirlist) = &parse_arguments (@ARGV);
-+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
- &scan_m4_files (@dirlist);
-@@ -200,8 +202,2 @@
+@@ -200,8 +200,2 @@
  
 -    # Search the versioned directory near the end, and then the
 -    # unversioned directory last.  Only do this if the user didn't
@@ -19,16 +14,16 @@
 -	if $acdir eq $default_acdir;
 -
      # By default $(datadir)/aclocal doesn't exist.  We don't want to
-@@ -296,2 +292,3 @@
+@@ -296,2 +290,3 @@
  
 +    local (@skipinolist) = ();
      local ($m4dir);
-@@ -301,3 +298,3 @@
+@@ -301,3 +296,3 @@
  	    || die "aclocal: couldn't open directory \`$m4dir': $!\n";
 -	local ($file, $fullfile, $expr);
 +	local ($file, $fullfile, $ino, $expr);
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
-@@ -311,2 +308,8 @@
+@@ -311,2 +306,8 @@
  	    $fullfile = $m4dir . '/' . $file;
 +
 +	    # Do not scan a file more than once.
diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index e9a407252cdd..804ef0a8c32a 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.5
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -35,8 +35,7 @@ post-patch:
 		${MV} automake.texi automake${BUILD_VERSION}.texi && \
 		${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \
 		${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in  && \
-		${REINPLACE_CMD} -e 's,%%BUILD_VERSION%%,${BUILD_VERSION},g; \
-				     s,%%X11BASE%%,${X11BASE},g' aclocal.in \
+		${REINPLACE_CMD} -e 's,%%BUILD_VERSION%%,${BUILD_VERSION},g' aclocal.in \
 	)
 
 pre-su-install:
diff --git a/devel/automake15/files/patch-aclocal.in b/devel/automake15/files/patch-aclocal.in
index 8492c92e4e19..d72fe290f094 100644
--- a/devel/automake15/files/patch-aclocal.in
+++ b/devel/automake15/files/patch-aclocal.in
@@ -1,12 +1,10 @@
---- aclocal.in.orig	Tue Jul 17 05:36:23 2001
-+++ aclocal.in	Tue Jul  6 21:30:44 2004
-@@ -35,2 +35,4 @@
+--- aclocal.in.orig	Mon Jul 16 22:36:23 2001
++++ aclocal.in	Sun May  6 13:52:34 2007
+@@ -35,2 +35,3 @@
  $acdir = "@datadir@/aclocal";
 +$acdir_ver = "@datadir@/aclocal%%BUILD_VERSION%%";
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
  
-@@ -210,2 +212,4 @@
+@@ -210,2 +211,3 @@
      push (@dirlist, $acdir);
 +    push (@dirlist, $acdir_ver) if (-d "$acdir_ver/.");
-+    push (@dirlist, $acdir_x11) if (-d "$acdir_x11/.");
  
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index 6353e032bee0..87241d34df47 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.9.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -37,7 +38,6 @@ post-patch:
 		${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \
 		${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in \
 	)
-	@${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in
 
 pre-su-install:
 	@${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
diff --git a/devel/automake19/files/patch-aclocal.in b/devel/automake19/files/patch-aclocal.in
index 0745a4e187a7..a9df0ac85c20 100644
--- a/devel/automake19/files/patch-aclocal.in
+++ b/devel/automake19/files/patch-aclocal.in
@@ -1,28 +1,26 @@
---- aclocal.in.orig	Sat Apr 10 10:15:32 2004
-+++ aclocal.in	Wed May 26 14:33:27 2004
+--- aclocal.in.orig	Sat Jul  9 02:28:44 2005
++++ aclocal.in	Sun May  6 13:54:43 2007
 @@ -31,3 +31,3 @@
  {
 -  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
 +  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
    unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
-@@ -47,4 +47,5 @@
+@@ -47,3 +47,3 @@
  # Note also that the versioned directory is handled later.
 -$acdir = '@datadir@/aclocal';
 +$acdir = '@datadir@/aclocal@APIPVERSION@';
  $default_acdir = $acdir;
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
- # contains a list of directories, one per line, to be added
-@@ -411,3 +412,3 @@
+@@ -406,3 +406,3 @@
  
 -  my $traces = ($ENV{AUTOM4TE} || 'autom4te');
 +  my $traces = ($ENV{AUTOM4TE} || 'autom4te259');
    $traces .= " --language Autoconf-without-aclocal-m4 ";
-@@ -622,7 +623,3 @@
- 
+@@ -634,8 +634,2 @@
+     if $acdir ne $default_acdir;
+-
 -  # Search the versioned directory near the end, and then the
 -  # unversioned directory last.  Only do this if the user didn't
 -  # override acdir.
 -  push (@dirlist, "$acdir-$APIVERSION")
 -    if $acdir eq $default_acdir;
-+  unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
  
diff --git a/devel/avalon-framework/Makefile b/devel/avalon-framework/Makefile
index bce9848b2349..32393d6494c3 100644
--- a/devel/avalon-framework/Makefile
+++ b/devel/avalon-framework/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	avalon-framework
 PORTVERSION=	4.2.0
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	avalon/${PORTNAME}/binaries/
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index c0a1c4ac974f..4d5ab2688147 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	avr-libc
 PORTVERSION=	1.4.5
 PORTEPOCH=	1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/baz/Makefile b/devel/baz/Makefile
index 4e8bb0238da4..ae82d23dffd6 100644
--- a/devel/baz/Makefile
+++ b/devel/baz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bazaar
 PORTVERSION=	1.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/obsolete/
 DISTNAME=	bazaar_${PORTVERSION}
diff --git a/devel/baz/pkg-plist b/devel/baz/pkg-plist
index e923d35f358a..d9a6d4f384b0 100644
--- a/devel/baz/pkg-plist
+++ b/devel/baz/pkg-plist
@@ -28,17 +28,7 @@ share/locale/zh_CN/LC_MESSAGES/bazaar.mo
 @dirrmtry share/locale/nl_BE
 @dirrmtry share/locale/it_IT/LC_MESSAGES
 @dirrmtry share/locale/it_IT
-@dirrmtry share/locale/fr_FR/LC_MESSAGES
-@dirrmtry share/locale/fr_FR
 @dirrmtry share/locale/fr_BE/LC_MESSAGES
 @dirrmtry share/locale/fr_BE
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrmtry share/locale/es_AR/LC_MESSAGES
 @dirrmtry share/locale/es_AR
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/devel/bazaar/Makefile b/devel/bazaar/Makefile
index 4e8bb0238da4..ae82d23dffd6 100644
--- a/devel/bazaar/Makefile
+++ b/devel/bazaar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bazaar
 PORTVERSION=	1.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/obsolete/
 DISTNAME=	bazaar_${PORTVERSION}
diff --git a/devel/bazaar/pkg-plist b/devel/bazaar/pkg-plist
index e923d35f358a..d9a6d4f384b0 100644
--- a/devel/bazaar/pkg-plist
+++ b/devel/bazaar/pkg-plist
@@ -28,17 +28,7 @@ share/locale/zh_CN/LC_MESSAGES/bazaar.mo
 @dirrmtry share/locale/nl_BE
 @dirrmtry share/locale/it_IT/LC_MESSAGES
 @dirrmtry share/locale/it_IT
-@dirrmtry share/locale/fr_FR/LC_MESSAGES
-@dirrmtry share/locale/fr_FR
 @dirrmtry share/locale/fr_BE/LC_MESSAGES
 @dirrmtry share/locale/fr_BE
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrmtry share/locale/es_AR/LC_MESSAGES
 @dirrmtry share/locale/es_AR
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile
index d29239c0dca4..16b48e68deb8 100644
--- a/devel/bison2/Makefile
+++ b/devel/bison2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bison
 PORTVERSION=	2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/bison2/pkg-plist b/devel/bison2/pkg-plist
index 9de63dacd3e9..c8e3bbeb1d1b 100644
--- a/devel/bison2/pkg-plist
+++ b/devel/bison2/pkg-plist
@@ -65,16 +65,8 @@ share/aclocal/bison-i18n.m4
 %%NLS%%share/locale/vi/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_TW
-%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sl
 %%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/rw
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
 %%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/calc++
 %%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
 @dirrmtry %%DATADIR%%/m4sugar
diff --git a/devel/bnfc/Makefile b/devel/bnfc/Makefile
index bb4b478d0c2d..2657dfacc332 100644
--- a/devel/bnfc/Makefile
+++ b/devel/bnfc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bnfc
 PORTVERSION=	2.3b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cs.chalmers.se/~markus/BNFC/ \
 		http://www.cs.chalmers.se/Cs/Grundutb/Kurser/komp/current/resources/
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index d93de6eee88d..52ae97f31708 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	boaconstructor
 PORTVERSION=	0.4.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	boa-constructor
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 0df2f7d8ee49..90eefe556a82 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bonobo-conf
 PORTVERSION=	0.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/bonobo-conf/0.16
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index b6366a4d7428..3a8773eca71e 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bonobo
 PORTVERSION=	1.0.22
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index cd3f5acaa7b8..4cc3ae908a2e 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -251,31 +251,3 @@ share/locale/zh_TW/LC_MESSAGES/bonobo.mo
 @dirrm %%DOCSDIR%%/bonobo
 @dirrm %%DOCSDIR%%
 @dirrm include/gnome-1.0/bonobo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/devel/bouml/Makefile b/devel/bouml/Makefile
index e979124ca45d..cadd899a940b 100644
--- a/devel/bouml/Makefile
+++ b/devel/bouml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bouml
 PORTVERSION=	2.25.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://bouml.free.fr/
 DISTFILES=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
diff --git a/devel/bouml/distinfo b/devel/bouml/distinfo
index c32fdacc21fd..64f01b03ec29 100644
--- a/devel/bouml/distinfo
+++ b/devel/bouml/distinfo
@@ -1,5 +1,5 @@
-MD5 (bouml-2.25.1_0/bouml_2.25.1.tar.gz) = 7874130b2b9d0489924d37e6505cb08a
-SHA256 (bouml-2.25.1_0/bouml_2.25.1.tar.gz) = 7cc9e6c1bbc2d36fd5f8d8a027da8609096b76bb74a6ad0f87483103a2ed1d71
-SIZE (bouml-2.25.1_0/bouml_2.25.1.tar.gz) = 3809173
-MD5 (bouml-2.25.1_0/doc.tar.gz) = IGNORE
-SHA256 (bouml-2.25.1_0/doc.tar.gz) = IGNORE
+MD5 (bouml-2.25.1_1/bouml_2.25.1.tar.gz) = 7874130b2b9d0489924d37e6505cb08a
+SHA256 (bouml-2.25.1_1/bouml_2.25.1.tar.gz) = 7cc9e6c1bbc2d36fd5f8d8a027da8609096b76bb74a6ad0f87483103a2ed1d71
+SIZE (bouml-2.25.1_1/bouml_2.25.1.tar.gz) = 3809173
+MD5 (bouml-2.25.1_1/doc.tar.gz) = IGNORE
+SHA256 (bouml-2.25.1_1/doc.tar.gz) = IGNORE
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index e1cf44e20687..357cf1a22588 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	bug-buddy
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 1c8db1c273d4..4ac6b5cd86c8 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -92,36 +92,14 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
 @dirrm share/gnome/bug-buddy/bugzilla/gnome
 @dirrm share/gnome/bug-buddy/bugzilla
 @dirrm share/gnome/bug-buddy
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -130,21 +108,7 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index db59482c7a43..4bb9ee40bb50 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	bugzilla
 PORTVERSION?=	2.22.2
+PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile
index db59482c7a43..4bb9ee40bb50 100644
--- a/devel/bugzilla2/Makefile
+++ b/devel/bugzilla2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	bugzilla
 PORTVERSION?=	2.22.2
+PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index db59482c7a43..4bb9ee40bb50 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	bugzilla
 PORTVERSION?=	2.22.2
+PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 0bd133cb3f04..a9e2365dec25 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzr-gtk
 PORTVERSION=	0.15.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://samba.org/~jelmer/bzr/
 
diff --git a/devel/bzr-gtk/pkg-plist b/devel/bzr-gtk/pkg-plist
index c1cbbf141a48..113e7b3b08c1 100644
--- a/devel/bzr-gtk/pkg-plist
+++ b/devel/bzr-gtk/pkg-plist
@@ -186,7 +186,6 @@ share/applications/olive-gtk.desktop
 share/pixmaps/olive-gtk.png
 @dirrm share/olive/icons
 @dirrm share/olive
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/olive
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz
diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index 09b541bd849b..b67d0b73134b 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bzrtools
 PORTVERSION=	0.15.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://panoramicfeedback.com/opensource/
 
diff --git a/devel/c_c++_reference/Makefile b/devel/c_c++_reference/Makefile
index e2c936682589..2aaa4a8a3b03 100644
--- a/devel/c_c++_reference/Makefile
+++ b/devel/c_c++_reference/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	c_c++_reference
 PORTVERSION=	2.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.ee.fhm.edu/pub/unix/ide/KDevelop/
 DISTNAME=	c_cpp_reference-${PORTVERSION}_for_KDE_3.0
diff --git a/devel/cbrowser/Makefile b/devel/cbrowser/Makefile
index 9e8040dd8fe3..4e878e3cc41f 100644
--- a/devel/cbrowser/Makefile
+++ b/devel/cbrowser/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cbrowser
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/cedet/Makefile b/devel/cedet/Makefile
index 8f93a8e8017b..f2228e88556d 100644
--- a/devel/cedet/Makefile
+++ b/devel/cedet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cedet
 PORTVERSION=	1.0.pre3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/devel/cgprof/Makefile b/devel/cgprof/Makefile
index c4cd27513ed4..4088ff6128a1 100644
--- a/devel/cgprof/Makefile
+++ b/devel/cgprof/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cgprof
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://mvertes.free.fr/download/
 
diff --git a/devel/charva/Makefile b/devel/charva/Makefile
index a9bf80efe648..09c2cf532c9e 100644
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	charva
 PORTVERSION=	1.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/chora/Makefile b/devel/chora/Makefile
index 49e3066164d4..b5c488e80b42 100644
--- a/devel/chora/Makefile
+++ b/devel/chora/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	chora
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	devel www
 DIST_SUBDIR=	horde
 
diff --git a/devel/cil/Makefile b/devel/cil/Makefile
index 8eaa23c6342e..598a5d636455 100644
--- a/devel/cil/Makefile
+++ b/devel/cil/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cil
 PORTVERSION=	1.3.6
+PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://hal.cs.berkeley.edu/cil/distrib/
diff --git a/devel/clanlib-devel/Makefile b/devel/clanlib-devel/Makefile
index 7d04cbf50b53..b51933853a85 100644
--- a/devel/clanlib-devel/Makefile
+++ b/devel/clanlib-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clanlib
 PORTVERSION=	0.7.8.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index 601303b67066..f1eabcaf9bfe 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clanlib
 PORTVERSION=	0.6.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://clanlib.org/download/legacy/ \
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index d2da7663e9da..0be3157896fe 100644
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		codeblocks
 PORTVERSION=		1.0r2
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile
index 80589f210561..09236ee57a40 100644
--- a/devel/cogito/Makefile
+++ b/devel/cogito/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cogito
 PORTVERSION=	0.17.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/cogito/ \
 		http://www.uk.kernel.org/pub/software/scm/cogito/ \
diff --git a/devel/colorer/Makefile b/devel/colorer/Makefile
index 64b81a0ad0a3..895d183d4a2b 100644
--- a/devel/colorer/Makefile
+++ b/devel/colorer/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	colorer
 PORTVERSION=	0.b2
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/cvschangelogbuilder/Makefile b/devel/cvschangelogbuilder/Makefile
index 2b46ba0ddf87..6c52ad7427c7 100644
--- a/devel/cvschangelogbuilder/Makefile
+++ b/devel/cvschangelogbuilder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvschangelogbuilder
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cvschangelogb
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 39e6a2865033..3ec3bc7f6b84 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cvsgraph
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.akhphd.au.dk/~bertho/cvsgraph/release/
 
diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile
index 8cad572e4112..16c6036a04d5 100644
--- a/devel/cvsmonitor/Makefile
+++ b/devel/cvsmonitor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvsmonitor
 PORTVERSION=	0.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/cvsplot/Makefile b/devel/cvsplot/Makefile
index 55c6945646f6..57976ec0518c 100644
--- a/devel/cvsplot/Makefile
+++ b/devel/cvsplot/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cvsplot
 PORTVERSION=	1.7.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 045388802df3..ebb9e80c58a2 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cvsweb
 PORTVERSION=	3.0.6
+PORTREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.FreeBSD.org/~scop/cvsweb/
diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index b1bab9ed69ad..6a64e0a08ac7 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	darcs
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://darcs.net/
 
diff --git a/devel/datadesigner/Makefile b/devel/datadesigner/Makefile
index 6f508d1f3727..9e8b16792a5a 100644
--- a/devel/datadesigner/Makefile
+++ b/devel/datadesigner/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	datadesigner
 PORTVERSION=	0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dbdesign
diff --git a/devel/datadesigner/pkg-plist b/devel/datadesigner/pkg-plist
index d1441e11fbd7..7babc4c5df3f 100644
--- a/devel/datadesigner/pkg-plist
+++ b/devel/datadesigner/pkg-plist
@@ -5,5 +5,3 @@ bin/datadesigner
 %%DATADIR%%/db2.xsl
 %%DATADIR%%/gen2pgsql.xsl
 @dirrm %%DATADIR%%
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
index 14f14aacb405..2a435e9a62c4 100644
--- a/devel/dbus-glib/Makefile
+++ b/devel/dbus-glib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	0.73
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-glib/
 PKGNAMESUFFIX=	-glib
diff --git a/devel/dbus-qt3/Makefile b/devel/dbus-qt3/Makefile
index 8144fa0fe5c1..20e89618a2a7 100644
--- a/devel/dbus-qt3/Makefile
+++ b/devel/dbus-qt3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index ef3ecdbc93d8..2dd9579bfe31 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMESUFFIX=	-qt4
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index 9cc404601640..56f5d18c5d93 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	dbus-sharp
 PORTVERSION=	0.62
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 DISTNAME=	dbus-${PORTVERSION}
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index fde02319f410..c52855667aec 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dbus
 PORTVERSION?=	1.0.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 786fea2ccff0..4e735280b868 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ddd
 PORTVERSION=	3.3.11
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/deputy/Makefile b/devel/deputy/Makefile
index b4532ea04035..328c1f486bd1 100644
--- a/devel/deputy/Makefile
+++ b/devel/deputy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	deputy
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	http://deputy.cs.berkeley.edu/
 
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 5c6353bc4a77..17e156a5ed9c 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	devhelp
 PORTVERSION=	0.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES?=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C,^([[:digit:]]+\.[[:digit:]]+).*,\1,}
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 76ca3dafc80a..de6f9ae76e79 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -77,33 +77,5 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrm share/gnome/devhelp
 @dirrm include/devhelp-1.0/devhelp
 @dirrm include/devhelp-1.0
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@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
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index f3a4eed03ed0..91e0f03f645b 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	directfb
 PORTVERSION=	0.9.16
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.directfb.org/downloads/Old/
 DISTNAME=	DirectFB-${PORTVERSION}
diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index c6f86b5a9346..d745c4c5b842 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	distel
 PORTVERSION=	2007.01.04
+PORTREVISION=	1
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	olgeni
diff --git a/devel/doctorj/Makefile b/devel/doctorj/Makefile
index 71f463316212..e0621dda17cf 100644
--- a/devel/doctorj/Makefile
+++ b/devel/doctorj/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	doctorj
 PORTVERSION=	5.1.2
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 6511e642d00e..09069ac7d3f6 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	doxygen
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/
 EXTRACT_SUFX=	.src.tar.gz
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index c3770f5a9437..fbeff2cac34d 100644
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drpython
 PORTVERSION=	3.10.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/eboxy/Makefile b/devel/eboxy/Makefile
index e8a35effab97..bdea0474ea3f 100644
--- a/devel/eboxy/Makefile
+++ b/devel/eboxy/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	eboxy
 PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/ecb/Makefile b/devel/ecb/Makefile
index acd6e8c9bcf6..1993fa727260 100644
--- a/devel/ecb/Makefile
+++ b/devel/ecb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ecb
 PORTVERSION=	2.32
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/devel/ecos-tools/Makefile b/devel/ecos-tools/Makefile
index 308226b32f04..c093a2a4493f 100644
--- a/devel/ecos-tools/Makefile
+++ b/devel/ecos-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ecos-tools
 PORTVERSION=	0.0.${SNAPDATE}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	tg
diff --git a/devel/eieio/Makefile b/devel/eieio/Makefile
index 7e3d07be1aee..6d861210257a 100644
--- a/devel/eieio/Makefile
+++ b/devel/eieio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eieio
 PORTVERSION=	0.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/devel/eiffelstudio/Makefile b/devel/eiffelstudio/Makefile
index 00c9ad0f8d31..6c42194af19b 100644
--- a/devel/eiffelstudio/Makefile
+++ b/devel/eiffelstudio/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eiffelstudio
 PORTVERSION=	5.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.rit.edu/pub/mirrors/ise/download/57/ \
 		ftp://ftp.inf.ethz.ch/pub/mirror/eiffel/57/ \
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index 203fcd2f157f..b2556db6a69e 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elib
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
diff --git a/devel/engrave/Makefile b/devel/engrave/Makefile
index a15c790e92c9..a7a1a0ab708a 100644
--- a/devel/engrave/Makefile
+++ b/devel/engrave/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	engrave
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/devel/entity/Makefile b/devel/entity/Makefile
index 3c4bf8bc047e..62eb2a4669ae 100644
--- a/devel/entity/Makefile
+++ b/devel/entity/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	entity
 PORTVERSION=	0.7.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/eric/Makefile b/devel/eric/Makefile
index 308e813569f8..31341306d23f 100644
--- a/devel/eric/Makefile
+++ b/devel/eric/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eric
 PORTVERSION=	3.9.4
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	eric-ide
diff --git a/devel/erlslang/Makefile b/devel/erlslang/Makefile
index 223ce847b9c0..c308982128c1 100644
--- a/devel/erlslang/Makefile
+++ b/devel/erlslang/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erlslang
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.erlang.org/contrib/ \
 		http://erlang.stacken.kth.se/contrib/ \
diff --git a/devel/esdl/Makefile b/devel/esdl/Makefile
index 4789b461f367..f591ac9da462 100644
--- a/devel/esdl/Makefile
+++ b/devel/esdl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	esdl
 PORTVERSION=	0.96.0626
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/esvn/Makefile b/devel/esvn/Makefile
index 2097bfa17b37..c42e00be430c 100644
--- a/devel/esvn/Makefile
+++ b/devel/esvn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	esvn
 PORTVERSION=	0.6.11
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://esvn.umputun.com/ \
 		${MASTER_SITE_GENTOO}
diff --git a/devel/etoile-collectionkit/Makefile b/devel/etoile-collectionkit/Makefile
index a40913c31eba..0fcfdd0ac987 100644
--- a/devel/etoile-collectionkit/Makefile
+++ b/devel/etoile-collectionkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	collectionkit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/devel/etoile-foundation/Makefile b/devel/etoile-foundation/Makefile
index a45e2f60bb6b..1c9f157099e5 100644
--- a/devel/etoile-foundation/Makefile
+++ b/devel/etoile-foundation/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	foundation
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/devel/etoile-unitkit/Makefile b/devel/etoile-unitkit/Makefile
index d272f95e2c57..7eb496fa4a50 100644
--- a/devel/etoile-unitkit/Makefile
+++ b/devel/etoile-unitkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	unitkit
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/devel/evfs/Makefile b/devel/evfs/Makefile
index 774aa881dd34..8ab9a8a88470 100644
--- a/devel/evfs/Makefile
+++ b/devel/evfs/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	evfs
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/devel/evolution-gconf-tools/Makefile b/devel/evolution-gconf-tools/Makefile
index 77ae615d57dd..035bcdec312d 100644
--- a/devel/evolution-gconf-tools/Makefile
+++ b/devel/evolution-gconf-tools/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	evolution-gconf-tools
 PORTVERSION=	0.1.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://people.redhat.com/dmalcolm/evolution-gconf-tools/
 
diff --git a/devel/excalibur-configuration/Makefile b/devel/excalibur-configuration/Makefile
index 1a17fa9aa102..0347971d5e94 100644
--- a/devel/excalibur-configuration/Makefile
+++ b/devel/excalibur-configuration/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	excalibur-configuration
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	avalon/${PORTNAME}/binaries
diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile
index 2673e0808e4a..cfe969074e4a 100644
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flatzebra
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel games
 MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
 
diff --git a/devel/flexjson/Makefile b/devel/flexjson/Makefile
index 0fa78952c8b3..b28d2c9079b2 100644
--- a/devel/flexjson/Makefile
+++ b/devel/flexjson/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flexjson
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/flowdesigner/Makefile b/devel/flowdesigner/Makefile
index 67aefe591697..a629ed846437 100644
--- a/devel/flowdesigner/Makefile
+++ b/devel/flowdesigner/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	flowdesigner
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index 1d84e28a7556..0aad62679bab 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Fnorb
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	fnorb
diff --git a/devel/fortytwo-encore/Makefile b/devel/fortytwo-encore/Makefile
index 3481edf2c0b9..90fee2b5c134 100644
--- a/devel/fortytwo-encore/Makefile
+++ b/devel/fortytwo-encore/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	encore
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fortytwo
diff --git a/devel/fpc-gconf/Makefile b/devel/fpc-gconf/Makefile
index f50aafdf028d..68853f46d44b 100644
--- a/devel/fpc-gconf/Makefile
+++ b/devel/fpc-gconf/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-gconf
 
diff --git a/devel/freeride/Makefile b/devel/freeride/Makefile
index 79b9936894b3..84b9827cf4ff 100644
--- a/devel/freeride/Makefile
+++ b/devel/freeride/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/fujaba/Makefile b/devel/fujaba/Makefile
index 957739617a65..46140614704d 100644
--- a/devel/fujaba/Makefile
+++ b/devel/fujaba/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fujaba
 PORTVERSION=	4.3.2
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://wwwcs.uni-paderborn.de/cs/fujaba/downloads/packages/Fujaba_4/
 DISTNAME=	FujabaToolSuite_Developer${PORTVERSION:S/./_/g}
diff --git a/devel/g2c/Makefile b/devel/g2c/Makefile
index d020517cc952..0f81f6300696 100644
--- a/devel/g2c/Makefile
+++ b/devel/g2c/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	g2c
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile
index 75cd9be712a4..78f6db471175 100644
--- a/devel/gaphor/Makefile
+++ b/devel/gaphor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gaphor
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/gauche-sdl/Makefile b/devel/gauche-sdl/Makefile
index f7dc309bbf71..39e1ecf911e9 100644
--- a/devel/gauche-sdl/Makefile
+++ b/devel/gauche-sdl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gauche-sdl
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel scheme
 MASTER_SITES=	http://michaelvess.com/files/
 DISTNAME=	${PORTFAKENAME}
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index 9e9bafbac0fb..31609ae75d7e 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gazpacho
 PORTVERSION=	0.6.6
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://ftp.acc.umu.se/pub/GNOME/sources/gazpacho/0.6/
 
diff --git a/devel/gazpacho/pkg-plist b/devel/gazpacho/pkg-plist
index 938614a2fa03..84e5dcf629df 100644
--- a/devel/gazpacho/pkg-plist
+++ b/devel/gazpacho/pkg-plist
@@ -296,24 +296,6 @@ share/locale/it/LC_MESSAGES/gazpacho.mo
 share/locale/pt_BR/LC_MESSAGES/gazpacho.mo
 share/locale/ru/LC_MESSAGES/gazpacho.mo
 share/locale/zh_CN/LC_MESSAGES/gazpacho.mo
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/ru/LC_MESSAGES
-@dirrmtry share/locale/ru
-@dirrmtry share/locale/pt_BR/LC_MESSAGES
-@dirrmtry share/locale/pt_BR
-@dirrmtry share/locale/it/LC_MESSAGES
-@dirrmtry share/locale/it
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fr/LC_MESSAGES
-@dirrmtry share/locale/fr
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/es/LC_MESSAGES
-@dirrmtry share/locale/es
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm %%DATADIR%%/resources/base
 @dirrmtry %%DATADIR%%/resources
 @dirrm %%DATADIR%%/pixmaps
diff --git a/devel/gccmakedep/Makefile b/devel/gccmakedep/Makefile
new file mode 100644
index 000000000000..b55bebf2c4d5
--- /dev/null
+++ b/devel/gccmakedep/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	gccmakedep
+# Date created:				Nov 18 2006
+# Whom:					Dave Grochowski
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gccmakedep
+PORTVERSION=	1.0.2
+CATEGORIES=	devel
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Create dependencies in makefiles using 'gcc -M'
+
+XORG_CAT=	util
+
+MAN1=		gccmakedep.1
+
+PLIST_FILES=	bin/gccmakedep
+
+.include <bsd.port.mk>
diff --git a/devel/gccmakedep/distinfo b/devel/gccmakedep/distinfo
new file mode 100644
index 000000000000..44bf7ed360c3
--- /dev/null
+++ b/devel/gccmakedep/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/util/gccmakedep-1.0.2.tar.bz2) = b533c0771dbbaf9b041ff35bb941d3a2
+SHA256 (xorg/util/gccmakedep-1.0.2.tar.bz2) = 063d49685b1002f3d0b89dfa730e9159f685bd51c277a39fc37b6e377a55ae11
+SIZE (xorg/util/gccmakedep-1.0.2.tar.bz2) = 70490
diff --git a/devel/gccmakedep/pkg-descr b/devel/gccmakedep/pkg-descr
new file mode 100644
index 000000000000..4de4fc5b3851
--- /dev/null
+++ b/devel/gccmakedep/pkg-descr
@@ -0,0 +1,2 @@
+The gccmakedep program creates dependencies in makefiles using
+'gcc -M'.
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 40f0ddd2e6fa..71b81f8d13bd 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gconf
 PORTVERSION=	1.0.9
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/GConf/1.0
diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist
index cc6ceb612da6..7ff843231b9e 100644
--- a/devel/gconf/pkg-plist
+++ b/devel/gconf/pkg-plist
@@ -64,31 +64,3 @@ share/locale/zh_CN/LC_MESSAGES/GConf.mo
 @dirrm include/gconf/1/gconf
 @dirrm include/gconf/1
 @dirrm etc/gconf/1
-@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/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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index e6f4e96d3181..6989d6652824 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gconf2
 PORTVERSION=	2.18.0.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index b2dc4c4c87f5..7ccbc022ad7c 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -108,53 +108,17 @@ share/sgml/gconf/gconf-1.0.dtd
 @dirrm include/gconf/2/gconf
 @dirrm include/gconf/2
 @dirrm etc/gconf/2
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/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/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 83e5e8cb5794..024621aa0e15 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gconfmm
 PORTVERSION=	2.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index deaec0b5bdb1..23cdd4d7cf18 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gconfmm
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 0e31b49e10c9..bf1caf8b3c84 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcvs
 PORTVERSION=	1.0
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	devel tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 5ee66d5f5a6e..7aa44f9a21af 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	geany
 PORTVERSION=	0.10.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index ca6ed083b995..54f368b41c9e 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -103,4 +103,3 @@ share/pixmaps/geany.png
 @dirrm %%PORTDOCS%%%%DOCSDIR%%/html
 @dirrm %%PORTDOCS%%%%DOCSDIR%%
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile
index 4ee371eccaa7..878c68dfcd70 100644
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gengameng
 PORTVERSION=	4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.osuosl.org/pub/FreeBSD/distfiles/
 
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 8a5c6c9a5e2c..110841195ec3 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gettext
 PORTVERSION=	0.16.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gettext
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index c29daec42327..ef9a2969d298 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -347,45 +347,9 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libdata/gettext-tools
 @dirrm lib/gettext
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/en@boldquot/LC_MESSAGES
 @dirrmtry share/locale/en@quot/LC_MESSAGES
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/be
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el
 @dirrmtry share/locale/en@boldquot
 @dirrmtry share/locale/en@quot
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/no
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_TW
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 2bc31d4bc826..1a1bdf49714e 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gindent
 PORTVERSION=	2.2.9
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	indent
diff --git a/devel/gindent/pkg-plist b/devel/gindent/pkg-plist
index c1219ff21379..4f9606384db3 100644
--- a/devel/gindent/pkg-plist
+++ b/devel/gindent/pkg-plist
@@ -22,15 +22,3 @@ bin/gtexinfo2man
 %%NLS%%share/locale/tr/LC_MESSAGES/indent.mo
 %%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/indent.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 64a4c6d4ce3d..04eed751cc44 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	git
 PORTVERSION=	1.4.4.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 98efd48a2d62..83d37e03b3e5 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	glade
 PORTVERSION=	2.12.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 4d851505e4f9..3ebde023f6b9 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	glade3
 PORTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index e8205659f8e9..d990859380f4 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -402,27 +402,5 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
 @dirrm include/libgladeui-1.0
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/devel/glademm/Makefile b/devel/glademm/Makefile
index d258bb93c8d5..155ef3586451 100644
--- a/devel/glademm/Makefile
+++ b/devel/glademm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glademm
 PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://home.wtal.de/petig/Gtk/
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
diff --git a/devel/glib-java/Makefile b/devel/glib-java/Makefile
index 561f81739cde..f28e878e6e78 100644
--- a/devel/glib-java/Makefile
+++ b/devel/glib-java/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	glib-java
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index e0fde6983e45..f61838718059 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	2.12.12
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 8a43ed548d47..55ee6cae4626 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -188,18 +188,12 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrm include/glib-2.0/gobject
 @dirrm include/glib-2.0/glib
 @dirrm include/glib-2.0
-@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/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
 @dirrmtry share/locale/tl/LC_MESSAGES
@@ -208,45 +202,15 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/devel/glui/Makefile b/devel/glui/Makefile
index 762ae5e24c7f..180f5fdc2b40 100644
--- a/devel/glui/Makefile
+++ b/devel/glui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glui
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.cs.unc.edu/~rademach/glui/src/release/
 DISTNAME=	glui_v2_1_beta
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index a0d5039b5c26..a9d47d2e8527 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmake
 PORTVERSION=	3.81
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	make
diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index a0d5039b5c26..a9d47d2e8527 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmake
 PORTVERSION=	3.81
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	make
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 45dad1cefc48..8bfea551a345 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-build
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/devel/gnome-build/pkg-plist b/devel/gnome-build/pkg-plist
index 535aec6e3530..4b2abe01ce3d 100644
--- a/devel/gnome-build/pkg-plist
+++ b/devel/gnome-build/pkg-plist
@@ -76,31 +76,5 @@ share/locale/zh_CN/LC_MESSAGES/gbf-1.mo
 @dirrm lib/gnome-build-1.0
 @dirrm include/gnome-build-1.0/gbf
 @dirrm include/gnome-build-1.0
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index 9cf50e40b842..e539021734cc 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-crash
 PORTVERSION=	0.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-crash/0.0
diff --git a/devel/gnome-vfs-monikers/Makefile b/devel/gnome-vfs-monikers/Makefile
index 386e89bd9df9..5d270961338a 100644
--- a/devel/gnome-vfs-monikers/Makefile
+++ b/devel/gnome-vfs-monikers/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-vfs-monikers
 PORTVERSION=	2.15.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/..$//}
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 2eef628fc8eb..571ff7c4af6e 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-vfs
 PORTVERSION=	2.18.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index dca70b75435a..81ed5c9a097f 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -194,61 +194,23 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrm include/gnome-vfs-2.0
 @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/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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @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/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/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/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index ef9ada9f9f48..3a5fa1069b41 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-vfs
 PORTVERSION=	1.0.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/1.0
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 147bff6b19e8..4db8af0e67fd 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-vfsmm
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile
index 1e5c964b094a..bfabce9d33f4 100644
--- a/devel/gnome2-hacker-tools/Makefile
+++ b/devel/gnome2-hacker-tools/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.42 2006/10/14 06:29:06 ahze Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 PKGNAMESUFFIX=	-hacker-tools
 
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index d38213164cc3..2d3f5dc01635 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnustep
 PORTVERSION=	1.13.0
+PORTREVISION=	1
 CATEGORIES=	devel lang gnustep
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 67db3738b499..2e966bbf5ed0 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	goffice
 PORTVERSION=	0.3.8
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/goffice/pkg-plist b/devel/goffice/pkg-plist
index cd029b3612bd..c6b72515b889 100644
--- a/devel/goffice/pkg-plist
+++ b/devel/goffice/pkg-plist
@@ -455,38 +455,8 @@ share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/gnome/pixmaps/goffice/%%VERSION%%
 @dirrm share/gnome/pixmaps/goffice
 @dirrm share/gnome/goffice/%%VERSION%%/patterns
diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile
index 67db3738b499..2e966bbf5ed0 100644
--- a/devel/goffice04/Makefile
+++ b/devel/goffice04/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	goffice
 PORTVERSION=	0.3.8
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/goffice04/pkg-plist b/devel/goffice04/pkg-plist
index cd029b3612bd..c6b72515b889 100644
--- a/devel/goffice04/pkg-plist
+++ b/devel/goffice04/pkg-plist
@@ -455,38 +455,8 @@ share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/gnome/pixmaps/goffice/%%VERSION%%
 @dirrm share/gnome/pixmaps/goffice
 @dirrm share/gnome/goffice/%%VERSION%%/patterns
diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile
index c335e4434d06..3a904a6ec6fa 100644
--- a/devel/goffice1/Makefile
+++ b/devel/goffice1/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	goffice
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile
index 4b31da4d41af..5a7d211bf3db 100644
--- a/devel/gorm/Makefile
+++ b/devel/gorm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gorm
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	dev-apps
diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile
index d029422865cc..6166e9ef6ad9 100644
--- a/devel/gpsim/Makefile
+++ b/devel/gpsim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpsim
 PORTVERSION=	0.22.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/gstreamer-plugins-gconf/Makefile b/devel/gstreamer-plugins-gconf/Makefile
index c32cd46cfd7e..28579979d91a 100644
--- a/devel/gstreamer-plugins-gconf/Makefile
+++ b/devel/gstreamer-plugins-gconf/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 COMMENT=	Gstreamer gconf plugin
diff --git a/devel/gstreamer-plugins-gconf80/Makefile b/devel/gstreamer-plugins-gconf80/Makefile
index a9586d779c5c..6126b45890fc 100644
--- a/devel/gstreamer-plugins-gconf80/Makefile
+++ b/devel/gstreamer-plugins-gconf80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/devel/gstreamer-plugins-gconf80/Makefile,v 1.2 2006/02/24 18:24:27 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 COMMENT=	Gstreamer gconf plugin
diff --git a/devel/gstreamer-plugins-gnomevfs/Makefile b/devel/gstreamer-plugins-gnomevfs/Makefile
index 705d51b00172..91b767005357 100644
--- a/devel/gstreamer-plugins-gnomevfs/Makefile
+++ b/devel/gstreamer-plugins-gnomevfs/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 COMMENT=	Gstreamer gnomevfs plugin
diff --git a/devel/gstreamer-plugins-gnomevfs80/Makefile b/devel/gstreamer-plugins-gnomevfs80/Makefile
index 23a27403ae1a..12c320a1bb34 100644
--- a/devel/gstreamer-plugins-gnomevfs80/Makefile
+++ b/devel/gstreamer-plugins-gnomevfs80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/devel/gstreamer-plugins-gnomevfs80/Makefile,v 1.2 2006/02/24 18:24:27 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 COMMENT=	Gstreamer gnomevfs plugin
diff --git a/devel/gstreamer-plugins-sdl/Makefile b/devel/gstreamer-plugins-sdl/Makefile
index 1a5253365db1..e5618413a71b 100644
--- a/devel/gstreamer-plugins-sdl/Makefile
+++ b/devel/gstreamer-plugins-sdl/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 COMMENT=	Gstreamer SDL plugin
diff --git a/devel/gstreamer-plugins-sdl80/Makefile b/devel/gstreamer-plugins-sdl80/Makefile
index 99eb08eff8bb..bf79d71f93ca 100644
--- a/devel/gstreamer-plugins-sdl80/Makefile
+++ b/devel/gstreamer-plugins-sdl80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/devel/gstreamer-plugins-sdl80/Makefile,v 1.2 2006/02/24 18:24:52 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 COMMENT=	Gstreamer SDL plugin
diff --git a/devel/gtkmozedit/Makefile b/devel/gtkmozedit/Makefile
index 081584690600..497b74f5bbeb 100644
--- a/devel/gtkmozedit/Makefile
+++ b/devel/gtkmozedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkmozedit
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel editors www
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index b0ae8dd0edbd..d9cc98a6018a 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtranslator
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gtranslator/pkg-plist b/devel/gtranslator/pkg-plist
index a43f5e308015..88ce57480ed4 100644
--- a/devel/gtranslator/pkg-plist
+++ b/devel/gtranslator/pkg-plist
@@ -92,40 +92,6 @@ share/locale/vi/LC_MESSAGES/gtranslator.mo
 share/locale/wa/LC_MESSAGES/gtranslator.mo
 share/locale/zh_CN/LC_MESSAGES/gtranslator.mo
 share/locale/zh_TW/LC_MESSAGES/gtranslator.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrm share/gnome/pixmaps/gtranslator
 @dirrm share/gnome/omf/gtranslator
 @dirrm share/gnome/help/gtranslator/C/figures
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 48965f2f7059..838626f23fe9 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	guichan
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	devel games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index 9eae5839efb3..13adc7456c9e 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	guikachu
 PORTVERSION=	1.5.7
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	devel palm gnome
 MASTER_SITES=	http://cactus.rulez.org/projects/guikachu/download/
diff --git a/devel/highlighterkit/Makefile b/devel/highlighterkit/Makefile
index b376a96708ea..3032197a2e02 100644
--- a/devel/highlighterkit/Makefile
+++ b/devel/highlighterkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	highlighterkit
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://download.gna.org/pmanager/0.2/
 DISTNAME=	HighlighterKit-${PORTVERSION}
diff --git a/devel/horde-chora/Makefile b/devel/horde-chora/Makefile
index 49e3066164d4..b5c488e80b42 100644
--- a/devel/horde-chora/Makefile
+++ b/devel/horde-chora/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	chora
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	devel www
 DIST_SUBDIR=	horde
 
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index bb4b478d0c2d..2657dfacc332 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bnfc
 PORTVERSION=	2.3b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cs.chalmers.se/~markus/BNFC/ \
 		http://www.cs.chalmers.se/Cs/Grundutb/Kurser/komp/current/resources/
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 5bde437533be..57b4e2da995a 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	alex
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/alex/dist/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-buddha/Makefile b/devel/hs-buddha/Makefile
index be8fc5c1cc6f..c47ab386f3f8 100644
--- a/devel/hs-buddha/Makefile
+++ b/devel/hs-buddha/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	buddha
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.cs.mu.oz.au/~bjpop/buddha/download/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index a1e4625aa9ec..32dc4ffcd530 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	c2hs
 PORTVERSION=	0.13.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index 42743f6477b0..a4a356b6517f 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cpphs
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.cs.york.ac.uk/fp/cpphs/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index b1bab9ed69ad..6a64e0a08ac7 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	darcs
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://darcs.net/
 
diff --git a/devel/hs-drift/Makefile b/devel/hs-drift/Makefile
index 6cc76df7c6bf..b4209249318d 100644
--- a/devel/hs-drift/Makefile
+++ b/devel/hs-drift/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	drift
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://repetae.net/john/computer/haskell/DrIFT/drop/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-fps/Makefile b/devel/hs-fps/Makefile
index 02465d73568d..a714029227b9 100644
--- a/devel/hs-fps/Makefile
+++ b/devel/hs-fps/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	fps
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cse.unsw.edu.au/pub/users/dons/fps/ \
 		${MASTER_SITE_LOCAL}
diff --git a/devel/hs-green-card/Makefile b/devel/hs-green-card/Makefile
index cd183c9179d2..aeefe92eca75 100644
--- a/devel/hs-green-card/Makefile
+++ b/devel/hs-green-card/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	green-card
 PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://haskell.org/greencard/downloads/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 536b31b9a88d..cbabb33c709a 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	haddock
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/haddock/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 8834d065815e..a4f62ce8a15f 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	happy
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/happy/dist/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-hat/Makefile b/devel/hs-hat/Makefile
index 0f4448d63fa6..d116dd34876a 100644
--- a/devel/hs-hat/Makefile
+++ b/devel/hs-hat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hat
 PORTVERSION=	2.04
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-hdoc/Makefile b/devel/hs-hdoc/Makefile
index 5bb731cd9fed..450ed74fb329 100644
--- a/devel/hs-hdoc/Makefile
+++ b/devel/hs-hdoc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	hdoc
 PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://staff.fmi.uni-passau.de/~groessli/hdoc/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-hmake/Makefile b/devel/hs-hmake/Makefile
index b9c06d5de33d..a37a8ab3e8df 100644
--- a/devel/hs-hmake/Makefile
+++ b/devel/hs-hmake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hmake
 PORTVERSION=	3.13
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/hmake/ \
 		ftp://ftp.cs.york.ac.uk/pub/haskell/hmake/ \
diff --git a/devel/hs-hpl/Makefile b/devel/hs-hpl/Makefile
index 01679fbb26ed..1369b7529f8a 100644
--- a/devel/hs-hpl/Makefile
+++ b/devel/hs-hpl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hpl
 PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.cse.unsw.edu.au/~chak/haskell/ports/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-idoc/Makefile b/devel/hs-idoc/Makefile
index 597dd20aabc3..662597e21ad5 100644
--- a/devel/hs-idoc/Makefile
+++ b/devel/hs-idoc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	idoc
 PORTVERSION=	0.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.cse.unsw.edu.au/~chak/haskell/idoc/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hs-tclhaskell-ghc/Makefile b/devel/hs-tclhaskell-ghc/Makefile
index 1c90faf91d84..22e4f318303f 100644
--- a/devel/hs-tclhaskell-ghc/Makefile
+++ b/devel/hs-tclhaskell-ghc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	tclhaskell
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel haskell tcl83
 MASTER_SITES=	http://www.dcs.gla.ac.uk/~meurig/TclHaskell/
 PKGNAMEPREFIX=	hs-
diff --git a/devel/hypersrc/Makefile b/devel/hypersrc/Makefile
index fbd0ed358007..9aa6d683aa39 100644
--- a/devel/hypersrc/Makefile
+++ b/devel/hypersrc/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	hypersrc
 PORTVERSION=	5.4.20
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.jimbrooks.org/hypersrc/%SUBDIR%/ \
 		http://www.home.earthlink.net/~jebrooks1/ftp/hypersrc/%SUBDIR%/
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index 1ce373aa9e99..b5c3ca4b121b 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	id-utils
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/id-utils/pkg-plist b/devel/id-utils/pkg-plist
index a5442a6ee032..f39563823369 100644
--- a/devel/id-utils/pkg-plist
+++ b/devel/id-utils/pkg-plist
@@ -13,5 +13,3 @@ share/id-lang.map
 %%NLS%%share/locale/fr/LC_MESSAGES/id-utils.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/id-utils.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/id-utils.mo
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile
index 1ce373aa9e99..b5c3ca4b121b 100644
--- a/devel/idutils/Makefile
+++ b/devel/idutils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	id-utils
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/idutils/pkg-plist b/devel/idutils/pkg-plist
index a5442a6ee032..f39563823369 100644
--- a/devel/idutils/pkg-plist
+++ b/devel/idutils/pkg-plist
@@ -13,5 +13,3 @@ share/id-lang.map
 %%NLS%%share/locale/fr/LC_MESSAGES/id-utils.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/id-utils.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/id-utils.mo
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index 234c672cb522..faeadb959e9f 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -16,10 +16,10 @@ DISTFILES=	XFree86-${PORTVERSION}-src-1.tgz \
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Imake and other utilities from XFree86
 
-CONFLICTS=	imake-6*
+CONFLICTS=	imake-1.[0-9]*
 
 PREFIX?=	${X11BASE}
-MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+MTREE_FILE=	${PORTSDIR}/Templates/BSD.local.dist
 USE_PERL5=	yes
 MAKE_ENV=	MAKEFLAGS="CC=${CC}"
 SCRIPTS_ENV=	CC=${CC}
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
new file mode 100644
index 000000000000..aab6ab2584bd
--- /dev/null
+++ b/devel/imake/Makefile
@@ -0,0 +1,45 @@
+# New ports collection makefile for:    imake-6
+# Date created:         18 Jun 2004
+# Whom:                 anholt
+#
+# $FreeBSD$
+#
+
+PORTNAME=	imake
+PORTVERSION=	1.0.2
+PORTREVISION=	4
+PORTEPOCH=	1
+CATEGORIES=	devel
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Imake and other utilities from X.Org
+
+RUN_DEPENDS=	gccmakedep:${PORTSDIR}/devel/gccmakedep \
+		makedepend:${PORTSDIR}/devel/makedepend \
+		${PREFIX}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files
+
+CONFLICTS=	imake-4*
+
+USE_PERL5=	yes
+
+XORG_CAT=	util
+USE_XORG=	xproto
+
+.ifdef USE_IMAKE
+.error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+.endif
+
+MAN1= 		ccmakedep.1 \
+		cleanlinks.1 \
+		imake.1 \
+		makeg.1 \
+		mergelib.1 \
+		mkdirhier.1 \
+		mkhtmlindex.1 \
+		revpath.1 \
+		xmkmf.1
+
+post-patch:
+	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/mkhtmlindex.pl
+
+.include <bsd.port.mk>
diff --git a/devel/imake/distinfo b/devel/imake/distinfo
new file mode 100644
index 000000000000..e47c5053c7f1
--- /dev/null
+++ b/devel/imake/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/util/imake-1.0.2.tar.bz2) = 02fea5a02ba2857c7d81820c8e8b8e6f
+SHA256 (xorg/util/imake-1.0.2.tar.bz2) = 97cefff4ae76863ebce87496aca715371890505db4a0511d980e92bfe050ac7b
+SIZE (xorg/util/imake-1.0.2.tar.bz2) = 112959
diff --git a/devel/imake/files/patch-imake.c b/devel/imake/files/patch-imake.c
new file mode 100644
index 000000000000..ff5609748481
--- /dev/null
+++ b/devel/imake/files/patch-imake.c
@@ -0,0 +1,35 @@
+--- imake.c.orig	Tue Jan 30 14:57:37 2007
++++ imake.c	Tue Jan 30 14:55:59 2007
+@@ -1153,29 +1153,17 @@
+   int mib[2];
+   size_t len;
+   int osrel = 0;
+-  FILE *objprog = NULL;
+   int iself = 0;
+-  char buf[10];
+-  char cmd[PATH_MAX];
+ 
+   mib[0] = CTL_KERN;
+   mib[1] = KERN_OSRELDATE;
+   len = sizeof(osrel);
+   sysctl(mib, 2, &osrel, &len, NULL, 0);
+-  if (CrossCompiling) {
+-      strcpy (cmd, CrossCompileDir);
+-      strcat (cmd, "/");
+-      strcat (cmd,"objformat");
+-  } else
+-      strcpy (cmd, "objformat");
+ 
+-  if (osrel >= 300004 &&
+-      (objprog = popen(cmd, "r")) != NULL &&
+-      fgets(buf, sizeof(buf), objprog) != NULL &&
+-      strncmp(buf, "elf", 3) == 0)
++  if (osrel < 300004)
++    iself = 0;
++  else
+     iself = 1;
+-  if (objprog)
+-    pclose(objprog);
+ 
+   fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO");
+ }
diff --git a/devel/imake/pkg-descr b/devel/imake/pkg-descr
new file mode 100644
index 000000000000..aa426ccf2e28
--- /dev/null
+++ b/devel/imake/pkg-descr
@@ -0,0 +1,7 @@
+This package contains X.Org's imake, imake config files, and other build-related
+tools.
+
+WWW: http://www.x.org/
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/devel/imake/pkg-plist b/devel/imake/pkg-plist
new file mode 100644
index 000000000000..4ba8d99890ea
--- /dev/null
+++ b/devel/imake/pkg-plist
@@ -0,0 +1,9 @@
+bin/ccmakedep
+bin/cleanlinks
+bin/imake
+bin/makeg
+bin/mergelib
+bin/mkdirhier
+bin/mkhtmlindex
+bin/revpath
+bin/xmkmf
diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index 3d5291a2f0f6..b552cffec83b 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ireport
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	devel databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/itext/Makefile b/devel/itext/Makefile
index 0a49f361e398..913224c8efd1 100644
--- a/devel/itext/Makefile
+++ b/devel/itext/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	itext
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
diff --git a/devel/jakarta-commons-chain/Makefile b/devel/jakarta-commons-chain/Makefile
index f922c83ec0e0..da533d6709c5 100644
--- a/devel/jakarta-commons-chain/Makefile
+++ b/devel/jakarta-commons-chain/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-chain
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/source
diff --git a/devel/jakarta-commons-configuration/Makefile b/devel/jakarta-commons-configuration/Makefile
index 961f083920c7..5be14752dfef 100644
--- a/devel/jakarta-commons-configuration/Makefile
+++ b/devel/jakarta-commons-configuration/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-configuration
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/binaries/
diff --git a/devel/jakarta-commons-io/Makefile b/devel/jakarta-commons-io/Makefile
index 377ad656cfeb..f6ca7066a29e 100644
--- a/devel/jakarta-commons-io/Makefile
+++ b/devel/jakarta-commons-io/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-io
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	commons/io/source
diff --git a/devel/jakarta-commons-jxpath/Makefile b/devel/jakarta-commons-jxpath/Makefile
index d8d83dc27ca1..f88b99c47e56 100644
--- a/devel/jakarta-commons-jxpath/Makefile
+++ b/devel/jakarta-commons-jxpath/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-jxpath
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	devel www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/binaries
diff --git a/devel/jakarta-commons-modeler/Makefile b/devel/jakarta-commons-modeler/Makefile
index 0c349bcedc9b..bd265d0944d8 100644
--- a/devel/jakarta-commons-modeler/Makefile
+++ b/devel/jakarta-commons-modeler/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-modeler
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/binaries
diff --git a/devel/java-util-concurrent/Makefile b/devel/java-util-concurrent/Makefile
index bb1fa1b40184..588647942022 100644
--- a/devel/java-util-concurrent/Makefile
+++ b/devel/java-util-concurrent/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	util-concurrent
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/
 PKGNAMEPREFIX=	java-
diff --git a/devel/jcmdline/Makefile b/devel/jcmdline/Makefile
index 7da085a754ea..301e14901705 100644
--- a/devel/jcmdline/Makefile
+++ b/devel/jcmdline/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jcmdline
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/jep/Makefile b/devel/jep/Makefile
index 9e2c63b590cd..9515a1a0b872 100644
--- a/devel/jep/Makefile
+++ b/devel/jep/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jep
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	devel java python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jepp
diff --git a/devel/jsap/Makefile b/devel/jsap/Makefile
index 4ff697319e6f..672ef7f1bc51 100644
--- a/devel/jsap/Makefile
+++ b/devel/jsap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jsap
 DISTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/jtag/Makefile b/devel/jtag/Makefile
index dcc2dec065d9..4f7acb1dd1d7 100644
--- a/devel/jtag/Makefile
+++ b/devel/jtag/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jtag
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=openwince
diff --git a/devel/jtag/pkg-plist b/devel/jtag/pkg-plist
index c83d047caf32..cce393476a2c 100644
--- a/devel/jtag/pkg-plist
+++ b/devel/jtag/pkg-plist
@@ -68,5 +68,3 @@ share/locale/sk/LC_MESSAGES/jtag.mo
 @dirrm %%DATADIR%%/altera/ep1c20f400
 @dirrm %%DATADIR%%/altera
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
diff --git a/devel/jude-community/Makefile b/devel/jude-community/Makefile
index ec476e707cb0..997de7b351bd 100644
--- a/devel/jude-community/Makefile
+++ b/devel/jude-community/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jude-community
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	# you have to register yourself as a member to download
 DISTNAME=	${PORTNAME}-${PORTVERSION:S!.!_!g}
diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index 5aca687c3fc4..85384ad0c6ad 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	kaptain
 PORTVERSION=	0.72
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index cb68c112c6d9..5aefdb93c0da 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kcachegrind
 PORTVERSION=	0.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kcachegrind
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 5f62949a41c7..52fc1561d4d9 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdbg
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/kdbg/pkg-plist b/devel/kdbg/pkg-plist
index a2ff7ca1f9cf..e6c7717e7be3 100644
--- a/devel/kdbg/pkg-plist
+++ b/devel/kdbg/pkg-plist
@@ -133,15 +133,3 @@ share/config/kdbgrc
 @dirrm share/apps/kdbg/icons
 @dirrm share/apps/kdbg
 @dirrm share/config
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 634653844522..6c3c6936f347 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdesdk
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 634653844522..6c3c6936f347 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdesdk
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index b69deef7140f..54611f8eeeaf 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdesvn
 PORTVERSION=	0.11.2
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	http://www.alwins-world.de/programs/download/${PORTNAME}/ \
 		http://www.yuanjue.net/download/
diff --git a/devel/kdesvn-kde4/pkg-plist b/devel/kdesvn-kde4/pkg-plist
index 949a0629e74f..756db1107939 100644
--- a/devel/kdesvn-kde4/pkg-plist
+++ b/devel/kdesvn-kde4/pkg-plist
@@ -273,8 +273,6 @@ share/services/svn+http.protocol
 share/services/svn+https.protocol
 share/services/svn+ssh.protocol
 share/services/svn.protocol
-@dirrmtry share/locale/es/LC_MESSAGES
-@dirrmtry share/locale/es
 @dirrmtry share/services/kded
 @dirrm share/doc/HTML/en/kdesvn
 @dirrm share/apps/kdesvnpart
diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile
index b69deef7140f..54611f8eeeaf 100644
--- a/devel/kdesvn/Makefile
+++ b/devel/kdesvn/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdesvn
 PORTVERSION=	0.11.2
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	http://www.alwins-world.de/programs/download/${PORTNAME}/ \
 		http://www.yuanjue.net/download/
diff --git a/devel/kdesvn/pkg-plist b/devel/kdesvn/pkg-plist
index 949a0629e74f..756db1107939 100644
--- a/devel/kdesvn/pkg-plist
+++ b/devel/kdesvn/pkg-plist
@@ -273,8 +273,6 @@ share/services/svn+http.protocol
 share/services/svn+https.protocol
 share/services/svn+ssh.protocol
 share/services/svn.protocol
-@dirrmtry share/locale/es/LC_MESSAGES
-@dirrmtry share/locale/es
 @dirrmtry share/services/kded
 @dirrm share/doc/HTML/en/kdesvn
 @dirrm share/apps/kdesvnpart
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 9c6c746a30fe..2a6c2622f8a0 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdevelop
 PORTVERSION=	3.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/src
diff --git a/devel/klassmodeler/Makefile b/devel/klassmodeler/Makefile
index 340b5f54d35b..4b083ca0cb64 100644
--- a/devel/klassmodeler/Makefile
+++ b/devel/klassmodeler/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	klassmodeler
 PORTVERSION=	0.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.jameswells.net/KlassModeler/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}.bsd
diff --git a/devel/kodos/Makefile b/devel/kodos/Makefile
index b856ee485e93..ae72a3b00fd4 100644
--- a/devel/kodos/Makefile
+++ b/devel/kodos/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	kodos
 PORTVERSION=	2.4.9
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/devel/kprof/Makefile b/devel/kprof/Makefile
index 0bb8c252431b..bbefc2ede7df 100644
--- a/devel/kprof/Makefile
+++ b/devel/kprof/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kprof
 PORTVERSION=	1.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index bcd34a6505ce..b629576d85f5 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kscope
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}/
diff --git a/devel/kxl/Makefile b/devel/kxl/Makefile
index 1db30ab41282..a5713210ef79 100644
--- a/devel/kxl/Makefile
+++ b/devel/kxl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kxl
 PORTVERSION=	1.1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel games
 MASTER_SITES=	http://kxl.orz.hm/download/
 DISTNAME=	KXL-${PORTVERSION}
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 97c685cb96ac..f38107358fe4 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kyra
 PORTVERSION=	2.0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index d2d590d4a4d7..ae7a79f49543 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lasi
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.unifont.org/lasi/download/
 
diff --git a/devel/lbpp/Makefile b/devel/lbpp/Makefile
index 505162fa8647..0e2929d03307 100644
--- a/devel/lbpp/Makefile
+++ b/devel/lbpp/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	lbpp
 PORTVERSION=	0.0.6b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/lhs2TeX/Makefile b/devel/lhs2TeX/Makefile
index aa810f27be74..086e28c61303 100644
--- a/devel/lhs2TeX/Makefile
+++ b/devel/lhs2TeX/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	lhs2tex
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.informatik.uni-bonn.de/~loeh/${PORTNAME}/
 
diff --git a/devel/libafterbase/Makefile b/devel/libafterbase/Makefile
index d2e89c0dacb5..9b10ea265c64 100644
--- a/devel/libafterbase/Makefile
+++ b/devel/libafterbase/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libafterbase
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	afterstep
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index 1656e581991f..64c502ec02ab 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libassetml
 PORTVERSION=	1.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ofset
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index a1c4ffa60acc..0572b10f6994 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libast
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://critical.ch/distfiles/ \
 		http://www.eterm.org/download/
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index de67f05bd701..fda80eee4ad7 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libbonobo
 PORTVERSION=	2.18.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index d1939c122125..2f472729718f 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -182,57 +182,19 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
 @dirrm etc/bonobo-activation
 @dirrmtry lib/bonobo/monikers
 @dirrmtry lib/bonobo
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @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/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/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index 6c5eeb32176a..0797729b82ce 100644
--- a/devel/libbonobomm/Makefile
+++ b/devel/libbonobomm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libbonobomm
 PORTVERSION=	1.3.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/devel/libchipcard-kde/Makefile b/devel/libchipcard-kde/Makefile
index 4a805b0a18e8..c354f844a120 100644
--- a/devel/libchipcard-kde/Makefile
+++ b/devel/libchipcard-kde/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		libchipcard-kde
 PORTVERSION=		0.9
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		devel kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libchipcard
diff --git a/devel/libgalago/Makefile b/devel/libgalago/Makefile
index 0d3ef19815b9..d0d4018d0911 100644
--- a/devel/libgalago/Makefile
+++ b/devel/libgalago/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgalago
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	devel deskutils
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/${PORTNAME}/
 
diff --git a/devel/libgconf-java/Makefile b/devel/libgconf-java/Makefile
index a87a4f4cae3c..7a208f8a52d7 100644
--- a/devel/libgconf-java/Makefile
+++ b/devel/libgconf-java/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgconf-java
 PORTVERSION=	2.12.5
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
diff --git a/devel/libgii/Makefile b/devel/libgii/Makefile
index fe79c448544d..e9dfb92112d1 100644
--- a/devel/libgii/Makefile
+++ b/devel/libgii/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgii
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.2/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/devel/libgiigic/Makefile b/devel/libgiigic/Makefile
index 762835ca3384..1feb57ba3f7f 100644
--- a/devel/libgiigic/Makefile
+++ b/devel/libgiigic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgiigic
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.2/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile
index 3bfe19f76c94..2544c87754df 100644
--- a/devel/libglade-java/Makefile
+++ b/devel/libglade-java/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libglade-java
 PORTVERSION=	2.12.6
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 8ca8a0351dcc..d370b97dbbc9 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libglade
 PORTVERSION=	0.17
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libglade/0.17
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 53c5bcb54530..9f5456be5d8b 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libglade2
 PORTVERSION=	2.6.0
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 140b06f7de08..281d9863503a 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libglademm
 PORTVERSION=	2.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 855ea368d2bb..00c69a1310a7 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libglademm
 PORTVERSION=	2.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 897916acd78c..b978af7042b2 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgsf
 PORTVERSION=	1.14.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index cdef1d781354..83729ce5a448 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgtop
 PORTVERSION=	2.14.8
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index c3df2c39cc33..73ea7de04db0 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -170,36 +170,14 @@ share/locale/zh_HK/LC_MESSAGES/libgtop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
 @dirrm include/libgtop-2.0/glibtop
 @dirrm include/libgtop-2.0
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/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
@@ -208,22 +186,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrm %%DOCSDIR%%
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 51202566e907..ca0bf0d59f51 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libnotify
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/libnotify/
 
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index cba6532f05fa..3fc73084c7b9 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	liboobs
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index 7eb6180fef08..fd1f6ba735d7 100644
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libsigcx
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index 438bd6137df1..1cc322ac3181 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libstroke
 PORTVERSION=	0.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.etla.net/libstroke/
 
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 6cdbc69d9125..74ec2c6cd5c3 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libunicode
 PORTVERSION=	0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libunicode/0.4
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index a2f52047128f..64f5652e16fd 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libzvbi
 PORTVERSION=	0.2.25
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	zapping
diff --git a/devel/lincvs/Makefile b/devel/lincvs/Makefile
index 9282e629f453..beb253209c9f 100644
--- a/devel/lincvs/Makefile
+++ b/devel/lincvs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lincvs
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	http://lincvs.com/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-0-generic-src
diff --git a/devel/linux-runrev/Makefile b/devel/linux-runrev/Makefile
index 609b22eaad0e..ab24633b4acd 100644
--- a/devel/linux-runrev/Makefile
+++ b/devel/linux-runrev/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	runrev
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel linux
 MASTER_SITES=	http://www.runrev.com/revolution/engines11/unix/
 PKGNAMEPREFIX=	linux-
diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile
index 30c5dc032fd0..a57057995644 100644
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	log4cpp
 DISTVERSION=	0.3.5rc3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/log4j/Makefile b/devel/log4j/Makefile
index c0c138aa90dd..768dcdcc8d58 100644
--- a/devel/log4j/Makefile
+++ b/devel/log4j/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	log4j
 PORTVERSION=	1.2.14
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	logging/${PORTNAME}/${PORTVERSION}
diff --git a/devel/looks/Makefile b/devel/looks/Makefile
index 9ccfd5b6d6ef..d690eff7b205 100644
--- a/devel/looks/Makefile
+++ b/devel/looks/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	looks
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	https://looks.dev.java.net/files/documents/31/${DISTREP}/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|_|g}-${DISTDATE}
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index 75856a666110..b915218bcf34 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	m17n-lib
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.m17n.org/m17n-lib-download/
 
diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile
index fff2e148248b..bae16e0551dc 100644
--- a/devel/makedepend/Makefile
+++ b/devel/makedepend/Makefile
@@ -6,23 +6,18 @@
 #
 
 PORTNAME=	makedepend
-PORTVERSION=	2000.12.28
+PORTVERSION=	1.0.0
+PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/
-MASTER_SITE_SUBDIR=. OLD-VERSIONS/imap
-DISTNAME=	cyrus-imapd-2.0.9
 
-MAINTAINER=	roam@FreeBSD.org
+MAINTAINER=	x11@FreeBSD.org
 COMMENT=	A dependency generator for makefiles
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/makedepend
-GNU_CONFIGURE=	YES
+XORG_CAT=	util
+USE_XORG=	xproto
 
-MAN1=		makedepend.1
 PLIST_FILES=	bin/makedepend
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/makedepend ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mkdepend.man ${PREFIX}/man/man1/makedepend.1
+MAN1=		makedepend.1
 
 .include <bsd.port.mk>
diff --git a/devel/makedepend/distinfo b/devel/makedepend/distinfo
index 207f924771ac..45461b853806 100644
--- a/devel/makedepend/distinfo
+++ b/devel/makedepend/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imapd-2.0.9.tar.gz) = d84e60f94f419f032c34035b2aa8a2c8
-SHA256 (cyrus-imapd-2.0.9.tar.gz) = 8a4f152eed0e98d372c93bb8bb59f747c57e3a54903e6365e8578aafe0cd390d
-SIZE (cyrus-imapd-2.0.9.tar.gz) = 1309231
+MD5 (xorg/util/makedepend-1.0.0.tar.bz2) = fa194caa4f059f5621ed2c5a51efb4d0
+SHA256 (xorg/util/makedepend-1.0.0.tar.bz2) = d2be3c940ee48b0e9e5c63025993162bc144d48923d28565450fb1dca52d140a
+SIZE (xorg/util/makedepend-1.0.0.tar.bz2) = 103213
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 68a8ddda8182..9e4f97fad277 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	maketool
 PORTVERSION=	0.8.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://home.alphalink.com.au/~gnb/maketool/downloads/
 
@@ -24,7 +24,6 @@ PLIST=		${WRKDIR}/pkg-plist
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	atk glib20 gtk20 pango
-USE_X_PREFIX=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e "s,-Wpointer-arithmetic,," ${WRKSRC}/configure
@@ -51,8 +50,6 @@ pre-install:
 .for ii in /help/C /help /
 	${ECHO_CMD} @dirrm share/maketool${ii} >> ${PLIST}
 .endfor
-	${ECHO_CMD} lib/charset.alias >> ${PLIST}
-	${ECHO_CMD} share/locale/locale.alias >> ${PLIST}
 .for ii in cs ja
 	${ECHO_CMD} share/locale/${ii}/LC_MESSAGES/maketool.mo >> ${PLIST}
 .endfor
diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index b0d3cfe9cd9c..3c403809c2fc 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	maven
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	${PORTNAME}/binaries
diff --git a/devel/maven2/Makefile b/devel/maven2/Makefile
index 564e560e404e..1f5098acc572 100644
--- a/devel/maven2/Makefile
+++ b/devel/maven2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	maven2
 DISTVERSION=	2.0.6
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	maven/binaries
diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile
index f073fa1b69b5..d67a3cd033f8 100644
--- a/devel/menhir/Makefile
+++ b/devel/menhir/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	menhir
 PORTVERSION=	20070215
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://cristal.inria.fr/~fpottier/menhir/
 
diff --git a/devel/mono-tools/Makefile b/devel/mono-tools/Makefile
index 0acd405a449f..bf68ff1d0a8e 100644
--- a/devel/mono-tools/Makefile
+++ b/devel/mono-tools/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mono-tools
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.go-mono.com/sources/${PORTNAME}/
 
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 4c65b081beeb..d7332e4348dc 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	monotone-viz
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://oandrieu.nerim.net/monotone-viz/
 
diff --git a/devel/netscape-java40/Makefile b/devel/netscape-java40/Makefile
index 03fd129fa121..a933270f5732 100644
--- a/devel/netscape-java40/Makefile
+++ b/devel/netscape-java40/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netscape-java40
 PORTVERSION=	1999.11.15
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://opendx.npaci.edu/libs/
 DISTNAME=	${PORTNAME}
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index b6c0fcf6e708..08baf34b9ba7 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	noweb
 PORTVERSION=	2.10a
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	tg
diff --git a/devel/nx/Makefile b/devel/nx/Makefile
index 8bc3421c2445..5c5b63ca9acb 100644
--- a/devel/nx/Makefile
+++ b/devel/nx/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nx
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://networkx.lanl.gov/download/
 DISTNAME=	networkx-${PORTVERSION}
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index f18998f03015..257f9d4f1425 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	oaf
 PORTVERSION=	0.6.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/oaf/0.6
diff --git a/devel/oaf/pkg-plist b/devel/oaf/pkg-plist
index 2861e3556ee3..b118520c8419 100644
--- a/devel/oaf/pkg-plist
+++ b/devel/oaf/pkg-plist
@@ -64,31 +64,3 @@ share/locale/zh_TW/LC_MESSAGES/oaf.mo
 @dirrm include/liboaf
 @dirrm etc/oaf
 @unexec ps gx | grep '[0-9]:[0-9][0-9]\.[0-9][0-9] oafd --ac-activate' | awk '{print $1}' | xargs kill 2>/dev/null || true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/devel/obfuscatejs/Makefile b/devel/obfuscatejs/Makefile
index 774f6af750a7..4f7ca1998f1d 100644
--- a/devel/obfuscatejs/Makefile
+++ b/devel/obfuscatejs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	obfuscatejs
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://nivi.interfree.it/distfiles/${DIST_SUBDIR}/ \
 		http://tools.2vi.nl/
diff --git a/devel/objcunit/Makefile b/devel/objcunit/Makefile
index 1712b64a875c..a296536ddd9c 100644
--- a/devel/objcunit/Makefile
+++ b/devel/objcunit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	objcunit
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://xanthippe.dyndns.org/Zipper/
 PKGNAMEPREFIX=	gnustep-
diff --git a/devel/ocaml-annexlib/Makefile b/devel/ocaml-annexlib/Makefile
index 21551923a83c..70af0aed2358 100644
--- a/devel/ocaml-annexlib/Makefile
+++ b/devel/ocaml-annexlib/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	annexlib
 PORTVERSION=	0.13.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://raevnos.pennmush.org/code/extlib/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-calendar/Makefile b/devel/ocaml-calendar/Makefile
index 0244c984c9bb..3f2918e6530c 100644
--- a/devel/ocaml-calendar/Makefile
+++ b/devel/ocaml-calendar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	calendar
 PORTVERSION=	1.09.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.lri.fr/~signoles/prog/calendar/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile
index f990ecb1267d..c514592d3062 100644
--- a/devel/ocaml-camljava/Makefile
+++ b/devel/ocaml-camljava/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	camljava
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-camomile/Makefile b/devel/ocaml-camomile/Makefile
index 84ae9da3973d..30b098b80d76 100644
--- a/devel/ocaml-camomile/Makefile
+++ b/devel/ocaml-camomile/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	camomile
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/ocaml-cfg/Makefile b/devel/ocaml-cfg/Makefile
index 4429d9717d7b..a1a55ca81290 100644
--- a/devel/ocaml-cfg/Makefile
+++ b/devel/ocaml-cfg/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cfg
 PORTVERSION=	1.7.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml.info/ocaml_sources/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-classes/Makefile b/devel/ocaml-classes/Makefile
index 293f10f3b8ba..92d9437a970a 100644
--- a/devel/ocaml-classes/Makefile
+++ b/devel/ocaml-classes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	classes
 PORTVERSION=	3.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/\
 		ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/\
diff --git a/devel/ocaml-equeue/Makefile b/devel/ocaml-equeue/Makefile
index 8580115ed9ca..f4bc17d68fd7 100644
--- a/devel/ocaml-equeue/Makefile
+++ b/devel/ocaml-equeue/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	equeue
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-event/Makefile b/devel/ocaml-event/Makefile
index 9712716f2773..6f319ae7de5f 100644
--- a/devel/ocaml-event/Makefile
+++ b/devel/ocaml-event/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	event
 PORTVERSION=	0.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.xs4all.nl/~mmzeeman/ocaml/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-extlib/Makefile b/devel/ocaml-extlib/Makefile
index a4b004e58b54..75e97d8b0d4b 100644
--- a/devel/ocaml-extlib/Makefile
+++ b/devel/ocaml-extlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	extlib
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ocaml-lib
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 6b252946e8a6..4d1ffd267d55 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	findlib
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile
index a6e80831c38a..00e6b754d018 100644
--- a/devel/ocaml-lacaml/Makefile
+++ b/devel/ocaml-lacaml/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	lacaml
 PORTVERSION=	3.0.20
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml.info/ocaml_sources/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-magic/Makefile b/devel/ocaml-magic/Makefile
index 2d8e728681dd..8239018b1abe 100644
--- a/devel/ocaml-magic/Makefile
+++ b/devel/ocaml-magic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	magic
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
diff --git a/devel/ocaml-ounit/Makefile b/devel/ocaml-ounit/Makefile
index 35240b6d5af7..5433f9e15819 100644
--- a/devel/ocaml-ounit/Makefile
+++ b/devel/ocaml-ounit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ounit
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.xs4all.nl/~mmzeeman/ocaml/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile
index 816b2f77d086..8ca1e2f84963 100644
--- a/devel/ocaml-pcre/Makefile
+++ b/devel/ocaml-pcre/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pcre
 PORTVERSION=	5.11.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml.info/ocaml_sources/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-pomap/Makefile b/devel/ocaml-pomap/Makefile
index e7bfca5dab09..8ba3bd1b51ac 100644
--- a/devel/ocaml-pomap/Makefile
+++ b/devel/ocaml-pomap/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pomap
 PORTVERSION=	2.9.8
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml.info/ocaml_sources/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-res/Makefile b/devel/ocaml-res/Makefile
index 079e7f2ca5ba..9c86eed97499 100644
--- a/devel/ocaml-res/Makefile
+++ b/devel/ocaml-res/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	res
 PORTVERSION=	2.2.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml.info/ocaml_sources/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index c7255d9f3a22..f2abfac3a036 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ocamlsdl
diff --git a/devel/ocaml-sem/Makefile b/devel/ocaml-sem/Makefile
index 218a51f94823..46f5055f5622 100644
--- a/devel/ocaml-sem/Makefile
+++ b/devel/ocaml-sem/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sem
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://ocaml-sem.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile
index 4ca2f8618a97..3160a0ef8d59 100644
--- a/devel/ocaml-sexplib/Makefile
+++ b/devel/ocaml-sexplib/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	sexplib
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.janestcapital.com/ocaml/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-ulex/Makefile b/devel/ocaml-ulex/Makefile
index e3f76d87139e..e0fc16b24d98 100644
--- a/devel/ocaml-ulex/Makefile
+++ b/devel/ocaml-ulex/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ulex
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cduce.org/download/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-xstr/Makefile b/devel/ocaml-xstr/Makefile
index 41f1f61fcc0e..3a27bdd0d4f2 100644
--- a/devel/ocaml-xstr/Makefile
+++ b/devel/ocaml-xstr/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xstr
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocaml-xstrp4/Makefile b/devel/ocaml-xstrp4/Makefile
index 9f118b6bdd39..b035145b55aa 100644
--- a/devel/ocaml-xstrp4/Makefile
+++ b/devel/ocaml-xstrp4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xstrp4
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/ocamlweb/Makefile b/devel/ocamlweb/Makefile
index c9e9c8684d98..d31dbebd719d 100644
--- a/devel/ocamlweb/Makefile
+++ b/devel/ocamlweb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ocamlweb
 PORTVERSION=	1.34
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.lri.fr/~filliatr/ftp/ocamlweb/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DOCFILES}
diff --git a/devel/ode-devel/Makefile b/devel/ode-devel/Makefile
index f919570bf7ec..5f68d81de0a7 100644
--- a/devel/ode-devel/Makefile
+++ b/devel/ode-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ode
 DISTVERSION=	${ODEVER}-060223
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://opende.sourceforge.net/snapshots/
 PKGNAMESUFFIX=	-devel
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index e63d18e05aad..7a32b87b64ad 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ode
 PORTVERSION=	0.7
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/devel/omake/Makefile b/devel/omake/Makefile
index cc94efabf0f8..944840e967de 100644
--- a/devel/omake/Makefile
+++ b/devel/omake/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	omake
 PORTVERSION=	0.9.8.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://omake.metaprl.org/downloads/ \
 		http://sunner.elcomnet.ru/~stas/
diff --git a/devel/otrs/Makefile b/devel/otrs/Makefile
index 4f894d475daf..00f002008ab9 100644
--- a/devel/otrs/Makefile
+++ b/devel/otrs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	otrs
 PORTVERSION=	2.1.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.otrs.org/pub/otrs/ \
 		ftp://ftp.samurai.com/pub/otrs/ \
diff --git a/devel/p5-Algorithm-Accounting/Makefile b/devel/p5-Algorithm-Accounting/Makefile
index 7ec95b5de38d..91676a9c906c 100644
--- a/devel/p5-Algorithm-Accounting/Makefile
+++ b/devel/p5-Algorithm-Accounting/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Algorithm-Accounting
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/G/GU/GUGOD
diff --git a/devel/p5-Devel-ptkdb/Makefile b/devel/p5-Devel-ptkdb/Makefile
index fe51c692c650..93b1adc8b0a5 100644
--- a/devel/p5-Devel-ptkdb/Makefile
+++ b/devel/p5-Devel-ptkdb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Devel-ptkdb
 PORTVERSION=	1.1091
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Devel
diff --git a/devel/p5-FSA-Rules/Makefile b/devel/p5-FSA-Rules/Makefile
index 5451fdab696e..985cb1a29de2 100644
--- a/devel/p5-FSA-Rules/Makefile
+++ b/devel/p5-FSA-Rules/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	FSA-Rules
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/D/DW/DWHEELER
diff --git a/devel/p5-Gnome2-GConf/Makefile b/devel/p5-Gnome2-GConf/Makefile
index 3908a0bae615..ec8d7eb47aa4 100644
--- a/devel/p5-Gnome2-GConf/Makefile
+++ b/devel/p5-Gnome2-GConf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		Gnome2-GConf
 PORTVERSION=		1.043
+PORTREVISION=	1
 CATEGORIES=		devel gnome perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Gnome2
diff --git a/devel/p5-Gtk2-Spell/Makefile b/devel/p5-Gtk2-Spell/Makefile
index 380643a9c42e..65955d7ebc4d 100644
--- a/devel/p5-Gtk2-Spell/Makefile
+++ b/devel/p5-Gtk2-Spell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Gtk2-Spell
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk2-perl
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index 44031a8e50eb..d4e9eb624329 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	Inline-Java
 PORTVERSION=	0.52
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../by-authors/id/P/PA/PATL
diff --git a/devel/p5-Java/Makefile b/devel/p5-Java/Makefile
index c5deb738be4e..f39ebf5f4f85 100644
--- a/devel/p5-Java/Makefile
+++ b/devel/p5-Java/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Java
 PORTVERSION=	4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=Java
diff --git a/devel/p5-Log-Accounting-SVK/Makefile b/devel/p5-Log-Accounting-SVK/Makefile
index 257896732cfa..7d520fe6fa8c 100644
--- a/devel/p5-Log-Accounting-SVK/Makefile
+++ b/devel/p5-Log-Accounting-SVK/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Log-Accounting-SVK
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/G/GU/GUGOD
diff --git a/devel/p5-Log-Accounting-SVN/Makefile b/devel/p5-Log-Accounting-SVN/Makefile
index 32ab714bfd58..6dc0efb7188d 100644
--- a/devel/p5-Log-Accounting-SVN/Makefile
+++ b/devel/p5-Log-Accounting-SVN/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Log-Accounting-SVN
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Log
diff --git a/devel/p5-Net-DBus/Makefile b/devel/p5-Net-DBus/Makefile
index 13b54d6cde5b..9109f36b57b6 100644
--- a/devel/p5-Net-DBus/Makefile
+++ b/devel/p5-Net-DBus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net-DBus
 PORTVERSION=	0.33.4
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
diff --git a/devel/p5-Project-Gantt/Makefile b/devel/p5-Project-Gantt/Makefile
index afedd32b8125..92cccf5c62cc 100644
--- a/devel/p5-Project-Gantt/Makefile
+++ b/devel/p5-Project-Gantt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Project-Gantt
 PORTVERSION=	1.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/A/AW/AWESTHOLM
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index 1024e2d288b2..3cac952fe441 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	1.20.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	http://bloodgate.com/perl/sdl/pub/
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Parser/Makefile b/devel/p5-Test-Parser/Makefile
index 0c4536e0a5b8..24bb8d63e849 100644
--- a/devel/p5-Test-Parser/Makefile
+++ b/devel/p5-Test-Parser/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Test-Parser
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Test
diff --git a/devel/pcl-cvs-emacs20/Makefile b/devel/pcl-cvs-emacs20/Makefile
index ebd5b144f1d8..5ffafd3bdc7d 100644
--- a/devel/pcl-cvs-emacs20/Makefile
+++ b/devel/pcl-cvs-emacs20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pcl-cvs
 PORTVERSION=	2.9.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	okazaki/pcl-cvs
diff --git a/devel/pdcurses-the/Makefile b/devel/pdcurses-the/Makefile
index 9f5a7da26dcb..4c5cdbb7f53e 100644
--- a/devel/pdcurses-the/Makefile
+++ b/devel/pdcurses-the/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pdcurses
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	PDCurses-${PORTVERSION}
diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile
index 9f5a7da26dcb..4c5cdbb7f53e 100644
--- a/devel/pdcurses/Makefile
+++ b/devel/pdcurses/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pdcurses
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	PDCurses-${PORTVERSION}
diff --git a/devel/pecl-expect/Makefile b/devel/pecl-expect/Makefile
index 866c8409450a..cdd844d327fd 100644
--- a/devel/pecl-expect/Makefile
+++ b/devel/pecl-expect/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	expect
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index f1a1a5866dbf..d7c89fd1d783 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pharmacy
 PORTVERSION=	0.2.1a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile
index 8bfc269867da..005487b77cd5 100644
--- a/devel/pikdev/Makefile
+++ b/devel/pikdev/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pikdev
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	http://pikdev.free.fr/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
diff --git a/devel/plan9port/Makefile b/devel/plan9port/Makefile
index c83c692e6527..2a22853f4ab3 100644
--- a/devel/plan9port/Makefile
+++ b/devel/plan9port/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	plan9port
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	devel plan9
 MASTER_SITES=	http://swtch.com/plan9port/ \
 		ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/
diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile
index cec2e38edc49..edfac89e2c59 100644
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pmd
 PORTVERSION=	3.7
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pmd
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 348f59de0b2b..8345d1f34d2f 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	popt
 PORTVERSION=	1.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/%SUBDIR%/ \
 		http://rpmfind.net/linux/rpm.org/rpm/dist/%SUBDIR%/ \
diff --git a/devel/popt/pkg-plist b/devel/popt/pkg-plist
index dfc9dda1666b..2f531ac86bf3 100644
--- a/devel/popt/pkg-plist
+++ b/devel/popt/pkg-plist
@@ -32,29 +32,5 @@ lib/libpopt.so.0
 %%NLS%%share/locale/wa/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/zh/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/popt.mo
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
-%%NLS%%@dirrmtry share/locale/sr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sr
-%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sl
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/no/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/no
-%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 %%NLS%%@dirrmtry share/locale/eu_ES/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/eu_ES
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
diff --git a/devel/portlet-api/Makefile b/devel/portlet-api/Makefile
index d0527458e4a9..03003d9fb461 100644
--- a/devel/portlet-api/Makefile
+++ b/devel/portlet-api/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	portlet-api
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.ibiblio.org/maven/portlet-api/jars/
 EXTRACT_SUFX=	.jar
diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile
index ba2d833063d0..1e59a102ebb8 100644
--- a/devel/preps-gui/Makefile
+++ b/devel/preps-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	preps
 PORTVERSION=	2.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://webpages.charter.net/stuffle/preps/download/files/
 PKGNAMESUFFIX=	-gui
diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile
index 49d2b1e18731..237247c0cdb4 100644
--- a/devel/prepstools/Makefile
+++ b/devel/prepstools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	prepstools
 PORTVERSION=	2.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://webpages.charter.net/stuffle/preps/download/files/
 
diff --git a/devel/present/Makefile b/devel/present/Makefile
index 9491b517344b..02af5cee9371 100644
--- a/devel/present/Makefile
+++ b/devel/present/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	present
 PORTVERSION=	0.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.0
diff --git a/devel/projectcenter.app/Makefile b/devel/projectcenter.app/Makefile
index fe2095417fec..890cd3220c51 100644
--- a/devel/projectcenter.app/Makefile
+++ b/devel/projectcenter.app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	projectcenter
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	dev-apps
diff --git a/devel/projectmanager/Makefile b/devel/projectmanager/Makefile
index d74cb3111b28..94fa3d1bfaff 100644
--- a/devel/projectmanager/Makefile
+++ b/devel/projectmanager/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	projectmanager
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://download.gna.org/pmanager/0.2/
 DISTNAME=	ProjectManager-${PORTVERSION}
diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile
index d569d0750ddf..ac761aa9f1b5 100644
--- a/devel/psvn/Makefile
+++ b/devel/psvn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	psvn
 PORTVERSION=	23396
+PORTREVISION=	1
 CATEGORIES=	devel elisp
 MASTER_SITES=	http://svn.collab.net/viewvc/*checkout*/svn/trunk/contrib/client-side/psvn/
 DISTNAME=	psvn.el\?pathrev=${PORTVERSION}
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index 1ce78ace479c..d48115d194b5 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	0.80.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome python
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 811a2191de93..ce1644a8366f 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	game
 PORTVERSION=	1.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	http://pygame.seul.org/ftp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile
index f8fd16730e4d..79ee89a4172e 100644
--- a/devel/py-notify/Makefile
+++ b/devel/py-notify/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	notify
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=python-
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/notify-python/
diff --git a/devel/py-ocempgui/Makefile b/devel/py-ocempgui/Makefile
index cad484bbd273..c9cf7ac1122b 100644
--- a/devel/py-ocempgui/Makefile
+++ b/devel/py-ocempgui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ocempgui
 PORTVERSION=	0.2.7
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ocemp
diff --git a/devel/py-ode/Makefile b/devel/py-ode/Makefile
index 4db40cd10a7d..039ca7222f6d 100644
--- a/devel/py-ode/Makefile
+++ b/devel/py-ode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ode
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	pyode
diff --git a/devel/py-pycallgraph/Makefile b/devel/py-pycallgraph/Makefile
index 17a42d7a3446..6ce6ecbfdcc2 100644
--- a/devel/py-pycallgraph/Makefile
+++ b/devel/py-pycallgraph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pycallgraph
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://pycallgraph.slowchop.com/files/download/ \
 		http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/
diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index cd23a0ef389c..05443d2ad7bd 100644
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	assistant
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index 03cda815974e..8e34d773b491 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	core
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index 09e3827a5ee9..d72b7d9933d5 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index 44c1ffd5d4ff..12b638969255 100644
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	designer
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile
index bae2a502cf2f..3afc1254c8b2 100644
--- a/devel/py-qt4-designerplugin/Makefile
+++ b/devel/py-qt4-designerplugin/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	designerplugin
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/devel/py-qt4-qct/Makefile b/devel/py-qt4-qct/Makefile
index f57aaea0b68e..230e17d06063 100644
--- a/devel/py-qt4-qct/Makefile
+++ b/devel/py-qt4-qct/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qct
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://qct.sourceforge.net/
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index ae6265c39ab9..84039d212782 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	qscintilla2
 PORTVERSION=	20070410
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/Snapshots/QScintilla2/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile
index fb368949d479..590fda9441b1 100644
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	test
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/devel/py-roxlib/Makefile b/devel/py-roxlib/Makefile
index c8c1d13e7e6c..40cd91c46416 100644
--- a/devel/py-roxlib/Makefile
+++ b/devel/py-roxlib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	roxlib
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
diff --git a/devel/py-unit/Makefile b/devel/py-unit/Makefile
index 0fc11afd21a0..acb8d1d77dbc 100644
--- a/devel/py-unit/Makefile
+++ b/devel/py-unit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	unit
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pyunit
diff --git a/devel/pymacs/Makefile b/devel/pymacs/Makefile
index d29b99bd5ef9..aa8c96e51073 100644
--- a/devel/pymacs/Makefile
+++ b/devel/pymacs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Pymacs
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	devel editors python elisp
 MASTER_SITES=	http://pymacs.progiciels-bpi.ca/archives/ \
 		${MASTER_SITE_GENTOO}
diff --git a/devel/pypersrc/Makefile b/devel/pypersrc/Makefile
index e017c56b14e0..0d289ac02ebb 100644
--- a/devel/pypersrc/Makefile
+++ b/devel/pypersrc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pypersrc
 PORTVERSION=	20060325
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.jimbrooks.org/pypersrc/ \
 		${MASTER_SITE_LOCAL}
diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index eb9ce571c6ba..c71c8c6c40f0 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qca
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel security
 MASTER_SITES=	http://delta.affinix.com/download/qca/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/qca/
diff --git a/devel/qct/Makefile b/devel/qct/Makefile
index f57aaea0b68e..230e17d06063 100644
--- a/devel/qct/Makefile
+++ b/devel/qct/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qct
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://qct.sourceforge.net/
diff --git a/devel/qextmdi/Makefile b/devel/qextmdi/Makefile
index 870b4000208a..c20844daf8b3 100644
--- a/devel/qextmdi/Makefile
+++ b/devel/qextmdi/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	qextmdi
 PORTVERSION=	2.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.geocities.com/gigafalk/qextmdi/
 EXTRACT_SUFX=	.tgz
diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile
index 5b6d25c16c9b..54fa4dbbea7b 100644
--- a/devel/qmake/Makefile
+++ b/devel/qmake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmake
 PORTVERSION=	3.3.8
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
diff --git a/devel/qsa/Makefile b/devel/qsa/Makefile
index e94f063dd6ba..0ad7dcf82cfb 100644
--- a/devel/qsa/Makefile
+++ b/devel/qsa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qsa
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_QT}
 MASTER_SITE_SUBDIR=../../qsa/source
diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile
index 9853d74ca54f..acc049d27ffd 100644
--- a/devel/qscintilla2-designerplugin/Makefile
+++ b/devel/qscintilla2-designerplugin/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	designerplugin
 PORTVERSION=	20070410
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/Snapshots/QScintilla2/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile
index a3156ab74a0d..680b7fde41e1 100644
--- a/devel/qscintilla2/Makefile
+++ b/devel/qscintilla2/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	qscintilla2
 PORTVERSION=	20070410
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/Snapshots/QScintilla2/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/devel/qssl/Makefile b/devel/qssl/Makefile
index 32ad798b57e3..bc24a7a21b0f 100644
--- a/devel/qssl/Makefile
+++ b/devel/qssl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qssl
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	devel security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	psi
diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile
index 5996b53ca788..4ff30149b466 100644
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	assistant
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index e4b4a3f05feb..a0e889c46958 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	designer
 PORTVERSION=	4.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 8bdbef3ea817..f45083de0ca6 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libQtAssistantClient
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index 45b2f56bd945..48baee29b381 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	linguist
 PORTVERSION=	4.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index e4bddbffc32c..c29e2a166671 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qt3support
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	devel x11-toolkits
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index 3033cc85f83d..e8f016d1d19d 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qvfb
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile
index 2d05d98f01bd..978a886f670e 100644
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	uic3
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile
index d24a4ee00e86..c8e06ce49474 100644
--- a/devel/qt4/Makefile
+++ b/devel/qt4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qt4
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# none
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index fa38c75b9774..bb4c62f57e30 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rapidsvn
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 PORTEVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.rapidsvn.org/download/release/${PORTVERSION}/
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 2b6519864845..0798863f0443 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		regexxer
 PORTVERSION=		0.9
+PORTREVISION=		1
 CATEGORIES=		devel textproc gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/regexxer/pkg-plist b/devel/regexxer/pkg-plist
index 0f77aa12e656..502209bfa79e 100644
--- a/devel/regexxer/pkg-plist
+++ b/devel/regexxer/pkg-plist
@@ -37,17 +37,5 @@ share/locale/zh_TW/LC_MESSAGES/regexxer.mo
 @dirrm share/gnome/regexxer
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pa/LC_MESSAGES
-@dirrmtry share/locale/pa
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/hu/LC_MESSAGES
-@dirrmtry share/locale/hu
-@dirrmtry share/locale/eu/LC_MESSAGES
-@dirrmtry share/locale/eu
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/locale/bg/LC_MESSAGES
-@dirrmtry share/locale/bg
-@dirrmtry share/locale/ar/LC_MESSAGES
-@dirrmtry share/locale/ar
diff --git a/devel/rhtvision/Makefile b/devel/rhtvision/Makefile
index a269bca123ce..b0f21bd218ed 100644
--- a/devel/rhtvision/Makefile
+++ b/devel/rhtvision/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rhtvision
 PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tvision
diff --git a/devel/root/Makefile b/devel/root/Makefile
index fdcc52208626..389a46ede840 100644
--- a/devel/root/Makefile
+++ b/devel/root/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		root
 PORTVERSION=		5.02.00
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		devel science math
 MASTER_SITES=		ftp://root.cern.ch/root/
 DISTNAME=		${PORTNAME}_v${PORTVERSION}.source
diff --git a/devel/rth/Makefile b/devel/rth/Makefile
index 076b3e817b2a..6445699eebbf 100644
--- a/devel/rth/Makefile
+++ b/devel/rth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rth
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rth
diff --git a/devel/ruby-ecore/Makefile b/devel/ruby-ecore/Makefile
index 1fa8162cfe41..46d3a98781ae 100644
--- a/devel/ruby-ecore/Makefile
+++ b/devel/ruby-ecore/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ecore
 PORTVERSION=	20061008
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/devel/ruby-game/Makefile b/devel/ruby-game/Makefile
index 8149d33bef34..a3222651db9b 100644
--- a/devel/ruby-game/Makefile
+++ b/devel/ruby-game/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	game
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://rubygame.seul.org/files/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/devel/ruby-gconf2/Makefile b/devel/ruby-gconf2/Makefile
index 80ca82ece884..a34014fec16f 100644
--- a/devel/ruby-gconf2/Makefile
+++ b/devel/ruby-gconf2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gconf2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	devel gnome ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/devel/ruby-gemfinder/Makefile b/devel/ruby-gemfinder/Makefile
index ff4169632296..6aef9e38f7ef 100644
--- a/devel/ruby-gemfinder/Makefile
+++ b/devel/ruby-gemfinder/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gemfinder
 PORTVERSION=	1.9.6
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://onestepback.org/packages/gemfinder/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/devel/ruby-gnomevfs/Makefile b/devel/ruby-gnomevfs/Makefile
index 38d376550874..72d96d1530dc 100644
--- a/devel/ruby-gnomevfs/Makefile
+++ b/devel/ruby-gnomevfs/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnomevfs
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	devel ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index 47034dd4e9d0..6da1cc0caa56 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnustep
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel lang ruby gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	libs
diff --git a/devel/ruby-libglade2/Makefile b/devel/ruby-libglade2/Makefile
index 6acb3beb0b85..19b4558db1a8 100644
--- a/devel/ruby-libglade2/Makefile
+++ b/devel/ruby-libglade2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libglade2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	devel ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/devel/ruby-rbbr/Makefile b/devel/ruby-rbbr/Makefile
index baf0d16c9290..96d78fbaedfa 100644
--- a/devel/ruby-rbbr/Makefile
+++ b/devel/ruby-rbbr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rbbr
 PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ruby-gnome2
diff --git a/devel/ruby-rudl/Makefile b/devel/ruby-rudl/Makefile
index 73299a7bc111..143ac0db53a4 100644
--- a/devel/ruby-rudl/Makefile
+++ b/devel/ruby-rudl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rudl
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
index fa0bb0d38a65..118cd08429a1 100644
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	1.3.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel graphics audio ruby
 MASTER_SITES=	http://www.kmc.gr.jp/~ohai/rubysdl/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/devel/rubygem-rubygame/Makefile b/devel/rubygem-rubygame/Makefile
index 8149d33bef34..a3222651db9b 100644
--- a/devel/rubygem-rubygame/Makefile
+++ b/devel/rubygem-rubygame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	game
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://rubygame.seul.org/files/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 9f89dda3ec8a..b631ca101dda 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile
index 3d9e9d4a5c79..1ec79841cc34 100644
--- a/devel/sdl_sge/Makefile
+++ b/devel/sdl_sge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_sge
 PORTVERSION=	0.030809
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.etek.chalmers.se/~e8cal1/sge/files/ \
 		http://www.digitalfanatics.org/cal/sge/files/
diff --git a/devel/sdlmm/Makefile b/devel/sdlmm/Makefile
index 8da82cebbb9e..4a260d7f5a6a 100644
--- a/devel/sdlmm/Makefile
+++ b/devel/sdlmm/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdlmm
 PORTVERSION=	0.1.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index 4da03c19bff9..2f7f9f68176c 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	semantic
 PORTVERSION=	1.4.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 2701a2f36b73..e2fa4f1b9ff3 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	SimGear
 PORTVERSION=	0.3.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel games
 MASTER_SITES=	ftp://ftp.simgear.org/pub/simgear/Source/ \
 		ftp://ftp.de.flightgear.org/pub/simgear/Source/
diff --git a/devel/simian/Makefile b/devel/simian/Makefile
index f11a86259d88..e7d3110e6813 100644
--- a/devel/simian/Makefile
+++ b/devel/simian/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	simian
 PORTVERSION=	2.2.17
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.redhillconsulting.com.au/products/simian/
 
diff --git a/devel/simulavr/Makefile b/devel/simulavr/Makefile
index a10d588c6ac5..755eebdee2aa 100644
--- a/devel/simulavr/Makefile
+++ b/devel/simulavr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	simulavr
 PORTVERSION=	0.1.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/smc/Makefile b/devel/smc/Makefile
index 6aca223e4bc1..463e85fbf8c0 100644
--- a/devel/smc/Makefile
+++ b/devel/smc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	smc
 PORTVERSION=	4.3.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/sourcenav/Makefile b/devel/sourcenav/Makefile
index 065f71544c8e..0c9c56b44b3a 100644
--- a/devel/sourcenav/Makefile
+++ b/devel/sourcenav/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sourcenav
 PORTVERSION=	5.1.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
diff --git a/devel/spin/Makefile b/devel/spin/Makefile
index d9cc1739d92b..11c1e2165ac7 100644
--- a/devel/spin/Makefile
+++ b/devel/spin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spin
 PORTVERSION=	4.2.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://spinroot.com/spin/Src/
 DISTNAME=	spin${PORTVERSION:S/.//g}
diff --git a/devel/subclipse/Makefile b/devel/subclipse/Makefile
index 3c2da8b81e7d..5d9a289b133b 100644
--- a/devel/subclipse/Makefile
+++ b/devel/subclipse/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	subclipse
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://subclipse.tigris.org/files/documents/906/36425
 DISTNAME=	site-${PORTVERSION}
diff --git a/devel/subversive/Makefile b/devel/subversive/Makefile
index 5f58bd842b0b..6abc33a62c54 100644
--- a/devel/subversive/Makefile
+++ b/devel/subversive/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	subversive
 DISTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.polarion.org/projects/subversive/download/1.1/builds/
 DISTNAME=	Subversive_${DISTVERSION}-LocalUpdateSite
diff --git a/devel/svnkit/Makefile b/devel/svnkit/Makefile
index e6a17eb14a4a..5643256c6e5f 100644
--- a/devel/svnkit/Makefile
+++ b/devel/svnkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	svnkit
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://svnkit.com/
 DISTNAME=	org.tmatesoft.svn_${PORTVERSION}.standalone
diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile
index 00646f9b49f1..1ccc67a929dd 100644
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	t1lib
 PORTVERSION=	5.1.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 4b2b0ca9e1ad..03b539de666b 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tclcl
 PORTVERSION=	1.19
+PORTREVISION=	1
 DISTVERSIONPREFIX=	src-
 CATEGORIES=	devel tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/devel/tinylaf/Makefile b/devel/tinylaf/Makefile
index 112dfd2d27e5..94e9b2476998 100644
--- a/devel/tinylaf/Makefile
+++ b/devel/tinylaf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tinylaf
 PORTVERSION=	1.3.05
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.muntjak.de/hans/java/tinylaf/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index ef11dbb96024..9bfaaff0bb20 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	titano
 PORTVERSION=	0.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/titano/pkg-plist b/devel/titano/pkg-plist
index 2ec921f35b29..323d2fd5ecc2 100644
--- a/devel/titano/pkg-plist
+++ b/devel/titano/pkg-plist
@@ -54,5 +54,4 @@ share/pixmaps/titano/gnome.png
 share/pixmaps/titano/gtk.png
 share/pixmaps/titano/logo.png
 @dirrm share/pixmaps/titano
-@dirrmtry share/pixmaps
 share/gnome/apps/Development/titano.desktop
diff --git a/devel/tkcon/Makefile b/devel/tkcon/Makefile
index 6007b0837fb1..36a46c62e84b 100644
--- a/devel/tkcon/Makefile
+++ b/devel/tkcon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkcon
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	devel tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 323324fce703..c661742bbd60 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkcvs
 PORTVERSION=	8.0.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.twobarleycorns.net/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/devel/tkinspect/Makefile b/devel/tkinspect/Makefile
index c7e98a055888..4f77929c2fcf 100644
--- a/devel/tkinspect/Makefile
+++ b/devel/tkinspect/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkinspect
 PORTVERSION=	5.1.6p10
+PORTREVISION=	1
 CATEGORIES=	devel tcl84 tk84
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=tkcon
diff --git a/devel/tkmerge/Makefile b/devel/tkmerge/Makefile
index 25d03923c1f7..e2c3f6106d70 100644
--- a/devel/tkmerge/Makefile
+++ b/devel/tkmerge/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkmerge
 PORTVERSION=	0.85
+PORTREVISION=	1
 CATEGORIES=	devel tk84
 MASTER_SITES=	http://immure.com/~bob/ports/tkmerge/
 
diff --git a/devel/tkp4/Makefile b/devel/tkp4/Makefile
index f6f36f4eb9a6..db1874c19757 100644
--- a/devel/tkp4/Makefile
+++ b/devel/tkp4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkp4
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel tk83 tk84
 MASTER_SITES=	http://www.timshel.ca/tkp4/
 
diff --git a/devel/tkref/Makefile b/devel/tkref/Makefile
index 1d2b940c9a2e..6113178745d5 100644
--- a/devel/tkref/Makefile
+++ b/devel/tkref/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkref
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	devel tk82
 MASTER_SITES=	http://gtcs.com/softdist/ \
 		${MASTER_SITE_LOCAL}
diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile
index 92a601bfaf8e..fb51d095984a 100644
--- a/devel/tmake/Makefile
+++ b/devel/tmake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tmake
 PORTVERSION=	1.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	ftp://ftp.trolltech.com/freebies/tmake/
 
diff --git a/devel/truc/Makefile b/devel/truc/Makefile
index 2ae6f3bab7fc..0b973c23b79f 100644
--- a/devel/truc/Makefile
+++ b/devel/truc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	truc
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	truc
diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 7b6d4100cfb7..53fac3c729dd 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	upp
 PORTVERSION=	2007.1
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/uppaal/Makefile b/devel/uppaal/Makefile
index 7310da4431d1..f5bdb96b141e 100644
--- a/devel/uppaal/Makefile
+++ b/devel/uppaal/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	uppaal
 PORTVERSION=	4.0.6
+PORTREVISION=	1
 CATEGORIES=	devel java linux
 
 MAINTAINER=	timbob@bigpond.com
diff --git a/devel/ups-debug/Makefile b/devel/ups-debug/Makefile
index 0a00e0c63c80..1cbb6ae87f6d 100644
--- a/devel/ups-debug/Makefile
+++ b/devel/ups-debug/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ups
 PORTVERSION=	3.38.b1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index 0df13f3b30a0..8c87b45fbce1 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vtcl
 PORTVERSION=	1.6.1a1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/wfut/Makefile b/devel/wfut/Makefile
index 7b0562b79b25..f9e1e20c24a5 100644
--- a/devel/wfut/Makefile
+++ b/devel/wfut/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wfut
 PORTVERSION=	42
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	oliver
diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile
index 8c4d4696ae20..67b31868bbfe 100644
--- a/devel/wininfo/Makefile
+++ b/devel/wininfo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		wininfo
 PORTVERSION=		0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=		devel
 MASTER_SITES=		http://www.freedesktop.org/software/wininfo/
 
diff --git a/devel/winpdb/Makefile b/devel/winpdb/Makefile
index 68ea14678a90..9782201d252b 100644
--- a/devel/winpdb/Makefile
+++ b/devel/winpdb/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	winpdb
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	SF
 
diff --git a/devel/wizardkit/Makefile b/devel/wizardkit/Makefile
index 2fae26535c67..8f0dd7173310 100644
--- a/devel/wizardkit/Makefile
+++ b/devel/wizardkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wizardkit
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://download.gna.org/pmanager/0.2/
 DISTNAME=	WizardKit-${PORTVERSION}
diff --git a/devel/wxGlade-devel/Makefile b/devel/wxGlade-devel/Makefile
index 5a7569937073..505a99099ff8 100644
--- a/devel/wxGlade-devel/Makefile
+++ b/devel/wxGlade-devel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	wxglade
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits python
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
diff --git a/devel/wxGlade/Makefile b/devel/wxGlade/Makefile
index 67f583547fcc..8def1a1dbaa4 100644
--- a/devel/wxGlade/Makefile
+++ b/devel/wxGlade/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	wxglade
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits python
 MASTER_SITES=	SF
 DISTNAME=	wxGlade-${PORTVERSION}
diff --git a/devel/xfc/Makefile b/devel/xfc/Makefile
index 9bdc71d7a7f5..b6af14762444 100644
--- a/devel/xfc/Makefile
+++ b/devel/xfc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfc
 PORTVERSION=	4.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel xfce
 MASTER_SITES=	http://xfc.xfce.org/download/${PORTVERSION}/src/
 
diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile
new file mode 100644
index 000000000000..45df4b0bd941
--- /dev/null
+++ b/devel/xorg-macros/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	xorg-macros
+# Date Created:				24 Mar 2007
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xorg-macros
+PORTVERSION=	1.1.5
+CATEGORIES=	x11
+DISTNAME=	util-macros-$(PORTVERSION)
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org development aclocal macros
+
+XORG_CAT=	util
+
+PLIST_FILES=	share/aclocal/xorgversion.m4 \
+		share/aclocal/xorg-macros.m4
+
+.include <bsd.port.mk>
diff --git a/devel/xorg-macros/distinfo b/devel/xorg-macros/distinfo
new file mode 100644
index 000000000000..9ceb0078fd5c
--- /dev/null
+++ b/devel/xorg-macros/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/util/util-macros-1.1.5.tar.bz2) = 51952682d8b42aeda3af5cee0133ce2c
+SHA256 (xorg/util/util-macros-1.1.5.tar.bz2) = 75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b
+SIZE (xorg/util/util-macros-1.1.5.tar.bz2) = 47165
diff --git a/devel/xorg-macros/pkg-descr b/devel/xorg-macros/pkg-descr
new file mode 100644
index 000000000000..bddd7c8c689e
--- /dev/null
+++ b/devel/xorg-macros/pkg-descr
@@ -0,0 +1,5 @@
+This package contains the aclocal macros needed for building xorg modules
+from upstream source.
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/devel/xtla/Makefile b/devel/xtla/Makefile
index 1c158bca090b..fc4db87c906d 100644
--- a/devel/xtla/Makefile
+++ b/devel/xtla/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtla
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel elisp
 MASTER_SITES=	http://download.gna.org/xtla-el/ \
diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile
index 0e36254694b6..8f1be7479ce0 100644
--- a/devel/xwpe/Makefile
+++ b/devel/xwpe/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xwpe
 PORTVERSION=	1.5.29a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.identicalsoftware.com/xwpe/ \
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index 70ef76876db9..cbc6b5d0d4fe 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xxgdb
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/dns/crossip/Makefile b/dns/crossip/Makefile
index e880e3e30393..8d6a26e08de9 100644
--- a/dns/crossip/Makefile
+++ b/dns/crossip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	crossip
 DISTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/dns/dnsjava/Makefile b/dns/dnsjava/Makefile
index 2836a54c0f4c..d95fe2efcb3b 100644
--- a/dns/dnsjava/Makefile
+++ b/dns/dnsjava/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dnsjava
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	dns java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/dns/gresolver/Makefile b/dns/gresolver/Makefile
index ffac66d155e4..af6143d19864 100644
--- a/dns/gresolver/Makefile
+++ b/dns/gresolver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gresolver
 PORTVERSION=	0.0.5
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://jodrell.net/files/gresolver/
 
diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile
index 92f1431c5ffb..d62955f731d4 100644
--- a/dns/nss_mdns/Makefile
+++ b/dns/nss_mdns/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nss_mdns
 PORTVERSION=	0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://0pointer.de/lennart/projects/nss-mdns/
 DISTNAME=	nss-mdns-${PORTVERSION}
diff --git a/dns/staticcharge/Makefile b/dns/staticcharge/Makefile
index 93e2d9b182be..5d6f19531a0a 100644
--- a/dns/staticcharge/Makefile
+++ b/dns/staticcharge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	staticcharge
 PORTVERSION=	0.7.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
 MASTER_SITES=	http://www.staticcling.org/clients/
 DISTNAME=	ChargeGTK-${PORTVERSION}
diff --git a/editors/MathPlanner/Makefile b/editors/MathPlanner/Makefile
index 237201fe46e0..d95605104be0 100644
--- a/editors/MathPlanner/Makefile
+++ b/editors/MathPlanner/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	MathPlanner
 PORTVERSION=	3.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://koti.mbnet.fi/jarmonik/ \
 		http://fresh.t-systems-sfr.com/unix/src/privat2/
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 53ac3fd9a217..50a7d2da82e0 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	abiword
 PORTVERSION=	2.4.6
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 278e64527b1c..a015c1c6dae3 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	abiword
 PORTVERSION=	2.4.6
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index cb5b016940f3..05f78dc8074d 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -292,7 +292,6 @@ share/pixmaps/abiword_48.png
 @dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord/glade
 @dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord
 @dirrm share/AbiSuite-%%ABIVERSION%%
-@dirrmtry share/pixmaps
 @exec /bin/mkdir -p %D/lib/AbiWord-%%ABIVERSION%%/plugins
 @dirrmtry lib/AbiWord-%%ABIVERSION%%/plugins
 @dirrmtry lib/AbiWord-%%ABIVERSION%%
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index d91396ed6750..df4f5451e306 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apel
 PORTVERSION=	${APEL_VER}
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/apel/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,elisp/jpl/elisp/apel,}
diff --git a/editors/asedit/Makefile b/editors/asedit/Makefile
index 6c2bd9c7fc0d..be72ca24da91 100644
--- a/editors/asedit/Makefile
+++ b/editors/asedit/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	asedit
 PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	editors
diff --git a/editors/axe/Makefile b/editors/axe/Makefile
index 9c7fab54c5cd..cf91e9aa527f 100644
--- a/editors/axe/Makefile
+++ b/editors/axe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aXe
 PORTVERSION=	6.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	editors
diff --git a/editors/bed/Makefile b/editors/bed/Makefile
index 47d50651b160..1fa2235745a1 100644
--- a/editors/bed/Makefile
+++ b/editors/bed/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bed
 PORTVERSION=	0.2.23
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://bedlinux.tripod.com/download/
 EXTRACT_SUFX=	.src.tar.gz
diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile
index a39243142827..2839544d8ce9 100644
--- a/editors/bitmap/Makefile
+++ b/editors/bitmap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bitmap
 PORTVERSION=	${BITMAP_VER}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/bitmap/ \
 		ftp://ftp.jpl.org/pub/elisp/bitmap/snapshots/
diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index e64c3e19b1e8..a19f31710d06 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	bless
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://download.gna.org/bless/
diff --git a/editors/calligra-l10n-ca/Makefile b/editors/calligra-l10n-ca/Makefile
index b4bd5f13bd25..edd3c17689e2 100644
--- a/editors/calligra-l10n-ca/Makefile
+++ b/editors/calligra-l10n-ca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/calligra-l10n-da/Makefile b/editors/calligra-l10n-da/Makefile
index d30b137918ee..58eeabfa8e82 100644
--- a/editors/calligra-l10n-da/Makefile
+++ b/editors/calligra-l10n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/calligra-l10n-el/Makefile b/editors/calligra-l10n-el/Makefile
index c88ced91fae5..0fb3423786da 100644
--- a/editors/calligra-l10n-el/Makefile
+++ b/editors/calligra-l10n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/calligra-l10n-en_GB/Makefile b/editors/calligra-l10n-en_GB/Makefile
index 2ceee8de12a2..85760b4ce37a 100644
--- a/editors/calligra-l10n-en_GB/Makefile
+++ b/editors/calligra-l10n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/calligra-l10n-es/Makefile b/editors/calligra-l10n-es/Makefile
index 22bf89236885..fe8ef8d4467d 100644
--- a/editors/calligra-l10n-es/Makefile
+++ b/editors/calligra-l10n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde spanish
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/calligra-l10n-et/Makefile b/editors/calligra-l10n-et/Makefile
index 7f2db742519a..34673dd52a15 100644
--- a/editors/calligra-l10n-et/Makefile
+++ b/editors/calligra-l10n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/calligra-l10n-it/Makefile b/editors/calligra-l10n-it/Makefile
index a5913ca8a679..f6ffc3023b6e 100644
--- a/editors/calligra-l10n-it/Makefile
+++ b/editors/calligra-l10n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/calligra-l10n-nb/Makefile b/editors/calligra-l10n-nb/Makefile
index d0b367291515..c6a4f3f7feb8 100644
--- a/editors/calligra-l10n-nb/Makefile
+++ b/editors/calligra-l10n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/calligra-l10n-nl/Makefile b/editors/calligra-l10n-nl/Makefile
index 07f2907f9abf..2411d50c0953 100644
--- a/editors/calligra-l10n-nl/Makefile
+++ b/editors/calligra-l10n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/calligra-l10n-sv/Makefile b/editors/calligra-l10n-sv/Makefile
index d3a487787ce0..91bbabbc5a94 100644
--- a/editors/calligra-l10n-sv/Makefile
+++ b/editors/calligra-l10n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile
index 8cdef1089255..5993a4a7d55c 100644
--- a/editors/calligra-l10n/Makefile
+++ b/editors/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index ef53f99fcc71..9e42157b7aae 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/editors/code-browser/Makefile b/editors/code-browser/Makefile
index 4815d0b1579c..1d65003db836 100644
--- a/editors/code-browser/Makefile
+++ b/editors/code-browser/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	code-browser
 PORTVERSION=	2.13
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/codeeditor/Makefile b/editors/codeeditor/Makefile
index 8d6bd1452963..7fd5445b72ee 100644
--- a/editors/codeeditor/Makefile
+++ b/editors/codeeditor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	codeeditor
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	editors gnustep
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	codeeditor
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index c95445098711..88f8a09b641d 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	conglomerate
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 0b7d96c9ba68..2201f1f52b77 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cooledit
 PORTVERSION=	3.17.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/editors/X/cooledit
diff --git a/editors/cooledit/pkg-plist b/editors/cooledit/pkg-plist
index 04587ce63ddd..bfdac7962a0e 100644
--- a/editors/cooledit/pkg-plist
+++ b/editors/cooledit/pkg-plist
@@ -61,17 +61,3 @@ share/locale/sl/LC_MESSAGES/cooledit.mo
 share/locale/sv/LC_MESSAGES/cooledit.mo
 @dirrm %%DATADIR%%/syntax
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
diff --git a/editors/cream/Makefile b/editors/cream/Makefile
index ee29b5222647..a9a1bf32e25a 100644
--- a/editors/cream/Makefile
+++ b/editors/cream/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cream
 PORTVERSION=	0.38
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/cream/pkg-plist b/editors/cream/pkg-plist
index c2a29e579d8c..8d8c04e86066 100644
--- a/editors/cream/pkg-plist
+++ b/editors/cream/pkg-plist
@@ -234,5 +234,4 @@ share/pixmaps/cream.svg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs-html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index 23ab60d35b8c..cb5e58ddb228 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dedit
 PORTVERSION=	0.6.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/editors/doxymacs/Makefile b/editors/doxymacs/Makefile
index 636f12e651c4..f6cb59e9ea83 100644
--- a/editors/doxymacs/Makefile
+++ b/editors/doxymacs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	doxymacs
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/editors/drjava/Makefile b/editors/drjava/Makefile
index 9ee68cc1e19c..0e15bf28384c 100644
--- a/editors/drjava/Makefile
+++ b/editors/drjava/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	drjava
 PORTVERSION=	20070130.2255
+PORTREVISION=	1
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/e93/Makefile b/editors/e93/Makefile
index e700ae6748ce..01bfd9514e72 100644
--- a/editors/e93/Makefile
+++ b/editors/e93/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	e93
 PORTVERSION=	1.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors tcl84 tk84
 MASTER_SITES=	ftp://ftp.e93.org/pub/ \
   		http://www.crpetsmoker.net/distfiles/ \
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index b3225d27c1ee..9b597cc5cf0b 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elvis
 PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cs.pdx.edu/pub/elvis/ \
 		ftp://ftp.false.com/pub/elvis/ \
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 5487dc26374d..7404a21189c2 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
+PORTREVISION=	1
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	emacs/pretest
diff --git a/editors/emacs.app/Makefile b/editors/emacs.app/Makefile
index a2fc62cd16d2..9e44764f50d6 100644
--- a/editors/emacs.app/Makefile
+++ b/editors/emacs.app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emacs.app
 PORTVERSION=	9.0
+PORTREVISION=	1
 CATEGORIES=	editors gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	emacs-app
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index e4cdc948fe90..496ab7f6b9d2 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	21.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	editors ipv6
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index d4aa53a63702..c087b413fd08 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	19.34b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
@@ -32,6 +32,7 @@ USE_GMAKE=	yes
 .if !defined(WITHOUT_X11)
 CONFIGURE_ARGS=	--with-x-toolkit --sharedstatedir=/var/run
 USE_XLIB=	yes
+USE_XORG=	xbitmaps
 .else
 CONFIGURE_ARGS=	--with-x=no --sharedstatedir=/var/run
 .endif
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 5668f6664997..2fa9decdfaaf 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES+=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
@@ -33,6 +33,7 @@ CONFIGURE_ARGS=	--with-x=no --with-pop
 .else
 CONFIGURE_ARGS=	--with-x-toolkit --with-pop
 USE_XLIB=	yes
+USE_XORG=	xbitmaps
 .endif
 CONFIGURE_ARGS+=	--with-line-space \
 	--bindir='$${archlibdir}' \
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index e4cdc948fe90..496ab7f6b9d2 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	21.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	editors ipv6
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index e4cdc948fe90..496ab7f6b9d2 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	21.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	editors ipv6
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/etoile-typewriter/Makefile b/editors/etoile-typewriter/Makefile
index 9b3b7730b083..3cf0aa6361a8 100644
--- a/editors/etoile-typewriter/Makefile
+++ b/editors/etoile-typewriter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typewriter
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	editors gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/editors/f4l/Makefile b/editors/f4l/Makefile
index 7e5170a75b4d..f0a1807182a5 100644
--- a/editors/f4l/Makefile
+++ b/editors/f4l/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	f4l
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	editors multimedia www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 5eb28229e79e..f98e7ad9affc 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flim
 PORTVERSION=	${FLIM_VER}
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/flim-1.14/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile
index 56dc92b360fc..e6d1e0646cb6 100644
--- a/editors/flim113/Makefile
+++ b/editors/flim113/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flim
 PORTVERSION=	${FLIM_VER}
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/flim/flim-1.13/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.13/
diff --git a/editors/fte/Makefile b/editors/fte/Makefile
index 2e9c46135772..3c1527727136 100644
--- a/editors/fte/Makefile
+++ b/editors/fte/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		fte
 PORTVERSION=		20051115
+PORTREVISION=	1
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 009e050151d4..757529260495 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index c478b734c650..7c10f9e54f3e 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -109,47 +109,9 @@ share/locale/zh_CN/LC_MESSAGES/gedit-plugins.mo
 share/locale/zh_HK/LC_MESSAGES/gedit-plugins.mo
 share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo
 %%PYTHON%%@dirrm lib/gedit-2/plugins/sessionsaver
-@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/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/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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 2ec4f7419174..6f271f63d53d 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gedit
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index fea908b55b3d..652b24f3e42c 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -456,38 +456,14 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
 @dirrm include/gedit-%%VERSION%%
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
@@ -496,23 +472,9 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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/editors/ghex/Makefile b/editors/ghex/Makefile
index e0b9fb11d420..60029766113e 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghex
 PORTVERSION=	2.8.2
+PORTREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index 082496a7dc1e..bc357052a640 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glimmer
 PORTVERSION=	1.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors gnome python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile
index 82dba2b86872..4c2f73ac4427 100644
--- a/editors/gmanedit/Makefile
+++ b/editors/gmanedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmanedit
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors gnome
 MASTER_SITES=	http://gmanedit.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/editors/gnome2-office/Makefile b/editors/gnome2-office/Makefile
index 3c661fc92b45..337e5447cb15 100644
--- a/editors/gnome2-office/Makefile
+++ b/editors/gnome2-office/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/editors/gnome2-office/Makefile,v 1.41 2006/04/12 22:11:33 marcus Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	editors gnome
 PKGNAMESUFFIX=	-office
 
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 2c1a6d1904ea..8b930089c51f 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnotepad+
 PORTVERSION=	1.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnotepad
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index d3e394ee6684..6e8688615011 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnuserv
 PORTVERSION=	3.12.7
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://meltin.net/hacks/emacs/src/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 6d225f8fea53..72c720578c3a 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gobby
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://releases.0x539.de/gobby/ \
 		http://www.atarininja.org/~wxs/distfiles/
@@ -30,7 +31,7 @@ PLIST_FILES=	bin/gobby share/pixmaps/gobby.png \
 		share/pixmaps/gobby/userlist.png \
 		share/pixmaps/gobby/doclist.png \
 		share/pixmaps/gobby/chat.png
-PLIST_DIRS=	share/pixmaps/gobby share/pixmaps
+PLIST_DIRS=	share/pixmaps/gobby
 
 MAN1=	gobby.1
 
diff --git a/editors/gphpedit/Makefile b/editors/gphpedit/Makefile
index 5bfc3fc651c0..d69955e65e4b 100644
--- a/editors/gphpedit/Makefile
+++ b/editors/gphpedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gphpedit
 PORTVERSION=	0.9.80
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors gnome
 MASTER_SITES=	http://www.gphpedit.org/download/store/ \
 		http://ftp.ceid.upatras.gr/pub/linux/gentoo/distfiles/ \
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index fbef43536a74..2bcab086946a 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	hte
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/iiimecf/Makefile b/editors/iiimecf/Makefile
index 36b17d645f13..e0d41023376b 100644
--- a/editors/iiimecf/Makefile
+++ b/editors/iiimecf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	iiimecf
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.kddlabs.co.jp/Japan/m17n.org/mule/IIIM/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/impress/Makefile b/editors/impress/Makefile
index e03a81045c4b..5137bffd1e65 100644
--- a/editors/impress/Makefile
+++ b/editors/impress/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	impress
 PORTVERSION=	1.1b9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors tk84
 MASTER_SITES=	TUCOWS http://fresh.t-systems-sfr.com/unix/src/privat2/ \
 		ftp://ftp.plig.net/pub/OpenBSD/distfiles/ \
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 7192409482f3..b329fae7acf6 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jed
 PORTVERSION=	0.99.18
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/jed/v${PORTVERSION:R}/ \
 		ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v${PORTVERSION:R}/ \
diff --git a/editors/jedit-devel/Makefile b/editors/jedit-devel/Makefile
index 2b103c590cc7..26fe5de58551 100644
--- a/editors/jedit-devel/Makefile
+++ b/editors/jedit-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jedit
 PORTVERSION=	4.3.p9
+PORTREVISION=	1
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/jedit/Makefile b/editors/jedit/Makefile
index 7e2d85949dad..6565d41a1200 100644
--- a/editors/jedit/Makefile
+++ b/editors/jedit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jedit
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/jext/Makefile b/editors/jext/Makefile
index f8824cc3964e..15bbb7d3c81e 100644
--- a/editors/jext/Makefile
+++ b/editors/jext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jext
 PORTVERSION=	3.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jext
diff --git a/editors/kate-plugins/Makefile b/editors/kate-plugins/Makefile
index e5af1eacd279..f935325a3d7f 100644
--- a/editors/kate-plugins/Makefile
+++ b/editors/kate-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${KATEPLUGINS_PORTNAME}
 PORTVERSION=	${KATEPLUGINS_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${KATEPLUGINS_PORTREVISION}
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
index 0fcf5a5eb98f..7c4eb8e4b614 100644
--- a/editors/kile-kde4/Makefile
+++ b/editors/kile-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kile
 PORTVERSION=	1.9.3
+PORTREVISION=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/kile-kde4/pkg-plist b/editors/kile-kde4/pkg-plist
index 8e231ab3e64e..705b67f8d0ed 100644
--- a/editors/kile-kde4/pkg-plist
+++ b/editors/kile-kde4/pkg-plist
@@ -1039,34 +1039,8 @@ share/locale/tr/LC_MESSAGES/kile.mo
 share/locale/uk/LC_MESSAGES/kile.mo
 share/locale/zh_CN/LC_MESSAGES/kile.mo
 share/mimelnk/text/x-kilepr.desktop
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/doc/HTML/sv/kile
 @dirrm share/doc/HTML/pt/kile
 @dirrm share/doc/HTML/nl/kile
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 0fcf5a5eb98f..7c4eb8e4b614 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kile
 PORTVERSION=	1.9.3
+PORTREVISION=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/kile/pkg-plist b/editors/kile/pkg-plist
index 8e231ab3e64e..705b67f8d0ed 100644
--- a/editors/kile/pkg-plist
+++ b/editors/kile/pkg-plist
@@ -1039,34 +1039,8 @@ share/locale/tr/LC_MESSAGES/kile.mo
 share/locale/uk/LC_MESSAGES/kile.mo
 share/locale/zh_CN/LC_MESSAGES/kile.mo
 share/mimelnk/text/x-kilepr.desktop
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/doc/HTML/sv/kile
 @dirrm share/doc/HTML/pt/kile
 @dirrm share/doc/HTML/nl/kile
diff --git a/editors/klat/Makefile b/editors/klat/Makefile
index 8598f1b105e5..c5fde2f9b594 100644
--- a/editors/klat/Makefile
+++ b/editors/klat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	klat
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://research.edm.uhasselt.be/jori/klat/ \
 		http://research.edm.luc.ac.be/jori/klat/
diff --git a/editors/klat4/Makefile b/editors/klat4/Makefile
index 8598f1b105e5..c5fde2f9b594 100644
--- a/editors/klat4/Makefile
+++ b/editors/klat4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	klat
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://research.edm.uhasselt.be/jori/klat/ \
 		http://research.edm.luc.ac.be/jori/klat/
diff --git a/editors/koffice-i18n-af/Makefile b/editors/koffice-i18n-af/Makefile
index e4b9ec692332..c4b8ef003f59 100644
--- a/editors/koffice-i18n-af/Makefile
+++ b/editors/koffice-i18n-af/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n/
diff --git a/editors/koffice-i18n-bg/Makefile b/editors/koffice-i18n-bg/Makefile
index 2ecbec660515..61ad16bb6803 100644
--- a/editors/koffice-i18n-bg/Makefile
+++ b/editors/koffice-i18n-bg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-br/Makefile b/editors/koffice-i18n-br/Makefile
index 8fd8edc0fb11..b789af177a69 100644
--- a/editors/koffice-i18n-br/Makefile
+++ b/editors/koffice-i18n-br/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-bs/Makefile b/editors/koffice-i18n-bs/Makefile
index 7de5ad949abf..4b0157e0af0f 100644
--- a/editors/koffice-i18n-bs/Makefile
+++ b/editors/koffice-i18n-bs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-ca/Makefile b/editors/koffice-i18n-ca/Makefile
index b4bd5f13bd25..edd3c17689e2 100644
--- a/editors/koffice-i18n-ca/Makefile
+++ b/editors/koffice-i18n-ca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-cs/Makefile b/editors/koffice-i18n-cs/Makefile
index 49126017d9aa..017b80526efa 100644
--- a/editors/koffice-i18n-cs/Makefile
+++ b/editors/koffice-i18n-cs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-cy/Makefile b/editors/koffice-i18n-cy/Makefile
index ea51b9d6672c..373ae03cb3b0 100644
--- a/editors/koffice-i18n-cy/Makefile
+++ b/editors/koffice-i18n-cy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-da/Makefile b/editors/koffice-i18n-da/Makefile
index d30b137918ee..58eeabfa8e82 100644
--- a/editors/koffice-i18n-da/Makefile
+++ b/editors/koffice-i18n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-el/Makefile b/editors/koffice-i18n-el/Makefile
index c88ced91fae5..0fb3423786da 100644
--- a/editors/koffice-i18n-el/Makefile
+++ b/editors/koffice-i18n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-en_GB/Makefile b/editors/koffice-i18n-en_GB/Makefile
index 2ceee8de12a2..85760b4ce37a 100644
--- a/editors/koffice-i18n-en_GB/Makefile
+++ b/editors/koffice-i18n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-eo/Makefile b/editors/koffice-i18n-eo/Makefile
index 86a742fdc68a..e398b2bff3a6 100644
--- a/editors/koffice-i18n-eo/Makefile
+++ b/editors/koffice-i18n-eo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-es/Makefile b/editors/koffice-i18n-es/Makefile
index 22bf89236885..fe8ef8d4467d 100644
--- a/editors/koffice-i18n-es/Makefile
+++ b/editors/koffice-i18n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde spanish
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-et/Makefile b/editors/koffice-i18n-et/Makefile
index 7f2db742519a..34673dd52a15 100644
--- a/editors/koffice-i18n-et/Makefile
+++ b/editors/koffice-i18n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-eu/Makefile b/editors/koffice-i18n-eu/Makefile
index f1a3591b8054..675cf0c91d76 100644
--- a/editors/koffice-i18n-eu/Makefile
+++ b/editors/koffice-i18n-eu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-fa/Makefile b/editors/koffice-i18n-fa/Makefile
index 3973b3ccdea8..619c3a17cec6 100644
--- a/editors/koffice-i18n-fa/Makefile
+++ b/editors/koffice-i18n-fa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-fi/Makefile b/editors/koffice-i18n-fi/Makefile
index cf720071bf73..d1c864407b5a 100644
--- a/editors/koffice-i18n-fi/Makefile
+++ b/editors/koffice-i18n-fi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-ga/Makefile b/editors/koffice-i18n-ga/Makefile
index 672d43e4ecb6..1c5188ff7dbf 100644
--- a/editors/koffice-i18n-ga/Makefile
+++ b/editors/koffice-i18n-ga/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-gl/Makefile b/editors/koffice-i18n-gl/Makefile
index d91721e5ce05..56633f036c10 100644
--- a/editors/koffice-i18n-gl/Makefile
+++ b/editors/koffice-i18n-gl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-hi/Makefile b/editors/koffice-i18n-hi/Makefile
index 7b830f40a021..de510025815e 100644
--- a/editors/koffice-i18n-hi/Makefile
+++ b/editors/koffice-i18n-hi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-hsb/Makefile b/editors/koffice-i18n-hsb/Makefile
index 7a2bc5d1df7f..68528fdc2f8d 100644
--- a/editors/koffice-i18n-hsb/Makefile
+++ b/editors/koffice-i18n-hsb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/editors/koffice-i18n-is/Makefile b/editors/koffice-i18n-is/Makefile
index a1271111d093..5fb8c04a1966 100644
--- a/editors/koffice-i18n-is/Makefile
+++ b/editors/koffice-i18n-is/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-it/Makefile b/editors/koffice-i18n-it/Makefile
index a5913ca8a679..f6ffc3023b6e 100644
--- a/editors/koffice-i18n-it/Makefile
+++ b/editors/koffice-i18n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-km/Makefile b/editors/koffice-i18n-km/Makefile
index 0931776a6a16..8c09f634ca2f 100644
--- a/editors/koffice-i18n-km/Makefile
+++ b/editors/koffice-i18n-km/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-lo/Makefile b/editors/koffice-i18n-lo/Makefile
index cf87b1235830..eceaec885a4a 100644
--- a/editors/koffice-i18n-lo/Makefile
+++ b/editors/koffice-i18n-lo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/editors/koffice-i18n-lt/Makefile b/editors/koffice-i18n-lt/Makefile
index 9d620d27b56e..24db363899d1 100644
--- a/editors/koffice-i18n-lt/Makefile
+++ b/editors/koffice-i18n-lt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-lv/Makefile b/editors/koffice-i18n-lv/Makefile
index 106daf74b643..fa7ec73cf827 100644
--- a/editors/koffice-i18n-lv/Makefile
+++ b/editors/koffice-i18n-lv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-mk/Makefile b/editors/koffice-i18n-mk/Makefile
index 45a7dce0da58..f8b26b27f915 100644
--- a/editors/koffice-i18n-mk/Makefile
+++ b/editors/koffice-i18n-mk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-ms/Makefile b/editors/koffice-i18n-ms/Makefile
index 143d7c5f7fdb..54884f2cbe9f 100644
--- a/editors/koffice-i18n-ms/Makefile
+++ b/editors/koffice-i18n-ms/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-mt/Makefile b/editors/koffice-i18n-mt/Makefile
index d407f02227af..eb8428d5a52d 100644
--- a/editors/koffice-i18n-mt/Makefile
+++ b/editors/koffice-i18n-mt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/editors/koffice-i18n-nb/Makefile b/editors/koffice-i18n-nb/Makefile
index d0b367291515..c6a4f3f7feb8 100644
--- a/editors/koffice-i18n-nb/Makefile
+++ b/editors/koffice-i18n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-nl/Makefile b/editors/koffice-i18n-nl/Makefile
index 07f2907f9abf..2411d50c0953 100644
--- a/editors/koffice-i18n-nl/Makefile
+++ b/editors/koffice-i18n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-nn/Makefile b/editors/koffice-i18n-nn/Makefile
index fde1226727f6..9f6376e6e4ab 100644
--- a/editors/koffice-i18n-nn/Makefile
+++ b/editors/koffice-i18n-nn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-ro/Makefile b/editors/koffice-i18n-ro/Makefile
index 9032169e0637..e27d0af1b79f 100644
--- a/editors/koffice-i18n-ro/Makefile
+++ b/editors/koffice-i18n-ro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-se/Makefile b/editors/koffice-i18n-se/Makefile
index 9763599d3b81..8808112a3081 100644
--- a/editors/koffice-i18n-se/Makefile
+++ b/editors/koffice-i18n-se/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-sk/Makefile b/editors/koffice-i18n-sk/Makefile
index fb5d0adf4a3b..ae19ada8c266 100644
--- a/editors/koffice-i18n-sk/Makefile
+++ b/editors/koffice-i18n-sk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-sl/Makefile b/editors/koffice-i18n-sl/Makefile
index a4ae3da03d9e..cc3c209eb719 100644
--- a/editors/koffice-i18n-sl/Makefile
+++ b/editors/koffice-i18n-sl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-sr/Makefile b/editors/koffice-i18n-sr/Makefile
index 12976dc3fbdd..e1fca0b2c0a4 100644
--- a/editors/koffice-i18n-sr/Makefile
+++ b/editors/koffice-i18n-sr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-sr@Latn/Makefile b/editors/koffice-i18n-sr@Latn/Makefile
index ef6cb3f78c8f..a386b2c5f925 100644
--- a/editors/koffice-i18n-sr@Latn/Makefile
+++ b/editors/koffice-i18n-sr@Latn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-sr_Latn/Makefile b/editors/koffice-i18n-sr_Latn/Makefile
index ef6cb3f78c8f..a386b2c5f925 100644
--- a/editors/koffice-i18n-sr_Latn/Makefile
+++ b/editors/koffice-i18n-sr_Latn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-sv/Makefile b/editors/koffice-i18n-sv/Makefile
index d3a487787ce0..91bbabbc5a94 100644
--- a/editors/koffice-i18n-sv/Makefile
+++ b/editors/koffice-i18n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-ta/Makefile b/editors/koffice-i18n-ta/Makefile
index 2de79fb19713..34939ef05142 100644
--- a/editors/koffice-i18n-ta/Makefile
+++ b/editors/koffice-i18n-ta/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-tg/Makefile b/editors/koffice-i18n-tg/Makefile
index 53952441adfe..4dbac99b9344 100644
--- a/editors/koffice-i18n-tg/Makefile
+++ b/editors/koffice-i18n-tg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-th/Makefile b/editors/koffice-i18n-th/Makefile
index a6554304a092..ac2e27ade196 100644
--- a/editors/koffice-i18n-th/Makefile
+++ b/editors/koffice-i18n-th/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/editors/koffice-i18n-tr/Makefile b/editors/koffice-i18n-tr/Makefile
index d8370e503c5d..16d95bb52935 100644
--- a/editors/koffice-i18n-tr/Makefile
+++ b/editors/koffice-i18n-tr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-uz/Makefile b/editors/koffice-i18n-uz/Makefile
index b68dddb6bbc6..48c5d904c5c0 100644
--- a/editors/koffice-i18n-uz/Makefile
+++ b/editors/koffice-i18n-uz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-i18n-uz/pkg-plist b/editors/koffice-i18n-uz/pkg-plist
index 004d1c86c9fa..b7c61cacebf5 100644
--- a/editors/koffice-i18n-uz/pkg-plist
+++ b/editors/koffice-i18n-uz/pkg-plist
@@ -23,5 +23,3 @@ share/locale/uz/LC_MESSAGES/kthesaurus.mo
 share/locale/uz/LC_MESSAGES/kugar.mo
 share/locale/uz/LC_MESSAGES/kword.mo
 share/locale/uz/LC_MESSAGES/thesaurus_tool.mo
-@dirrm share/locale/uz/LC_MESSAGES
-@dirrm share/locale/uz
diff --git a/editors/koffice-i18n-ven/Makefile b/editors/koffice-i18n-ven/Makefile
index 852f90d03a4e..245d7d58ceb7 100644
--- a/editors/koffice-i18n-ven/Makefile
+++ b/editors/koffice-i18n-ven/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/editors/koffice-i18n-xh/Makefile b/editors/koffice-i18n-xh/Makefile
index fdb440f6d59a..04703d316bd9 100644
--- a/editors/koffice-i18n-xh/Makefile
+++ b/editors/koffice-i18n-xh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/editors/koffice-i18n-zu/Makefile b/editors/koffice-i18n-zu/Makefile
index a4e08e99df21..9af9419fcd19 100644
--- a/editors/koffice-i18n-zu/Makefile
+++ b/editors/koffice-i18n-zu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/editors/koffice-i18n/Makefile b/editors/koffice-i18n/Makefile
index 8cdef1089255..5993a4a7d55c 100644
--- a/editors/koffice-i18n/Makefile
+++ b/editors/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index ef53f99fcc71..9e42157b7aae 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/editors/koffice-kde4-l10n-ca/Makefile b/editors/koffice-kde4-l10n-ca/Makefile
index b4bd5f13bd25..edd3c17689e2 100644
--- a/editors/koffice-kde4-l10n-ca/Makefile
+++ b/editors/koffice-kde4-l10n-ca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-da/Makefile b/editors/koffice-kde4-l10n-da/Makefile
index d30b137918ee..58eeabfa8e82 100644
--- a/editors/koffice-kde4-l10n-da/Makefile
+++ b/editors/koffice-kde4-l10n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-el/Makefile b/editors/koffice-kde4-l10n-el/Makefile
index c88ced91fae5..0fb3423786da 100644
--- a/editors/koffice-kde4-l10n-el/Makefile
+++ b/editors/koffice-kde4-l10n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-en_GB/Makefile b/editors/koffice-kde4-l10n-en_GB/Makefile
index 2ceee8de12a2..85760b4ce37a 100644
--- a/editors/koffice-kde4-l10n-en_GB/Makefile
+++ b/editors/koffice-kde4-l10n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-es/Makefile b/editors/koffice-kde4-l10n-es/Makefile
index 22bf89236885..fe8ef8d4467d 100644
--- a/editors/koffice-kde4-l10n-es/Makefile
+++ b/editors/koffice-kde4-l10n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde spanish
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-et/Makefile b/editors/koffice-kde4-l10n-et/Makefile
index 7f2db742519a..34673dd52a15 100644
--- a/editors/koffice-kde4-l10n-et/Makefile
+++ b/editors/koffice-kde4-l10n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-gl/Makefile b/editors/koffice-kde4-l10n-gl/Makefile
index d91721e5ce05..56633f036c10 100644
--- a/editors/koffice-kde4-l10n-gl/Makefile
+++ b/editors/koffice-kde4-l10n-gl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-it/Makefile b/editors/koffice-kde4-l10n-it/Makefile
index a5913ca8a679..f6ffc3023b6e 100644
--- a/editors/koffice-kde4-l10n-it/Makefile
+++ b/editors/koffice-kde4-l10n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-nb/Makefile b/editors/koffice-kde4-l10n-nb/Makefile
index d0b367291515..c6a4f3f7feb8 100644
--- a/editors/koffice-kde4-l10n-nb/Makefile
+++ b/editors/koffice-kde4-l10n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-nl/Makefile b/editors/koffice-kde4-l10n-nl/Makefile
index 07f2907f9abf..2411d50c0953 100644
--- a/editors/koffice-kde4-l10n-nl/Makefile
+++ b/editors/koffice-kde4-l10n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-sv/Makefile b/editors/koffice-kde4-l10n-sv/Makefile
index d3a487787ce0..91bbabbc5a94 100644
--- a/editors/koffice-kde4-l10n-sv/Makefile
+++ b/editors/koffice-kde4-l10n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-tr/Makefile b/editors/koffice-kde4-l10n-tr/Makefile
index d8370e503c5d..16d95bb52935 100644
--- a/editors/koffice-kde4-l10n-tr/Makefile
+++ b/editors/koffice-kde4-l10n-tr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n/Makefile b/editors/koffice-kde4-l10n/Makefile
index 8cdef1089255..5993a4a7d55c 100644
--- a/editors/koffice-kde4-l10n/Makefile
+++ b/editors/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index ef53f99fcc71..9e42157b7aae 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
index 8785c26ebfe8..67028eafe301 100644
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kxmleditor
 PORTVERSION=	1.1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 2a8fc753c372..2bb6dbd1766f 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lazarus
 PORTVERSION=	0.9.22
+PORTREVISION=	1
 CATEGORIES=	editors devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/$/-0/}
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 043179cb3149..8fb2febab152 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	leafpad
 PORTVERSION=	0.8.9
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/leafpad/pkg-plist b/editors/leafpad/pkg-plist
index 58f26f0e52eb..941b037b7c61 100644
--- a/editors/leafpad/pkg-plist
+++ b/editors/leafpad/pkg-plist
@@ -24,23 +24,6 @@ share/locale/zh_CN/LC_MESSAGES/leafpad.mo
 share/locale/zh_TW/LC_MESSAGES/leafpad.mo
 share/pixmaps/leafpad.png
 share/pixmaps/leafpad.xpm
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@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
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index 9cc8962b51e3..9b7e5f091ca8 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	leim
 PORTVERSION=	20.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
diff --git a/editors/leim21/Makefile b/editors/leim21/Makefile
index fd73e5e99b86..ea112c07a97a 100644
--- a/editors/leim21/Makefile
+++ b/editors/leim21/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	leim
 PORTVERSION=	21.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index 750377e2acbe..f6d5b1ced668 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	leo
 PORTVERSION=	4.2.1
+PORTREVISION=	1
 CATEGORIES=	editors python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile
index 9c3f49e37393..31810d51504d 100644
--- a/editors/lfhex/Makefile
+++ b/editors/lfhex/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	lfhex
 PORTVERSION=	0.3.7.2
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://stoopidsimple.com/files/ \
 		http://home.earthlink.net/~eyekode/data/
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index d8fbec5b5fee..bdc53cf7519d 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	manedit
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://wolfpack.twu.net/users/wolfpack/
 
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 050cdf316d97..4d58377b04d9 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mlview
 PORTVERSION=	0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
diff --git a/editors/mlview/pkg-plist b/editors/mlview/pkg-plist
index ad017e8c3440..ccf12c2f10c0 100644
--- a/editors/mlview/pkg-plist
+++ b/editors/mlview/pkg-plist
@@ -63,15 +63,3 @@ share/locale/sr/LC_MESSAGES/mlview.mo
 share/locale/sr@Latn/LC_MESSAGES/mlview.mo
 share/locale/sv/LC_MESSAGES/mlview.mo
 @dirrm share/gnome/mlview
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/editors/mode-info/Makefile b/editors/mode-info/Makefile
index 2d69162b7e37..cb7468f28bbb 100644
--- a/editors/mode-info/Makefile
+++ b/editors/mode-info/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mode-info
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://namazu.org/~tsuchiya/elisp/
 
diff --git a/editors/mondrian/Makefile b/editors/mondrian/Makefile
index 3daa07347f1d..9eef39808520 100644
--- a/editors/mondrian/Makefile
+++ b/editors/mondrian/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mondrian
 PORTVERSION=	1.0.b8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors ruby
 MASTER_SITES=	http://www.mondrian-ide.com/download/ \
 		LOCAL/nivit/${PORTNAME}/
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index d7486101cb10..3ec7ab422743 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	morla
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	editors textproc
 MASTER_SITES=	http://www2.autistici.org/bakunin/morla/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index 04c0e1723034..de71f51a914a 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mousepad
 PORTVERSION=	0.2.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/editors/mousepad/pkg-plist b/editors/mousepad/pkg-plist
index fd5ccaac11a1..bea02f360631 100644
--- a/editors/mousepad/pkg-plist
+++ b/editors/mousepad/pkg-plist
@@ -36,4 +36,3 @@ share/locale/zh_CN/LC_MESSAGES/mousepad.mo
 share/locale/zh_TW/LC_MESSAGES/mousepad.mo
 share/pixmaps/mousepad.png
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/editors/muggy/Makefile b/editors/muggy/Makefile
index 35a437011927..86da30d520b3 100644
--- a/editors/muggy/Makefile
+++ b/editors/muggy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	muggy
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors windowmaker tkstep80
 MASTER_SITES=	http://www.aaa-int.or.jp/~jfactory/JDE/dist/ \
 		${MASTER_SITE_LOCAL}
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 469d3814e980..eea53650f841 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mule-common
 PORTVERSION=	${MULE_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors japanese
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/ \
 		ftp://ftp.jaist.ac.jp/pub/GNU/mule/ \
@@ -21,6 +21,8 @@ COMMENT=	For a multilingual emacs, emacs lisp files, info pages, etc (except exe
 MULE_VERSION=	2.3
 EMACS_VERSION=	19.34
 
+USE_XORG=	xbitmaps
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 10ded89ab364..ad6882191ade 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	mule
 PORTVERSION=	${MULE_VERSION}
 PKGNAMESUFFIX=	${INPUT_METHOD}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES+=	editors
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/ \
 		ftp://ftp.jaist.ac.jp/pub/GNU/mule/ \
@@ -29,6 +29,7 @@ EMACS_VERSION=	19.34
 SLAVEDIRS=	chinese/mule-freewnn
 
 USE_XLIB=	yes
+USE_XORG=	xbitmaps
 WRKSRC=		${WRKDIR}/mule-${MULE_VERSION}-${EMACS_VERSION}
 PATCHDIR=	${.CURDIR}/../../editors/mule-common/files
 FILESDIR=	${.CURDIR}/../../editors/mule-common/files
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index d2ce3ae148e9..5cd14bc9a97a 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nedit
 PORTVERSION=	5.5
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nedit.org/pub/NEdit/v5_5/ \
 		ftp://ftp.nedit.org/pub/NEdit/contrib/misc/ \
diff --git a/editors/nxml-emacs21/Makefile b/editors/nxml-emacs21/Makefile
index ed693cbfdf9b..c4565a8977f7 100644
--- a/editors/nxml-emacs21/Makefile
+++ b/editors/nxml-emacs21/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nxml-mode
 PORTVERSION=	${NXML_VER}
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://www.thaiopensource.com/download/
 
diff --git a/editors/nxml/Makefile b/editors/nxml/Makefile
index ed693cbfdf9b..c4565a8977f7 100644
--- a/editors/nxml/Makefile
+++ b/editors/nxml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nxml-mode
 PORTVERSION=	${NXML_VER}
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://www.thaiopensource.com/download/
 
diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index c8cc152bdde1..839ea02db4cd 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -5,6 +5,7 @@
 
 PORTNAME=	ooo-build
 PORTVERSION=	${OOOBUILD_VERSION}
+PORTREVISION=	1
 MASTER_SITES+=	http://www.go-ooo.org/packages/OOE680/ \
 		http://www.go-ooo.org/packages/SRC680/ \
 		http://www.openclipart.org/downloads/0.18/:openclipart \
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index ed188d4d6d06..e89a244101ec 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.3.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 64586582f8cb..625e45a35134 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 781b142c055b..440785188053 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	1.0.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/:moz,ru,src,help \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.0.3/:moz,ru,src,help \
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index b3f97fd8740e..9b279757dde5 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	1.1.5.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \
 		http://openoffice.lunarshells.com/sources/1.1/ \
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 7631602ea034..9cc02c4ec472 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	1.1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \
 		http://openoffice.lunarshells.com/sources/1.1/ \
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 944441f5574a..d8222e2b0351 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.2.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index ed188d4d6d06..e89a244101ec 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.3.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 64586582f8cb..625e45a35134 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 944441f5574a..d8222e2b0351 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.2.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index ed188d4d6d06..e89a244101ec 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.3.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 64586582f8cb..625e45a35134 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index ed188d4d6d06..e89a244101ec 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.3.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 96469760adcb..9b8518a750ec 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	poedit
 PORTVERSION=	1.3.6
-PORTREVISION=	0
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	SF
 
diff --git a/editors/poedit/pkg-plist b/editors/poedit/pkg-plist
index 47438b745b47..9a90230f6147 100644
--- a/editors/poedit/pkg-plist
+++ b/editors/poedit/pkg-plist
@@ -138,53 +138,18 @@ share/locale/zh_TW/LC_MESSAGES/poedit.mo
 @dirrm %%DATADIR%%/help/common
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/sq_AL/LC_MESSAGES
 @dirrmtry share/locale/sq_AL
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
 @dirrmtry share/locale/fur/LC_MESSAGES
 @dirrmtry share/locale/fur
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/fa_IR/LC_MESSAGES
-@dirrmtry share/locale/fa_IR
 @dirrmtry share/locale/es_PR/LC_MESSAGES
 @dirrmtry share/locale/es_PR
-@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
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/af_ZA/LC_MESSAGES
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 6fabf72d3432..931b864b9586 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	psgml
 PORTVERSION=	1.3.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	psgml
diff --git a/editors/qemacs/Makefile b/editors/qemacs/Makefile
index 6b892275acec..ce1687541f0f 100644
--- a/editors/qemacs/Makefile
+++ b/editors/qemacs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qemacs
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://fabrice.bellard.free.fr/qemacs/
 
diff --git a/editors/richtext/Makefile b/editors/richtext/Makefile
index cf0fc13f9478..33b53d28adec 100644
--- a/editors/richtext/Makefile
+++ b/editors/richtext/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	richtext
 PORTVERSION=	0.1.6
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/editors/X
diff --git a/editors/rospell/Makefile b/editors/rospell/Makefile
index 6f0576216ba9..f07d796e907e 100644
--- a/editors/rospell/Makefile
+++ b/editors/rospell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rospell
 PORTVERSION=	2007.00
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	editors textproc # this should/will be romanian ;)
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
index da15ebe777bb..43686529fa99 100644
--- a/editors/rox-edit/Makefile
+++ b/editors/rox-edit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rox-edit
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index c9cee6e3aea4..20fdd5e1c24e 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sam
 PORTVERSION=	4.3
+PORTREVISION=	1
 CATEGORIES=	editors plan9
 MASTER_SITES=	ftp://ftp.cs.usyd.edu.au/matty/unicode/
 DISTNAME=	${PORTNAME}
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index c2561d2e700c..4a0483bf5389 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scite
 PORTVERSION=	1.71
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index 67ec260ed785..c0d4364ff542 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -77,5 +77,4 @@ share/pixmaps/Sci48M.png
 %%DATADIR%%/vhdl.properties
 %%DATADIR%%/yaml.properties
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
diff --git a/editors/scribes/Makefile b/editors/scribes/Makefile
index 1560a3c3845f..90cfd40844ab 100644
--- a/editors/scribes/Makefile
+++ b/editors/scribes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scribes
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index e5e7cd4341f1..3eabee752185 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/comp/emacsen/lisp/semi/semi-1.14-for-flim-1.14/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile
index fc0bbd7759e9..694dda4576f1 100644
--- a/editors/semi113/Makefile
+++ b/editors/semi113/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/semi/semi-1.13-for-flim-1.13/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.13/
diff --git a/editors/setedit/Makefile b/editors/setedit/Makefile
index 443dd809c1d3..57cb6d7cfab6 100644
--- a/editors/setedit/Makefile
+++ b/editors/setedit/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	setedit
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	setedit
diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index b90f1e9f025d..f49569f5d73a 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	slime
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://common-lisp.net/project/slime/
 EXTRACT_SUFX=	.tgz
diff --git a/editors/softmaker-office/Makefile b/editors/softmaker-office/Makefile
index 339569db12cb..2770aee3533e 100644
--- a/editors/softmaker-office/Makefile
+++ b/editors/softmaker-office/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	SoftMaker-Office
 PORTVERSION=	2006
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.softmaker.net/down/
 DISTFILES=	ofb06trial.tgz
diff --git a/editors/spe/Makefile b/editors/spe/Makefile
index bfab7595d3af..c25e4db9ddd7 100644
--- a/editors/spe/Makefile
+++ b/editors/spe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	SPE
 PORTVERSION=	0.8.3.c
+PORTREVISION=	1
 CATEGORIES=	editors devel python
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	python
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index f76d04424f3c..2de69ca00ec6 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	speedbar
 PORTVERSION=	0.14.b4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/editors/ssed/Makefile b/editors/ssed/Makefile
index 0b5f75642175..94b9bf53b189 100644
--- a/editors/ssed/Makefile
+++ b/editors/ssed/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sed
 PORTVERSION=	3.62
+PORTREVISION=	1
 CATEGORIES=	editors textproc
 MASTER_SITES=	http://sed.sourceforge.net/grabbag/ssed/
 PKGNAMEPREFIX=	s
diff --git a/editors/ssed/pkg-plist b/editors/ssed/pkg-plist
index bb708ae49d45..bd3fe1471c89 100644
--- a/editors/ssed/pkg-plist
+++ b/editors/ssed/pkg-plist
@@ -30,23 +30,3 @@ bin/ssed
 %%NLS%%share/locale/sv/LC_MESSAGES/ssed.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/ssed.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/ssed.mo
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sl
diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile
index c761a848b436..8cc5c77e7f1d 100644
--- a/editors/tamago-emacs21/Makefile
+++ b/editors/tamago-emacs21/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tamago
 PORTVERSION=	${EGG_DEBIAN_VER}.${EGG_ANTHY_VER}
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN} \
 		http://www.meadowy.org/~shirai/elips/:anthy
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index c761a848b436..8cc5c77e7f1d 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tamago
 PORTVERSION=	${EGG_DEBIAN_VER}.${EGG_ANTHY_VER}
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN} \
 		http://www.meadowy.org/~shirai/elips/:anthy
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index 4970ac5bad52..4be0ca3ab4a2 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tea
 DISTVERSION=	16.0.5
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tea-editor
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 82971fab04ef..4c256c928053 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ted
 PORTVERSION=	2.17
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
 EXTRACT_SUFX=	.src.tar.gz
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index c4518d8eeb1a..224822e837c7 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	texmacs
 PORTVERSION=	1.0.6.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors print
 MASTER_SITES=	http://www.texmacs.org/Download/ftp/%SUBDIR%/ \
 		ftp://ftp.texmacs.org/pub/TeXmacs/%SUBDIR%/ \
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index d4c18fdab142..9278ea97057f 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	texmaker
 PORTVERSION=	1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
diff --git a/editors/textedit.app/Makefile b/editors/textedit.app/Makefile
index ff17c724233f..07e97cd495f6 100644
--- a/editors/textedit.app/Makefile
+++ b/editors/textedit.app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	textedit.app
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	editors gnustep
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/editors/textedit/Makefile b/editors/textedit/Makefile
index e22359922520..839e252df317 100644
--- a/editors/textedit/Makefile
+++ b/editors/textedit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	textedit
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fenner
diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile
index f9f6286358ff..15f712c630e3 100644
--- a/editors/thoteditor/Makefile
+++ b/editors/thoteditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	thoteditor
 PORTVERSION=	2.1e
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors www
 MASTER_SITES=	ftp://ftp.inrialpes.fr/pub/opera/sources/thot/ \
 		ftp://ftp.ruhr-uni-bochum.de/local/jk.collection/thot/
diff --git a/editors/tpad/Makefile b/editors/tpad/Makefile
index 81224f5a4a38..19411a5fcdbf 100644
--- a/editors/tpad/Makefile
+++ b/editors/tpad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tpad
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	editors tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://monitor.deis.unical.it/ant/tpad/ \
diff --git a/editors/tree-widget/Makefile b/editors/tree-widget/Makefile
index 5305945d0196..09d92f572c35 100644
--- a/editors/tree-widget/Makefile
+++ b/editors/tree-widget/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tree-widget
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 663b15fb6055..951aea7aff6b 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vigor
 PORTVERSION=	0.016
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors tk84 tcl84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 8a8be5c4a380..5b263216f854 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -10,7 +10,7 @@ PORTNAME?=	vim
 PATCHLEVEL=	224
 PORTVERSION=	7.0.${PATCHLEVEL}
 RELEASE=	vim-${PORTVERSION:C/\.[0-9a-z]*$//}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
 DISTFILES=	${RELEASE}${EXTRACT_SUFX}
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index d15775f84b02..c9bd2c18208a 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME?=	vim
 PORTVERSION=	5.8.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
 DISTNAME=	vim-${PORTVERSION:C/\.[0-9]+$//g}
diff --git a/editors/vim6+ruby/Makefile b/editors/vim6+ruby/Makefile
index ec27e783300c..25c85d220589 100644
--- a/editors/vim6+ruby/Makefile
+++ b/editors/vim6+ruby/Makefile
@@ -7,7 +7,7 @@
 
 MASTERDIR=	${.CURDIR}/../vim
 
-PORTREVISION=	4
+PORTREVISION=	5
 
 CATEGORIES=	editors ruby
 PKGNAMESUFFIX=	+ruby
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 3ae6b1e50d7f..4b77e5f57e84 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -9,7 +9,7 @@
 PORTNAME?=	vim6
 PATCHLEVEL=	9
 PORTVERSION=	6.4.${PATCHLEVEL}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
 DISTNAME=	vim-${PORTVERSION:C/\.[0-9a-z]*$//}
diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index ec867fd1172a..15d61c34f128 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wily
 PORTVERSION=	0.13.42
+PORTREVISION=	1
 CATEGORIES=	editors plan9
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 4a391adb0c9c..2a3e373453e9 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	winefish
 DISTVERSION=	1.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors print
 MASTER_SITES=	http://download.berlios.de/winefish/ \
 		http://nivi.interfree.it/distfiles/winefish/
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index f9ddd3667e8c..a696c1f8e5af 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcoral
 PORTVERSION=	3.46
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://xcoral.free.fr/
 
diff --git a/editors/xed/Makefile b/editors/xed/Makefile
index e9df5f1f40c6..fdb9a82641fc 100644
--- a/editors/xed/Makefile
+++ b/editors/xed/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xed
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	editors
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 4b350ffb2445..e334a7a7f36a 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-devel-mule
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 36a28ec4d504..5bc2472103ff 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xemacs-devel
 PORTVERSION=	${XEMACS_VER:S/-/./}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
@@ -29,6 +30,7 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		compface.1:${PORTSDIR}/mail/faces
 USE_XLIB=	yes
+USE_XORG=	xbitmaps
 USE_XPM=	yes
 .endif
 
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 2eed362f95ca..b46c735d88af 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 63097bd57c74..9032a9fad45d 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-mule
 PORTVERSION=	${XEMACS_VER}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
diff --git a/editors/xenon/Makefile b/editors/xenon/Makefile
index 095a8a1c6157..4e4f1db79a38 100644
--- a/editors/xenon/Makefile
+++ b/editors/xenon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xenon
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://sydney.proximity.com.au/~ben/xenon/dist/ \
 		ftp://yankee.proximitygroup.com/pub/xenon/
diff --git a/editors/xml2rfc-xxe/Makefile b/editors/xml2rfc-xxe/Makefile
index 603090b9a6ce..d1875c664c3a 100644
--- a/editors/xml2rfc-xxe/Makefile
+++ b/editors/xml2rfc-xxe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xml2rfc-xxe
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://rtg.ietf.org/~fenner/ietf/
 PKGNAMESUFFIX=	-${XXE_VERSION}
diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index b60af65c8a21..a980f3ca10d0 100644
--- a/editors/xmleditor/Makefile
+++ b/editors/xmleditor/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xmleditor
 PORTVERSION=	0.5.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 7f7b9b83fc75..e5b8967e854d 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xvile
 PORTVERSION=	9.5n
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://invisible-island.net/vile/ \
 		ftp://dickey.his.com/vile/ \
diff --git a/editors/xxe/Makefile b/editors/xxe/Makefile
index 52698019585c..41135ca3d0f6 100644
--- a/editors/xxe/Makefile
+++ b/editors/xxe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xxe
 PORTVERSION=	${XXE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	editors java
 MASTER_SITES=	http://www.xmlmind.net/xmleditor/_download/
 PKGNAMESUFFIX=	-std
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index 54f7f8dee38c..d2969c21d795 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yudit
 PORTVERSION=	2.8.1
+PORTREVISION=	1
 CATEGORIES=	editors converters print
 MASTER_SITES=	http://yudit.org/download/ \
 		${MASTER_SITE_SUNSITE}
diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index 20924cbf0d5d..6f85b2c94efe 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zim
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	editors perl5
 MASTER_SITES=	http://pardus-larus.student.utwente.nl/~pardus/downloads/Zim/
 DISTNAME=	Zim-${PORTVERSION}
diff --git a/editors/zim/pkg-plist b/editors/zim/pkg-plist
index 9178eca32c12..b0e2214d2746 100644
--- a/editors/zim/pkg-plist
+++ b/editors/zim/pkg-plist
@@ -93,4 +93,3 @@ share/pixmaps/zim/stock_calendar-view-month.png
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @dirrmtry share/pixmaps/zim
-@dirrmtry share/pixmaps
diff --git a/editors/zoinks/Makefile b/editors/zoinks/Makefile
index 187efd105d68..c9eab4638aa9 100644
--- a/editors/zoinks/Makefile
+++ b/editors/zoinks/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zoinks
 PORTVERSION=	0.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://zoinks.mikelockwood.com/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/emulators/adamem/Makefile b/emulators/adamem/Makefile
index 714798c99e60..71733620ba62 100644
--- a/emulators/adamem/Makefile
+++ b/emulators/adamem/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	adamem
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.komkon.org/~dekogel/files/coleco/
 DISTNAME=	${PORTNAME}
diff --git a/emulators/advancemame/Makefile b/emulators/advancemame/Makefile
index 3f9db06a23dd..b6d715800a5a 100644
--- a/emulators/advancemame/Makefile
+++ b/emulators/advancemame/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	advancemame
 PORTVERSION=	0.106.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
diff --git a/emulators/advancemenu/Makefile b/emulators/advancemenu/Makefile
index 78e5c873a1cc..3a55f9b0704a 100644
--- a/emulators/advancemenu/Makefile
+++ b/emulators/advancemenu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	advancemenu
 PORTVERSION=	2.4.13
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	advancemame
diff --git a/emulators/advancemess/Makefile b/emulators/advancemess/Makefile
index 1113314fb252..22570293b606 100644
--- a/emulators/advancemess/Makefile
+++ b/emulators/advancemess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	advancemess
 PORTVERSION=	0.102.0.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	advancemame
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index f66de44ad9af..80c8118d7436 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	atari800
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/basiliskII/Makefile b/emulators/basiliskII/Makefile
index 5c9fca864b74..ffad59f21460 100644
--- a/emulators/basiliskII/Makefile
+++ b/emulators/basiliskII/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	basiliskII
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	http://gwenole.beauchesne.info/projects/basilisk2/files/
 MASTER_SITE_SUBDIR=	basilisk
diff --git a/emulators/bfe/Makefile b/emulators/bfe/Makefile
index 9b4c85aad07e..a8318f9e7238 100644
--- a/emulators/bfe/Makefile
+++ b/emulators/bfe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bfe2
 PORTVERSION=	20030723
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bfe
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 459df5094ee8..8fe0c40c8cad 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bochs
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index b31cbdb6d0c3..55f1109231e6 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bsvc
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators tk84
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/emulators
diff --git a/emulators/cingb/Makefile b/emulators/cingb/Makefile
index 1cad7d7f2170..5eddeb64fe21 100644
--- a/emulators/cingb/Makefile
+++ b/emulators/cingb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cingb
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/cygne-sdl/Makefile b/emulators/cygne-sdl/Makefile
index 3f71a915d874..e99e7c99ca59 100644
--- a/emulators/cygne-sdl/Makefile
+++ b/emulators/cygne-sdl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cygne-sdl
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://sdlemu.ngemu.com/OpenProjects/
 DISTNAME=	Cygne-SDL-${PORTVERSION}-src
diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile
index 08550933d9ea..8866659bed67 100644
--- a/emulators/darcnes/Makefile
+++ b/emulators/darcnes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	darcnes
 PORTVERSION=	9b0401
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.dridus.com/~nyef/darcnes/download/
 DISTNAME=	dn${PORTVERSION}
diff --git a/emulators/desmume/Makefile b/emulators/desmume/Makefile
index 34489471c09e..540e6886e64d 100644
--- a/emulators/desmume/Makefile
+++ b/emulators/desmume/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	desmume
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
diff --git a/emulators/dgen-sdl/Makefile b/emulators/dgen-sdl/Makefile
index 926ffda6628f..246f69006ab4 100644
--- a/emulators/dgen-sdl/Makefile
+++ b/emulators/dgen-sdl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dgen-sdl
 PORTVERSION=	1.23
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://pknet.com/~joe/
 
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index ba0a652c5384..a8e67bdbcbcd 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dosbox
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
index 98f83d9f906b..e253008a8177 100644
--- a/emulators/doscmd/Makefile
+++ b/emulators/doscmd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	doscmd
 PORTVERSION=	20040330
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	des
diff --git a/emulators/dtcyber/Makefile b/emulators/dtcyber/Makefile
index f2bb18cd2e8f..6e70289767f5 100644
--- a/emulators/dtcyber/Makefile
+++ b/emulators/dtcyber/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dtcyber
 PORTVERSION=	2.0b1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://members.iinet.net.au/~tom-hunter/
 DISTNAME=	dtcyber20b1
diff --git a/emulators/e-uae/Makefile b/emulators/e-uae/Makefile
index 273c132c9441..e4c793cea972 100644
--- a/emulators/e-uae/Makefile
+++ b/emulators/e-uae/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	e-uae
 DISTVERSION=	0.8.28
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.rcdrummond.net/uae/${DISTNAME}/ \
 		http://www.energyhq.es.eu.org/files/
diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile
index 366809b7b1cd..176278b186e1 100644
--- a/emulators/fceu/Makefile
+++ b/emulators/fceu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fceu
 PORTVERSION=	0.98.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://bsd-unix.org/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-pre.src
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index 366809b7b1cd..176278b186e1 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fceu
 PORTVERSION=	0.98.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://bsd-unix.org/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-pre.src
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 18fbc384fc30..cb70f945dac5 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fmsx
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.mavetju.org/download/adopted/:code \
 		http://fms.komkon.org/fMSX/:code \
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 16669b138dd9..a27766509142 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	frodo
 PORTVERSION=	4.1b
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators tk84
 MASTER_SITES=	http://frodo.cebix.net/downloads/
 DISTNAME=	FrodoV4_1b.Src
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index cb29bde4018c..0623b048be7f 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fuse
 PORTVERSION=	0.7.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fuse-emulator
diff --git a/emulators/gbe/Makefile b/emulators/gbe/Makefile
index 17d84861bacc..f1a92bb99aa7 100644
--- a/emulators/gbe/Makefile
+++ b/emulators/gbe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gbe
 PORTVERSION=	0.0.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.zophar.net/unix/Files/
 
diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile
index 5d534c8d7a25..b325e448b677 100644
--- a/emulators/gcube/Makefile
+++ b/emulators/gcube/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcube
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.liquidx.org/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -18,6 +18,7 @@ COMMENT=	Gamecube emulator
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 WRKSRC=		${WRKDIR}/${PORTVERSION}
+USE_GL=		yes
 USE_SDL=	sdl
 USE_GCC=	3.4
 USE_BZIP2=	yes
diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile
index 03707a2518c2..6c71a162e5b1 100644
--- a/emulators/generator-cbiere/Makefile
+++ b/emulators/generator-cbiere/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	generator
 PORTVERSION=	0.35.r2
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.ghostwhitecrab.com/generator/ \
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index 556eff914c08..397db1dfc06c 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	generator
 PORTVERSION=	0.35
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.squish.net/generator/files/
 
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index cf434611eafc..735c60f1e055 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gens
 PORTVERSION=	2.12a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/gngb/Makefile b/emulators/gngb/Makefile
index de8a1c44302e..0d6a23448dac 100644
--- a/emulators/gngb/Makefile
+++ b/emulators/gngb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gngb
 PORTVERSION=	20060309
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://m.peponas.free.fr/gngb/download/
 
diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile
index b41f8a61e76b..b4ceb9309a34 100644
--- a/emulators/gngeo/Makefile
+++ b/emulators/gngeo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gngeo
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index ab29959db131..0b1faa239d1d 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnuboy
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators games
 MASTER_SITES=	http://gnuboy.unix-fu.org/src/ \
 		http://brightrain.aerifal.cx/~laguna/src/
diff --git a/emulators/gsnes9x/Makefile b/emulators/gsnes9x/Makefile
index cd7940377289..97845226bad6 100644
--- a/emulators/gsnes9x/Makefile
+++ b/emulators/gsnes9x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gsnes9x
 PORTVERSION=	3.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index 23da6f737e7d..fdfc95aaef3f 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gxemul
 PORTVERSION=	0.4.5.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://gavare.se/gxemul/src/ \
 		${MASTER_SITE_LOCAL}
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index 97f40f044519..5147ef5ae5b4 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxmame
 DISTVERSION=	0.35beta2
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index bf3f76779e5b..c187e80d8781 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hatari
 PORTVERSION=	0.90
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/hfsutils/Makefile b/emulators/hfsutils/Makefile
index 8e8c23603789..73904602cc96 100644
--- a/emulators/hfsutils/Makefile
+++ b/emulators/hfsutils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hfsutils
 PORTVERSION=	3.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators tk84
 MASTER_SITES=	ftp://ftp.mars.org/pub/hfs/
 
diff --git a/emulators/hugo/Makefile b/emulators/hugo/Makefile
index 5b7e7bc18adf..35ea2eda3fbd 100644
--- a/emulators/hugo/Makefile
+++ b/emulators/hugo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hugo
 PORTVERSION=	2.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.zeograd.com/download/
 
diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile
index 5bd4f4fd17ce..aa31d9209f66 100644
--- a/emulators/ines/Makefile
+++ b/emulators/ines/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ines
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://fms.komkon.org/iNES/
 DISTNAME=	iNES30-FreeBSD-80x86-bin
diff --git a/emulators/linux-ePSXe/Makefile b/emulators/linux-ePSXe/Makefile
index 82e8d521c930..59aa9509a3a1 100644
--- a/emulators/linux-ePSXe/Makefile
+++ b/emulators/linux-ePSXe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	epsxe
 PORTVERSION=	1.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://www.epsxe.com/files/
 PKGNAMEPREFIX=	linux-
diff --git a/emulators/linux-padjoy/Makefile b/emulators/linux-padjoy/Makefile
index 97a01d3dfbe8..4b435d5da6e2 100644
--- a/emulators/linux-padjoy/Makefile
+++ b/emulators/linux-padjoy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	padjoy
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://members.chello.at/erich.kitzmueller/ammoq/
 PKGNAMEPREFIX=	linux-
diff --git a/emulators/linux-peops-softgpu/Makefile b/emulators/linux-peops-softgpu/Makefile
index 3ce26f5290ff..1713977fbe0c 100644
--- a/emulators/linux-peops-softgpu/Makefile
+++ b/emulators/linux-peops-softgpu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	peops-softgpu
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://www.pbernert.com/
 PKGNAMEPREFIX=	linux-
diff --git a/emulators/linux-peops-spu/Makefile b/emulators/linux-peops-spu/Makefile
index e7df1a57534b..633cc3de63fe 100644
--- a/emulators/linux-peops-spu/Makefile
+++ b/emulators/linux-peops-spu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	peops-spu
 PORTVERSION=	1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://www.pbernert.com/
 PKGNAMEPREFIX=	linux-
diff --git a/emulators/linux-winetools/Makefile b/emulators/linux-winetools/Makefile
index 1976c3a9b0fa..f2766ae891dc 100644
--- a/emulators/linux-winetools/Makefile
+++ b/emulators/linux-winetools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	winetools
 PORTVERSION=	1.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators linux
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/winetools/}
 PKGNAMEPREFIX=	linux-
diff --git a/emulators/loemu/Makefile b/emulators/loemu/Makefile
index 123f18cc6649..babebd30b619 100644
--- a/emulators/loemu/Makefile
+++ b/emulators/loemu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	loemu
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	emulators python
 MASTER_SITES=	http://loemu.pegueroles.com/dists/
 
diff --git a/emulators/m2000/Makefile b/emulators/m2000/Makefile
index 41cf23fbcc22..1003a8ae58f3 100644
--- a/emulators/m2000/Makefile
+++ b/emulators/m2000/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	m2000
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	\
 		http://www.komkon.org/~dekogel/files/p2000/:code \
diff --git a/emulators/mame-devel/Makefile b/emulators/mame-devel/Makefile
index 6e925bc6cd32..c6ecad0dc390 100644
--- a/emulators/mame-devel/Makefile
+++ b/emulators/mame-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdlmame
 PORTVERSION=	0.114u2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 6e925bc6cd32..c6ecad0dc390 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdlmame
 PORTVERSION=	0.114u2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
diff --git a/emulators/mastergear/Makefile b/emulators/mastergear/Makefile
index e4c52adb56a7..d3e80f96b642 100644
--- a/emulators/mastergear/Makefile
+++ b/emulators/mastergear/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mastergear
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://fms.komkon.org/MG/
 DISTNAME=	MG20-FreeBSD-80x86-bin
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index 83b174d5d382..02fff7c737aa 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mednafen
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	emulators games
 MASTER_SITES=	SF
 
diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile
index f9427fcc53c0..ec58282cebd9 100644
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdlmess
 PORTVERSION=	0.114
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile
index 9ec036bf9dbc..a4f025894fd8 100644
--- a/emulators/minivmac/Makefile
+++ b/emulators/minivmac/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	minivmac
 PORTVERSION=	2.8.2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,6 +27,9 @@ ALL_TARGET=	# nothing
 
 PLIST_FILES=	bin/minivmac
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/Makefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/minivmac ${PREFIX}/bin
 	@${CAT} ${PKGMESSAGE}
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 59de4dd38f02..d526a3e0ee17 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mtools
 PORTVERSION=	3.9.10
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.tux.org/pub/knaff/mtools/  \
 		http://mtools.linux.lu/
diff --git a/emulators/mupen64-base/Makefile b/emulators/mupen64-base/Makefile
index 2489690b290f..ac990ef2b331 100644
--- a/emulators/mupen64-base/Makefile
+++ b/emulators/mupen64-base/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/${PORTVERSION}/
 PKGNAMESUFFIX=	-base
diff --git a/emulators/mupen64-glide/Makefile b/emulators/mupen64-glide/Makefile
index d23dd23aa1cf..401ce43c2ab6 100644
--- a/emulators/mupen64-glide/Makefile
+++ b/emulators/mupen64-glide/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/0.4/
 PKGNAMESUFFIX=	-glide
@@ -23,6 +23,7 @@ USE_GMAKE=	yes
 USE_SDL=	sdl
 USE_GNOME=	gtk12
 USE_XLIB=	yes
+USE_GL=		yes
 USE_GCC=	3.4
 ONLY_FOR_ARCHS=	i386
 
diff --git a/emulators/mupen64-gln64/Makefile b/emulators/mupen64-gln64/Makefile
index ba90c9f4176e..e17940352e90 100644
--- a/emulators/mupen64-gln64/Makefile
+++ b/emulators/mupen64-gln64/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/0.4/
 PKGNAMESUFFIX=	-gln64
@@ -19,6 +19,7 @@ COMMENT=	GlN64 graphics plugin for Mupen64
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
+USE_GL=		gl
 USE_GNOME=	gtk12
 USE_GCC=	3.4
 ONLY_FOR_ARCHS=	i386
diff --git a/emulators/mupen64-input/Makefile b/emulators/mupen64-input/Makefile
index c524f90602a4..119af59450bf 100644
--- a/emulators/mupen64-input/Makefile
+++ b/emulators/mupen64-input/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/${PORTVERSION}/
 PKGNAMESUFFIX=	-input
diff --git a/emulators/mupen64-rice/Makefile b/emulators/mupen64-rice/Makefile
index 5b9f46aee4c8..e0999c382e60 100644
--- a/emulators/mupen64-rice/Makefile
+++ b/emulators/mupen64-rice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	5.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/0.4/
 PKGNAMESUFFIX=	-rice
@@ -21,6 +21,7 @@ BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
+USE_GL=		gl
 USE_GNOME=	gtk12
 USE_GCC=	3.4
 ONLY_FOR_ARCHS=	i386
diff --git a/emulators/mupen64-rsp/Makefile b/emulators/mupen64-rsp/Makefile
index 81d02a870137..8e59157e51ae 100644
--- a/emulators/mupen64-rsp/Makefile
+++ b/emulators/mupen64-rsp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/${PORTVERSION}/
 PKGNAMESUFFIX=	-rsp
diff --git a/emulators/mupen64-sdlaudio/Makefile b/emulators/mupen64-sdlaudio/Makefile
index 87eac4044f73..9a64ec54b63f 100644
--- a/emulators/mupen64-sdlaudio/Makefile
+++ b/emulators/mupen64-sdlaudio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/0.4/
 PKGNAMESUFFIX=	-sdlaudio
diff --git a/emulators/mupen64-sdlinput/Makefile b/emulators/mupen64-sdlinput/Makefile
index 0a3c129b10c8..7448873bdde9 100644
--- a/emulators/mupen64-sdlinput/Makefile
+++ b/emulators/mupen64-sdlinput/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	0.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/0.4/
 PKGNAMESUFFIX=	-sdlinput
diff --git a/emulators/mupen64-sound/Makefile b/emulators/mupen64-sound/Makefile
index 51d9745437cb..1b2ee6fe9aa2 100644
--- a/emulators/mupen64-sound/Makefile
+++ b/emulators/mupen64-sound/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/${PORTVERSION}/
 PKGNAMESUFFIX=	-sound
diff --git a/emulators/mupen64/Makefile b/emulators/mupen64/Makefile
index a96346985250..1aca9ed0b43c 100644
--- a/emulators/mupen64/Makefile
+++ b/emulators/mupen64/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	emulators
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/emulators/nonpareil/Makefile b/emulators/nonpareil/Makefile
index 3b972859cb54..261719e9401e 100644
--- a/emulators/nonpareil/Makefile
+++ b/emulators/nonpareil/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nonpareil
 PORTVERSION=	0.78
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://nonpareil.brouhaha.com/download/
 
diff --git a/emulators/o2em/Makefile b/emulators/o2em/Makefile
index 6a472f360799..57c1a2efd4a8 100644
--- a/emulators/o2em/Makefile
+++ b/emulators/o2em/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		o2em
 PORTVERSION=		1.17
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		emulators games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/o2em/:S/$/:1/} \
 			http://o2em.sourceforge.net/files/:2
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 856774cdd42f..e4d6c184d107 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openmsx
 DISTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/osmose/Makefile b/emulators/osmose/Makefile
index 0c1cc47d87e2..f3c086389feb 100644
--- a/emulators/osmose/Makefile
+++ b/emulators/osmose/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	osmose
 PORTVERSION=	0.6.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav
diff --git a/emulators/p-interp/Makefile b/emulators/p-interp/Makefile
index 387a7dc658e5..13e198346321 100644
--- a/emulators/p-interp/Makefile
+++ b/emulators/p-interp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	p-interp
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.klebsch.de/ \
 		ftp://ftp.apple.asimov.net/pub/apple_II/images/utility/programming/apple_pascal/:disks \
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index df6267fb8262..627e488c97ea 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pcemu
 PORTVERSION=	1.01b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 #
 # This could in theory become a chicken-and-egg problem.  Anyway,
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index 43af87b40d1e..11d5954e8652 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pearpc
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/pyxmame/Makefile b/emulators/pyxmame/Makefile
index 4d3e387b6cdf..1fef04980faa 100644
--- a/emulators/pyxmame/Makefile
+++ b/emulators/pyxmame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pyxmame
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/pyxmame/pkg-plist b/emulators/pyxmame/pkg-plist
index 2b3fe7e70622..80dae444a323 100644
--- a/emulators/pyxmame/pkg-plist
+++ b/emulators/pyxmame/pkg-plist
@@ -35,7 +35,6 @@ bin/pyxmame
 share/pixmaps/pyxmame/penguin-revolt-128.png
 etc/pyxmame/pyxmamerc
 @dirrm share/pixmaps/pyxmame
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/snaps
 @dirrm %%DATADIR%%/roms
 @dirrm %%DATADIR%%/flyers
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 5a7f60faf1f5..c9f25d202098 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	0.9.0s.20070405
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	http://qemu.org/:release \
 		http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \
diff --git a/emulators/qemu-launcher/Makefile b/emulators/qemu-launcher/Makefile
index b78d2ce21fb5..54864cf8de49 100644
--- a/emulators/qemu-launcher/Makefile
+++ b/emulators/qemu-launcher/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qemu-launcher
 PORTVERSION=	1.7.3
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.gna.org/qemulaunch/1.7.x/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 933adf1d0f57..fa995d213738 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://qemu.org/:release \
 		http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \
diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
index 0b23083b9a5e..0c4fa1ec1a82 100644
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmc2
 PORTVERSION=	0.1.b8
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
diff --git a/emulators/quasi88/Makefile b/emulators/quasi88/Makefile
index af1a9ddc486d..aeb09c8f2383 100644
--- a/emulators/quasi88/Makefile
+++ b/emulators/quasi88/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	quasi88
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.117.ne.jp/~show/pc8801/
 EXTRACT_SUFX=	.tgz
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index c9d7b303c29a..477a84c3501d 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	raine
 PORTVERSION=	0.43.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators games
 MASTER_SITES=	http://www.rainemu.com/html/archive/
 DISTNAME=	${PORTNAME}s-${PORTVERSION}
diff --git a/emulators/sdlmame-devel/Makefile b/emulators/sdlmame-devel/Makefile
index 6e925bc6cd32..c6ecad0dc390 100644
--- a/emulators/sdlmame-devel/Makefile
+++ b/emulators/sdlmame-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdlmame
 PORTVERSION=	0.114u2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
diff --git a/emulators/sdlmame/Makefile b/emulators/sdlmame/Makefile
index 6e925bc6cd32..c6ecad0dc390 100644
--- a/emulators/sdlmame/Makefile
+++ b/emulators/sdlmame/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdlmame
 PORTVERSION=	0.114u2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
diff --git a/emulators/sdlmess/Makefile b/emulators/sdlmess/Makefile
index f9427fcc53c0..ec58282cebd9 100644
--- a/emulators/sdlmess/Makefile
+++ b/emulators/sdlmess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdlmess
 PORTVERSION=	0.114
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
index 6064e55fa538..61b56ff65b94 100644
--- a/emulators/ski/Makefile
+++ b/emulators/ski/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ski
 PORTVERSION=	0.943l.2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	# http://www.hpl.hp.com/research/linux/ski/
 DISTNAME=	ski-0.943l-2.i386
diff --git a/emulators/ski/pkg-plist b/emulators/ski/pkg-plist
index 75e702b7c61c..51fada04f933 100644
--- a/emulators/ski/pkg-plist
+++ b/emulators/ski/pkg-plist
@@ -3,7 +3,7 @@ bin/ski
 bin/bski
 bin/bskinc
 bin/xski
-../X11R6/lib/X11/app-defaults/XSki
+lib/X11/app-defaults/XSki
 share/doc/ski/HOWTO-ski-networking
 share/doc/ski/README
 share/doc/ski/Makefile
diff --git a/emulators/skyeye/Makefile b/emulators/skyeye/Makefile
index 1d8cf01bd505..75be37b0d8a6 100644
--- a/emulators/skyeye/Makefile
+++ b/emulators/skyeye/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skyeye
 PORTVERSION=	1.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 DISTVERSIONSUFFIX=_Rel
 CATEGORIES=	emulators
diff --git a/emulators/snes9express/Makefile b/emulators/snes9express/Makefile
index b619709a57f0..0f91d824db9d 100644
--- a/emulators/snes9express/Makefile
+++ b/emulators/snes9express/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snes9express
 PORTVERSION=	1.42
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 64f05b80f197..ed9ca9f2cd45 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snes9x
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://files.ipherswipsite.com/snes9x/ \
 		http://www.geocities.co.jp/SiliconValley-PaloAlto/2560/release/ \
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 74bccc93cc43..f5ecd17eb4e3 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	spim
 PORTVERSION=	7.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.cs.wisc.edu/~larus/SPIM/
 
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index b7d28690e067..0e82ba574571 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stella
 PORTVERSION=	2.3.5
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile
index 91e253327d76..854b62954d8b 100644
--- a/emulators/stonx/Makefile
+++ b/emulators/stonx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stonx
 PORTVERSION=	0.6.7e
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.complang.tuwien.ac.at/pub/nino/stonx-current/
 DISTNAME=	STonX-0.6.7-epsilon
diff --git a/emulators/tiemu2/Makefile b/emulators/tiemu2/Makefile
index 34441f9d6fb1..9bd0de1ef46d 100644
--- a/emulators/tiemu2/Makefile
+++ b/emulators/tiemu2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tiemu2
 PORTVERSION=	2.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.ticalc.org/pub/unix/ \
 		http://freebsd.nsu.ru/distfiles/tiemu/
diff --git a/emulators/tilem/Makefile b/emulators/tilem/Makefile
index 6d6f4b4d0189..96f5266c4e90 100644
--- a/emulators/tilem/Makefile
+++ b/emulators/tilem/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tilem
 PORTVERSION=	0.973
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/tkhfs/Makefile b/emulators/tkhfs/Makefile
index 6c8a6a44ef2f..8127f9245b01 100644
--- a/emulators/tkhfs/Makefile
+++ b/emulators/tkhfs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkhfs
 PORTVERSION=	1.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators tk84
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jmz
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index e96804a94572..a1e9c328fb5b 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tme
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://theory.lcs.mit.edu/~fredette/tme/
 
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index ffca9b163c67..32f0936c4d75 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tuxnes
 PORTVERSION=	0.75
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 23b5b564c157..786a2655e50b 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	twin
 PORTVERSION=	3.1.14
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	emulators devel
 MASTER_SITES=	${MASTER_SITE_NETBSD} \
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 19dce28a908e..86a126b81ecb 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uae
 PORTVERSION=	0.8.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/ \
 		http://www.electronghost.co.uk/~bernds/
diff --git a/emulators/vMac/Makefile b/emulators/vMac/Makefile
index c4c756c31adc..55ce050e3045 100644
--- a/emulators/vMac/Makefile
+++ b/emulators/vMac/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		vMac
 PORTVERSION=		0.1.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.vmac.org/download/XWindows/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-src
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index ce4f54f7833d..6b378a45c30d 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	vba
 PORTVERSION=	1.7.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/vgb-bin/Makefile b/emulators/vgb-bin/Makefile
index 85892d6bd3e2..baa358d82240 100644
--- a/emulators/vgb-bin/Makefile
+++ b/emulators/vgb-bin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vgb
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://fms.komkon.org/VGB/
diff --git a/emulators/vgb/Makefile b/emulators/vgb/Makefile
index b53735ad4784..e9a7f32bc884 100644
--- a/emulators/vgb/Makefile
+++ b/emulators/vgb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vgb
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
diff --git a/emulators/vgba-bin/Makefile b/emulators/vgba-bin/Makefile
index 58b9498bd2bf..582193a786ae 100644
--- a/emulators/vgba-bin/Makefile
+++ b/emulators/vgba-bin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vgba
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://fms.komkon.org/VGBA/
 PKGNAMESUFFIX=	-bin
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index a8c363c3cf88..db05a743dbd4 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	vice
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
 		http://fresh.t-systems-sfr.com/linux/src/ \
diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile
index 07ef4187c145..862bdde20142 100644
--- a/emulators/visualos/Makefile
+++ b/emulators/visualos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	VisualOS
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
index 8eedcee99c2b..063e7661da90 100644
--- a/emulators/vmips/Makefile
+++ b/emulators/vmips/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vmips
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.dgate.org/vmips/releases/vmips-${PORTVERSION}/
diff --git a/emulators/vmware-tools3/Makefile b/emulators/vmware-tools3/Makefile
index 1b81f5ced6f6..4061e3b1a02a 100644
--- a/emulators/vmware-tools3/Makefile
+++ b/emulators/vmware-tools3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vmware-tools
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	# bundled with VMware itself
 DISTNAME=	vmware-freebsd-tools
diff --git a/emulators/vmware-tools5/Makefile b/emulators/vmware-tools5/Makefile
index 975e57444c43..e31dde983e60 100644
--- a/emulators/vmware-tools5/Makefile
+++ b/emulators/vmware-tools5/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vmware
-PORTREVISION?=	2
+PORTREVISION?=	3
 MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMESUFFIX?=	-tools
 
diff --git a/emulators/vpce/Makefile b/emulators/vpce/Makefile
index 6c34dc5a41c5..a82b74b7d71b 100644
--- a/emulators/vpce/Makefile
+++ b/emulators/vpce/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vpce
 PORTVERSION=	0.3f
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Way/3340/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/emulators/wahcade/Makefile b/emulators/wahcade/Makefile
index 6e84e813e49c..67973be49eae 100644
--- a/emulators/wahcade/Makefile
+++ b/emulators/wahcade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wahcade
 PORTVERSION=	0.19
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.anti-particle.com/projects/wahcade/
 
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 15d78694ed4b..01d2d328e9e8 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wine
 PORTVERSION=	0.9.36
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 15d78694ed4b..01d2d328e9e8 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wine
 PORTVERSION=	0.9.36
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 5004077ed18b..1d0d24c386f4 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	x48
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/xbraitenberg/Makefile b/emulators/xbraitenberg/Makefile
index 2102186c8cde..a81743ad37aa 100644
--- a/emulators/xbraitenberg/Makefile
+++ b/emulators/xbraitenberg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbraitenberg
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.lcdf.org/~eddietwo/xbraitenberg/
 
diff --git a/emulators/xgngeo/Makefile b/emulators/xgngeo/Makefile
index 2a577cb69390..287f91413dad 100644
--- a/emulators/xgngeo/Makefile
+++ b/emulators/xgngeo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xgngeo
 PORTVERSION=	16
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	emulators games
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
diff --git a/emulators/xgs/Makefile b/emulators/xgs/Makefile
index c492304f38fa..5f5ce5a6b945 100644
--- a/emulators/xgs/Makefile
+++ b/emulators/xgs/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	xgs
 PORTVERSION=	0.50
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.inwards.com/xgs/ \
 		http://www.inwards.com/xgs/2mg/
diff --git a/emulators/xhomer/Makefile b/emulators/xhomer/Makefile
index 8e8fcec885d2..37dc086c9fc4 100644
--- a/emulators/xhomer/Makefile
+++ b/emulators/xhomer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xhomer
 DISTVERSION=	9-16-06
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://xhomer.isani.org/xhomer/
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 323729c1dc47..438a5aea5948 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	xmame
 PORTVERSION?=	0.106
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.franksworld.org/dist/xmame/ \
 		http://x.mame.net/download/ \
diff --git a/emulators/xmamegui/Makefile b/emulators/xmamegui/Makefile
index c594362ae126..1698231cecb0 100644
--- a/emulators/xmamegui/Makefile
+++ b/emulators/xmamegui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmamegui
 DISTVERSION=	0.9-1
+PORTREVISION=	1
 CATEGORIES=	emulators java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 6733bb741375..15c030d8143c 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmess
-PORTREVISION=	2
+PORTREVISION=	3
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 emulator for game consoles
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index 7f01b963b2a1..dadab1664fb5 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xsystem35
 PORTVERSION=	1.7.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://8ne.sakura.ne.jp:20008/chika/unitbase/xsys35/down/
 
diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile
index 20a736d60e6c..fd3f7f70537e 100644
--- a/emulators/xzx/Makefile
+++ b/emulators/xzx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xzx
 PORTVERSION=	4.6
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://mitglied.lycos.de/suppentops123/spectrum/xzx/
 DISTNAME=	${PORTNAME}-pro-${PORTVERSION}
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index 6d933f932c56..b55d91c352ab 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yabause
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
diff --git a/emulators/yabause/pkg-plist b/emulators/yabause/pkg-plist
index c47c4ecb8779..0540785d440d 100644
--- a/emulators/yabause/pkg-plist
+++ b/emulators/yabause/pkg-plist
@@ -5,4 +5,3 @@ share/applications/yabause.desktop
 share/pixmaps/yabause.png
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/emulators/yape/Makefile b/emulators/yape/Makefile
index 6270c267ff8e..d2903c3efbfb 100644
--- a/emulators/yape/Makefile
+++ b/emulators/yape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yape
 PORTVERSION=	0.32.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://yape.homeserver.hu/download/
 DISTNAME=	${PORTNAME}SDL-${PORTVERSION}
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index cbbef1eb9e14..b738d79e16c9 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zsnes
 PORTVERSION=	1.51
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
diff --git a/finance/cbb/Makefile b/finance/cbb/Makefile
index 60db6609bdde..7c88d72ccdce 100644
--- a/finance/cbb/Makefile
+++ b/finance/cbb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cbb
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	finance deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/finance/expense/Makefile b/finance/expense/Makefile
index 541c5af0bebb..cb8fbfbe10ee 100644
--- a/finance/expense/Makefile
+++ b/finance/expense/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	expense
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	finance gnustep
 MASTER_SITES=	http://www.eskimo.com/~pburns/Expense/files/
 DISTNAME=	Expense-${PORTVERSION}
diff --git a/finance/gfp/Makefile b/finance/gfp/Makefile
index 67c8f449547c..e30b01addd2d 100644
--- a/finance/gfp/Makefile
+++ b/finance/gfp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gfp
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	finance java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	gfd
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index d53f313788a4..3341cc65449a 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnofin
 PORTVERSION=	0.8.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index cb1b1a7d18dc..0e259ed4e3a2 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnucash-docs
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	finance gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.gnucash.org/pub/gnucash/sources/stable/ \
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index e642c10df0ee..45b2019e452a 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	2.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.gnucash.org/pub/gnucash/sources/stable/
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 02d8163710dc..016e5084a647 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -1013,32 +1013,10 @@ share/locale/tr/LC_MESSAGES/gnucash.mo
 share/locale/uk/LC_MESSAGES/gnucash.mo
 share/locale/zh_CN/LC_MESSAGES/gnucash.mo
 share/locale/zh_TW/LC_MESSAGES/gnucash.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/es_NI/LC_MESSAGES
 @dirrmtry share/locale/es_NI
-@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/gnome/xml/gnucash/xsl
 @dirrm share/gnome/xml/gnucash
 @dirrm share/gnome/xml
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 72860261b97c..b23ecd535ab8 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grisbi
 PORTVERSION=	0.5.9
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/finance/grisbi/pkg-plist b/finance/grisbi/pkg-plist
index c0798c89d865..2f6d23f5e0d5 100644
--- a/finance/grisbi/pkg-plist
+++ b/finance/grisbi/pkg-plist
@@ -56,7 +56,3 @@ bin/grisbi
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile
index 827a03195a78..c3522b9e1527 100644
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	homebank
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	http://homebank.free.fr/public/
 
diff --git a/finance/kexchange/Makefile b/finance/kexchange/Makefile
index d6aac87493c9..3c1d788cfcfd 100644
--- a/finance/kexchange/Makefile
+++ b/finance/kexchange/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kexchange
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	finance kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/finance/kexchange/pkg-plist b/finance/kexchange/pkg-plist
index 267ce26379b3..12155b2b2839 100644
--- a/finance/kexchange/pkg-plist
+++ b/finance/kexchange/pkg-plist
@@ -28,8 +28,6 @@ share/icons/locolor/16x16/apps/kexchange.png
 share/icons/locolor/32x32/apps/kexchange.png
 share/locale/de/LC_MESSAGES/kexchange.mo
 share/locale/fi/LC_MESSAGES/kexchange.mo
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrmtry share/icons/locolor/32x32/apps
 @dirrmtry share/icons/locolor/32x32
 @dirrmtry share/icons/locolor/16x16/apps
diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile
index 7b7365502711..ba5283774ded 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	khacc
 PORTVERSION=	3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	qhacc
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 8d84e3d416e7..7708c52accc1 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kmymoney2
 PORTVERSION=	0.8.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index 8d84e3d416e7..7708c52accc1 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kmymoney2
 PORTVERSION=	0.8.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/finance/mybudget/Makefile b/finance/mybudget/Makefile
index 5eea46bc9f4a..1b63000f67f5 100644
--- a/finance/mybudget/Makefile
+++ b/finance/mybudget/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	myBudget
 PORTVERSION=	0.60
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	finance gnome
 MASTER_SITES=	http://www.abisource.com/~msevior/
 
diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile
index 663dfa268910..0c570f294c4b 100644
--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${UPPORTNAME:L}
 PORTVERSION=	4.01
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	opentaxsolver
@@ -16,6 +17,7 @@ MAINTAINER=	jhein@timing.com
 COMMENT=	US tax prep software
 
 USE_XLIB=	yes
+USE_GL=		yes
 UPPORTNAME=	OpenTaxSolver
 
 post-patch:
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index 750c817699eb..65071d1f31da 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qhacc
 PORTVERSION=	3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/finance/qtstalker/Makefile b/finance/qtstalker/Makefile
index 2499b914c9bd..16d35a8b9f87 100644
--- a/finance/qtstalker/Makefile
+++ b/finance/qtstalker/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qtstalker
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	finance kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/finance/sabernetdcs-client/Makefile b/finance/sabernetdcs-client/Makefile
index d6f09bbf9b39..f6542b47bb36 100644
--- a/finance/sabernetdcs-client/Makefile
+++ b/finance/sabernetdcs-client/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sabernetdcs
 PORTVERSION=	2.0.3
+PORTREVISION=	2
 CATEGORIES=	finance www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sabernetdcs
diff --git a/finance/sabernetdcs-client/pkg-plist b/finance/sabernetdcs-client/pkg-plist
index 4d7e72d51ee9..81282355f015 100644
--- a/finance/sabernetdcs-client/pkg-plist
+++ b/finance/sabernetdcs-client/pkg-plist
@@ -102,7 +102,6 @@ share/pixmaps/sndcs.png
 %%PYTHON_SITELIBDIR%%/sndcs_common/__init__.py
 %%PYTHON_SITELIBDIR%%/sndcs_common/__init__.pyc
 %%PYTHON_SITELIBDIR%%/sndcs_common/__init__.pyo
-@dirrmtry share/pixmaps
 @dirrm etc/sndcs
 @dirrm %%PYTHON_SITELIBDIR%%/sndcs_common
 @dirrm %%PYTHON_SITELIBDIR%%/sndcs_client/gtk
diff --git a/finance/tinyerp-server/Makefile b/finance/tinyerp-server/Makefile
index 814bb76ac3fc..32e20d5528ca 100644
--- a/finance/tinyerp-server/Makefile
+++ b/finance/tinyerp-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tinyerp-server
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_LOCAL}			\
 		http://tinyerp.org/download/sources/
diff --git a/finance/venice/Makefile b/finance/venice/Makefile
index 0224918ac6de..38e959e84753 100644
--- a/finance/venice/Makefile
+++ b/finance/venice/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	venice
 PORTVERSION=	0.5.1.a
+PORTREVISION=	1
 DISTVERSION=	0.51alpha
 CATEGORIES=	finance java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/finance/wmstock/Makefile b/finance/wmstock/Makefile
index c1ca467d4d10..46c797358ca0 100644
--- a/finance/wmstock/Makefile
+++ b/finance/wmstock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmstock
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance windowmaker
 MASTER_SITES=	http://mattfischer.com/wmstock/src/
 
diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile
index 9e174382d975..9d472b63184f 100644
--- a/finance/xinvest/Makefile
+++ b/finance/xinvest/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xinvest
 PORTVERSION=	2.6.9
+PORTREVISION=	1
 CATEGORIES=	finance deskutils
 MASTER_SITES=	http://xinvest.sunsite.dk/
 
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index 003ec20cd187..8e3b3e39beb4 100644
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xquote
 PORTVERSION=	2.6.10
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	http://xinvest.sunsite.dk/ XCONTRIB
 MASTER_SITE_SUBDIR=	applications
diff --git a/finance/xtrader/Makefile b/finance/xtrader/Makefile
index 3c8cb4b0fdaf..3db87b7d8215 100644
--- a/finance/xtrader/Makefile
+++ b/finance/xtrader/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtrader
 PORTVERSION=	0.99.9
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/french/acroread/Makefile b/french/acroread/Makefile
index ad658a778b53..44944040b28e 100644
--- a/french/acroread/Makefile
+++ b/french/acroread/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	french print linux
 
diff --git a/french/alphabet_sounds_fr/Makefile b/french/alphabet_sounds_fr/Makefile
index 2a06507b5a23..88dd7201d49b 100644
--- a/french/alphabet_sounds_fr/Makefile
+++ b/french/alphabet_sounds_fr/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	alphabet_sounds_fr
 PORTVERSION=	0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	french games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	childsplay
diff --git a/french/aster/Makefile b/french/aster/Makefile
index 3eddcd655558..d2ffa9485657 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aster
 DISTVERSION=	9.0.0-2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french cad python
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 DISTNAME=	${PORTNAME}-full-src-${DISTVERSION}.noarch
diff --git a/french/belote/Makefile b/french/belote/Makefile
index 008b2c27450f..b1555bc82d8e 100644
--- a/french/belote/Makefile
+++ b/french/belote/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	belote
 PORTVERSION=	20061109
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	french games java
 MASTER_SITES=	http://coincher.free.fr/
 DISTNAME=	belote
diff --git a/french/belote/pkg-plist b/french/belote/pkg-plist
index 9510d2c2ec4c..7d2580e9b45e 100644
--- a/french/belote/pkg-plist
+++ b/french/belote/pkg-plist
@@ -3,4 +3,3 @@ bin/belote
 %%DATADIR%%/data.bin
 share/pixmaps/belote.gif
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
diff --git a/french/calligra-l10n/Makefile b/french/calligra-l10n/Makefile
index 6b619a05114c..6ce79f2a7fcc 100644
--- a/french/calligra-l10n/Makefile
+++ b/french/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	french kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/french/dico/Makefile b/french/dico/Makefile
index dfd8aaaef1c0..e0aa0e152144 100644
--- a/french/dico/Makefile
+++ b/french/dico/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dico
 PORTVERSION=	1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	french
 MASTER_SITES=	ftp://ftp.supelec.fr/lsi/pub/security/
 DISTNAME=	le_dico
@@ -21,7 +21,7 @@ BROKEN_WWW=	http://www.montefiore.ulg.ac.be/cgi-bin-ulg/DICO.html
 #
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_AUTOTOOLS=	automake:14 autoconf:213
+USE_AUTOTOOLS=	automake:14 autoconf:253
 USE_GMAKE=	true
 AUTOMAKE_ARGS=	--add-missing --foreign --include-deps
 MAKE_ARGS=	prefix=${PREFIX}
diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index 182c8eeb9d4f..52791c4e25a9 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eficas
 DISTVERSION=	1.11.0-1
+PORTREVISION=	1
 CATEGORIES=	french cad python
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 
diff --git a/french/facturier/Makefile b/french/facturier/Makefile
index 54b77a565f28..46caa88d82a8 100644
--- a/french/facturier/Makefile
+++ b/french/facturier/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	facturier
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	french finance
 MASTER_SITES=	http://ignu.ungi.org/download/	\
 		${MASTER_SITE_LOCAL}
diff --git a/french/gfaim/Makefile b/french/gfaim/Makefile
index fdba98705d9c..d24a50061b18 100644
--- a/french/gfaim/Makefile
+++ b/french/gfaim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gfaim
 PORTVERSION=	0.30
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french
 MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/ \
 		http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/
diff --git a/french/gibi/Makefile b/french/gibi/Makefile
index 39059328eedc..65b93952a2d7 100644
--- a/french/gibi/Makefile
+++ b/french/gibi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gibi
 DISTVERSION=	2003-2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	french cad linux
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 DISTNAME=	${PORTNAME}-${DISTVERSION}.${ARCH}
diff --git a/french/homard/Makefile b/french/homard/Makefile
index 98a428811a17..dc71164ab7a2 100644
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	homard
 DISTVERSION=	8.5-1
+PORTREVISION=	1
 CATEGORIES=	french cad linux python
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 DISTNAME=	${PORTNAME}-${DISTVERSION}.${ARCH}
diff --git a/french/jdictionary-fre-hun/Makefile b/french/jdictionary-fre-hun/Makefile
index e6bc02fc0c24..fa067aa909ed 100644
--- a/french/jdictionary-fre-hun/Makefile
+++ b/french/jdictionary-fre-hun/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdictionary-fre-hun
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french hungarian textproc
 DISTNAME=	Smart_French_Hungarian-1_0.jar
 
diff --git a/french/kde3-i18n/Makefile b/french/kde3-i18n/Makefile
index 4097c96d8ffd..33f401df7e5e 100644
--- a/french/kde3-i18n/Makefile
+++ b/french/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	french kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/french/kde4-l10n/Makefile b/french/kde4-l10n/Makefile
index 4097c96d8ffd..33f401df7e5e 100644
--- a/french/kde4-l10n/Makefile
+++ b/french/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	french kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/french/koffice-i18n/Makefile b/french/koffice-i18n/Makefile
index 6b619a05114c..6ce79f2a7fcc 100644
--- a/french/koffice-i18n/Makefile
+++ b/french/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	french kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/french/koffice-kde4-l10n/Makefile b/french/koffice-kde4-l10n/Makefile
index 6b619a05114c..6ce79f2a7fcc 100644
--- a/french/koffice-kde4-l10n/Makefile
+++ b/french/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	french kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/french/med/Makefile b/french/med/Makefile
index f6b0d4e335bc..75def8dc1758 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	med
 PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	french science
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 
diff --git a/french/mozilla-flp/Makefile b/french/mozilla-flp/Makefile
index 398119c1c5b7..b94b1bc4e94b 100644
--- a/french/mozilla-flp/Makefile
+++ b/french/mozilla-flp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	${GECKO}-flp
 PORTVERSION=	${MOZVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	french www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
diff --git a/french/xtel/Makefile b/french/xtel/Makefile
index 1babd1cc8fa1..34fc779e2014 100644
--- a/french/xtel/Makefile
+++ b/french/xtel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtel
 PORTVERSION=	3.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french comms emulators
 MASTER_SITES=	http://pficheux.free.fr/xtel/download/
 
diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile
index 092f3e3eb82b..82a3be78c202 100644
--- a/ftp/IglooFTP/Makefile
+++ b/ftp/IglooFTP/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	IglooFTP
 PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://littleigloo.org/pub/iglooftp/
diff --git a/ftp/axyftp/Makefile b/ftp/axyftp/Makefile
index dcfd0e47453f..6327931f6dfa 100644
--- a/ftp/axyftp/Makefile
+++ b/ftp/axyftp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	axyftp
 PORTVERSION=	0.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.bitchx.com/pub/shareware/ \
 		ftp://ftp.netsw.org/net/ip/filetrans/ftp/axyftp/ \
diff --git a/ftp/dmachine/Makefile b/ftp/dmachine/Makefile
index 7ffe100e3b3f..302dc762d93c 100644
--- a/ftp/dmachine/Makefile
+++ b/ftp/dmachine/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	dmachine
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	ftp java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index 2eebebe48698..ac3eda7e1bdb 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	downloader
 PORTVERSION=	2.5.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	http://d4x.krasu.ru/files/ \
 		ftp://ftp.chg.ru/pub/X11/applications/Xdownloader/
diff --git a/ftp/downloader/pkg-plist b/ftp/downloader/pkg-plist
index 66a91a102ba1..9c22e0952f54 100644
--- a/ftp/downloader/pkg-plist
+++ b/ftp/downloader/pkg-plist
@@ -288,20 +288,6 @@ bin/nt
 %%NLS%%share/locale/uk/LC_MESSAGES/d4x.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/d4x.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
-%%NLS%%@dirrmtry share/locale/sr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sr
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
 @dirrm %%DATADIR%%/themes/old_theme/queue
 @dirrm %%DATADIR%%/themes/old_theme/buttons
 @dirrm %%DATADIR%%/themes/old_theme
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 5de05604825c..1436f27c667e 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	filezilla
 DISTVERSION=	3.0.0-beta7
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	SF
 DISTNAME=	FileZilla_${DISTVERSION}_src
diff --git a/ftp/ftpcube/Makefile b/ftp/ftpcube/Makefile
index 4840030b5af1..4cf5aad96a64 100644
--- a/ftp/ftpcube/Makefile
+++ b/ftp/ftpcube/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ftpcube
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	ftp python
 MASTER_SITES=	SF
 
diff --git a/ftp/ftptool/Makefile b/ftp/ftptool/Makefile
index f9cee71b0c1e..704e9b17f22e 100644
--- a/ftp/ftptool/Makefile
+++ b/ftp/ftptool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ftptool
 PORTVERSION=	4.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 9e7a43f948c6..eaf62223ad7b 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gftp
 PORTVERSION=	2.0.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp
 MASTER_SITES=	http://gftp.seul.org/ \
 		ftp://gftp.seul.org/pub/gftp/
diff --git a/ftp/gnustep-ftp/Makefile b/ftp/gnustep-ftp/Makefile
index 098f6c404dd3..c880659b248f 100644
--- a/ftp/gnustep-ftp/Makefile
+++ b/ftp/gnustep-ftp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ftp
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	ftp gnustep
 MASTER_SITES=	http://download.savannah.gnu.org/releases/gap/
 PKGNAMEPREFIX=	gnustep-
diff --git a/ftp/gollem/Makefile b/ftp/gollem/Makefile
index ed0172793a66..6ec5257235e9 100644
--- a/ftp/gollem/Makefile
+++ b/ftp/gollem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gollem
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/ftp/horde-gollem/Makefile b/ftp/horde-gollem/Makefile
index ed0172793a66..6ec5257235e9 100644
--- a/ftp/horde-gollem/Makefile
+++ b/ftp/horde-gollem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gollem
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/ftp/jftp/Makefile b/ftp/jftp/Makefile
index 5e62ca2d37c8..af76aab97f1e 100644
--- a/ftp/jftp/Makefile
+++ b/ftp/jftp/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	jftp
 PORTVERSION=	1.49
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	j-ftp
diff --git a/ftp/junglemonkey/Makefile b/ftp/junglemonkey/Makefile
index 34b87d59134f..d55540e7c361 100644
--- a/ftp/junglemonkey/Makefile
+++ b/ftp/junglemonkey/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	junglemonkey
 PORTVERSION=	0.1.11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	ftp gnome
 MASTER_SITES=	http://www.gizmolabs.org/~dhelder/junglemonkey/src/
 DISTNAME=	jm-${PORTVERSION}
diff --git a/ftp/kasablanca/Makefile b/ftp/kasablanca/Makefile
index 610e68d34a04..11457db1284c 100644
--- a/ftp/kasablanca/Makefile
+++ b/ftp/kasablanca/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kasablanca
 PORTVERSION=	0.4.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp kde
 MASTER_SITES=	http://download.berlios.de/kasablanca/ \
 		http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile
index 607f45b6fe76..12c78a030f76 100644
--- a/ftp/kbear/Makefile
+++ b/ftp/kbear/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kbear
 PORTVERSION=		3.0.a.1
-PORTREVISION=		6
+PORTREVISION=		7
 CATEGORIES=		ftp kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/ftp/kftpgrabber/Makefile b/ftp/kftpgrabber/Makefile
index a5f84cce8aeb..52eff75de767 100644
--- a/ftp/kftpgrabber/Makefile
+++ b/ftp/kftpgrabber/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kftpgrabber
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	ftp kde
 MASTER_SITES=	http://www.kftp.org/uploads/files/
 
diff --git a/ftp/kftpgrabber/pkg-plist b/ftp/kftpgrabber/pkg-plist
index 52e1b51148cd..598be06f3fb3 100644
--- a/ftp/kftpgrabber/pkg-plist
+++ b/ftp/kftpgrabber/pkg-plist
@@ -61,24 +61,8 @@ share/services/kftpimportplugin_gftp.desktop
 share/services/kftpimportplugin_kftp.desktop
 share/services/kftpimportplugin_ncftp.desktop
 share/servicetypes/kftpbookmarkimportplugin.desktop
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrm share/apps/kftpgrabber
 @dirrmtry share/applications/kde
 @dirrm include/kftpgrabber
diff --git a/ftp/kpum/Makefile b/ftp/kpum/Makefile
index b357335829a2..98cfbeead7cc 100644
--- a/ftp/kpum/Makefile
+++ b/ftp/kpum/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kpum
 PORTVERSION=	0.5.3.1
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/ftp/kwebget/Makefile b/ftp/kwebget/Makefile
index ffcead7dd2b2..f05752993d92 100644
--- a/ftp/kwebget/Makefile
+++ b/ftp/kwebget/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kwebget
 PORTVERSION=	0.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp kde
 MASTER_SITES=	http://www.kpage.de/download/
 DIST_SUBDIR=	KDE
diff --git a/ftp/llnlxdir/Makefile b/ftp/llnlxdir/Makefile
index 076619488551..73be2758b493 100644
--- a/ftp/llnlxdir/Makefile
+++ b/ftp/llnlxdir/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	llnlxdir
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.llnl.gov/pub/ia/llnlxdir/
 DISTNAME=	latest_xdir
diff --git a/ftp/llnlxftp/Makefile b/ftp/llnlxftp/Makefile
index 3dfc62bff3a5..800c80818278 100644
--- a/ftp/llnlxftp/Makefile
+++ b/ftp/llnlxftp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	llnlxftp
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.llnl.gov/pub/ia/llnlxftp/
 DISTNAME=	latest_xftp
diff --git a/ftp/multiget/Makefile b/ftp/multiget/Makefile
index 4da57e349a9e..2b6b43701ef1 100644
--- a/ftp/multiget/Makefile
+++ b/ftp/multiget/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	multiget
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	ftp www
 MASTER_SITES=	SF
 
diff --git a/ftp/ocaml-ocurl/Makefile b/ftp/ocaml-ocurl/Makefile
index 1b4ef808797c..d0190b7862ac 100644
--- a/ftp/ocaml-ocurl/Makefile
+++ b/ftp/ocaml-ocurl/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	ocurl
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 72c4fa1cfc78..28c6427bff5e 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pavuk
 PORTVERSION=	0.9.35
+PORTREVISION=	1
 CATEGORIES=	ftp www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/ftp/pavuk/pkg-plist b/ftp/pavuk/pkg-plist
index 2289e5c19125..b34da653d897 100644
--- a/ftp/pavuk/pkg-plist
+++ b/ftp/pavuk/pkg-plist
@@ -30,11 +30,3 @@ etc/pavukrc.sample
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index 086d5179b008..4f60928107a2 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pureadmin
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	purify
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index d1d91350cfc6..ece600a73b41 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	urlgfe
 PORTVERSION=	0.7.1
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES=	ftp www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	urlget
diff --git a/ftp/waiho/Makefile b/ftp/waiho/Makefile
index d8271fe0a0ca..3c0501468a4b 100644
--- a/ftp/waiho/Makefile
+++ b/ftp/waiho/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	waiho
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	ftp gnustep
 MASTER_SITES=	http://www.roard.com/waiho/download/
 DISTNAME=	Waiho-${PORTVERSION}
diff --git a/ftp/wgetpro/Makefile b/ftp/wgetpro/Makefile
index 4ffbb78fc18d..8ef2528a4232 100644
--- a/ftp/wgetpro/Makefile
+++ b/ftp/wgetpro/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wgetpro
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/ftp/wgetpro/pkg-plist b/ftp/wgetpro/pkg-plist
index 0a1bad5e281b..a9583408f7a6 100644
--- a/ftp/wgetpro/pkg-plist
+++ b/ftp/wgetpro/pkg-plist
@@ -27,27 +27,3 @@ bin/wpro
 %%NLS%%share/locale/uk/LC_MESSAGES/wpro.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wpro.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/wpro.mo
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/no/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/no
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sl
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_TW
diff --git a/ftp/wmget/Makefile b/ftp/wmget/Makefile
index e35432789e13..039d2a6df5cc 100644
--- a/ftp/wmget/Makefile
+++ b/ftp/wmget/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmget
 PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	http://amtrickey.net/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/ftp/wxdfast/Makefile b/ftp/wxdfast/Makefile
index c1f0c7714194..8a2bf2e05c5e 100644
--- a/ftp/wxdfast/Makefile
+++ b/ftp/wxdfast/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wxdfast
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	ftp www
 MASTER_SITES=	SF/dfast
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/ftp/wxdfast/pkg-plist b/ftp/wxdfast/pkg-plist
index 7717d3841af1..aa8a6bf1ba47 100644
--- a/ftp/wxdfast/pkg-plist
+++ b/ftp/wxdfast/pkg-plist
@@ -102,5 +102,4 @@ share/pixmaps/wxdfast.png
 @dirrm %%DATADIR%%/RipStop/icon
 @dirrm %%DATADIR%%/RipStop
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 64aca5f17aa7..6564e676054b 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wzdftpd
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/ftp/xrmftp/Makefile b/ftp/xrmftp/Makefile
index 36e24fecc7e4..b17551988a8c 100644
--- a/ftp/xrmftp/Makefile
+++ b/ftp/xrmftp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xrmftp
 PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	http://www-users.mat.uni.torun.pl/~rafmet/xrmftp/
 EXTRACT_SUFX=	.src.tgz
diff --git a/games/0verkill/Makefile b/games/0verkill/Makefile
index 28b52e4ddf16..06676bffceb1 100644
--- a/games/0verkill/Makefile
+++ b/games/0verkill/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	0verkill
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/
 EXTRACT_SUFX=	.tgz
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 5eccd07d847d..25f04ae42d43 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		3dc
 PORTVERSION=		0.8.1
+PORTREVISION=	1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/3dpong/Makefile b/games/3dpong/Makefile
index 3841c4b15564..6d2594abb4a7 100644
--- a/games/3dpong/Makefile
+++ b/games/3dpong/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	3dpong
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/3dpong/src/
 
diff --git a/games/4stattack/Makefile b/games/4stattack/Makefile
index 33c45e7d180d..e68adfb20919 100644
--- a/games/4stattack/Makefile
+++ b/games/4stattack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	4stattack
 PORTVERSION=	2.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	forcedattack
diff --git a/games/54321/Makefile b/games/54321/Makefile
index 07d0a003fc31..5cf54e7abf32 100644
--- a/games/54321/Makefile
+++ b/games/54321/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	54321
 PORTVERSION=	1.0.2001.11.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.nklein.com/products/54321/${PORTVERSION}/
 DISTNAME=	${PORTNAME}
diff --git a/games/BillardGL/Makefile b/games/BillardGL/Makefile
index d04c02e2569c..f866d9a9a9b5 100644
--- a/games/BillardGL/Makefile
+++ b/games/BillardGL/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		BillardGL
 PORTVERSION=		1.75
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	billardgl
diff --git a/games/CaribbeanStud/Makefile b/games/CaribbeanStud/Makefile
index 6be58856435d..8c3dc1b372af 100644
--- a/games/CaribbeanStud/Makefile
+++ b/games/CaribbeanStud/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		CaribbeanStud
 PORTVERSION=		1.0
+PORTREVISION=	1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/KnightCap/Makefile b/games/KnightCap/Makefile
index 6a6875c08e1b..341d83e854a2 100644
--- a/games/KnightCap/Makefile
+++ b/games/KnightCap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	knightcap
 PORTVERSION=	3.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.samba.org/pub/KnightCap/
 DISTNAME=	KnightCap-${PORTVERSION}
diff --git a/games/abe/Makefile b/games/abe/Makefile
index 2b358fc327f5..41616dbc9eea 100644
--- a/games/abe/Makefile
+++ b/games/abe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	abe
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/abridge/Makefile b/games/abridge/Makefile
index 70fd14ee4cfa..83485008a185 100644
--- a/games/abridge/Makefile
+++ b/games/abridge/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	abridge
 PORTVERSION=	0.4.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTREVISON=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.abridgegame.org/src/
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 3c3dfe431285..99b941df7439 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	abuse
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.labyrinth.net.au/~trandor/abuse/files/
 DISTFILES=	abuse_datafiles.tar.gz
diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile
index e823100fa795..d2b7e69d5033 100644
--- a/games/abuse_sdl/Makefile
+++ b/games/abuse_sdl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	abuse_sdl
 PORTVERSION=	0.7.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.labyrinth.net.au/~trandor/abuse/files/
 
diff --git a/games/acm/Makefile b/games/acm/Makefile
index d9fa6982b0bf..e3145f063f32 100644
--- a/games/acm/Makefile
+++ b/games/acm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	acm
 PORTVERSION=	5.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.websimulations.com/download/
 
diff --git a/games/actioncube/Makefile b/games/actioncube/Makefile
index 623413c058b6..1b3ea4d4bb2d 100644
--- a/games/actioncube/Makefile
+++ b/games/actioncube/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	actioncube
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/actiongame
 DISTNAME=	ActionCube_v${PORTVERSION}
diff --git a/games/actx/Makefile b/games/actx/Makefile
index 35aba421de70..e188118c924d 100644
--- a/games/actx/Makefile
+++ b/games/actx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	actx
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://rosegray.sakura.ne.jp/ActX/
 
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index a6e9fe6d0f22..0feb2315e7d2 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	adgali
 PORTVERSION=	0.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games devel
 MASTER_SITES=	http://adgali.apiou.org/download/
 
diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index 81a587dc9afa..17f1665d1035 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	adonthell
 PORTVERSION=	0.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/adonthell/pkg-plist b/games/adonthell/pkg-plist
index b972e6c9c9a9..5621f679a31f 100644
--- a/games/adonthell/pkg-plist
+++ b/games/adonthell/pkg-plist
@@ -472,4 +472,3 @@ share/pixmaps/wastesedge_32x32.xpm
 @dirrm %%DATADIR%%/games
 @dirrm %%DATADIR%%/modules
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
diff --git a/games/affenspiel/Makefile b/games/affenspiel/Makefile
index b6d0d95c05ce..c1b15e57308e 100644
--- a/games/affenspiel/Makefile
+++ b/games/affenspiel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	affenspiel
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/affenspiel/
 
diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile
index b5c864e07770..b19d6041918b 100644
--- a/games/afternoonstalker/Makefile
+++ b/games/afternoonstalker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	afternoonstalker
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
 
diff --git a/games/afternoonstalker/pkg-plist b/games/afternoonstalker/pkg-plist
index 27db4787b89e..0f3cc3b9c2a6 100644
--- a/games/afternoonstalker/pkg-plist
+++ b/games/afternoonstalker/pkg-plist
@@ -15,5 +15,4 @@ share/pixmaps/afternoonstalker.png
 share/applications/afternoonstalker.desktop
 @dirrm share/afternoonstalker/sounds
 @dirrm share/afternoonstalker
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
diff --git a/games/agame/Makefile b/games/agame/Makefile
index 1b5ad93e232b..a7222bcc831c 100644
--- a/games/agame/Makefile
+++ b/games/agame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	agame
 PORTVERSION=	1577
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://zevv.nl/code/game/ \
 		http://critical.ch/distfiles/ \
diff --git a/games/airrox/Makefile b/games/airrox/Makefile
index 37e271350bba..e559a47e8d80 100644
--- a/games/airrox/Makefile
+++ b/games/airrox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	airrox
 PORTVERSION=	0.0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-0.04
diff --git a/games/alephone-data/Makefile b/games/alephone-data/Makefile
index e7d7a6653f23..5413b5673d0f 100644
--- a/games/alephone-data/Makefile
+++ b/games/alephone-data/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	data
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://trilogyrelease.bungie.org/files/:bungie \
 		ftp://ftp2.fileball.net/fileball/marathon/aleph1/alterations/:landscapes \
diff --git a/games/alephone-scenarios/Makefile b/games/alephone-scenarios/Makefile
index 480790046d1f..26ee1d7f9469 100644
--- a/games/alephone-scenarios/Makefile
+++ b/games/alephone-scenarios/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scenarios
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://trilogyrelease.bungie.org/files/:bungie \
 		http://files5.bungie.org/marathon/:rubicon \
diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 44abb20145aa..7e41c45ff849 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	alephone
 PORTVERSION=	20061228
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	marathon
diff --git a/games/alienarena-data/Makefile b/games/alienarena-data/Makefile
index 466132a19e98..a2d4086d3c6d 100644
--- a/games/alienarena-data/Makefile
+++ b/games/alienarena-data/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	alienarena
 PORTVERSION=	2007.604
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://cor.planetquake.gamespy.com/codered/files/
 PKGNAMESUFFIX=	-data
diff --git a/games/alienarena-data/pkg-plist b/games/alienarena-data/pkg-plist
index acf4376a7385..cfb46935cc41 100644
--- a/games/alienarena-data/pkg-plist
+++ b/games/alienarena-data/pkg-plist
@@ -2121,4 +2121,3 @@ share/pixmaps/alienarena.xpm
 @dirrm %%DATADIR%%/arena/pics
 @dirrm %%DATADIR%%/arena
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 2b7a8e923900..11d5a317870e 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alienarena
 PORTVERSION=	2007.604
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://cor.planetquake.gamespy.com/codered/files/
 DISTNAME=	${PORTNAME}2007-linux20070225-x86
diff --git a/games/alienblaster/Makefile b/games/alienblaster/Makefile
index 10336a47c28a..bb52606fafce 100644
--- a/games/alienblaster/Makefile
+++ b/games/alienblaster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alienblaster
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.informatik.uni-bremen.de/~schwardt/alienblaster/
 EXTRACT_SUFX=	.tgz
diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index dd2a0696addc..45c5b3a6ba9e 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	allacrost
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/amphetamine/Makefile b/games/amphetamine/Makefile
index 3e032a5ec12b..93a765d5a5b6 100644
--- a/games/amphetamine/Makefile
+++ b/games/amphetamine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amphetamine
 PORTVERSION=	0.8.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://n.ethz.ch/student/loehrerl/amph/files/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/games/anagramarama/Makefile b/games/anagramarama/Makefile
index 5c474e965a18..4ae178b55eef 100644
--- a/games/anagramarama/Makefile
+++ b/games/anagramarama/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	anagramarama
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.omega.clara.net/anagramarama/dist/
 
diff --git a/games/angband/Makefile b/games/angband/Makefile
index 9225f647354a..4f4efc0deecd 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	angband
 PORTVERSION=	3.0.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://angband.oook.cz/download/
 
diff --git a/games/annelid/Makefile b/games/annelid/Makefile
index 2f4d1ce99017..d6bbc6dd5b9f 100644
--- a/games/annelid/Makefile
+++ b/games/annelid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	annelid
 PORTVERSION=	1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.garthgillespie.com/annelid/ \
 		${MASTER_SITE_LOCAL}
diff --git a/games/antipolix/Makefile b/games/antipolix/Makefile
index e8672bcfc5ec..46275ae2f62a 100644
--- a/games/antipolix/Makefile
+++ b/games/antipolix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	antipolix
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/multiplayer
diff --git a/games/apoolGL/Makefile b/games/apoolGL/Makefile
index 907ab4e6691d..39b135db24cc 100644
--- a/games/apoolGL/Makefile
+++ b/games/apoolGL/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apoolGL
 PORTVERSION=	0.99.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.planetjahn.de/files/
 DISTNAME=	${PORTNAME}-099-pre22
diff --git a/games/aqbubble/Makefile b/games/aqbubble/Makefile
index 29fa64abff7f..7eda0c1c734a 100644
--- a/games/aqbubble/Makefile
+++ b/games/aqbubble/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aqbubble
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.losersjuegos.com.ar/juegos/aqbubble/descargas/
 
diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile
index e35b03340aa2..2cec6d68ab4c 100644
--- a/games/armagetron/Makefile
+++ b/games/armagetron/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	armagetron
 PORTVERSION=	0.2.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	armagetronad
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 2fc4f845fdd7..96f4bc42d5a4 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asc
 PORTVERSION=	1.16.4.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	asc-hq
diff --git a/games/assaultcube/Makefile b/games/assaultcube/Makefile
index 623413c058b6..1b3ea4d4bb2d 100644
--- a/games/assaultcube/Makefile
+++ b/games/assaultcube/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	actioncube
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/actiongame
 DISTNAME=	ActionCube_v${PORTVERSION}
diff --git a/games/atitd/Makefile b/games/atitd/Makefile
index 10ca373f3322..097acdfd19e4 100644
--- a/games/atitd/Makefile
+++ b/games/atitd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	atitd
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games graphics linux
 MASTER_SITES=	http://game3.atitd.com/dl/files/
 DISTNAME=	eClient-linux-i686.run
diff --git a/games/atlantikdesigner/Makefile b/games/atlantikdesigner/Makefile
index 8ccf86bfe2ac..2618407f7d39 100644
--- a/games/atlantikdesigner/Makefile
+++ b/games/atlantikdesigner/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${ATLANTIKDESIGNER_PORTNAME}
 PORTVERSION=	${ATLANTIKDESIGNER_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${ATLANTIKDESIGNER_PORTREVISION}
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index be673aa18d23..5f143535d39e 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	atomix
 PORTVERSION=	2.14.0
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index 6a3e14271e11..b64915a4b6ea 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	atr3d
 PORTVERSION=	0.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.avoidtheroid.com/pub/${PORTNAME}/
 DISTNAME=	${PORTNAME}_source_${PORTVERSION}
diff --git a/games/atris-sounds/Makefile b/games/atris-sounds/Makefile
index 83ecdb7b6775..c26670e4b687 100644
--- a/games/atris-sounds/Makefile
+++ b/games/atris-sounds/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	atris
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.cs.berkeley.edu/~weimer/atris/
 PKGNAMESUFFIX=	-sounds
diff --git a/games/atris/Makefile b/games/atris/Makefile
index 289454486046..9fbdac3b895b 100644
--- a/games/atris/Makefile
+++ b/games/atris/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	atris
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.cs.berkeley.edu/~weimer/atris/
 
diff --git a/games/awele/Makefile b/games/awele/Makefile
index 09b5b002f3e5..626c799391eb 100644
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	awele
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games tk84
 MASTER_SITES=	http://www-air.inria.fr/ftp/Jean-Paul/ \
 		${MASTER_SITE_XCONTRIB}
diff --git a/games/balazar/Makefile b/games/balazar/Makefile
index db33282e55be..34bcee1616d7 100644
--- a/games/balazar/Makefile
+++ b/games/balazar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	balazar
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games python
 MASTER_SITES=	http://download.gna.org/balazar/
 DISTNAME=	Balazar-${PORTVERSION}
diff --git a/games/balazarbrothers/Makefile b/games/balazarbrothers/Makefile
index d5863833563e..26906d2ed805 100644
--- a/games/balazarbrothers/Makefile
+++ b/games/balazarbrothers/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	balazarbrothers
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games python
 MASTER_SITES=	http://download.gna.org/${PORTNAME:S/brothers//}/
 DISTNAME=	${PORTNAME:S/b/B/g}-${PORTVERSION}
diff --git a/games/barrage/Makefile b/games/barrage/Makefile
index e68d22485cbe..8829b052e87b 100644
--- a/games/barrage/Makefile
+++ b/games/barrage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	barrage
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgames
diff --git a/games/bass/Makefile b/games/bass/Makefile
index 2ffe9b411e71..6c76c1f4c64e 100644
--- a/games/bass/Makefile
+++ b/games/bass/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bass
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scummvm
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index 61bf25574067..c3f1379ca74d 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	battalion
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.evl.uic.edu/aej/BATTALION/
 DISTFILES=	battalionSource1.4.tar.Z battalionSUN4.tar.gz
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index 309388d48ef2..e6eaa488793e 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	battleball
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://freebsd.aeternal.net/ports/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/games/bfm/Makefile b/games/bfm/Makefile
index 71400d658309..dfb64d6f7e80 100644
--- a/games/bfm/Makefile
+++ b/games/bfm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bfm
 PORTVERSION=	0.0.6.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/battle4mandicor
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/games/biloba/Makefile b/games/biloba/Makefile
index dc93c28d3102..2fe408e27d2a 100644
--- a/games/biloba/Makefile
+++ b/games/biloba/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	biloba
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/bitefusion/Makefile b/games/bitefusion/Makefile
index f864bd4a3800..ea1a1e63d9ba 100644
--- a/games/bitefusion/Makefile
+++ b/games/bitefusion/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bitefusion
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.junoplay.com/files/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/blackjack/Makefile b/games/blackjack/Makefile
index ee5be0a49881..c71bdfdbab68 100644
--- a/games/blackjack/Makefile
+++ b/games/blackjack/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	blackjack
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile
index 0fcdb75df3ad..ac0af5388e82 100644
--- a/games/blinkensisters/Makefile
+++ b/games/blinkensisters/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blinkensisters
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/blobandconquer/Makefile b/games/blobandconquer/Makefile
index eade97775cf5..1444bc66b457 100644
--- a/games/blobandconquer/Makefile
+++ b/games/blobandconquer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	blobandconquer
 DISTVERSION=	0.8-2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.amdmi3.ru/distfiles/ \
 		http://www.parallelrealities.co.uk/download.php?type=zip&file=
diff --git a/games/bloboats/Makefile b/games/bloboats/Makefile
index f1d35d0796a3..5d3a0d792dc6 100644
--- a/games/bloboats/Makefile
+++ b/games/bloboats/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bloboats
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://mirror.kapsi.fi/bloboats.dy.fi/ \
 		http://koti.mbnet.fi/makegho/c/blobtrox/ \
diff --git a/games/blobwars/Makefile b/games/blobwars/Makefile
index 2eed280c60c3..ce8429f2932c 100644
--- a/games/blobwars/Makefile
+++ b/games/blobwars/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	blobwars
 DISTVERSION=	1.04-1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=distfiles
diff --git a/games/blockade/Makefile b/games/blockade/Makefile
index e73e42ff4371..18367936b758 100644
--- a/games/blockade/Makefile
+++ b/games/blockade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	blockade
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.geocities.com/TimesSquare/Zone/5267/
 DISTFILES=	blockade-1_00-linux.tar.gz
diff --git a/games/blokish/Makefile b/games/blokish/Makefile
index 25cdead0835c..536421785f06 100644
--- a/games/blokish/Makefile
+++ b/games/blokish/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	blokish
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/bloodfrontier/Makefile b/games/bloodfrontier/Makefile
index 1ce8ba53a2e1..33bde012dd10 100644
--- a/games/bloodfrontier/Makefile
+++ b/games/bloodfrontier/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sauerbraten
 PORTVERSION=	20061204
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/bogged/Makefile b/games/bogged/Makefile
index 4c070a4c301e..c538be5ab323 100644
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		bogged
 PORTVERSION=		1.0.0
+PORTREVISION=	1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/bomb/Makefile b/games/bomb/Makefile
index 2abb17107a1c..3ab7a3dff3ac 100644
--- a/games/bomb/Makefile
+++ b/games/bomb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bomb
 PORTVERSION=	1.26
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.draves.org/bomb/
 
diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 393b5ec65d7b..26c5048f9da4 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bomberclone
 PORTVERSION=	0.11.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile
index 5c2b421c433f..606f7c686bbe 100644
--- a/games/bomberinstinct/Makefile
+++ b/games/bomberinstinct/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bomberinstinct
 PORTVERSION=	0.8.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile
index f97050e6d1a4..475b1a243d65 100644
--- a/games/bombermaze/Makefile
+++ b/games/bombermaze/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bombermaze
 PORTVERSION=	0.6.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/bomns/Makefile b/games/bomns/Makefile
index 2ba65e6b092e..3f9e935a6213 100644
--- a/games/bomns/Makefile
+++ b/games/bomns/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bomns
 PORTVERSION=	0.99.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	greenridge
diff --git a/games/boswars/Makefile b/games/boswars/Makefile
index 379caf165561..81b8794df010 100644
--- a/games/boswars/Makefile
+++ b/games/boswars/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	boswars
 PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.boswars.org/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile
index b31430a1cc21..fdb716145744 100644
--- a/games/briquolo/Makefile
+++ b/games/briquolo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	briquolo
 PORTVERSION=	0.5.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://briquolo.free.fr/download/
 
@@ -17,6 +18,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
+USE_GL=		yes
 USE_SDL=	mixer sdl ttf
 USE_GCC=	3.4
 USE_GMAKE=	yes
diff --git a/games/briquolo/pkg-plist b/games/briquolo/pkg-plist
index 7a497f72aaab..def4df1b6c0b 100644
--- a/games/briquolo/pkg-plist
+++ b/games/briquolo/pkg-plist
@@ -112,14 +112,5 @@ share/pixmaps/briquolo.svg
 @dirrm %%DATADIR%%/tableau
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
 share/applications/briquolo.desktop
 %%NLS%%@dirrmtry share/applications
-%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/be
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
diff --git a/games/brutalchess/Makefile b/games/brutalchess/Makefile
index 08bdc752788f..a540d54c212a 100644
--- a/games/brutalchess/Makefile
+++ b/games/brutalchess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		brutalchess
 PORTVERSION=		0.5.2
+PORTREVISION=	1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/bubbros/Makefile b/games/bubbros/Makefile
index 35082666f75e..4de5a2e6ddee 100644
--- a/games/bubbros/Makefile
+++ b/games/bubbros/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bubbros
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bub-n-bros
diff --git a/games/bugsquish/Makefile b/games/bugsquish/Makefile
index c780c377bc09..7d1f2c3f412c 100644
--- a/games/bugsquish/Makefile
+++ b/games/bugsquish/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bugsquish
 PORTVERSION=	0.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/bugsquish/src/
 
diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile
index b2668c88e40b..eccd32d501c5 100644
--- a/games/bugsx/Makefile
+++ b/games/bugsx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bugsx
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
diff --git a/games/bumprace/Makefile b/games/bumprace/Makefile
index e40e506ba7a0..d64d7ec84124 100644
--- a/games/bumprace/Makefile
+++ b/games/bumprace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bumprace
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://user.cs.tu-berlin.de/~karlb/bumprace/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile
index 29d832f8f072..3ccf91319a98 100644
--- a/games/burgerspace/Makefile
+++ b/games/burgerspace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	burgerspace
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
 
diff --git a/games/burrtools/Makefile b/games/burrtools/Makefile
index cb9017208feb..058edd652e27 100644
--- a/games/burrtools/Makefile
+++ b/games/burrtools/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	burrtools
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile
index 008e06823acd..e899ca86eb99 100644
--- a/games/bygfoot/Makefile
+++ b/games/bygfoot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bygfoot
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 93265da66325..6e15db668e49 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bzflag
 PORTVERSION=	2.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/cake/Makefile b/games/cake/Makefile
index e8a36753dc46..a2ba97b9b407 100644
--- a/games/cake/Makefile
+++ b/games/cake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cake
 PORTVERSION=	2005.12.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.calodox.scene.org/morbac/cake/download/ \
 		${MASTER_SITE_LOCAL} http://freebsd.nsu.ru/distfiles/
diff --git a/games/ceferino/Makefile b/games/ceferino/Makefile
index 1c29b98910ac..1098f068feb7 100644
--- a/games/ceferino/Makefile
+++ b/games/ceferino/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ceferino
 PORTVERSION=	0.97.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.losersjuegos.com.ar/juegos/ceferino/descargas/
 
diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile
index 85322654eff8..d5a15ff7e83b 100644
--- a/games/cgoban/Makefile
+++ b/games/cgoban/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cgoban
 PORTVERSION=	1.9.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cgoban1
diff --git a/games/cgoban2/Makefile b/games/cgoban2/Makefile
index 24a606165850..3d97e32fc29f 100644
--- a/games/cgoban2/Makefile
+++ b/games/cgoban2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cgoban2
 PORTVERSION=	2.6.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games java
 MASTER_SITES=	http://kgs.kiseido.com/
 DISTNAME=	cgoban-unix-${PORTVERSION}
diff --git a/games/chanta/Makefile b/games/chanta/Makefile
index 3504ea35bb0a..bc850a6293fa 100644
--- a/games/chanta/Makefile
+++ b/games/chanta/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chanta
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.losersjuegos.com.ar/juegos/chanta/descargas/
 
diff --git a/games/childsplay/Makefile b/games/childsplay/Makefile
index 9bc8aea67820..67476ff281a2 100644
--- a/games/childsplay/Makefile
+++ b/games/childsplay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	childsplay
 PORTVERSION=	0.80.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	childsplay
diff --git a/games/childsplay_plugins/Makefile b/games/childsplay_plugins/Makefile
index 2a43736deb4c..d15e5438c6c8 100644
--- a/games/childsplay_plugins/Makefile
+++ b/games/childsplay_plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	childsplay_plugins
 PORTVERSION=	0.80.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	childsplay
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index b6537255b4e8..1c3364864d04 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chromium
 PORTVERSION=	0.9.12
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.reptilelabour.com/software/files/chromium/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/chromium/Makefile b/games/chromium/Makefile
index b6537255b4e8..1c3364864d04 100644
--- a/games/chromium/Makefile
+++ b/games/chromium/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chromium
 PORTVERSION=	0.9.12
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.reptilelabour.com/software/files/chromium/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/circuslinux/Makefile b/games/circuslinux/Makefile
index 97289d722e5f..0e118c0840c7 100644
--- a/games/circuslinux/Makefile
+++ b/games/circuslinux/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	circuslinux
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/circus-linux/src/
 
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index 79f269055704..ec484b5b564d 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clanbomber
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/cleanq3/Makefile b/games/cleanq3/Makefile
index 041da4d3aaca..c8d9dcacfd71 100644
--- a/games/cleanq3/Makefile
+++ b/games/cleanq3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cleanq3
 PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://tremor.quakedev.com/
 DISTNAME=	CleanQ3_v${PORTVERSION}-srcbin
diff --git a/games/columns/Makefile b/games/columns/Makefile
index 3898704f0fbd..685ebfa8bda6 100644
--- a/games/columns/Makefile
+++ b/games/columns/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	columns
 PORTVERSION=	1.2b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 # mastersite disappeared in December 2000
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/games/concentration/Makefile b/games/concentration/Makefile
index 05f85440b713..ea2f0a3cd99f 100644
--- a/games/concentration/Makefile
+++ b/games/concentration/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	concentration
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.shiftygames.com/concentration/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/connectfive/Makefile b/games/connectfive/Makefile
index a34800ba62fd..7946cb70a925 100644
--- a/games/connectfive/Makefile
+++ b/games/connectfive/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	connectfive
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	connectfive
diff --git a/games/construo/Makefile b/games/construo/Makefile
index 740c39620324..d545a0bc1b9a 100644
--- a/games/construo/Makefile
+++ b/games/construo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	construo
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	construo
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 162973e698f4..17d93f3c236f 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	corewars
 PORTVERSION=	0.9.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/cosmo/Makefile b/games/cosmo/Makefile
index 3f307dbb77ab..9f4ace828ecd 100644
--- a/games/cosmo/Makefile
+++ b/games/cosmo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cosmo
 PORTVERSION=	2.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://133.25.251.9/pub/linux/Vine/VinePlus/1.1/JG-0.9.1/other-sources/jp/ \
 		ftp://ftp.uni-erlangen.de/.mirrors/ftpbsd/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/cosmo/
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index 8b9ede3982a4..5779046c7ac0 100644
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	crack-attack
 PORTVERSION=	1.1.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/crimson/Makefile b/games/crimson/Makefile
index 32855d6169b6..b90d529641d5 100644
--- a/games/crimson/Makefile
+++ b/games/crimson/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	crimson
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://crimson.seul.org/files/
 
diff --git a/games/crimson/pkg-plist b/games/crimson/pkg-plist
index cd2b9a5eb3f2..fbb03db59a3b 100644
--- a/games/crimson/pkg-plist
+++ b/games/crimson/pkg-plist
@@ -43,7 +43,6 @@ share/applications/crimson.desktop
 %%DATADIR%%/sound/select.wav
 %%DATADIR%%/title.bmp
 share/pixmaps/crimson.png
-@dirrmtry share/pixmaps/
 @dirrmtry share/applications
 @dirrm %%DATADIR%%/levels
 @dirrm %%DATADIR%%/locale
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index f6ac5e1700cf..d323f0cf8d0d 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	criticalmass
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 030ec3ae16a9..68a714727aa8 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	crossfire-client
 PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.ifi.uio.no/pub/crossfire/ \
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index a2c84d9418e9..222112ff5a57 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	crossfire
 PORTVERSION=	1.10.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF \
 		ftp://ftp.real-time.com/pub/games/crossfire/
diff --git a/games/csmash/Makefile b/games/csmash/Makefile
index d5be1d2ea0c0..532c2c01a16f 100644
--- a/games/csmash/Makefile
+++ b/games/csmash/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	csmash
 PORTVERSION=	0.6.6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cannonsmash
diff --git a/games/cube/Makefile b/games/cube/Makefile
index 597f3262c4ad..b73b8053dcb2 100644
--- a/games/cube/Makefile
+++ b/games/cube/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cube
 PORTVERSION=	2005.08.29
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/cultivation/Makefile b/games/cultivation/Makefile
index 60a89a1bcb2c..9bdde53e6c17 100644
--- a/games/cultivation/Makefile
+++ b/games/cultivation/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cultivation
 PORTVERSION=	7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index 79dfdc420c64..4bf0c4cf8195 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	d2x
 PORTVERSION=	0.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.icculus.org/d2x/src/
 
diff --git a/games/daimonin-client/Makefile b/games/daimonin-client/Makefile
index 621700743392..9ce6db56a431 100644
--- a/games/daimonin-client/Makefile
+++ b/games/daimonin-client/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	daimonin_client
 DISTVERSION=	BETA3-0967
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	daimonin
diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile
index 621700743392..9ce6db56a431 100644
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	daimonin_client
 DISTVERSION=	BETA3-0967
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	daimonin
diff --git a/games/dangen/Makefile b/games/dangen/Makefile
index aca4ea791e23..41e9e05d5e53 100644
--- a/games/dangen/Makefile
+++ b/games/dangen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dangen
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.interq.or.jp/libra/oohara/dangen/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile
index 61a11bdd3c9d..e76e813e5549 100644
--- a/games/dangerdeep/Makefile
+++ b/games/dangerdeep/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dangerdeep
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/darkplaces/Makefile b/games/darkplaces/Makefile
index e825bfe68fd2..8dc1e1aa1594 100644
--- a/games/darkplaces/Makefile
+++ b/games/darkplaces/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	darkplaces
 PORTVERSION=	20060725
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://offload1.icculus.org/twilight/darkplaces/files/
 DISTNAME=	${PORTNAME}engine${PORTVERSION}
diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile
index b1e5d843e934..242d5375c16e 100644
--- a/games/defendguin/Makefile
+++ b/games/defendguin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	defendguin
 PORTVERSION=	0.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/defendguin/src/
 
diff --git a/games/demonquake/Makefile b/games/demonquake/Makefile
index da4c1fe4bb44..cda3f9aadf0a 100644
--- a/games/demonquake/Makefile
+++ b/games/demonquake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	demonquake
 PORTVERSION=	0.16.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://qudos.quakedev.com/linux/quake1/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/games/deng/Makefile b/games/deng/Makefile
index 28e3d608b825..7343efdcdd73 100644
--- a/games/deng/Makefile
+++ b/games/deng/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	deng
 PORTVERSION=	1.9.0b4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/-beta/}
diff --git a/games/diameter/Makefile b/games/diameter/Makefile
index 3b29af23d2b8..4457cf859c46 100644
--- a/games/diameter/Makefile
+++ b/games/diameter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	diameter
 PORTVERSION=	0.4.0.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gamediameter
diff --git a/games/dmjava/Makefile b/games/dmjava/Makefile
index a6478c2ea877..a761c58c0e8c 100644
--- a/games/dmjava/Makefile
+++ b/games/dmjava/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dmjava
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://chaos.zpc.cz/files/
diff --git a/games/dodgindiamond2/Makefile b/games/dodgindiamond2/Makefile
index 61f8e0e774b0..de2cf84a2b47 100644
--- a/games/dodgindiamond2/Makefile
+++ b/games/dodgindiamond2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		dodgindiamond2
 PORTVERSION=		0.2.1
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		http://www.usebox.net/jjm/dd2/releases/
 DISTNAME=		dd2-${PORTVERSION}
diff --git a/games/dontspace/Makefile b/games/dontspace/Makefile
index d7df2612ca0b..7058d7e4b815 100644
--- a/games/dontspace/Makefile
+++ b/games/dontspace/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dontspace
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games tk84
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/JACOBY/
 
diff --git a/games/doom/Makefile b/games/doom/Makefile
index 34b26d86c67e..39ad082d4cb9 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	doom
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_IDSOFTWARE}
 MASTER_SITE_SUBDIR=	source
diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile
index 05e228414ad1..2fd1fdce78be 100644
--- a/games/doomlegacy/Makefile
+++ b/games/doomlegacy/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	doomlegacy
 PORTVERSION=	142
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	legacy_${PORTVERSION}_src
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index a07b650b09ae..21ea97b64e32 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dopewars
 PORTVERSION=	1.5.12
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/duel/Makefile b/games/duel/Makefile
index d023a65f9180..9eea06d3a62b 100644
--- a/games/duel/Makefile
+++ b/games/duel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	duel
 PORTVERSION=	0.98
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
diff --git a/games/easysok/Makefile b/games/easysok/Makefile
index 892bda40dfb3..7ce39f48c34b 100644
--- a/games/easysok/Makefile
+++ b/games/easysok/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	easysok
 PORTVERSION=	0.3.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index 8b15a77ddde5..0322e4b90c7c 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eboard
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 EXTRAS=		1pl2 2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/games/eboard/pkg-plist b/games/eboard/pkg-plist
index 4f2b7c3ef057..3d984e61bc69 100644
--- a/games/eboard/pkg-plist
+++ b/games/eboard/pkg-plist
@@ -76,5 +76,4 @@ share/eboard/themeconf.extras2
 share/eboard/timeseal.FreeBSD
 share/pixmaps/eboard.xpm
 @dirrm share/eboard
-@dirrmtry share/pixmaps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/editss/Makefile b/games/editss/Makefile
index e63ca1cede8a..43e86407cd6e 100644
--- a/games/editss/Makefile
+++ b/games/editss/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	editss
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jylefort
diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index 27a081de175a..5136a73ac9d8 100644
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	eduke32
 PORTVERSION=	20060718
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/egl/Makefile b/games/egl/Makefile
index 29d9ec241d01..08dfee4127d9 100644
--- a/games/egl/Makefile
+++ b/games/egl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	egl
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://egl.quakedev.com/files/:src \
 		ftp://ftp.alepulver.com.ar/distfiles/:data
diff --git a/games/egoboo/Makefile b/games/egoboo/Makefile
index 8c43602e4ab2..1ef4a7919b5c 100644
--- a/games/egoboo/Makefile
+++ b/games/egoboo/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	egoboo
 PORTVERSION=	2.22
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/games/einstein/Makefile b/games/einstein/Makefile
index b49da94178b7..1481c965d58f 100644
--- a/games/einstein/Makefile
+++ b/games/einstein/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	einstein
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://games.flowix.com/files/einstein/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/games/el/Makefile b/games/el/Makefile
index ee0fe2e1ef48..086155ffbf95 100644
--- a/games/el/Makefile
+++ b/games/el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	el
 PORTVERSION=	133
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	acm/${PORTNAME}
@@ -26,6 +27,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_SDL=	sdl net
+USE_GL=		yes
 USE_XLIB=	yes
 
 ALL_TARGET=	el.x86
diff --git a/games/emacs-chess/Makefile b/games/emacs-chess/Makefile
index 216017173c7b..beea2529150a 100644
--- a/games/emacs-chess/Makefile
+++ b/games/emacs-chess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		emacs-chess
 PORTVERSION=		2.0b5
+PORTREVISION=	1
 CATEGORIES=		games elisp
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
 			http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/games/ember/Makefile b/games/ember/Makefile
index 0b41fe8a7506..311b08387490 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ember
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://amber.worldforge.org/ember/releases/stable/
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 606c9bbfcfcd..89547bedeb5a 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enigma
 PORTVERSION=	0.92
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	enigma
diff --git a/games/enigma/pkg-plist b/games/enigma/pkg-plist
index fcd400fd1e17..9b40b61e532a 100644
--- a/games/enigma/pkg-plist
+++ b/games/enigma/pkg-plist
@@ -2736,7 +2736,6 @@ share/locale/it/LC_MESSAGES/enigma.mo
 share/locale/nl/LC_MESSAGES/enigma.mo
 share/pixmaps/enigma.png
 
-@dirrmtry share/pixmaps
 @dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor
diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile
index 90996ada7183..8239ea21f48b 100644
--- a/games/ensemblist/Makefile
+++ b/games/ensemblist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ensemblist
 PORTVERSION=	040126
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index 72044bb067ef..ad6eb51d3845 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tuxracer
 PORTVERSION=	0.61
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=tuxracer
@@ -22,7 +22,7 @@ LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 USE_SDL=	mixer sdl
 USE_GL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213
+USE_AUTOTOOLS=	automake:14 autoconf:253
 AUTOMAKE_ARGS=	-a
 CONFIGURE_ENV=	THREAD_LIB="${PTHREAD_LIBS}"
 MAKE_ENV=	${CONFIGURE_ENV}
diff --git a/games/euchre/Makefile b/games/euchre/Makefile
index 23aa974e4013..710f7a626e48 100644
--- a/games/euchre/Makefile
+++ b/games/euchre/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	euchre
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index b40c41ff3cbd..8b350fb1bc09 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	evq3
 PORTVERSION=	1.0a
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://evolution.quakedev.com/dev/final/
 DISTNAME=	${PORTNAME}-final-src
diff --git a/games/excido/Makefile b/games/excido/Makefile
index ad5eabf3dc5b..a183b532a2ed 100644
--- a/games/excido/Makefile
+++ b/games/excido/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	excido
 PORTVERSION=	0.1.5c
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://offload1.icculus.org/excido/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/games/exult/Makefile b/games/exult/Makefile
index 7217f535e0f5..a3c479f4dc74 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	exult
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile
index be379e4ed204..fb2c3e56d292 100644
--- a/games/ezquake/Makefile
+++ b/games/ezquake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ezquake
 PORTVERSION=	1754
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_source_${PORTVERSION}
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index 46c7f10d5797..fcf942266fda 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	falconseye
 PORTVERSION=	1.9.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= falconseye
diff --git a/games/farblazer/Makefile b/games/farblazer/Makefile
index 2d8124c47c3b..7b7beebc73ce 100644
--- a/games/farblazer/Makefile
+++ b/games/farblazer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	farblazer
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.pygame.org/gamelets/games/
 
diff --git a/games/fargoal/Makefile b/games/fargoal/Makefile
index aa0e1a5ebbab..18ff5a385d67 100644
--- a/games/fargoal/Makefile
+++ b/games/fargoal/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fargoal
 PORTVERSION=	20040629
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	squidfighter
diff --git a/games/fgfs-base/Makefile b/games/fgfs-base/Makefile
index d17528ecaad1..068873ed7f98 100644
--- a/games/fgfs-base/Makefile
+++ b/games/fgfs-base/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fgfs-base
 PORTVERSION=	0.9.10
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Shared/ \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Shared/
diff --git a/games/fgkicker/Makefile b/games/fgkicker/Makefile
index 031aa3cc67a9..b351cf8d4088 100644
--- a/games/fgkicker/Makefile
+++ b/games/fgkicker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fgkicker
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.larfeliz.be/projects/files/fgkicker/
 EXTRACT_SUFX=	.tgz
diff --git a/games/fgsd/Makefile b/games/fgsd/Makefile
index 16c996049c24..bea2611d9af2 100644
--- a/games/fgsd/Makefile
+++ b/games/fgsd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fgsd
 DISTVERSION=	0.3.1a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index d147464fd1ef..77891bad3ce8 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fillets-ng
 PORTVERSION=	0.7.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fillets
diff --git a/games/fishsupper/Makefile b/games/fishsupper/Makefile
index a7f3acd325a9..a3ae371eeb46 100644
--- a/games/fishsupper/Makefile
+++ b/games/fishsupper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fishsupper
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index b94b65631542..a280db46fcc7 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fkiss
 PORTVERSION=	0.33a
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.oersted.co.jp/~yav/soft/fkiss/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/a//}
diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index b450b90d2e7a..b2d3c5d71cc5 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flightgear-aircrafts
 PORTVERSION=	20060812
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Aircraft/ \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft/ \
diff --git a/games/flightgear-aircrafts/Makefile b/games/flightgear-aircrafts/Makefile
index b450b90d2e7a..b2d3c5d71cc5 100644
--- a/games/flightgear-aircrafts/Makefile
+++ b/games/flightgear-aircrafts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flightgear-aircrafts
 PORTVERSION=	20060812
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Aircraft/ \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft/ \
diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile
index a12c80319010..41c15d140dbc 100644
--- a/games/flightgear-atlas/Makefile
+++ b/games/flightgear-atlas/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flightgear-atlas
 PORTVERSION=	0.3.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	atlas
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index d17528ecaad1..068873ed7f98 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fgfs-base
 PORTVERSION=	0.9.10
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Shared/ \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Shared/
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index b0a1ca82c36d..6da0372d5eb1 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	FlightGear
 PORTVERSION?=	${FGVERSION}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	games
 MASTER_SITES+=	ftp://ftp.flightgear.org/pub/fgfs/Source/:fg \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Source/:fg
diff --git a/games/flobopuyo/Makefile b/games/flobopuyo/Makefile
index 03fad46d5247..78b9841cc391 100644
--- a/games/flobopuyo/Makefile
+++ b/games/flobopuyo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flobopuyo
 PORTVERSION=	0.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.ios-software.com/flobopuyo/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/flyhard/Makefile b/games/flyhard/Makefile
index a3e072806d3d..b74e4e4951ad 100644
--- a/games/flyhard/Makefile
+++ b/games/flyhard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flyhard
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.markboyd.me.uk/games/flyhard/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/flying/Makefile b/games/flying/Makefile
index 96293c313f4e..a20a1b8dc47e 100644
--- a/games/flying/Makefile
+++ b/games/flying/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flying
 PORTVERSION=	6.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 29a321db3f1e..1b0674342f36 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	foobillard
 PORTVERSION=	2.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://foobillard.sunsite.dk/dnl/
 
diff --git a/games/formido/Makefile b/games/formido/Makefile
index e068e358da32..100424dfe906 100644
--- a/games/formido/Makefile
+++ b/games/formido/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	formido
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://koti.mbnet.fi/lsoft/formido/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/fortunate/Makefile b/games/fortunate/Makefile
index 68fa2ab63b3f..22c49e2c0189 100644
--- a/games/fortunate/Makefile
+++ b/games/fortunate/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fortunate
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP_CH}
 
diff --git a/games/fotaq/Makefile b/games/fotaq/Makefile
index 3a5cd7630625..168a40b1b728 100644
--- a/games/fotaq/Makefile
+++ b/games/fotaq/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fotaq
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scummvm
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 2bbc4ccec0cf..b04062edb408 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freeciv
 PORTVERSION=	2.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ SF
 
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index 04cac22dd715..d8837bc57dde 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -321,26 +321,8 @@ share/locale/ru/LC_MESSAGES/freeciv.mo
 share/locale/sv/LC_MESSAGES/freeciv.mo
 share/locale/uk/LC_MESSAGES/freeciv.mo
 %%X11%%share/applications/freeciv.desktop
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrmtry share/locale/he_IL/LC_MESSAGES
 @dirrmtry share/locale/he_IL
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 %%X11%%@dirrm %%DATADIR%%/trident
 @dirrm %%DATADIR%%/scenario
 @dirrm %%DATADIR%%/nation
diff --git a/games/freecol/Makefile b/games/freecol/Makefile
index fb19521f3109..fa8b42ccf100 100644
--- a/games/freecol/Makefile
+++ b/games/freecol/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freecol
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/freedoko/Makefile b/games/freedoko/Makefile
index 49386d97510f..c523fb866704 100644
--- a/games/freedoko/Makefile
+++ b/games/freedoko/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freedoko
 PORTVERSION=	0.7.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	free-doko
diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index f1abfc270bb7..b237015be4b4 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freedroid
 PORTVERSION=	1.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freedroid
diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile
index dcbf964673dd..f1f2f2b9164e 100644
--- a/games/freedroidrpg/Makefile
+++ b/games/freedroidrpg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freedroidrpg
 PORTVERSION=	0.10.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freedroid
diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile
index 8f4e0966ac16..d1c86f2326d0 100644
--- a/games/freeorion/Makefile
+++ b/games/freeorion/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freeorion
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.alepulver.com.ar/distfiles/
 
diff --git a/games/freera/Makefile b/games/freera/Makefile
index 83e85b685479..d453852d711e 100644
--- a/games/freera/Makefile
+++ b/games/freera/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freera
 PORTVERSION=	070328
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTVERSION}_freera++_src
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index 29fb30c1b843..5cbbe859234c 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freesci
 PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games emulators
 MASTER_SITES=	http://www-plan.cs.colorado.edu/creichen/${PORTNAME}/ \
 		http://teksolv.de/~jameson/
diff --git a/games/freetennis/Makefile b/games/freetennis/Makefile
index fe5705ed59e7..3aca7e2eb94b 100644
--- a/games/freetennis/Makefile
+++ b/games/freetennis/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freetennis
 PORTVERSION=	0.4.8
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freetennis
diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile
index 0dcd5aba6abc..b57763702745 100644
--- a/games/fretsonfire/Makefile
+++ b/games/fretsonfire/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fretsonfire
 PORTVERSION=	1.2.451
+PORTREVISION=	1
 CATEGORIES=	games python
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME:S/f/F/g:S/o/O/}-${PORTVERSION:S/^/src-/}
diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile
index dd76d9020829..777766908517 100644
--- a/games/frozenbubble/Makefile
+++ b/games/frozenbubble/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	frozenbubble
 PORTVERSION=	2.1.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.frozen-bubble.org/data/
 DISTNAME=	frozen-bubble-${PORTVERSION}
diff --git a/games/frozenbubble/pkg-plist b/games/frozenbubble/pkg-plist
index 107384dcc55e..8c37cb350c70 100644
--- a/games/frozenbubble/pkg-plist
+++ b/games/frozenbubble/pkg-plist
@@ -3253,26 +3253,6 @@ share/locale/ru/LC_MESSAGES/frozen-bubble.mo
 share/locale/sk/LC_MESSAGES/frozen-bubble.mo
 share/locale/sl/LC_MESSAGES/frozen-bubble.mo
 share/locale/sv/LC_MESSAGES/frozen-bubble.mo
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm %%DATADIR%%/snd
 @dirrm %%DATADIR%%/gfx/pinguins
 @dirrm %%DATADIR%%/gfx/menu/anims
diff --git a/games/fteqw/Makefile b/games/fteqw/Makefile
index 0f468645b77b..3235b05982eb 100644
--- a/games/fteqw/Makefile
+++ b/games/fteqw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fteqw
 PORTVERSION=	2770
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	ftesrc${PORTVERSION}-all
diff --git a/games/ftjava/Makefile b/games/ftjava/Makefile
index 4d0b49644dfc..180a804cb34e 100644
--- a/games/ftjava/Makefile
+++ b/games/ftjava/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ftjava
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	http://www.warpfish.com/davisje/:file1 \
 		http://home.nycap.rr.com/davisje/ftjava/:doc1
diff --git a/games/fuhquake/Makefile b/games/fuhquake/Makefile
index 523f0738f4b2..461eca70da62 100644
--- a/games/fuhquake/Makefile
+++ b/games/fuhquake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fuhquake
 PORTVERSION=	0.31
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.fuhquake.net/files/releases/v${PORTVERSION}/ \
 		ftp://gibbage.mine.nu/clients/fuhquake/releases/v${PORTVERSION}/ \
diff --git a/games/funnyboat/Makefile b/games/funnyboat/Makefile
index dc3f0338154f..1a91391f4233 100644
--- a/games/funnyboat/Makefile
+++ b/games/funnyboat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	funnyboat
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/fwp/Makefile b/games/fwp/Makefile
index aa515f41558c..4aec3b966663 100644
--- a/games/fwp/Makefile
+++ b/games/fwp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fwp
 PORTVERSION=	0.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fightwinprevail
diff --git a/games/fxsudoku/Makefile b/games/fxsudoku/Makefile
index ecbb50fe5e6e..231a8f5c5d9a 100644
--- a/games/fxsudoku/Makefile
+++ b/games/fxsudoku/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fxsudoku
 PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.fifthplanet.net/files/
 
diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile
index d7e3eb68175d..bf5a6d46d0a7 100644
--- a/games/galaxyhack/Makefile
+++ b/games/galaxyhack/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	galaxyhack
 PORTVERSION=	1.74
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/galaxymage/Makefile b/games/galaxymage/Makefile
index 812038356526..e2bd51f67ca8 100644
--- a/games/galaxymage/Makefile
+++ b/games/galaxymage/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	galaxymage
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	games python
 MASTER_SITES=	http://download.gna.org/tactics/
 
diff --git a/games/garith/Makefile b/games/garith/Makefile
index b17159306016..c426de674370 100644
--- a/games/garith/Makefile
+++ b/games/garith/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	garith
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.cnm-vra.com/micah/garith/
 
diff --git a/games/gbottler/Makefile b/games/gbottler/Makefile
index 070021001e15..75848d8dba3d 100644
--- a/games/gbottler/Makefile
+++ b/games/gbottler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gbottler
 PORTVERSION=	0.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	gbottler/16706
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 4de1d0bea404..004488884fdc 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcompris
 DISTVERSION=	8.2.2-2
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gcompris
diff --git a/games/gcompris/pkg-plist b/games/gcompris/pkg-plist
index d25a28395b6c..3c1010e5073f 100644
--- a/games/gcompris/pkg-plist
+++ b/games/gcompris/pkg-plist
@@ -4884,40 +4884,12 @@ share/locale/vi/LC_MESSAGES/gcompris.mo
 share/locale/wa/LC_MESSAGES/gcompris.mo
 share/locale/zh_CN/LC_MESSAGES/gcompris.mo
 share/locale/zh_TW/LC_MESSAGES/gcompris.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/so/LC_MESSAGES
 @dirrmtry share/locale/so
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@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/gnome/help/gcompris/fr
 @dirrm share/gnome/help/gcompris/eu
 @dirrm share/gnome/help/gcompris
diff --git a/games/geki2/Makefile b/games/geki2/Makefile
index 42963661ab90..daaa55906b40 100644
--- a/games/geki2/Makefile
+++ b/games/geki2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geki2
 PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://kxl.hn.org/download/ \
 		http://www.mavetju.org/download/adopted/
diff --git a/games/geki3/Makefile b/games/geki3/Makefile
index 187ae4d554c3..43fa1a2e3159 100644
--- a/games/geki3/Makefile
+++ b/games/geki3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geki3
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://kxl.hn.org/download/ \
 		http://www.mavetju.org/download/adopted/
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index 6ee50a11ac53..8d4abade2b02 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gemdropx
 PORTVERSION=	0.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/gemdropx/src/
 
diff --git a/games/ggo/Makefile b/games/ggo/Makefile
index 9c4abc362fc2..cda752e8f57a 100644
--- a/games/ggo/Makefile
+++ b/games/ggo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ggo
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	http://panda-igs.joyjoy.net/java/gGo/download/ \
 		http://www.pandanet.co.jp/java/gGo/download/
diff --git a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile
index 33e856e59d5f..4a339c2ee87c 100644
--- a/games/ggz-gtk-client/Makefile
+++ b/games/ggz-gtk-client/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ggz-gtk-client
 PORTVERSION=	${GGZ_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
diff --git a/games/ggz-gtk-games/Makefile b/games/ggz-gtk-games/Makefile
index ecc07a71e1c5..265acc7000b6 100644
--- a/games/ggz-gtk-games/Makefile
+++ b/games/ggz-gtk-games/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ggz-gtk-games
 PORTVERSION=	${GGZ_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
diff --git a/games/ggz-kde-client/Makefile b/games/ggz-kde-client/Makefile
index 74c127ae83f5..e0d066a42999 100644
--- a/games/ggz-kde-client/Makefile
+++ b/games/ggz-kde-client/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ggz-kde-client
 PORTVERSION=	${GGZ_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
diff --git a/games/ggz-sdl-games/Makefile b/games/ggz-sdl-games/Makefile
index f5acad194285..9b9b7f212a48 100644
--- a/games/ggz-sdl-games/Makefile
+++ b/games/ggz-sdl-games/Makefile
@@ -8,12 +8,14 @@
 
 PORTNAME=	ggz-sdl-games
 PORTVERSION=	${GGZ_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	The GGZ Gaming Zone - SDL-based games
 
 USE_GETOPT_LONG=	yes
+USE_GL=		yes
 USE_SDL=	image mixer sdl ttf
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/games/gillo/Makefile b/games/gillo/Makefile
index a74263282ff9..7c750bd99e0e 100644
--- a/games/gillo/Makefile
+++ b/games/gillo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gillo
 DISTVERSION=	1.0beta1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index a91c7ff4cc62..cf837bf2367c 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gl-117
 PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/glasteroids/Makefile b/games/glasteroids/Makefile
index 6e7282a012bb..5c4e326ca00e 100644
--- a/games/glasteroids/Makefile
+++ b/games/glasteroids/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glasteroids
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.honors.montana.edu/~jjc/Glasteroids/
 DISTNAME=	Glasteriods
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index 30d99e3bdbe7..868c61ae9038 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glaxium
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://xhosxe.free.fr/glaxium/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 05029761f29a..2540e5ac2930 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glchess
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/glchess/pkg-plist b/games/glchess/pkg-plist
index 4507a9b6a256..f6ab9fe4a1f6 100644
--- a/games/glchess/pkg-plist
+++ b/games/glchess/pkg-plist
@@ -199,7 +199,6 @@ share/locale/zh_HK/LC_MESSAGES/glchess.mo
 share/locale/zh_TW/LC_MESSAGES/glchess.mo
 share/mime/packages/glchess.xml
 share/pixmaps/glchess.svg
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/textures
 @dirrm %%DATADIR%%/gui
 @dirrm %%DATADIR%%
diff --git a/games/glest/Makefile b/games/glest/Makefile
index 68aa3581b441..75bbb05c83b3 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glest
 PORTVERSION=	2.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/glife/Makefile b/games/glife/Makefile
index 846f59c58e30..0f375bc2a028 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glife
 PORTVERSION=	0.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/glmaze/Makefile b/games/glmaze/Makefile
index d768ce0abc78..2c27ba3e84a6 100644
--- a/games/glmaze/Makefile
+++ b/games/glmaze/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	glmaze
 PORTVERSION=	1.1a
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiplayer OpenGL Maze Game
 
+USE_GL=		yes
 USE_SDL=	mixer sdl
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index 9aa6718f6f63..2f75cae43c1d 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		glob2
 PORTVERSION=		0.8.23
+PORTREVISION=	1
 CATEGORIES=		games
 MASTER_SITES=		http://dl.sv.nongnu.org/releases/glob2/${PORTVERSION}/
 MASTER_SITE_SUBDIR=	thierry
diff --git a/games/glpuzzle/Makefile b/games/glpuzzle/Makefile
index 3a300f8e8365..820eddd8aad5 100644
--- a/games/glpuzzle/Makefile
+++ b/games/glpuzzle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glpuzzle
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.iua.upf.es/~mdeboer/resorama/glpuzzle/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index b1834bd434de..841719628bda 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gltron
 PORTVERSION=	0.70
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/gmastermind/Makefile b/games/gmastermind/Makefile
index aeef33c645b7..ec113301aaf5 100644
--- a/games/gmastermind/Makefile
+++ b/games/gmastermind/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gmastermind
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://www.gnustep.it/marko/GMastermind/
 DISTNAME=	GMastermind2
diff --git a/games/gmines/Makefile b/games/gmines/Makefile
index eb35054181a1..08516dd2cb3d 100644
--- a/games/gmines/Makefile
+++ b/games/gmines/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gmines
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://www.gnustep.it/marko/GMines/
 DISTNAME=	GMines
diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile
index 37ffeb0b3767..506010c27eac 100644
--- a/games/gnmm/Makefile
+++ b/games/gnmm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnmm
 PORTVERSION=	0.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index e52856622d80..75dd9f464870 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gno3dtet
 PORTVERSION=	1.96.1
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	http://eseb.net/ftp/gno3dtet/
 EXTRACT_SUFX=	.tgz
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index 1405ddb11dbb..b4ff2be40fbf 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-games-extra-data
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index e6b4fabf4bb3..89e5aac7d54f 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-games
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index e57f78b84174..51673044d4cb 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -1105,53 +1105,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm %%PYTHON_SITELIBDIR%%/glchess
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/games/gnome-music-quiz/Makefile b/games/gnome-music-quiz/Makefile
index d9157aa6a964..9666d0ebb8bc 100644
--- a/games/gnome-music-quiz/Makefile
+++ b/games/gnome-music-quiz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-music-quiz
 PORTVERSION=	0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games audio
 MASTER_SITES=	http://ishamael.inactivex.net/software/tarballs/
 DISTNAME=	mq-${PORTVERSION}
diff --git a/games/gnomeattacks/Makefile b/games/gnomeattacks/Makefile
index 8485eacc2aa7..041d3327b786 100644
--- a/games/gnomeattacks/Makefile
+++ b/games/gnomeattacks/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomeattacks
 PORTVERSION=	0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index bab0c37ef448..9c9649156c68 100644
--- a/games/gnomebreakout/Makefile
+++ b/games/gnomebreakout/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomebreakout
 PORTVERSION=	0.5.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	http://www.users.on.net/~mipearson/
 DISTNAME=	gnome-breakout-${PORTVERSION}
diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index eae2fdf2344b..bb408ab115a1 100644
--- a/games/gnomechess/Makefile
+++ b/games/gnomechess/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomechess
 PORTVERSION=	0.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-chess/0.3
diff --git a/games/gnomekiss/Makefile b/games/gnomekiss/Makefile
index b470c20e69f2..b1f683b6c76f 100644
--- a/games/gnomekiss/Makefile
+++ b/games/gnomekiss/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomekiss
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	http://devel.tlrmx.org/kiss/source/
 
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index aa3e75cecbeb..55f1fe098003 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomememoryblocks
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnome-memblocks
diff --git a/games/gnomermind/Makefile b/games/gnomermind/Makefile
index 6b6460e09706..7f7cc249df76 100644
--- a/games/gnomermind/Makefile
+++ b/games/gnomermind/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomermind
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/gnomesudoku/Makefile b/games/gnomesudoku/Makefile
index b0c583aa2627..ce84de3e5d86 100644
--- a/games/gnomesudoku/Makefile
+++ b/games/gnomesudoku/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomesudoku
 PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnome-sudoku
diff --git a/games/gnomesudoku/pkg-plist b/games/gnomesudoku/pkg-plist
index 64fafebcd0ba..d3b20be4ec71 100644
--- a/games/gnomesudoku/pkg-plist
+++ b/games/gnomesudoku/pkg-plist
@@ -90,17 +90,10 @@ share/locale/sv/LC_MESSAGES/gnome-sudoku.mo
 share/locale/tr/LC_MESSAGES/gnome-sudoku.mo
 share/locale/uk/LC_MESSAGES/gnome-sudoku.mo
 share/pixmaps/sudoku.png
-@dirrmtry share/pixmaps
 @dirrm share/gnome-sudoku
 @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies
 @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku
 @dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry %%PYTHON_LIBDIR%%
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
diff --git a/games/gnono/Makefile b/games/gnono/Makefile
index 5edf508d7234..26455e93ce26 100644
--- a/games/gnono/Makefile
+++ b/games/gnono/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnono
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/gnono/pkg-plist b/games/gnono/pkg-plist
index 88d2b32792e7..f737dc923028 100644
--- a/games/gnono/pkg-plist
+++ b/games/gnono/pkg-plist
@@ -20,4 +20,3 @@ share/pixmaps/gnono-about.png
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrmtry share/pixmaps
diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index fd495a515687..351f305546dc 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnubg
 PORTVERSION=	0.14.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/gnubg/pkg-plist b/games/gnubg/pkg-plist
index 1ac7df9f8ead..e14bed3d92ff 100644
--- a/games/gnubg/pkg-plist
+++ b/games/gnubg/pkg-plist
@@ -63,8 +63,6 @@ share/locale/tr/LC_MESSAGES/gnubg.mo
 @dirrmtry share/locale/en_US
 @dirrmtry share/locale/en@quot/LC_MESSAGES
 @dirrmtry share/locale/en@quot
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/met
diff --git a/games/gnudoku/Makefile b/games/gnudoku/Makefile
index 07d8b383852a..6c7679918b46 100644
--- a/games/gnudoku/Makefile
+++ b/games/gnudoku/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GNUDoku
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://offload1.icculus.org/~jcspray/GNUDoku/ \
 		http://icculus.org/~jcspray/GNUDoku/
diff --git a/games/gnudoku/pkg-plist b/games/gnudoku/pkg-plist
index 614920d0855e..cc01a0e7c1ed 100644
--- a/games/gnudoku/pkg-plist
+++ b/games/gnudoku/pkg-plist
@@ -2,4 +2,3 @@ bin/GNUDoku
 share/applications/GNUDoku.desktop
 share/pixmaps/GNUDoku.png
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile
index 00ac6e21f25e..d867ebf38d4d 100644
--- a/games/gnurobots/Makefile
+++ b/games/gnurobots/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnurobots
 PORTVERSION=	1.0D
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gnurobots
diff --git a/games/gnustep-ladder/Makefile b/games/gnustep-ladder/Makefile
index 9fff1deb0295..4506227f94dd 100644
--- a/games/gnustep-ladder/Makefile
+++ b/games/gnustep-ladder/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ladder
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://download.savannah.gnu.org/releases/gap/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/games/golddig/Makefile b/games/golddig/Makefile
index 7abdea7af799..478083cbc9f3 100644
--- a/games/golddig/Makefile
+++ b/games/golddig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	golddig
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/games/
 DISTNAME=	golddig2
diff --git a/games/gomoku.app/Makefile b/games/gomoku.app/Makefile
index 2a3dcea777d7..c2f4224d2c18 100644
--- a/games/gomoku.app/Makefile
+++ b/games/gomoku.app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gomoku
 PORTVERSION=	1.2.8
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://www.gnustep.it/nicola/Applications/Gomoku/
 DISTNAME=	Gomoku-${PORTVERSION}
diff --git a/games/goonies/Makefile b/games/goonies/Makefile
index 5779987c3b52..3d219f1ae67c 100644
--- a/games/goonies/Makefile
+++ b/games/goonies/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	goonies
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://goonies.jorito.net/download/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/gpuzzle/Makefile b/games/gpuzzle/Makefile
index 29b4bf2fe209..3c173daf255f 100644
--- a/games/gpuzzle/Makefile
+++ b/games/gpuzzle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpuzzle
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://www.gnustep.it/marko/GPuzzle2/
 DISTNAME=	GPuzzle2
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 11befac0eeb6..8c030e658637 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gracer
 PORTVERSION=	0.1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/grande/Makefile b/games/grande/Makefile
index 792832b3c1ba..ac521a39c7f7 100644
--- a/games/grande/Makefile
+++ b/games/grande/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grande
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://kxl.orz.hm/download/
 DISTNAME=	${PORTNAME}-KXL-${PORTVERSION}
diff --git a/games/gretools/Makefile b/games/gretools/Makefile
index 593bc1a7894d..63de768cdce9 100644
--- a/games/gretools/Makefile
+++ b/games/gretools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gretools
 PORTVERSION=	1.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	http://www.cs.utexas.edu/~arvindn/gretools/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index 6b6fc7b32178..6588b16e7fa9 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grhino
 PORTVERSION=	0.16.0
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rhino
diff --git a/games/gridlock/Makefile b/games/gridlock/Makefile
index 68483ad00c91..5628d8400749 100644
--- a/games/gridlock/Makefile
+++ b/games/gridlock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gridlock
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://www.dozingcatsoftware.com/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/games/groundhog/Makefile b/games/groundhog/Makefile
index 510b058cc0fd..8ca6002fbc47 100644
--- a/games/groundhog/Makefile
+++ b/games/groundhog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	groundhog
 PORTVERSION=	1.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	http://home-2.tiscali.nl/~cb007736/
 
diff --git a/games/gru/Makefile b/games/gru/Makefile
index f0d203f5ed5a..dfc4bb9b6545 100644
--- a/games/gru/Makefile
+++ b/games/gru/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gru
 PORTVERSION=	8087
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.bsddiary.net/gru/
 
diff --git a/games/grubik/Makefile b/games/grubik/Makefile
index 09f748933e00..bd7774b6f2be 100644
--- a/games/grubik/Makefile
+++ b/games/grubik/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grubik
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/Recreational/
 DISTNAME=	GRubik
diff --git a/games/gshisen/Makefile b/games/gshisen/Makefile
index 30c82fdb6f59..036051b992a6 100644
--- a/games/gshisen/Makefile
+++ b/games/gshisen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gshisen
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://www.gnustep.it/enrico/gshisen/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 34c1f1d16e0b..d97e4e39ed0b 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gtetrinet
 PORTVERSION=	0.7.11
+PORTREVISION=	1
 CATEGORIES=	games gnome ipv6
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/games/gtkabale/Makefile b/games/gtkabale/Makefile
index 0990a2562a84..ac8454850937 100644
--- a/games/gtkabale/Makefile
+++ b/games/gtkabale/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkabale
 PORTVERSION=	0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
 
diff --git a/games/gtkatlantic/Makefile b/games/gtkatlantic/Makefile
index 7742bfb40aec..a0d5c368e54f 100644
--- a/games/gtkatlantic/Makefile
+++ b/games/gtkatlantic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkatlantic
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://gtkatlantic.gradator.net/downloads/v0.4/
 
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index b54839e89d14..1456a8e197fd 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkballs
 PORTVERSION=	3.1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://gtkballs.antex.ru/dist/
 
diff --git a/games/gtkballs/pkg-plist b/games/gtkballs/pkg-plist
index 36d5f9bdf60a..e714b2871fad 100644
--- a/games/gtkballs/pkg-plist
+++ b/games/gtkballs/pkg-plist
@@ -537,5 +537,3 @@ share/locale/ru/LC_MESSAGES/gtkballs.mo
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
diff --git a/games/gtklife/Makefile b/games/gtklife/Makefile
index 25d059fb5d2f..c66e5e384551 100644
--- a/games/gtklife/Makefile
+++ b/games/gtklife/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtklife
 PORTVERSION=	5.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://ironphoenix.org/tril/gtklife/
 
diff --git a/games/gtkpool/Makefile b/games/gtkpool/Makefile
index c2bce5f177a5..32012f34f7f1 100644
--- a/games/gtkpool/Makefile
+++ b/games/gtkpool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkpool
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://gtkpool.seul.org/
 
diff --git a/games/gtkradiant/Makefile b/games/gtkradiant/Makefile
index 499ca2481f58..8f5cafea37ff 100644
--- a/games/gtkradiant/Makefile
+++ b/games/gtkradiant/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkradiant
 PORTVERSION=	1.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_IDSOFTWARE:S|$|source/:id|} \
 		http://www.bsd-geek.de/FreeBSD/distfiles/:fb
diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index 5c5f58a74d91..8548d16407f1 100644
--- a/games/gtktetcolor/Makefile
+++ b/games/gtktetcolor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtktetcolor
 PORTVERSION=	0.6.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.dvgu.ru/ifit/~panov/gtktetcolor/
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index e72b6706f2c8..f34733817de4 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gturing
 PORTVERSION=	0.1.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games gnome
 MASTER_SITES=	ftp://ftp.gnome.org/pub/gnome/sources/gturing/0.1/
 
diff --git a/games/gweled/Makefile b/games/gweled/Makefile
index 13c908585809..04b3728bc6cc 100644
--- a/games/gweled/Makefile
+++ b/games/gweled/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gweled
 PORTVERSION=	0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	http://sebdelestaing.free.fr/gweled/Release/
 
diff --git a/games/hangman/Makefile b/games/hangman/Makefile
index d11e4b4e0d40..869a4a257cff 100644
--- a/games/hangman/Makefile
+++ b/games/hangman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hangman
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.shiftygames.com/hangman/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/hattrickorganizer/Makefile b/games/hattrickorganizer/Makefile
index e704f1079879..925f96a57d60 100644
--- a/games/hattrickorganizer/Makefile
+++ b/games/hattrickorganizer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hattrickorganizer
 PORTVERSION=	1.395
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	games java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/games/heretic/Makefile b/games/heretic/Makefile
index a91b6f871ca4..9ca41598fea2 100644
--- a/games/heretic/Makefile
+++ b/games/heretic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	heretic
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://heretic.linuxgames.com/heretic/src/:source \
 		http://heretic.linuxgames.com/wad/:wad
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index 9a8c9bde5b90..63b82bd4be99 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	heroes
 PORTVERSION=	0.21
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/hex-a-hop/Makefile b/games/hex-a-hop/Makefile
index 7b0430af25d1..06d934f68f3c 100644
--- a/games/hex-a-hop/Makefile
+++ b/games/hex-a-hop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hex-a-hop
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://ftp.bishopston.net/freebsd/distfiles/ \
 		ftp://ftp.bishopston.net/freebsd/distfiles/ \
diff --git a/games/hex/Makefile b/games/hex/Makefile
index b79e67ff8865..fd6269b79f5a 100644
--- a/games/hex/Makefile
+++ b/games/hex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hex
 PORTVERSION=	0.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.earth.li/projectpurple/files/
 
diff --git a/games/hexxagon/Makefile b/games/hexxagon/Makefile
index cabd579f8bf5..caf35c9e1b57 100644
--- a/games/hexxagon/Makefile
+++ b/games/hexxagon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hexxagon
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.nesqi.se/hexxagon/hexxagon/download/
 
diff --git a/games/highmoon/Makefile b/games/highmoon/Makefile
index 197a65033611..c76d18c00744 100644
--- a/games/highmoon/Makefile
+++ b/games/highmoon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	highmoon
 PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://highmoon.gerdsmeier.net/
 
diff --git a/games/hlstatsx/Makefile b/games/hlstatsx/Makefile
index 0cb6a9061305..a10169223ed0 100644
--- a/games/hlstatsx/Makefile
+++ b/games/hlstatsx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hlstatsx
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	games www
 MASTER_SITES=	http://www.hlstatsx.com/downloads/
 DISTNAME=	HLstatsX_V${PORTVERSION}
diff --git a/games/holotz-castle/Makefile b/games/holotz-castle/Makefile
index f640b4a244b7..02649616eaf2 100644
--- a/games/holotz-castle/Makefile
+++ b/games/holotz-castle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	holotz-castle
 PORTVERSION=	1.3.9
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.mainreactor.net/holotzcastle/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -16,6 +17,7 @@ COMMENT=	A platform game with high doses of mystery
 
 MAKE_ARGS=	HC_BASE=${PREFIX}/share/${PORTNAME}/ HC_BIN_DIR=${PREFIX}/bin/
 
+USE_GL=		gl
 USE_SDL=	image mixer sdl ttf
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile
index 83cf88a4c2ce..82547fb08801 100644
--- a/games/icbm3d/Makefile
+++ b/games/icbm3d/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icbm3d
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/icbm3d/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index cd9e5b003b41..a2bde403cc11 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	icebreaker
 PORTVERSION=	1.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://mattdm.org/icebreaker/1.2.x/
 EXTRACT_SUFX=	.tgz
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index 016c0144939f..6eba8691bfeb 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ifm
 PORTVERSION=	5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games tk84
 MASTER_SITES=	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ \
 		http://www.ifarchive.org/%SUBDIR%/
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 1e701ceabc14..5bbeb5a9e666 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imaze
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://home.tu-clausthal.de/student/iMaze/files/
 PKGNAMESUFFIX=	-${TOOLKIT}
diff --git a/games/interlogic/Makefile b/games/interlogic/Makefile
index 3d1b0910146a..15c50b88e425 100644
--- a/games/interlogic/Makefile
+++ b/games/interlogic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	interlogic
 PORTVERSION=	0.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	interlogic
diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile
index 732d101d8885..62489ec5a13c 100644
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ioquake3
 DISTVERSION=	1.34-rc3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://ioquake3.org/files/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
diff --git a/games/iourbanterror/Makefile b/games/iourbanterror/Makefile
index 732d101d8885..62489ec5a13c 100644
--- a/games/iourbanterror/Makefile
+++ b/games/iourbanterror/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ioquake3
 DISTVERSION=	1.34-rc3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://ioquake3.org/files/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
diff --git a/games/ishido/Makefile b/games/ishido/Makefile
index 9642ab398b68..b4b18245992b 100644
--- a/games/ishido/Makefile
+++ b/games/ishido/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ishido
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	obrien
diff --git a/games/ivan/Makefile b/games/ivan/Makefile
index 9e2e45d933cd..0250fb2c7a09 100644
--- a/games/ivan/Makefile
+++ b/games/ivan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ivan
 PORTVERSION=	0.50
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ivan
diff --git a/games/jaggedalliance2/Makefile b/games/jaggedalliance2/Makefile
index 56cb3b51fba2..09d8777685a7 100644
--- a/games/jaggedalliance2/Makefile
+++ b/games/jaggedalliance2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ja2
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://deponie.yamagi.org/freebsd/distfiles/ \
 		http://ja2.dragonriders.de/files/
diff --git a/games/jchessboard/Makefile b/games/jchessboard/Makefile
index 42dac83066a2..7a834ebd4480 100644
--- a/games/jchessboard/Makefile
+++ b/games/jchessboard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jchessboard
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/jetpack/Makefile b/games/jetpack/Makefile
index 6ef2567ff27f..d80c38e9cf10 100644
--- a/games/jetpack/Makefile
+++ b/games/jetpack/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jetpack
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/games/
 DISTNAME=	${PORTNAME}
diff --git a/games/jfduke3d/Makefile b/games/jfduke3d/Makefile
index 1571370db9d0..551b8ff1ffcd 100644
--- a/games/jfduke3d/Makefile
+++ b/games/jfduke3d/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	jfduke3d
 PORTVERSION=	20051009
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://users.on.net/~jonof/buildport/
 DISTFILES=	${PORTNAME}_src_${PORTVERSION}.zip \
diff --git a/games/jfk/Makefile b/games/jfk/Makefile
index fb6e711e7ebc..531d750136ca 100644
--- a/games/jfk/Makefile
+++ b/games/jfk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jfk
 PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://relax.ath.cx/jfk/
 
diff --git a/games/jigsaw/Makefile b/games/jigsaw/Makefile
index 29b4bf2fe209..3c173daf255f 100644
--- a/games/jigsaw/Makefile
+++ b/games/jigsaw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpuzzle
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://www.gnustep.it/marko/GPuzzle2/
 DISTNAME=	GPuzzle2
diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile
index 3a300f8e8365..820eddd8aad5 100644
--- a/games/jigzo/Makefile
+++ b/games/jigzo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glpuzzle
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.iua.upf.es/~mdeboer/resorama/glpuzzle/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/jin/Makefile b/games/jin/Makefile
index bade1541c2de..ad0b27289d73 100644
--- a/games/jin/Makefile
+++ b/games/jin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jin
 PORTVERSION=	2.14.1
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-unix
diff --git a/games/joequake/Makefile b/games/joequake/Makefile
index cb9f78201a6b..0e6b2012cbf0 100644
--- a/games/joequake/Makefile
+++ b/games/joequake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	joequake
 PORTVERSION=	0.15b1329
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://runecentral.com/joequake/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}-source
diff --git a/games/jools/Makefile b/games/jools/Makefile
index 3dcd841bbbc2..abb03ac2e293 100644
--- a/games/jools/Makefile
+++ b/games/jools/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	jools
 PORTVERSION=	0.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.eecs.umich.edu/~pelzlpj/jools/
 
diff --git a/games/jtans/Makefile b/games/jtans/Makefile
index 91826e1f4cd6..6decf3e7c37d 100644
--- a/games/jtans/Makefile
+++ b/games/jtans/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	jtans
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/jumpnbump/Makefile b/games/jumpnbump/Makefile
index 4d0f5b542b0a..1229289ff482 100644
--- a/games/jumpnbump/Makefile
+++ b/games/jumpnbump/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jumpnbump
 PORTVERSION=	1.41
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.jumpbump.mine.nu/port/ \
 	http://www.vlaadworld.net/jumpnbump/ \
diff --git a/games/kamikaze/Makefile b/games/kamikaze/Makefile
index 7bc3d027e248..39dd1cae83d9 100644
--- a/games/kamikaze/Makefile
+++ b/games/kamikaze/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kamikaze
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	games kde
 MASTER_SITES=	http://kamikaze.coolprojects.org/download/
 
diff --git a/games/kanatest/Makefile b/games/kanatest/Makefile
index 4f3f477da7d4..fccd9a3ca5ab 100644
--- a/games/kanatest/Makefile
+++ b/games/kanatest/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kanatest
 PORTVERSION=	0.3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://clay.ll.pl/download/
 
diff --git a/games/kbilliards/Makefile b/games/kbilliards/Makefile
index ce54c8c07500..b630df094f1a 100644
--- a/games/kbilliards/Makefile
+++ b/games/kbilliards/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kbilliards
 PORTVERSION=	0.8.7b
+PORTREVISION=	1
 CATEGORIES=	games kde
 MASTER_SITES=	http://www.hostnotfound.it/kbilliards/ \
 		${MASTER_SITE_LOCAL}
diff --git a/games/kbilliards/pkg-plist b/games/kbilliards/pkg-plist
index 1988ed38d0fd..e6b33bd9780d 100644
--- a/games/kbilliards/pkg-plist
+++ b/games/kbilliards/pkg-plist
@@ -66,5 +66,3 @@ share/locale/ru/LC_MESSAGES/kbilliards.mo
 @dirrm share/apps/kbilliards/maps
 @dirrm share/apps/kbilliards/balls
 @dirrm share/apps/kbilliards
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/games/kcheckers/Makefile b/games/kcheckers/Makefile
index cf6686e66c40..5778df49aa67 100644
--- a/games/kcheckers/Makefile
+++ b/games/kcheckers/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kcheckers
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://wibix.de/infusions/pro_download_panel/downloads/
 
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 82c1724ada84..6a9189d0d00e 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdegames
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index 82c1724ada84..6a9189d0d00e 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdegames
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/games/kfreerings/Makefile b/games/kfreerings/Makefile
index 798946e02f37..90bc07692360 100644
--- a/games/kfreerings/Makefile
+++ b/games/kfreerings/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kfreerings
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kfreerings
diff --git a/games/kiki/Makefile b/games/kiki/Makefile
index a17ed770a285..8cd8b2203368 100644
--- a/games/kiki/Makefile
+++ b/games/kiki/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kiki
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/kimboot/Makefile b/games/kimboot/Makefile
index 9aa4ef9a84b4..b9d78cc6f2e3 100644
--- a/games/kimboot/Makefile
+++ b/games/kimboot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kimboot
 PORTVERSION=	0.74
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile
index e592e72e39c9..4124b89ee5d0 100644
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	klavaro
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/klavaro/pkg-plist b/games/klavaro/pkg-plist
index 37b619fd09bc..b4174829c81a 100644
--- a/games/klavaro/pkg-plist
+++ b/games/klavaro/pkg-plist
@@ -157,8 +157,6 @@ share/locale/sv_SE/LC_MESSAGES/klavaro.mo
 @dirrmtry share/locale/de_DE
 @dirrmtry share/locale/eo_EO/LC_MESSAGES
 @dirrmtry share/locale/eo_EO
-@dirrmtry share/locale/fr_FR/LC_MESSAGES
-@dirrmtry share/locale/fr_FR
 @dirrmtry share/locale/hu_HU/LC_MESSAGES
 @dirrmtry share/locale/hu_HU
 @dirrmtry share/locale/nl_BE/LC_MESSAGES
diff --git a/games/klondike/Makefile b/games/klondike/Makefile
index e048420fa401..7f29c7c52768 100644
--- a/games/klondike/Makefile
+++ b/games/klondike/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	klondike
 PORTVERSION=	1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games tk84
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/JACOBY/
 
diff --git a/games/kmastermind/Makefile b/games/kmastermind/Makefile
index 63a22fdfeb74..d5b83e3c7026 100644
--- a/games/kmastermind/Makefile
+++ b/games/kmastermind/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kmastermind
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	games kde
 MASTER_SITES=	http://www.kde-apps.org/CONTENT/content-files/
 DISTNAME=	20292-${PORTNAME}-${PORTVERSION}
diff --git a/games/kmquake2/Makefile b/games/kmquake2/Makefile
index ce31a02477e2..71387cf36a98 100644
--- a/games/kmquake2/Makefile
+++ b/games/kmquake2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kmquake2
 PORTVERSION=	0.19
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://qudos.quakedev.com/linux/quake2/engines/KMQuake2/:src \
 		http://qexpo2005.quakedev.com/uploaded/54/:data \
diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile
index 76de94bfafe0..671061c240cd 100644
--- a/games/knights-kde4/Makefile
+++ b/games/knights-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	knights
 PORTVERSION=	0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	knights
diff --git a/games/knights-kde4/pkg-plist b/games/knights-kde4/pkg-plist
index a987c3125aff..7eebb6010fa0 100644
--- a/games/knights-kde4/pkg-plist
+++ b/games/knights-kde4/pkg-plist
@@ -45,5 +45,3 @@ share/mimelnk/application/pgn.desktop
 @dirrm share/doc/HTML/de/knights
 @dirrm share/apps/knights/themes
 @dirrm share/apps/knights
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 76de94bfafe0..671061c240cd 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	knights
 PORTVERSION=	0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	knights
diff --git a/games/knights/pkg-plist b/games/knights/pkg-plist
index a987c3125aff..7eebb6010fa0 100644
--- a/games/knights/pkg-plist
+++ b/games/knights/pkg-plist
@@ -45,5 +45,3 @@ share/mimelnk/application/pgn.desktop
 @dirrm share/doc/HTML/de/knights
 @dirrm share/apps/knights/themes
 @dirrm share/apps/knights
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
diff --git a/games/kobodeluxe/Makefile b/games/kobodeluxe/Makefile
index 3229790dd8ba..a0d5157488c3 100644
--- a/games/kobodeluxe/Makefile
+++ b/games/kobodeluxe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kobodeluxe
 DISTVERSION=	0.4pre10
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://olofson.net/kobodl/download/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/koth/Makefile b/games/koth/Makefile
index 31c81a9b9068..001cdd6235b2 100644
--- a/games/koth/Makefile
+++ b/games/koth/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	koth
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=games/multiplayer
diff --git a/games/kpicframer/Makefile b/games/kpicframer/Makefile
index f1b4a6e42874..e1661e46949f 100644
--- a/games/kpicframer/Makefile
+++ b/games/kpicframer/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kpicframer
 PORTVERSION=	0.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
diff --git a/games/kpictorial/Makefile b/games/kpictorial/Makefile
index 43d010c9dd07..9222dbf5f1f0 100644
--- a/games/kpictorial/Makefile
+++ b/games/kpictorial/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kpictorial
 PORTVERSION=	0.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kpictorial
diff --git a/games/kpuzzle/Makefile b/games/kpuzzle/Makefile
index 2b0b1770c191..1e43ea77faf2 100644
--- a/games/kpuzzle/Makefile
+++ b/games/kpuzzle/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kpuzzle
 PORTVERSION=	0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kpuzzle
diff --git a/games/krosswordplayer/Makefile b/games/krosswordplayer/Makefile
index 513fc8f5f069..a5b67400fc4e 100644
--- a/games/krosswordplayer/Makefile
+++ b/games/krosswordplayer/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	KrossWordPlayer
 PORTVERSION=	1.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games kde
 MASTER_SITES=	http://home.houston.rr.com/epasveer/
 EXTRACT_SUFX=	.tgz
diff --git a/games/kslide/Makefile b/games/kslide/Makefile
index c751c1d88533..4a7659ffcb49 100644
--- a/games/kslide/Makefile
+++ b/games/kslide/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kslide
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	games kde
 MASTER_SITES=	http://david.bieder.free.fr/eric/taquin/ \
 		http://perso.orange.fr/coquelle/taquin/
diff --git a/games/ksudoku/Makefile b/games/ksudoku/Makefile
index 86911b781ec2..7024e445f50b 100644
--- a/games/ksudoku/Makefile
+++ b/games/ksudoku/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ksudoku
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/ktritoc/Makefile b/games/ktritoc/Makefile
index b65d8754e737..9ed4dedc15bf 100644
--- a/games/ktritoc/Makefile
+++ b/games/ktritoc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ktritoc
 PORTVERSION=	1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games kde
 MASTER_SITES=	http://www.heni-online.de/files/
 
diff --git a/games/kwappen/Makefile b/games/kwappen/Makefile
index 3a81d4bcc2cf..cc7dd582608c 100644
--- a/games/kwappen/Makefile
+++ b/games/kwappen/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kwappen
 PORTVERSION=	1.1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde
 MASTER_SITES=	http://www.lcs-chemie.de/
 
diff --git a/games/lapispuzzle/Makefile b/games/lapispuzzle/Makefile
index bcba563fbc9c..2089ae00445f 100644
--- a/games/lapispuzzle/Makefile
+++ b/games/lapispuzzle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lapispuzzle
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://download.savannah.gnu.org/releases/gap/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index 760d798f440e..5cd6e675a6b9 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lbreakout
 PORTVERSION=	010315
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgames
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 1594af0bc42f..a35ec40fee1b 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lbreakout2
 DISTVERSION=	2.6beta-3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgames
diff --git a/games/lgeneral-data/Makefile b/games/lgeneral-data/Makefile
index e01c3c8084fa..6f7f650fb868 100644
--- a/games/lgeneral-data/Makefile
+++ b/games/lgeneral-data/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lgeneral-data
 PORTVERSION=	1.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgeneral
diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index e281781c99c9..0e57294c6b34 100644
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lgeneral
 PORTVERSION=	1.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgeneral
diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index 2c393e3fa5bd..91afd7622183 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lianliankan
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	llk-linux
diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index 16c2863b18d4..dfefeb988265 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libshhcards
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 DISTNAME=	shhcards-${PORTVERSION}
diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile
index 0820f15e6a30..e2c4c4c7c731 100644
--- a/games/lincity-ng/Makefile
+++ b/games/lincity-ng/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lincity-ng
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,6 +21,7 @@ LIB_DEPENDS=	physfs-1.0.1:${PORTSDIR}/devel/physfs
 USE_BZIP2=	yes
 USE_GCC=	3.2+
 USE_SDL=	sdl mixer image ttf gfx
+USE_GL=		yes
 USE_GNOME=	libxml2
 
 GNU_CONFIGURE=	yes
diff --git a/games/lincity-ng/pkg-plist b/games/lincity-ng/pkg-plist
index 0ca8d83a217b..f7d776e0551f 100644
--- a/games/lincity-ng/pkg-plist
+++ b/games/lincity-ng/pkg-plist
@@ -1129,7 +1129,6 @@ share/applications/lincity-ng.desktop
 %%DATADIR%%/sounds/WindowClose.wav
 %%DATADIR%%/sounds/WindowOpen.wav
 share/pixmaps/lincity-ng.png
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/opening
 @dirrm %%DATADIR%%/music
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index 5d8834610dda..6b7316d5443c 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lincity
 PORTVERSION=	1.13.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/lincity/pkg-plist b/games/lincity/pkg-plist
index 8d28bb0515f7..76909c64bd5e 100644
--- a/games/lincity/pkg-plist
+++ b/games/lincity/pkg-plist
@@ -532,8 +532,6 @@
 %%DATADIR%%/opening/winfont_8x8.fnt
 %%NLS%%share/locale/ca/LC_MESSAGES/lincity.mo
 %%NLS%%share/locale/it/LC_MESSAGES/lincity.mo
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
 @dirrm %%DATADIR%%/opening
 @dirrm %%DATADIR%%/messages
 @dirrm %%DATADIR%%/icons
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index 327b5e9c77d7..fe45b512ea2b 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	doom3
 PORTVERSION=	1.3.1302
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games linux
 MASTER_SITES=	${MASTER_SITE_IDSOFTWARE}
 MASTER_SITE_SUBDIR=	doom3/linux
diff --git a/games/linux-doom3/pkg-plist b/games/linux-doom3/pkg-plist
index 6857eba1fcdf..ad74b3e4a437 100644
--- a/games/linux-doom3/pkg-plist
+++ b/games/linux-doom3/pkg-plist
@@ -7,6 +7,5 @@ bin/linux-doom3-ded
 %%DATADIR%%/doom.x86
 %%DATADIR%%/doomded.x86
 share/pixmaps/doom3.png
-@dirrmtry share/pixmaps
 @dirrmtry %%DATADIR%%/base
 @unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt
diff --git a/games/linux-goodway/Makefile b/games/linux-goodway/Makefile
index 275fa44db1a5..03f7a64b2d25 100644
--- a/games/linux-goodway/Makefile
+++ b/games/linux-goodway/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	linux-goodway
 PORTVERSION=	3.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.xpgoodwayteam.org/dwn_goodway/
 DISTNAME=	goodwayv${GWVERSION}_free
diff --git a/games/liquidwar/Makefile b/games/liquidwar/Makefile
index 210a7cb06acb..1a1eb30d20f8 100644
--- a/games/liquidwar/Makefile
+++ b/games/liquidwar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	liquidwar
 PORTVERSION=	5.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://liquidwar.sunsite.dk/archive/ \
 		${MASTER_SITE_SAVANNAH} \
diff --git a/games/liquidwar/pkg-plist b/games/liquidwar/pkg-plist
index 555afc568faf..e325915d1680 100644
--- a/games/liquidwar/pkg-plist
+++ b/games/liquidwar/pkg-plist
@@ -66,5 +66,4 @@ games/liquidwar
 @dirrm %%DOCSDIR%%
 
 @dirrmtry share/games
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile
index 972f50aef358..8f065dbfa26d 100644
--- a/games/lmarbles/Makefile
+++ b/games/lmarbles/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lmarbles
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lgames
diff --git a/games/ltris/Makefile b/games/ltris/Makefile
index 820a384646d1..7dbf71dac8a0 100644
--- a/games/ltris/Makefile
+++ b/games/ltris/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ltris
 PORTVERSION=	1.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/games/lucidlife/Makefile b/games/lucidlife/Makefile
index fb15e28f0b1f..fb51dc93b051 100644
--- a/games/lucidlife/Makefile
+++ b/games/lucidlife/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lucidlife
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 	    	http://offload1.icculus.org/~jcspray/LucidLife/ \
diff --git a/games/lucidlife/pkg-plist b/games/lucidlife/pkg-plist
index 5000fd7ffb01..5fc6bdcdf81c 100644
--- a/games/lucidlife/pkg-plist
+++ b/games/lucidlife/pkg-plist
@@ -358,7 +358,6 @@ share/pixmaps/lucidlife.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/window.gif
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/patterns/lpa/synthesis
 @dirrm %%DATADIR%%/patterns/lpa/spaceships
 @dirrm %%DATADIR%%/patterns/lpa/space_fillers
diff --git a/games/luola/Makefile b/games/luola/Makefile
index 09436acbcd53..35b469141edc 100644
--- a/games/luola/Makefile
+++ b/games/luola/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	luola
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.luolamies.org/software/luola/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index ec56731613a7..aa2830830df7 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	macopix
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://rosegray.sakura.ne.jp/macopix/
 .if defined(WITH_GTK1)
diff --git a/games/madbomber/Makefile b/games/madbomber/Makefile
index e2394ebeb0fb..516c36514338 100644
--- a/games/madbomber/Makefile
+++ b/games/madbomber/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	madbomber
 PORTVERSION=	0.2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/madbomber/src/
 
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index d1006b846828..ee9f649ef972 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	maelstrom
 PORTVERSION=	3.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.devolution.com/~slouken/projects/Maelstrom/src/
 DISTNAME=	Maelstrom-${PORTVERSION}
diff --git a/games/magiccube4d/Makefile b/games/magiccube4d/Makefile
index f0bdce554eee..77331160193a 100644
--- a/games/magiccube4d/Makefile
+++ b/games/magiccube4d/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	magiccube4d
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.superliminal.com/cube/
 DISTNAME=	mc4d-src-${PORTVERSION:S/./_/}
diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile
index b95e7424bef2..6667da290c8d 100644
--- a/games/mahjong/Makefile
+++ b/games/mahjong/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mahjong
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	games net
 MASTER_SITES=	http://www.stevens-bradfield.com/MahJong/Source/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Old
diff --git a/games/mangband/Makefile b/games/mangband/Makefile
index f71367080b23..ffa64f38c0f7 100644
--- a/games/mangband/Makefile
+++ b/games/mangband/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mangband
 PORTVERSION=	0.7.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://mangband.org/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/games/marathon-evil/Makefile b/games/marathon-evil/Makefile
index a38eb0a0db0d..da3c6ea0e430 100644
--- a/games/marathon-evil/Makefile
+++ b/games/marathon-evil/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	marathon-evil
 PORTVERSION=	3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://archives2.bungie.org/a1sdl/ \
 		ftp://ftp2.bungie.org/archives/a1sdl/
diff --git a/games/marathon2-data/Makefile b/games/marathon2-data/Makefile
index 5ffea7a4513d..0c5c1145f01d 100644
--- a/games/marathon2-data/Makefile
+++ b/games/marathon2-data/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	marathon2-data
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://files3.bungie.org/trilogy/
 DISTNAME=	marathon2
diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile
index 3d1c7fc52bf8..3311e4a7eec1 100644
--- a/games/marsnomercy/Makefile
+++ b/games/marsnomercy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	marsnomercy
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mars
diff --git a/games/merlin/Makefile b/games/merlin/Makefile
index e69718a251f0..c4ea71fd7be8 100644
--- a/games/merlin/Makefile
+++ b/games/merlin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	merlin
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.doc.ic.ac.uk/~np2/software/download/
 DISTNAME=	${PORTNAME}
diff --git a/games/mindfocus/Makefile b/games/mindfocus/Makefile
index f695db6f6c8d..37c450b0315f 100644
--- a/games/mindfocus/Makefile
+++ b/games/mindfocus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mindfocus
 PORTVERSION=	0.88
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.toyoshima-house.net/classic/mf/files/
 DISTFILES=	mindfocus-0.88.tar.gz mindfocus-data1.tar.gz
diff --git a/games/mindguard/Makefile b/games/mindguard/Makefile
index 522ad9e611bd..094bcf0cec51 100644
--- a/games/mindguard/Makefile
+++ b/games/mindguard/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mindguard
 PORTVERSION=	0.0.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://zapatopi.net/mindguard/
 EXTRACT_SUFX=	.tgz
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index b0f3f39ee1b8..1cbca697985c 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mirrormagic
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/mirrormagic/
 
diff --git a/games/mkhexgrid/Makefile b/games/mkhexgrid/Makefile
index 3e8345480189..648743f9edbe 100644
--- a/games/mkhexgrid/Makefile
+++ b/games/mkhexgrid/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mkhexgrid
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.nomic.net/~uckelman/mkhexgrid/releases/ \
 		http://aaron.daltons.ca/freebsd/
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index ac1b95cf69a8..a2a77596e502 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	monkeybubble
 PORTVERSION=	0.3.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games gnome
 MASTER_SITES=	http://home.gna.org/monkeybubble/downloads/
 DISTNAME=	monkey-bubble-${PORTVERSION}
diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile
index 0181e72c98a7..5791951a1f8c 100644
--- a/games/monster-masher/Makefile
+++ b/games/monster-masher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	monster
 PORTVERSION=	1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	http://www.cs.aau.dk/~olau/monster-masher/source/
 PKGNAMESUFFIX=	-masher
diff --git a/games/monsterz/Makefile b/games/monsterz/Makefile
index f22d2d5b5a37..38656cd43652 100644
--- a/games/monsterz/Makefile
+++ b/games/monsterz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	monsterz
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://sam.zoy.org/monsterz/
 
diff --git a/games/moonlander/Makefile b/games/moonlander/Makefile
index 33b6e68d5124..873b36782a00 100644
--- a/games/moonlander/Makefile
+++ b/games/moonlander/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moonlander
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=pool/main/m/moon-lander
diff --git a/games/mt_gtk_client/Makefile b/games/mt_gtk_client/Makefile
index 6df3bd41186f..f04430c310d0 100644
--- a/games/mt_gtk_client/Makefile
+++ b/games/mt_gtk_client/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		mt_gtk_client
 PORTVERSION=		0.1.98
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	maitretarot
diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile
index 84f330311443..b12d49f5e1ae 100644
--- a/games/mudmagic/Makefile
+++ b/games/mudmagic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mudmagic
 PORTVERSION=	1.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.mudmagic.com/mud-client/downloads/
 
diff --git a/games/mudmagic/pkg-plist b/games/mudmagic/pkg-plist
index c4911e4a01e4..6ccef8293e06 100644
--- a/games/mudmagic/pkg-plist
+++ b/games/mudmagic/pkg-plist
@@ -108,7 +108,6 @@ share/applications/mudmagic.desktop
 %%DATADIR%%/interface/wizard.xpm
 %%DATADIR%%/interface/xs_wizard.xpm
 share/pixmaps/mudmagic.png
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/interface
 @dirrm %%DATADIR%%/doc/grafix/hlp
 @dirrm %%DATADIR%%/doc/grafix
diff --git a/games/nadar/Makefile b/games/nadar/Makefile
index 8b6ef4663e26..934635a39dda 100644
--- a/games/nadar/Makefile
+++ b/games/nadar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nadar
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://download.vector.co.jp/pack/unix/game/action/
 
diff --git a/games/nazghul/Makefile b/games/nazghul/Makefile
index 895c86571ce1..f8ddb92269d1 100644
--- a/games/nazghul/Makefile
+++ b/games/nazghul/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nazghul
 PORTVERSION=	0.5.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/nehquake/Makefile b/games/nehquake/Makefile
index 36da2a05c895..ea0b7a8451d0 100644
--- a/games/nehquake/Makefile
+++ b/games/nehquake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nehquake
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index b3281e0864c6..cf2d7e02e21c 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nethack
 PORTVERSION=	3.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index f6995ddbc550..537f96ee5080 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nethack
 PORTVERSION=	3.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES?=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nethack
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 59b6331da0f5..82a41882fee5 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nethack
 PORTVERSION=	3.4.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/netpanzer-data/Makefile b/games/netpanzer-data/Makefile
index e9d082626982..e3d41bc1482a 100644
--- a/games/netpanzer-data/Makefile
+++ b/games/netpanzer-data/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	data
 PORTVERSION=	0.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX:S/-//}
diff --git a/games/netpanzer/Makefile b/games/netpanzer/Makefile
index b5f407f86a98..e7d051b03cd4 100644
--- a/games/netpanzer/Makefile
+++ b/games/netpanzer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netpanzer
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_BERLIOS}/${PORTNAME}/
 
diff --git a/games/netpanzer/pkg-plist b/games/netpanzer/pkg-plist
index 507fbeae981e..a24c8d088dcb 100644
--- a/games/netpanzer/pkg-plist
+++ b/games/netpanzer/pkg-plist
@@ -9,5 +9,4 @@ share/applications/netpanzer.desktop
 share/pixmaps/netpanzer.png
 share/pixmaps/netpanzer.xpm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
diff --git a/games/netrek-BRMH-bin/Makefile b/games/netrek-BRMH-bin/Makefile
index e05938fe0a99..37c103a59445 100644
--- a/games/netrek-BRMH-bin/Makefile
+++ b/games/netrek-BRMH-bin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netrek-BRMH
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://ftp.netrek.org/pub/netrek/mirrors/ftp.csua.berkeley.edu.old/netrek/ \
 		
diff --git a/games/netrek-COW3-bin/Makefile b/games/netrek-COW3-bin/Makefile
index 74a550325fc1..c7951fd4cb68 100644
--- a/games/netrek-COW3-bin/Makefile
+++ b/games/netrek-COW3-bin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netrek-COW
 PORTVERSION=	3.00.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://ftp.netrek.org/pub/netrek/clients/cow/COW-bin/old/
 DISTFILES=	COW.3.00pl0.FreeBSD.gz
diff --git a/games/netspades/Makefile b/games/netspades/Makefile
index 13ef61a6d2b8..0176b0948208 100644
--- a/games/netspades/Makefile
+++ b/games/netspades/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	NetSpades
 PORTVERSION=	4.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.ece.rice.edu/~brentmh/spades/
 
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index 827a06698206..9ce19519525d 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	neverball
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://offload1.icculus.org/neverball/
 
@@ -18,6 +18,7 @@ BUILD_DEPENDS=	${FREETYPE_CONFIG}:${PORTSDIR}/print/freetype2
 
 FREETYPE_CONFIG?=	${LOCALBASE}/bin/freetype-config
 
+USE_GL=		gl
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_SDL=	image mixer ttf
diff --git a/games/newvox/Makefile b/games/newvox/Makefile
index 3167b8f9f5a4..35d15b59bc52 100644
--- a/games/newvox/Makefile
+++ b/games/newvox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	newvox
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.libsdl.org/projects/newvox/src/
 
diff --git a/games/nextgo/Makefile b/games/nextgo/Makefile
index 5f3f02f42f79..80bb8102d216 100644
--- a/games/nextgo/Makefile
+++ b/games/nextgo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nextgo
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://download.savannah.gnu.org/releases/gap/
 DISTNAME=	NeXTGo-${PORTVERSION}
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index c76c9fbf4a80..453cecaf1e34 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nexuiz
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index af71193eafc3..c52a983d361c 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nighthawk
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://jsno.leal.com.au/rel/unix_projects/
diff --git a/games/nil/Makefile b/games/nil/Makefile
index deee1ee2e1f7..c0ee1b8a132e 100644
--- a/games/nil/Makefile
+++ b/games/nil/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nil
 DISTVERSION=	20050603-1400
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/ninix-aya/Makefile b/games/ninix-aya/Makefile
index 8075c151748d..8ae9dcac8125 100644
--- a/games/ninix-aya/Makefile
+++ b/games/ninix-aya/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ninix-aya
 PORTVERSION=	3.9.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	ninix-aya/25158
diff --git a/games/njam/Makefile b/games/njam/Makefile
index 94b69bcace4d..8cf9f1b11880 100644
--- a/games/njam/Makefile
+++ b/games/njam/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	njam
 PORTVERSION=	1.25
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/noegnud-littlehack/Makefile b/games/noegnud-littlehack/Makefile
index 0636a78609e5..e41f2df62bda 100644
--- a/games/noegnud-littlehack/Makefile
+++ b/games/noegnud-littlehack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	noegnud
 PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud	\
 		${MASTER_SITE_SOURCEFORGE:S/$/:nethack/}
diff --git a/games/noegnud-nethack-deet/Makefile b/games/noegnud-nethack-deet/Makefile
index ccdb1306074b..e30d41d41e11 100644
--- a/games/noegnud-nethack-deet/Makefile
+++ b/games/noegnud-nethack-deet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	noegnud
 PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud	\
 		${MASTER_SITE_SOURCEFORGE:S/$/:nethack/}
diff --git a/games/noegnud-nethack/Makefile b/games/noegnud-nethack/Makefile
index 20a6972c83ba..69f07b8e2467 100644
--- a/games/noegnud-nethack/Makefile
+++ b/games/noegnud-nethack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	noegnud
 PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud	\
 		${MASTER_SITE_SOURCEFORGE:S/$/:nethack/}
diff --git a/games/noegnud-slashem/Makefile b/games/noegnud-slashem/Makefile
index c9eabeb76fdd..390e13b24805 100644
--- a/games/noegnud-slashem/Makefile
+++ b/games/noegnud-slashem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	noegnud
 PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud	\
 		${MASTER_SITE_SOURCEFORGE:S/$/:slashem/}
diff --git a/games/nuclearchess/Makefile b/games/nuclearchess/Makefile
index 39d09c328f0f..03588583e193 100644
--- a/games/nuclearchess/Makefile
+++ b/games/nuclearchess/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nuclearchess
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://user.cs.tu-berlin.de/~karlb/${PORTNAME}/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/games/oilwar/Makefile b/games/oilwar/Makefile
index 310db5ca4413..59c79414ce3d 100644
--- a/games/oilwar/Makefile
+++ b/games/oilwar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oilwar
 PORTVERSION=	1.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.2ndpoint.fi/projektit/filut/
 DISTNAME=	OilWar-${PORTVERSION}
diff --git a/games/oneko-sakura/Makefile b/games/oneko-sakura/Makefile
index 779ca0489437..d84124abeccf 100644
--- a/games/oneko-sakura/Makefile
+++ b/games/oneko-sakura/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oneko
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.daidouji.com/oneko/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.sakura.5
diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index 77d5f2732187..b65af4cbbbd4 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oneko
 PORTVERSION=	2.0b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.3bit.co.jp/~sasaki/oneko/ \
 		http://www.net24.ne.jp/~ryo2/archives/:ryo2 \
diff --git a/games/oolite/Makefile b/games/oolite/Makefile
index 23fbaf4dbe55..edfdec5b27b7 100644
--- a/games/oolite/Makefile
+++ b/games/oolite/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		oolite
 PORTVERSION=		1.65
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		games gnustep
 MASTER_SITES=		${MASTER_SITE_BERLIOS} \
 			ftp://ftp.alioth.net/%SUBDIR%/:alioth
@@ -19,6 +19,7 @@ MAINTAINER=		avg@icyb.net.ua
 COMMENT=		Trade and combat space simulator, clone of Elite
 
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
+USE_GL=			yes
 USE_SDL=		mixer image gfx
 USE_GMAKE=		yes
 USE_GNUSTEP=		yes
diff --git a/games/oonsoo/Makefile b/games/oonsoo/Makefile
index 1f0aeae325e1..feb8f7bfd567 100644
--- a/games/oonsoo/Makefile
+++ b/games/oonsoo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oonsoo
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www4.ncsu.edu/~bwmott/www/oonsoo/distributions/
diff --git a/games/openglad/Makefile b/games/openglad/Makefile
index 5eddf056981e..e8decdb60a9c 100644
--- a/games/openglad/Makefile
+++ b/games/openglad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openglad
 PORTVERSION=	0.98
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	snowstorm
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index 9e2193676550..36402df8794a 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openmortal
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 201adc871264..a98c0f0f7758 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openttd
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/openyahtzee/Makefile b/games/openyahtzee/Makefile
index 9b173b50427d..dc2b7feb82a6 100644
--- a/games/openyahtzee/Makefile
+++ b/games/openyahtzee/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	OpenYahtzee
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/orbital_eunuchs_sniper/Makefile b/games/orbital_eunuchs_sniper/Makefile
index 77308b7ca225..edaa88efa519 100644
--- a/games/orbital_eunuchs_sniper/Makefile
+++ b/games/orbital_eunuchs_sniper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	orbital_eunuchs_sniper
 PORTVERSION=	1.29
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://filesingularity.timedoctor.org/
 
diff --git a/games/outerspace/Makefile b/games/outerspace/Makefile
index 2c2f045caf09..4dd0f2d88e42 100644
--- a/games/outerspace/Makefile
+++ b/games/outerspace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	outerspace
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	ospace
diff --git a/games/pachi/Makefile b/games/pachi/Makefile
index 300402478e8b..9947e4370859 100644
--- a/games/pachi/Makefile
+++ b/games/pachi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pachi
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dragontech
diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index 08ceb4317a4e..305a3beaa527 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	palomino
 PORTVERSION=	20061125
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}-sim
 DISTNAME=	${PORTNAME}_${DISTVERSION}
diff --git a/games/pathological/Makefile b/games/pathological/Makefile
index fdc2669fee77..74f6dd722a80 100644
--- a/games/pathological/Makefile
+++ b/games/pathological/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pathological
 PORTVERSION=	1.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/pcgen/Makefile b/games/pcgen/Makefile
index ae121a2da4a8..f443c50e91f1 100644
--- a/games/pcgen/Makefile
+++ b/games/pcgen/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	pcgen
 PORTVERSION=	5.10.2
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pcgen
diff --git a/games/pengpong/Makefile b/games/pengpong/Makefile
index 1e1f899483c3..7e87cca70309 100644
--- a/games/pengpong/Makefile
+++ b/games/pengpong/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pengpong
 PORTVERSION=	0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/penguin-command/Makefile b/games/penguin-command/Makefile
index 9f83261a96ff..47744200e959 100644
--- a/games/penguin-command/Makefile
+++ b/games/penguin-command/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	penguin-command
 PORTVERSION=	1.6.11
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/pengupop/Makefile b/games/pengupop/Makefile
index 6d948b054257..642c1ce09ee5 100644
--- a/games/pengupop/Makefile
+++ b/games/pengupop/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pengupop
 PORTVERSION=	2.1.9
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.junoplay.com/files/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/pets/Makefile b/games/pets/Makefile
index f0f89d576677..2875cf531241 100644
--- a/games/pets/Makefile
+++ b/games/pets/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pets
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.loria.fr/~rougier/pub/Software/
 
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index ace724564962..35cf7de2b727 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pinball
 PORTVERSION=	0.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 5cfd3babb6d8..13bfdb239427 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pioneers
 PORTVERSION=	0.10.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pio
diff --git a/games/pipenightdreams/Makefile b/games/pipenightdreams/Makefile
index 4ba4bc138d61..cea828a122df 100644
--- a/games/pipenightdreams/Makefile
+++ b/games/pipenightdreams/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pipenightdreams
 PORTVERSION=	0.10.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.libsdl.org/projects/pipenightdreams/packages/
 
diff --git a/games/pipepanic/Makefile b/games/pipepanic/Makefile
index c93a52214bdd..01e3bb371bad 100644
--- a/games/pipepanic/Makefile
+++ b/games/pipepanic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pipepanic
 PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.users.waitrose.com/~thunor/pipepanic/dload/ \
 		${MASTER_SITE_LOCAL} \
diff --git a/games/planeshift/Makefile b/games/planeshift/Makefile
index d2eabe415ba4..6438fec10d8c 100644
--- a/games/planeshift/Makefile
+++ b/games/planeshift/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	planeshift
 PORTVERSION=	0.3.017
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://alex.foxybanana.com/freebsd/
 
diff --git a/games/pmars-sdl/Makefile b/games/pmars-sdl/Makefile
index aac52a481b04..aa4d41de0497 100644
--- a/games/pmars-sdl/Makefile
+++ b/games/pmars-sdl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pmars
 PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.cs.helsinki.fi/u/jpihlaja/cw/pmars-sdl/
 PKGNAMESUFFIX=	-sdl
diff --git a/games/pmars/Makefile b/games/pmars/Makefile
index 93ca24be7da4..3d2c064aa915 100644
--- a/games/pmars/Makefile
+++ b/games/pmars/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pmars
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	corewar
diff --git a/games/polypuzzle/Makefile b/games/polypuzzle/Makefile
index f6256cfe617c..993348dfcb73 100644
--- a/games/polypuzzle/Makefile
+++ b/games/polypuzzle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	polypuzzle
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	games tcl84 tk84
 MASTER_SITES=	ftp://ibiblio.org/pub/Linux/games/
 EXTRACT_SUFX=	.tgz
diff --git a/games/pongix/Makefile b/games/pongix/Makefile
index e5df0830f64e..de9f74841596 100644
--- a/games/pongix/Makefile
+++ b/games/pongix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pongix
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.losersjuegos.com.ar/juegos/pongix/descargas/
 
diff --git a/games/pouetchess/Makefile b/games/pouetchess/Makefile
index 3389ca40acc3..89050081380b 100644
--- a/games/pouetchess/Makefile
+++ b/games/pouetchess/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pouetchess
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile
index 779aa0c060d7..6f8540a98c02 100644
--- a/games/powermanga/Makefile
+++ b/games/powermanga/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		powermanga
 PORTVERSION=		0.80
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		games
 MASTER_SITES=		http://linux.tlk.fr/games/Powermanga/download/
 EXTRACT_SUFX=		.tgz
diff --git a/games/ppracer/Makefile b/games/ppracer/Makefile
index 9049c121c2a9..e95021891d12 100644
--- a/games/ppracer/Makefile
+++ b/games/ppracer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ppracer
 DISTVERSION=	0.5alpha
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/ppracer/pkg-plist b/games/ppracer/pkg-plist
index 8d1b7f84d414..10cb67c12ce1 100644
--- a/games/ppracer/pkg-plist
+++ b/games/ppracer/pkg-plist
@@ -315,7 +315,6 @@ share/pixmaps/ppracer.png
 %%DATADIR%%/translations/ru_RU.nut
 %%DATADIR%%/translations/sv_SE.nut
 %%DATADIR%%/translations/uk_UA.nut
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
 @dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%/themes/terrains/snow
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index 5b0c9b2eff2f..84d68c97ddad 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	prboom
 PORTVERSION=	2.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/primateplunge/Makefile b/games/primateplunge/Makefile
index af3b68af8b9a..b19da21c7294 100644
--- a/games/primateplunge/Makefile
+++ b/games/primateplunge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	primateplunge
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.ecs.soton.ac.uk/~njh/primateplunge/
 
diff --git a/games/ptkei/Makefile b/games/ptkei/Makefile
index 3e8d36f64585..80cd6db5b755 100644
--- a/games/ptkei/Makefile
+++ b/games/ptkei/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ptkei
 PORTVERSION=	1.18.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.lfmm.org/ptkei/
 
diff --git a/games/pyching/Makefile b/games/pyching/Makefile
index 94f016321ae4..02a7892ebc2d 100644
--- a/games/pyching/Makefile
+++ b/games/pyching/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pyching
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	games python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/pydance/Makefile b/games/pydance/Makefile
index 43b122dd45eb..321f4d070b25 100644
--- a/games/pydance/Makefile
+++ b/games/pydance/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pydance
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	\
 		http://offload1.icculus.org/pyddr/ \
diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
index 988b02b6682e..3851d2adf187 100644
--- a/games/pykawari/Makefile
+++ b/games/pykawari/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pykawari
 PORTVERSION=	8.2.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kawari
diff --git a/games/pysol-cardsets/Makefile b/games/pysol-cardsets/Makefile
index a2d88f8f0549..e70ff13c7649 100644
--- a/games/pysol-cardsets/Makefile
+++ b/games/pysol-cardsets/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pysol-cardsets
 PORTVERSION=	4.40
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
diff --git a/games/pysol-music/Makefile b/games/pysol-music/Makefile
index de9b13a6d23e..9d9c3f85fae5 100644
--- a/games/pysol-music/Makefile
+++ b/games/pysol-music/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pysol-music
 PORTVERSION=	4.40
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index eb36ce241925..e4306544d811 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pysol
 PORTVERSION=	4.82
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.pysol.org/download/pysol/:source \
 		${MASTER_SITE_LOCAL:S/$/:support/}
diff --git a/games/pysycache-lang/Makefile b/games/pysycache-lang/Makefile
index 1d142477dc1f..e208a48ab375 100644
--- a/games/pysycache-lang/Makefile
+++ b/games/pysycache-lang/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lang
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	games python
 MASTER_SITES=	http://download.gna.org/py4childs/pysycache/v${PORTVERSION}/
 PKGNAMEPREFIX=	pysycache-
diff --git a/games/pysycache-themes/Makefile b/games/pysycache-themes/Makefile
index 15c72d64ece7..67dc8d523170 100644
--- a/games/pysycache-themes/Makefile
+++ b/games/pysycache-themes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	themes
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	games python
 MASTER_SITES=	http://themes.pysycache.free.fr/
 PKGNAMEPREFIX=	pysycache-
diff --git a/games/pysycache/Makefile b/games/pysycache/Makefile
index 1176977f586f..706194bfec6c 100644
--- a/games/pysycache/Makefile
+++ b/games/pysycache/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pysycache
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	games python
 MASTER_SITES=	http://download.gna.org/py4childs/${PORTNAME}/v${PORTVERSION}/
 DIST_SUBDIR=	${PORTNAME}
diff --git a/games/pythonchess/Makefile b/games/pythonchess/Makefile
index 69801ae52e94..225eb9c7f38d 100644
--- a/games/pythonchess/Makefile
+++ b/games/pythonchess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pythonchess
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
diff --git a/games/q15/Makefile b/games/q15/Makefile
index ebb7363d8317..43e033a3bf9a 100644
--- a/games/q15/Makefile
+++ b/games/q15/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	q15
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://silversoft.net/src/
 
diff --git a/games/q2p/Makefile b/games/q2p/Makefile
index 5166afb770b1..105e3e689ac3 100644
--- a/games/q2p/Makefile
+++ b/games/q2p/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	q2p
 PORTVERSION=	0.2.20061231
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://qudos.quakedev.com/linux/quake2/engines/Q2P/
 DISTNAME=	Q2P-0.2-2006-12-31
diff --git a/games/q2pro/Makefile b/games/q2pro/Makefile
index a6f22a844e7a..6279261a1ce5 100644
--- a/games/q2pro/Makefile
+++ b/games/q2pro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	q2pro
 PORTVERSION=	${SVN_REV}
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
diff --git a/games/q3base/Makefile b/games/q3base/Makefile
index 2ebfc9f0781c..0e473a46bab7 100644
--- a/games/q3base/Makefile
+++ b/games/q3base/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		q3base
 PORTVERSION=		0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		games
 MASTER_SITES=		http://quake3.quakesrc.org/files/quake3/q3base/
 
diff --git a/games/q3cellshading/Makefile b/games/q3cellshading/Makefile
index 08694ddbd211..36fc94664af8 100644
--- a/games/q3cellshading/Makefile
+++ b/games/q3cellshading/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	q3cellshading
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	q3cel-${PORTVERSION}-src
diff --git a/games/qgo/Makefile b/games/qgo/Makefile
index 3e8fcf273702..7889a725ccbc 100644
--- a/games/qgo/Makefile
+++ b/games/qgo/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qgo
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/qix/Makefile b/games/qix/Makefile
index b74c8c989767..73983e38174d 100644
--- a/games/qix/Makefile
+++ b/games/qix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qix
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jmz
@@ -16,10 +17,8 @@ COMMENT=	The classic arcade game
 
 BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
 RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.endif
+
+USE_DISPLAY=	yes
 
 .if defined(WITHOUT_X11)
 MAKE_ARGS=	NO_X11=yes
diff --git a/games/qnetchess/Makefile b/games/qnetchess/Makefile
index 0c9bbe07b4b0..d7fe34f23515 100644
--- a/games/qnetchess/Makefile
+++ b/games/qnetchess/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	QNetChess
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.silversoft.net/src/
 
diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile
index afef1abcd083..e3efea8e9c09 100644
--- a/games/qnetwalk/Makefile
+++ b/games/qnetwalk/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	qnetwalk
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://qt.osdn.org.ua/
 
diff --git a/games/qonk/Makefile b/games/qonk/Makefile
index 43fe60a2c417..558e03be7fec 100644
--- a/games/qonk/Makefile
+++ b/games/qonk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qonk
 DISTVERSION=	0.0.2beta1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://anthony.liekens.net/pub/files/
 
diff --git a/games/quake-dpmod/Makefile b/games/quake-dpmod/Makefile
index fe8a3776ce9a..e18a65c9f336 100644
--- a/games/quake-dpmod/Makefile
+++ b/games/quake-dpmod/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dpmod
 PORTVERSION=	20060725
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://offload1.icculus.org/twilight/darkplaces/files/
 PKGNAMEPREFIX=	${Q1PKGNAMEPREFIX}
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 1b433a5af101..89288b07fbce 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quake2forge
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.galgenberg.net/distfiles/
 DISTNAME=	quake2-${PORTVERSION}
diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile
index 4b8b55deb8d5..843d2c980693 100644
--- a/games/quake2lnx/Makefile
+++ b/games/quake2lnx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quake2lnx
 PORTVERSION=	0.16.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games ipv6
 MASTER_SITES=	http://offload1.icculus.org/quake2/files/
 DISTNAME=	quake2-r${PORTVERSION}
diff --git a/games/quake2max/Makefile b/games/quake2max/Makefile
index b30d8afa19ff..fa2d4d22d738 100644
--- a/games/quake2max/Makefile
+++ b/games/quake2max/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	quake2max
 PORTVERSION=	0.45
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://qudos.quakedev.com/linux/quake2/engines/Quake2MaX/:src \
 		${MASTER_SITE_LOCAL:S/$/:data/}
diff --git a/games/quake3-data/Makefile b/games/quake3-data/Makefile
index 375e8d04fbfb..6b94d19d2a92 100644
--- a/games/quake3-data/Makefile
+++ b/games/quake3-data/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	data
 DISTVERSION=	1.32b-3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_IDSOFTWARE}
 MASTER_SITE_SUBDIR=	quake3/linux
diff --git a/games/quake3-data/pkg-plist b/games/quake3-data/pkg-plist
index 0e4b1b762bc8..683fc3342dd8 100644
--- a/games/quake3-data/pkg-plist
+++ b/games/quake3-data/pkg-plist
@@ -10,7 +10,6 @@
 %%TEAMARENA%%%%DATADIR%%/missionpack/pak2.pk3
 %%TEAMARENA%%%%DATADIR%%/missionpack/pak3.pk3
 share/pixmaps/quake3.xpm
-@dirrmtry share/pixmaps
 %%TEAMARENA%%@dirrmtry %%DATADIR%%/missionpack
 @dirrmtry %%DATADIR%%/baseq3
 @unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt
diff --git a/games/quake3/Makefile b/games/quake3/Makefile
index 63f10c3bbf34..a798e7efd994 100644
--- a/games/quake3/Makefile
+++ b/games/quake3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	quake3
 PORTVERSION=	1.32c
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.proarena.com/p/ftpx/x8524/quake_3_arena/ \
 		http://www.planetgargoyle.com/ \
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index d502bb298284..a5ffdcb12f71 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quakeforge
 PORTVERSION=	0.5.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
 MASTER_SITE_SUBDIR=	quake/:sf
diff --git a/games/qudos/Makefile b/games/qudos/Makefile
index 44b6d7e27deb..8078f4592fa7 100644
--- a/games/qudos/Makefile
+++ b/games/qudos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qudos
 PORTVERSION=	0.40.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://qudos.quakedev.com/linux/quake2/engines/QuDos/
 DISTNAME=	QuDos-${PORTVERSION}-src
diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile
index 8caff2786348..b3dcc7603768 100644
--- a/games/quetoo/Makefile
+++ b/games/quetoo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	quetoo
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://jdolan.dyndns.org/jaydolan/files/ \
 		http://tastyspleen.net/~jdolan/ \
diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile
index 12f5b50f7a20..54d1082cf120 100644
--- a/games/r1q2/Makefile
+++ b/games/r1q2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	r1q2
 PORTVERSION=	7322
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.r1ch.net/stuff/r1q2/src/
 DISTNAME=	${PORTNAME}-b${PORTVERSION}-src
diff --git a/games/race/Makefile b/games/race/Makefile
index b3bb76a0f302..fb20b31b663e 100644
--- a/games/race/Makefile
+++ b/games/race/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	race
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	ftp://users.freebsd.org.uk/pub/foobar2k/
 
diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile
index 1ce8ba53a2e1..33bde012dd10 100644
--- a/games/redeclipse/Makefile
+++ b/games/redeclipse/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sauerbraten
 PORTVERSION=	20061204
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/reminiscence/Makefile b/games/reminiscence/Makefile
index ec70723885a7..c881b445fe49 100644
--- a/games/reminiscence/Makefile
+++ b/games/reminiscence/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	REminiscence
 PORTVERSION=	0.1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://cyxdown.free.fr/reminiscence/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile
index af5f5b87ba54..8dddf17e4fe9 100644
--- a/games/ri-li/Makefile
+++ b/games/ri-li/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Ri-li
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ri-li
diff --git a/games/robocode/Makefile b/games/robocode/Makefile
index ca27a57fc195..798307e05d61 100644
--- a/games/robocode/Makefile
+++ b/games/robocode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	robocode
 PORTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=robocode
diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile
index 937123ea70ca..27016517ddac 100644
--- a/games/rockdodger/Makefile
+++ b/games/rockdodger/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rockdodger
 PORTVERSION=	0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	spacerocks
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 77513ba07e83..d8c2b73d8b99 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rocksndiamonds
 PORTVERSION=	3.2.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \
 		http://homepages.compuserve.de/rocksndiamonds/
diff --git a/games/rottdc/Makefile b/games/rottdc/Makefile
index bf065f35d804..972b2e691e5d 100644
--- a/games/rottdc/Makefile
+++ b/games/rottdc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rottdc
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sdl-dc
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index 666588a0e024..f6f1a41f4b73 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	RealTimeBattle
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index bbfa4d8065ec..5694b9db3928 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rtcw
 PORTVERSION=	1.41b
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	games linux
 MASTER_SITES=	${MASTER_SITE_IDSOFTWARE}
diff --git a/games/rtcw/pkg-plist b/games/rtcw/pkg-plist
index 8dfa97fd6efa..2c9cbdb51f83 100644
--- a/games/rtcw/pkg-plist
+++ b/games/rtcw/pkg-plist
@@ -235,7 +235,6 @@ share/pixmaps/WolfSP.xpm
 @dirrm %%DATADIR%%/main/scripts
 @dirrmtry %%DATADIR%%/main
 @unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt
-@dirrmtry share/pixmaps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/PunkBuster/players
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/PunkBuster/admins
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/PunkBuster
diff --git a/games/rubix/Makefile b/games/rubix/Makefile
index 8329eb2b21f6..bad00d944178 100644
--- a/games/rubix/Makefile
+++ b/games/rubix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rubix
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://sed.free.fr/rubix/
 
diff --git a/games/sarien/Makefile b/games/sarien/Makefile
index 1ca65b7f314b..9e2896166739 100644
--- a/games/sarien/Makefile
+++ b/games/sarien/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sarien
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/sauerbraten/Makefile b/games/sauerbraten/Makefile
index 1ce8ba53a2e1..33bde012dd10 100644
--- a/games/sauerbraten/Makefile
+++ b/games/sauerbraten/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sauerbraten
 PORTVERSION=	20061204
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/scid/Makefile b/games/scid/Makefile
index 3d0e95b0e06d..77e3add125bc 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	scid
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	games databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index e88746627cc2..9b05cf4b2bd0 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		scorched3d
 PORTVERSION=		0.${SCORCH_VERSION}${SCORCH_REVISION}
+PORTREVISION=	1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scorched3d
diff --git a/games/scourge/Makefile b/games/scourge/Makefile
index 202452bccfac..aa27cd500663 100644
--- a/games/scourge/Makefile
+++ b/games/scourge/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scourge
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/scramble/Makefile b/games/scramble/Makefile
index a28d8c47c404..c7b314abebfc 100644
--- a/games/scramble/Makefile
+++ b/games/scramble/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scramble
 PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.shiftygames.com/scramble/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 763918e825bd..28deac0c14ee 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scummvm-tools
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scummvm
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 6d6c4792b76b..98de461bfd4a 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scummvm
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/sdb/Makefile b/games/sdb/Makefile
index 507162733e6d..c9daa456d09f 100644
--- a/games/sdb/Makefile
+++ b/games/sdb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdb
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://sdb.gamecreation.org/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/sdlquake2/Makefile b/games/sdlquake2/Makefile
index 63ded0675d1d..cbc835b07742 100644
--- a/games/sdlquake2/Makefile
+++ b/games/sdlquake2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdlquake2
 PORTVERSION=	0.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://koti.mbnet.fi/~turol/sdlquake2/
 
diff --git a/games/sdlroids/Makefile b/games/sdlroids/Makefile
index 64523850c66b..659a7eab9a81 100644
--- a/games/sdlroids/Makefile
+++ b/games/sdlroids/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdlroids
 PORTVERSION=	1.3.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/sdlsand/Makefile b/games/sdlsand/Makefile
index 0d75a7a8ab61..56c8a4476977 100644
--- a/games/sdlsand/Makefile
+++ b/games/sdlsand/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdlsand
 PORTVERSION=	20061017
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/seahaven/Makefile b/games/seahaven/Makefile
index 2b5f5e6e5a46..63389443bd18 100644
--- a/games/seahaven/Makefile
+++ b/games/seahaven/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	seahaven
 PORTVERSION=	1.44
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://seahaven.sourceforge.net/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/games/senken/Makefile b/games/senken/Makefile
index aa15368d43ee..7318f873bcef 100644
--- a/games/senken/Makefile
+++ b/games/senken/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	senken
 PORTVERSION=	0.3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
diff --git a/games/senso/Makefile b/games/senso/Makefile
index 4823c7c5c2f3..eede72e7238a 100644
--- a/games/senso/Makefile
+++ b/games/senso/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	senso
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.v-i-t.de/mirkos_hp/pub/
 EXTRACT_SUFX=	.py
diff --git a/games/sfbol/Makefile b/games/sfbol/Makefile
index a86d446d58a8..449ac0d172a6 100644
--- a/games/sfbol/Makefile
+++ b/games/sfbol/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	sfbol
 PORTVERSION=	4.37
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	http://www.sfbonline.com/programs/
 DISTNAME=	install40
diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile
index 0244b1c551be..783b03c2c0eb 100644
--- a/games/shaaft/Makefile
+++ b/games/shaaft/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	shaaft
 PORTVERSION=	0.5.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	criticalmass
diff --git a/games/shootingstar/Makefile b/games/shootingstar/Makefile
index b24e25b8fc0b..16931365215c 100644
--- a/games/shootingstar/Makefile
+++ b/games/shootingstar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	shootingstar
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.2ndpoint.fi/projektit.xml/shootingstar/files/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/six/Makefile b/games/six/Makefile
index f8fd0a95bbde..2bd9eeec6e0f 100644
--- a/games/six/Makefile
+++ b/games/six/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	six
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	games kde
 MASTER_SITES=	http://six.retes.hu/download/
 
diff --git a/games/slune/Makefile b/games/slune/Makefile
index 453c0ba86326..ee2ef5f1522e 100644
--- a/games/slune/Makefile
+++ b/games/slune/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slune
 PORTVERSION=	1.0.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games python
 MASTER_SITES=	http://download.gna.org/slune/
 DISTNAME=	Slune-${PORTVERSION}
diff --git a/games/sol/Makefile b/games/sol/Makefile
index c09f1fa18a1a..00c1dede9806 100644
--- a/games/sol/Makefile
+++ b/games/sol/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sol
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 
diff --git a/games/solarconquest/Makefile b/games/solarconquest/Makefile
index b549d485181e..6788329fe584 100644
--- a/games/solarconquest/Makefile
+++ b/games/solarconquest/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	solarconquest
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://games.sajthelper.com/ \
 		${MASTER_SITE_LOCAL} \
diff --git a/games/solarwolf/Makefile b/games/solarwolf/Makefile
index 6cd708f0f72a..35612bfda84c 100644
--- a/games/solarwolf/Makefile
+++ b/games/solarwolf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	solarwolf
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.pygame.org/shredwheat/solarwolf/
 
diff --git a/games/sopwith/Makefile b/games/sopwith/Makefile
index 6f76fd3f8c50..53ac20e24421 100644
--- a/games/sopwith/Makefile
+++ b/games/sopwith/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sopwith
 PORTVERSION=	1.7.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sdl-sopwith
diff --git a/games/spacearyarya/Makefile b/games/spacearyarya/Makefile
index b188c5600288..afa0448a4d88 100644
--- a/games/spacearyarya/Makefile
+++ b/games/spacearyarya/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spacearyarya
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ \
 		ftp://ftp.uni-erlangen.de/.mirrors/ftpbsd/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ \
diff --git a/games/spacehulk/Makefile b/games/spacehulk/Makefile
index 490296a943c7..99c09ac9627e 100644
--- a/games/spacehulk/Makefile
+++ b/games/spacehulk/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	spacehulk
 PORTVERSION=	1.5.b1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde
 MASTER_SITES=	http://r.vinot.free.fr/spacehulk/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b1/-beta1/}
diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile
index e8ad6a3a5391..0eb047209a74 100644
--- a/games/spellcast/Makefile
+++ b/games/spellcast/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spellcast
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.eblong.com/zarf/ftp/
 DISTNAME=	${PORTNAME}
diff --git a/games/speyes/Makefile b/games/speyes/Makefile
index 6a4ba3f2737a..d39d0c51ba9d 100644
--- a/games/speyes/Makefile
+++ b/games/speyes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	speyes
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://okb-1.org/speyes/
 
diff --git a/games/spicetrade/Makefile b/games/spicetrade/Makefile
index 1ba0591734a0..8aeeb9edf85a 100644
--- a/games/spicetrade/Makefile
+++ b/games/spicetrade/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spicetrade
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/spider/Makefile b/games/spider/Makefile
index b13a1f82cb1b..b1ed4ffbfd64 100644
--- a/games/spider/Makefile
+++ b/games/spider/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spider
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/solitaires
diff --git a/games/ssc/Makefile b/games/ssc/Makefile
index 153fa6863172..f0862f8f5982 100644
--- a/games/ssc/Makefile
+++ b/games/ssc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ssc
 PORTVERSION=	0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}x
diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile
index 2c818da93e88..dfea2e3f8889 100644
--- a/games/starfighter/Makefile
+++ b/games/starfighter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	starfighter
 DISTVERSION=	1.1-1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.parallelrealities.co.uk/download.php?type=zip&file=
 
diff --git a/games/stepbill/Makefile b/games/stepbill/Makefile
index e01d40f043db..efba423b0a25 100644
--- a/games/stepbill/Makefile
+++ b/games/stepbill/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stepbill
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	games gnustep
 MASTER_SITES=	http://www.linuks.mine.nu/stepbill/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/games/stormbaancoureur/Makefile b/games/stormbaancoureur/Makefile
index 88b218914a82..01c6a0386396 100644
--- a/games/stormbaancoureur/Makefile
+++ b/games/stormbaancoureur/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sturmbahnfahrer
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.stolk.org/sturmbahnfahrer/download/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index 253d49ee4aaf..15929435064c 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stratagus
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 EXTRACT_SUFX=	-src.tar.gz
@@ -20,6 +21,7 @@ USE_GMAKE=	yes
 USE_LUA=	5.0
 USE_SDL=	sdl
 USE_XLIB=	yes
+USE_GL=		yes
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LUA_INCDIR}
 CONFIGURE_ENV=	LDFLAGS="-L${LUA_LIBDIR} -lm"
diff --git a/games/stroq/Makefile b/games/stroq/Makefile
index 3c0c7ca2acc2..296acb71daf1 100644
--- a/games/stroq/Makefile
+++ b/games/stroq/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	stroq
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stroq
diff --git a/games/sturmbahnfahrer/Makefile b/games/sturmbahnfahrer/Makefile
index 88b218914a82..01c6a0386396 100644
--- a/games/sturmbahnfahrer/Makefile
+++ b/games/sturmbahnfahrer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sturmbahnfahrer
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.stolk.org/sturmbahnfahrer/download/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/super_methane_brothers/Makefile b/games/super_methane_brothers/Makefile
index bcc3d1e42924..e27cecc5ad5f 100644
--- a/games/super_methane_brothers/Makefile
+++ b/games/super_methane_brothers/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	super_methane_brothers
 PORTVERSION=	1.4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	methane
diff --git a/games/supertux/Makefile b/games/supertux/Makefile
index 97b7667bd377..b6e881f4de76 100644
--- a/games/supertux/Makefile
+++ b/games/supertux/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	supertux
 PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/sxsame/Makefile b/games/sxsame/Makefile
index 47bf661ee94d..7456dfd380d4 100644
--- a/games/sxsame/Makefile
+++ b/games/sxsame/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sxsame
 PORTVERSION=	3.02
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.hanzubon.org/mirrors/Vine/VinePlus/1.1/JG-0.9.1/sources/ \
 		http://www.asahi-net.or.jp/~fj9y-ynym/ \
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 1c9e4f26c101..9498213cc67c 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tank
 PORTVERSION=	0.4a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://step.polymtl.ca/~coyote/tank/
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/games/taxipilot/Makefile b/games/taxipilot/Makefile
index f89f8ed44cf6..5ba499816412 100644
--- a/games/taxipilot/Makefile
+++ b/games/taxipilot/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	taxipilot
 PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/games/tecnoballz/Makefile b/games/tecnoballz/Makefile
index 8d0cf7a51348..531e246f9b37 100644
--- a/games/tecnoballz/Makefile
+++ b/games/tecnoballz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		tecnoballz
 PORTVERSION=		0.90
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		games
 MASTER_SITES=		http://linux.tlk.fr/games/TecnoballZ/download/
 EXTRACT_SUFX=		.tgz
diff --git a/games/teg/Makefile b/games/teg/Makefile
index 54c9f08b8d49..44d4146451cd 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	teg
 PORTVERSION=	0.11.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/tenebrae/Makefile b/games/tenebrae/Makefile
index c0c092e5a14e..f5420ccb3754 100644
--- a/games/tenebrae/Makefile
+++ b/games/tenebrae/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tenebrae
 PORTVERSION=	1.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://tenebrae.sourceforge.net/downloads/
 DISTFILES=	${PORTNAME}_src${EXTRACT_SUFX} \
diff --git a/games/tetrons/Makefile b/games/tetrons/Makefile
index 9a377aacb179..3a79b5fad4fa 100644
--- a/games/tetrons/Makefile
+++ b/games/tetrons/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tetrons
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.mammothcheese.ca/
 
diff --git a/games/thevalley/Makefile b/games/thevalley/Makefile
index 3b49d575d71f..b705fa78c799 100644
--- a/games/thevalley/Makefile
+++ b/games/thevalley/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	thevalley
 PORTVERSION=	0.98
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.autismuk.freeserve.co.uk/
 DISTNAME=	valley-${PORTVERSION}
diff --git a/games/thudboard/Makefile b/games/thudboard/Makefile
index 3e17dc5b1b34..5663fcd17419 100644
--- a/games/thudboard/Makefile
+++ b/games/thudboard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	thudboard
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.million.nl/file/
 
diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index 52ed05818206..fe322f24ab16 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tileworld
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.muppetlabs.com/~breadbox/pub/software/tworld/
 DISTNAME=	tworld-${PORTVERSION}
diff --git a/games/tkmoo/Makefile b/games/tkmoo/Makefile
index 3fc21d97a9a2..75fe405f1a78 100644
--- a/games/tkmoo/Makefile
+++ b/games/tkmoo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkmoo
 PORTVERSION=	0.3.32
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games tk84
 MASTER_SITES=	http://www.awns.com/tkMOO-light/Source/
 DISTNAME=	tkMOO-light-${PORTVERSION}
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index 8ee5b283c55d..197b3a661ed4 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tksol
 PORTVERSION=	1.8.4
+PORTREVISION=	1
 CATEGORIES=	games tk84
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/solitaires
diff --git a/games/tmw/Makefile b/games/tmw/Makefile
index c48b06f4ec65..c69796ee073f 100644
--- a/games/tmw/Makefile
+++ b/games/tmw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tmw
 PORTVERSION=	0.0.22.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	themanaworld
diff --git a/games/tomatoes/Makefile b/games/tomatoes/Makefile
index c1b33bddf89f..71e768e5df50 100644
--- a/games/tomatoes/Makefile
+++ b/games/tomatoes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tomatoes
 PORTVERSION=	1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/tome/Makefile b/games/tome/Makefile
index da711434aca3..ad599392a2f8 100644
--- a/games/tome/Makefile
+++ b/games/tome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tome
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://t-o-m-e.net/dl/src/
 DISTNAME=	tome-234-src
diff --git a/games/toppler/Makefile b/games/toppler/Makefile
index 3e013c447bfd..a622ac1f2ac2 100644
--- a/games/toppler/Makefile
+++ b/games/toppler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	toppler
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	toppler
diff --git a/games/torcs/Makefile b/games/torcs/Makefile
index e4686c9cc644..22de29e53516 100644
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		torcs
 DISTVERSION=		1.3.0
+PORTREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/torrent/Makefile b/games/torrent/Makefile
index 2764e414da90..7a65fc0f55dc 100644
--- a/games/torrent/Makefile
+++ b/games/torrent/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	torrent
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.shiftygames.com/torrent/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/toycars/Makefile b/games/toycars/Makefile
index 3ced5d2a58c2..47fc5dd5882a 100644
--- a/games/toycars/Makefile
+++ b/games/toycars/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	toycars
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	toycars
diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index ca96b04c8834..2711f3e18323 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	trackballs
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,6 +19,7 @@ LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_X_PREFIX=	yes
+USE_GL=		yes
 USE_SDL=	image mixer sdl ttf
 USE_GETTEXT=	yes
 USE_GETOPT_LONG=	yes
diff --git a/games/traindirector/Makefile b/games/traindirector/Makefile
index 1e1699cfab66..4640eee28421 100644
--- a/games/traindirector/Makefile
+++ b/games/traindirector/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	traindirector
 PORTVERSION=	1.19c
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://xtsl.free.fr/119c/
 DISTNAME=	traindir-${PORTVERSION}-src
diff --git a/games/tremor/Makefile b/games/tremor/Makefile
index 431bd89dbb70..f4b268cb059c 100644
--- a/games/tremor/Makefile
+++ b/games/tremor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tremor
 PORTVERSION=	3.2.4.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://qudos.quakedev.com/linux/quake1/:src \
 		http://tremor.quakedev.com/:data
diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile
index a6bc6f2c2ed0..cc39db01d863 100644
--- a/games/tremulous/Makefile
+++ b/games/tremulous/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tremulous
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S|$|${PORTNAME}/|} \
 		http://0day.icculus.org/mirrors/tremulous/ \
diff --git a/games/tremulous/pkg-plist b/games/tremulous/pkg-plist
index 922bf10bf823..acbd1e8e624c 100644
--- a/games/tremulous/pkg-plist
+++ b/games/tremulous/pkg-plist
@@ -15,6 +15,5 @@ share/pixmaps/tremulous.xpm
 %%DATADIR%%/base/maprotation.cfg
 %%DATADIR%%/base/server.cfg
 %%DATADIR%%/base/vms-1.1.0.pk3
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/base
 @dirrm %%DATADIR%%
diff --git a/games/trigger/Makefile b/games/trigger/Makefile
index 0c22c9bde303..e5d9a1549add 100644
--- a/games/trigger/Makefile
+++ b/games/trigger/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	trigger
 PORTVERSION=	0.5.2.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME}-rally
diff --git a/games/trimines/Makefile b/games/trimines/Makefile
index 7a2f7d502c8d..9472f380f30a 100644
--- a/games/trimines/Makefile
+++ b/games/trimines/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	trimines
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.freewebs.com/trimines/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/trophy/Makefile b/games/trophy/Makefile
index 2b0a574f51f0..4592234797f7 100644
--- a/games/trophy/Makefile
+++ b/games/trophy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		trophy
 PORTVERSION=		1.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/ttraffic/Makefile b/games/ttraffic/Makefile
index 768e727924d1..bb17bdc6cedb 100644
--- a/games/ttraffic/Makefile
+++ b/games/ttraffic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ttraffic
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games tk84
 MASTER_SITES=	http://alpha.luc.ac.be/Research/Algebra/Members/Ttraffic/ \
 		http://www.tobez.org/download/port-mirrors/games/ttraffic/
diff --git a/games/ttt/Makefile b/games/ttt/Makefile
index 8b15d72bc227..17ba666127e6 100644
--- a/games/ttt/Makefile
+++ b/games/ttt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ttt
 PORTVERSION=	2003.03.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/ttt/
 
diff --git a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile
index 1c88839e85c9..d5c9c3b9dfd9 100644
--- a/games/tux-aqfh/Makefile
+++ b/games/tux-aqfh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tux_aqfh
 PORTVERSION=	1.0.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://tuxaqfh.sourceforge.net/dist/
 
diff --git a/games/tuxkart/Makefile b/games/tuxkart/Makefile
index 1806f9a63247..b3c03d339692 100644
--- a/games/tuxkart/Makefile
+++ b/games/tuxkart/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tuxkart
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://tuxkart.sourceforge.net/dist/
 
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index 8a275ef81c6e..e1dc30d6a594 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tuxmath
 DISTVERSION=	2001.09.07-0102
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/tuxpaint-config/Makefile b/games/tuxpaint-config/Makefile
index 6b5aca6877aa..1d709540987f 100644
--- a/games/tuxpaint-config/Makefile
+++ b/games/tuxpaint-config/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tuxpaint-config
 PORTVERSION=	0.0.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tuxpaint
diff --git a/games/tuxpaint-fonts/Makefile b/games/tuxpaint-fonts/Makefile
index e094589aee9e..3563f4c9acde 100644
--- a/games/tuxpaint-fonts/Makefile
+++ b/games/tuxpaint-fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tuxpaint
 PORTVERSION=	1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/tuxpaint-stamps/Makefile b/games/tuxpaint-stamps/Makefile
index 5b1be774d86f..f2f192e9aa27 100644
--- a/games/tuxpaint-stamps/Makefile
+++ b/games/tuxpaint-stamps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tuxpaint
 DISTVERSION=	2006.10.21
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile
index 0b9a3a199df5..0beb5a546e98 100644
--- a/games/tuxpaint/Makefile
+++ b/games/tuxpaint/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tuxpaint
 PORTVERSION=	0.9.16
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/tuxpaint/pkg-plist b/games/tuxpaint/pkg-plist
index eff611b6084e..8773fc20a405 100644
--- a/games/tuxpaint/pkg-plist
+++ b/games/tuxpaint/pkg-plist
@@ -801,7 +801,6 @@ share/pixmaps/tuxpaint.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/be
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/af
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/pixmaps
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/ve/LC_MESSAGES
diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile
index 49ec7f2b1070..b3b311ea2148 100644
--- a/games/tuxpuck/Makefile
+++ b/games/tuxpuck/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	tuxpuck
 PORTVERSION=	0.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://users.student.lth.se/d00jkr/tuxpuck/
 
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 72044bb067ef..ad6eb51d3845 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tuxracer
 PORTVERSION=	0.61
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=tuxracer
@@ -22,7 +22,7 @@ LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 USE_SDL=	mixer sdl
 USE_GL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213
+USE_AUTOTOOLS=	automake:14 autoconf:253
 AUTOMAKE_ARGS=	-a
 CONFIGURE_ENV=	THREAD_LIB="${PTHREAD_LIBS}"
 MAKE_ENV=	${CONFIGURE_ENV}
diff --git a/games/tuxracer_golf/Makefile b/games/tuxracer_golf/Makefile
index db70977ad35c..3655ab71067b 100644
--- a/games/tuxracer_golf/Makefile
+++ b/games/tuxracer_golf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tuxracer_golf
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	adamw
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index 505846f05655..d8875e0cb42e 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tuxtype
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/tvp/Makefile b/games/tvp/Makefile
index d61b9274f8f5..12a7dff180de 100644
--- a/games/tvp/Makefile
+++ b/games/tvp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tvp
 PORTVERSION=	0.9.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games tk82
 MASTER_SITES=	http://www3.sympatico.ca/john.vanderhoek/tim/src/president/
 
diff --git a/games/twitch/Makefile b/games/twitch/Makefile
index b99f17c4c724..247631859bd6 100644
--- a/games/twitch/Makefile
+++ b/games/twitch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	twitch
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/tyrquake/Makefile b/games/tyrquake/Makefile
index 9b07fec0d6bc..db938d1ce533 100644
--- a/games/tyrquake/Makefile
+++ b/games/tyrquake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tyrquake
 PORTVERSION=	0.56
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://disenchant.net/files/engine/
 
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index f2762a7625d8..c249fdb9a631 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ufoai
 DISTVERSION=	2.0RC5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME:S/$/-/}${DISTVERSION:S/R/-R/}-source
diff --git a/games/uhexen/Makefile b/games/uhexen/Makefile
index f30e384cedc5..a4155e61599c 100644
--- a/games/uhexen/Makefile
+++ b/games/uhexen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uhexen
 PORTVERSION=	0.601
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://uhexen.sourceforge.net/
 DISTNAME=	${PORTNAME}-latest
diff --git a/games/uhexen2-extras/Makefile b/games/uhexen2-extras/Makefile
index 849ab8b8dc00..5ce9fde4dc49 100644
--- a/games/uhexen2-extras/Makefile
+++ b/games/uhexen2-extras/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	uhexen2
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-extras
diff --git a/games/uhexen2/Makefile b/games/uhexen2/Makefile
index e9a0c14b4f6b..d76a5765f7b3 100644
--- a/games/uhexen2/Makefile
+++ b/games/uhexen2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	uhexen2
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	hexen2source-${PORTVERSION}
diff --git a/games/umark/Makefile b/games/umark/Makefile
index 8b5fcdf8b4bc..3b514825dbfd 100644
--- a/games/umark/Makefile
+++ b/games/umark/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	umark
 DISTVERSION=	2.0.0-Beta3
+PORTREVISION=	1
 CATEGORIES=	games benchmarks
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ut2k3botbench
diff --git a/games/untahris/Makefile b/games/untahris/Makefile
index 771252f1fd6f..8e5b769304cb 100644
--- a/games/untahris/Makefile
+++ b/games/untahris/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	untahris
 DISTVERSION=	1.0beta
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index a4d7d4ba22e3..f7945917f742 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -14,6 +14,7 @@
 
 PORTNAME=	uqm
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sc2
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index 943e5bfca4b4..0e28d68728bf 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	vamos
 PORTVERSION=	0.5.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile
index 10dd932473f6..631d19d72e2f 100644
--- a/games/vavoom/Makefile
+++ b/games/vavoom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vavoom
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/vdrift/Makefile b/games/vdrift/Makefile
index fce0f252b7c1..e1ac0cca9b34 100644
--- a/games/vdrift/Makefile
+++ b/games/vdrift/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vdrift
 PORTVERSION=	20070323
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/vectoroids/Makefile b/games/vectoroids/Makefile
index 1af95f17b4b1..f2ca4ec576d8 100644
--- a/games/vectoroids/Makefile
+++ b/games/vectoroids/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vectoroids
 PORTVERSION=	1.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/vectoroids/src/
 
diff --git a/games/viruskiller/Makefile b/games/viruskiller/Makefile
index 59833b74ecaa..82faa2d6592b 100644
--- a/games/viruskiller/Makefile
+++ b/games/viruskiller/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	viruskiller
 DISTVERSION=	1.0-1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.parallelrealities.co.uk/download.php?type=zip&file=
 
diff --git a/games/viruskiller/pkg-plist b/games/viruskiller/pkg-plist
index 323031bf5b8c..4a89f8d243f3 100644
--- a/games/viruskiller/pkg-plist
+++ b/games/viruskiller/pkg-plist
@@ -13,5 +13,4 @@ share/pixmaps/viruskiller.png
 %%PORTDOCS%%%%DOCSDIR%%/virus3.gif
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
diff --git a/games/volleyball/Makefile b/games/volleyball/Makefile
index 552ec8665f53..ed5fd000277e 100644
--- a/games/volleyball/Makefile
+++ b/games/volleyball/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	volleyball
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.losersjuegos.com.ar/juegos/volleyball/descargas/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/vor/Makefile b/games/vor/Makefile
index 4038fb16d5b8..8d9d0030c108 100644
--- a/games/vor/Makefile
+++ b/games/vor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vor
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://qualdan.com/vor/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/vultures-claw/Makefile b/games/vultures-claw/Makefile
index af997ad5784b..a56977cf6bce 100644
--- a/games/vultures-claw/Makefile
+++ b/games/vultures-claw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vultures
 PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.darkarts.co.za/projects/vultures/attachment/wiki/downloads/${PORTVERSION}/
 PKGNAMESUFFIX=	-claw
diff --git a/games/vultures-eye/Makefile b/games/vultures-eye/Makefile
index 7d1ae1b27d93..18295ce99e9a 100644
--- a/games/vultures-eye/Makefile
+++ b/games/vultures-eye/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vultures
 PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.darkarts.co.za/projects/vultures/attachment/wiki/downloads/${PORTVERSION}/
 PKGNAMESUFFIX=	-eye
diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index a5d31a63954c..ea1da9608134 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wargus
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/games/warmux/Makefile b/games/warmux/Makefile
index c01c473af47e..2434505273ef 100644
--- a/games/warmux/Makefile
+++ b/games/warmux/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wormux
 DISTVERSION=	0.7.9
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://download.gna.org/wormux/
 
diff --git a/games/warmux/pkg-plist b/games/warmux/pkg-plist
index 3f5b125219c6..e29f0871bd9b 100644
--- a/games/warmux/pkg-plist
+++ b/games/warmux/pkg-plist
@@ -729,18 +729,6 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 @dirrm %%DATADIR%%/body/beastieteam
 @dirrm %%DATADIR%%/body
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
 @dirrmtry share/locale/pt-BR/LC_MESSAGES
 @dirrmtry share/locale/pt-BR
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/applications
diff --git a/games/warsow/Makefile b/games/warsow/Makefile
index ff95d816abbe..bf15fa21f380 100644
--- a/games/warsow/Makefile
+++ b/games/warsow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	warsow
 PORTVERSION=	0.12
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://warsow.aditsystems.com/ \
 		http://ftp.club-internet.fr/pub/games/nofrag/warsow/ \
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index dc68a64e77fe..498a66d958ed 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	warzone2100
 PORTVERSION=	2.0.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://download.gna.org/warzone/releases/2.0/
 
diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index 0679e366aada..5eb01b6ca7dd 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wesnoth
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.wesnoth.org/files/
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 0679e366aada..5eb01b6ca7dd 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wesnoth
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.wesnoth.org/files/
diff --git a/games/widelands/Makefile b/games/widelands/Makefile
index 8324ec57af51..5dca9e802e30 100644
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	widelands
 DISTVERSION=	build10
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/wmeyes/Makefile b/games/wmeyes/Makefile
index fffdc8131a52..c5b951eaa9a1 100644
--- a/games/wmeyes/Makefile
+++ b/games/wmeyes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmeyes
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.bstern.org/wmeyes/
 
diff --git a/games/wmfortune/Makefile b/games/wmfortune/Makefile
index 4781376482a1..f2da82ee2b52 100644
--- a/games/wmfortune/Makefile
+++ b/games/wmfortune/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmfortune
 PORTVERSION=	0.241
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games windowmaker afterstep
 MASTER_SITES=	http://dockapps.org/files/90/128/
 
diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile
index c585c9ad5ce0..8e6566bc7409 100644
--- a/games/wmminichess/Makefile
+++ b/games/wmminichess/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmminichess
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.insanum.com/miniCHESS/
 DISTNAME=	miniCHESS-${PORTVERSION}
diff --git a/games/wmpuzzle/Makefile b/games/wmpuzzle/Makefile
index 74aa2aaca46d..ba9fbbd46961 100644
--- a/games/wmpuzzle/Makefile
+++ b/games/wmpuzzle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmpuzzle
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	games windowmaker afterstep
 MASTER_SITES=	http://www.godisch.de/debian/wmpuzzle/
 
diff --git a/games/wmqstat/Makefile b/games/wmqstat/Makefile
index 9d1661cade9e..b815fcf44c6a 100644
--- a/games/wmqstat/Makefile
+++ b/games/wmqstat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmqstat
 PORTVERSION=	0.0.4
+PORTREVISION=	1
 CATEGORIES=	games windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/wmquake/Makefile b/games/wmquake/Makefile
index 4490ca141376..9425776e3358 100644
--- a/games/wmquake/Makefile
+++ b/games/wmquake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmquake
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.ne.jp/asahi/linux/timecop/software/
 
diff --git a/games/wmshuffle/Makefile b/games/wmshuffle/Makefile
index d761ba7a73ba..09955aa1d2d2 100644
--- a/games/wmshuffle/Makefile
+++ b/games/wmshuffle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmshuffle
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games windowmaker afterstep
 MASTER_SITES=	http://www.linuks.mine.nu/dockapp/ \
 		http://freebsd.nsu.ru/distfiles/
diff --git a/games/wmtictactoe/Makefile b/games/wmtictactoe/Makefile
index fdf972a86ca1..0156be20c240 100644
--- a/games/wmtictactoe/Makefile
+++ b/games/wmtictactoe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmtictactoe
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games windowmaker afterstep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jim
diff --git a/games/wmtimebomb/Makefile b/games/wmtimebomb/Makefile
index 1f27bc7064e5..94f0c2cf264f 100644
--- a/games/wmtimebomb/Makefile
+++ b/games/wmtimebomb/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmtimebomb
 PORTVERSION=	0.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games windowmaker
 MASTER_SITES=	ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
 DISTNAME=	wmtimebomb.20
diff --git a/games/wolf3d/Makefile b/games/wolf3d/Makefile
index 39beef6a6eb0..0f88c675db2e 100644
--- a/games/wolf3d/Makefile
+++ b/games/wolf3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wolf3d
 PORTVERSION=	20011028
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://www.icculus.org/wolf3d/:wolf \
 		http://cvsup.theplanet.com/distfiles/:wolf \
diff --git a/games/wop/Makefile b/games/wop/Makefile
index 2ffb991c2023..3a1774c161fd 100644
--- a/games/wop/Makefile
+++ b/games/wop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wop
 PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://wormsofprey.org/download/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/wormux-devel/Makefile b/games/wormux-devel/Makefile
index a69b08229ee7..44f43ee38b74 100644
--- a/games/wormux-devel/Makefile
+++ b/games/wormux-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wormux
 DISTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://download.gna.org/wormux/
 PKGNAMESUFFIX=	-devel
diff --git a/games/wormux-devel/pkg-plist b/games/wormux-devel/pkg-plist
index 57efcc9c3a46..148333d119ff 100644
--- a/games/wormux-devel/pkg-plist
+++ b/games/wormux-devel/pkg-plist
@@ -709,16 +709,4 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 @dirrm %%DATADIR%%/body/beastieteam
 @dirrm %%DATADIR%%/body
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/applications
diff --git a/games/wormux/Makefile b/games/wormux/Makefile
index c01c473af47e..2434505273ef 100644
--- a/games/wormux/Makefile
+++ b/games/wormux/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wormux
 DISTVERSION=	0.7.9
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://download.gna.org/wormux/
 
diff --git a/games/wormux/pkg-plist b/games/wormux/pkg-plist
index 3f5b125219c6..e29f0871bd9b 100644
--- a/games/wormux/pkg-plist
+++ b/games/wormux/pkg-plist
@@ -729,18 +729,6 @@ share/locale/tr/LC_MESSAGES/wormux.mo
 @dirrm %%DATADIR%%/body/beastieteam
 @dirrm %%DATADIR%%/body
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
 @dirrmtry share/locale/pt-BR/LC_MESSAGES
 @dirrmtry share/locale/pt-BR
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/applications
diff --git a/games/wrogue/Makefile b/games/wrogue/Makefile
index 26251c989acb..f70453888101 100644
--- a/games/wrogue/Makefile
+++ b/games/wrogue/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wrogue
 PORTVERSION=	0.7.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	todoom
diff --git a/games/xabacus/Makefile b/games/xabacus/Makefile
index 6bc9cc053a12..cc17e5cdd95e 100644
--- a/games/xabacus/Makefile
+++ b/games/xabacus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xabacus
 PORTVERSION=	7.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.tux.org/~bagleyd/abacus/ \
 		http://ftp.tux.org/pub/tux/bagleyd/xabacus/ \
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index b0c5fd5d1e6d..60c4b2ec6554 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xarchon
 PORTVERSION=	0.50
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.seul.org/pub/xarchon/ \
 		http://xarchon.seul.org/
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index 1697eae1ae2d..cc53ddd1333f 100644
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xasteroids
 PORTVERSION=	5.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.opengroup.org/pub/ftp.x.org/R5contrib/
 DISTFILES=	xasteroids.sh.Z
diff --git a/games/xataxx/Makefile b/games/xataxx/Makefile
index 6686a73a9207..d89908f8f99c 100644
--- a/games/xataxx/Makefile
+++ b/games/xataxx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xataxx
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}
diff --git a/games/xbaby/Makefile b/games/xbaby/Makefile
index 1318fa9ae6d0..37a1ba522de0 100644
--- a/games/xbaby/Makefile
+++ b/games/xbaby/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbaby
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://hpux.cs.utah.edu/ftp/hpux/X11/Misc/xbaby-1.2/ \
 		http://hpux.its.tudelft.nl/ftp/hpux/X11/Misc/xbaby-1.2/ \
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index ff9f463f8e74..4eb0110c7505 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbat
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.nemoto.ecei.tohoku.ac.jp/~wai/Xbat/
 DISTNAME=	xev111
diff --git a/games/xbattle/Makefile b/games/xbattle/Makefile
index 6475520e0b72..8c819622f1fd 100644
--- a/games/xbattle/Makefile
+++ b/games/xbattle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbattle
 PORTVERSION=	5.4.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 8198f03a49bd..1391be429190 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xbill
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.xbill.org/download/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/xbl/Makefile b/games/xbl/Makefile
index e91753f4f378..667e916ed3b3 100644
--- a/games/xbl/Makefile
+++ b/games/xbl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbl
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www710.univ-lyon1.fr/~exco/XBL/ GENTOO/distfiles
 
diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile
index 508a2b4bcf83..e96dd4a000f7 100644
--- a/games/xblackjack/Makefile
+++ b/games/xblackjack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xblackjack
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index bdaf88710fb4..39b56b4d71f8 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xblast
 PORTVERSION=	2.9.22
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= xblast
diff --git a/games/xblood/Makefile b/games/xblood/Makefile
index d738f1dea41d..8f6c70839ee3 100644
--- a/games/xblood/Makefile
+++ b/games/xblood/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xblood
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA014157/myfreesoft/
 
diff --git a/games/xbloody/Makefile b/games/xbloody/Makefile
index 1ce0c625b2c9..866fe0e80f3c 100644
--- a/games/xbloody/Makefile
+++ b/games/xbloody/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbloody
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.kazu.kz/freebsd/
 DISTNAME=	${PORTNAME}
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index ebf85d3a57ff..04ffb545fd11 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xboard
 PORTVERSION=	4.2.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.tim-mann.org/xboard/ \
 		${MASTER_SITE_GNU}
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 73ba8a64141d..af403fe29189 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xboing
 PORTVERSION=	2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 1b5b6b3b8ddf..6d58f4aefa77 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbomb
 PORTVERSION=	2.1a
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.gedanken.demon.co.uk/download-xbomb/
 EXTRACT_SUFX=	.tgz
diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile
index 150c6527f0ae..a57b38e4f956 100644
--- a/games/xbomber/Makefile
+++ b/games/xbomber/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbomber
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/xbomber/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index 205f6aec1c35..8fe9be1aa67f 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xbubble
 PORTVERSION=	0.5.8
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
diff --git a/games/xchadance/Makefile b/games/xchadance/Makefile
index d695fcd0ceb2..390451d0259b 100644
--- a/games/xchadance/Makefile
+++ b/games/xchadance/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xchadance
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.mk.bsdclub.org/pub/FreeBSD/distfiles/ \
 		${MASTER_SITE_LOCAL}
diff --git a/games/xcheckers/Makefile b/games/xcheckers/Makefile
index e0c73adc75a1..949408377582 100644
--- a/games/xcheckers/Makefile
+++ b/games/xcheckers/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcheckers
 PORTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://arton.cunst.net/xcheckers/
 
diff --git a/games/xchomp/Makefile b/games/xchomp/Makefile
index 5becb66dc07c..373b7d2efadf 100644
--- a/games/xchomp/Makefile
+++ b/games/xchomp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xchomp
 PORTVERSION=	pl1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 
diff --git a/games/xcogitate/Makefile b/games/xcogitate/Makefile
index fab116a612d6..86141b6c511d 100644
--- a/games/xcogitate/Makefile
+++ b/games/xcogitate/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcogitate
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mph
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 4b419e1a6f60..ecc31dcebae3 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xconq
 PORTVERSION=	7.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games tcl84 tk84
 MASTER_SITES=	ftp://sources.redhat.com/pub/xconq/ \
 		ftp://unix.hensa.ac.uk/mirrors/sources.redhat.com/pub/xconq/
diff --git a/games/xcubes/Makefile b/games/xcubes/Makefile
index bf1575b54026..49c0acc5c36c 100644
--- a/games/xcubes/Makefile
+++ b/games/xcubes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcubes
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index 34cedf3d7014..81ef27423e33 100644
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdeblock
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.vector.co.jp/pack/unix/game/action/block/
 DISTFILES=	${PORTNAME}.tgz
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index 6e92e017b410..f92fefff11c3 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdemineur
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
 		http://www.babafou.eu.org/xdemineur/
diff --git a/games/xdesktopwaves/Makefile b/games/xdesktopwaves/Makefile
index 5f7feba6e9b5..dc24ca25963a 100644
--- a/games/xdesktopwaves/Makefile
+++ b/games/xdesktopwaves/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdesktopwaves
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/xdigger/Makefile b/games/xdigger/Makefile
index a7b595d1c350..087421154612 100644
--- a/games/xdigger/Makefile
+++ b/games/xdigger/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdigger
 PORTVERSION=	1.0.10
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
diff --git a/games/xdino/Makefile b/games/xdino/Makefile
index 20d4ccab04ff..2d01d99fcf9c 100644
--- a/games/xdino/Makefile
+++ b/games/xdino/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdino
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index da54b0afc95e..27662addcfad 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xevil
 PORTVERSION=	2.02.r2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.xevil.com/download/stable/
 DISTNAME=	xevilsrc${PORTVERSION:S/.r/r/}
diff --git a/games/xeyesplus/Makefile b/games/xeyesplus/Makefile
index 1862d15e707e..830ba9c6b8c6 100644
--- a/games/xeyesplus/Makefile
+++ b/games/xeyesplus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xeyes+
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.asahi-net.or.jp/~fj9y-ynym/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/games/xfireworks/Makefile b/games/xfireworks/Makefile
index cff4f4a964ad..2fa8b4861c0c 100644
--- a/games/xfireworks/Makefile
+++ b/games/xfireworks/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfireworks
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA014157/myfreesoft/
 
diff --git a/games/xflame/Makefile b/games/xflame/Makefile
index 76a02c120649..795d63d0af79 100644
--- a/games/xflame/Makefile
+++ b/games/xflame/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xflame
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=kris
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 02f58288aabe..58c11a662fbc 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfrisk
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://tuxick.net/xfrisk/files/
 DISTNAME=	XFrisk-${PORTVERSION}
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index 7c1ad7c278e0..0412ba56f23c 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xgalaga
 PORTVERSION=	2.0.34
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://people.FreeBSD.org/~linimon/public_distfiles/
 
diff --git a/games/xgammon/Makefile b/games/xgammon/Makefile
index 8ac8bbe98368..614b8cec6bbe 100644
--- a/games/xgammon/Makefile
+++ b/games/xgammon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xgammon
 PORTVERSION=	0.98a
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/
 
diff --git a/games/xglk/Makefile b/games/xglk/Makefile
index 24e5895b7945..1d69e6a38add 100644
--- a/games/xglk/Makefile
+++ b/games/xglk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xglk
 PORTVERSION=	411
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.ifarchive.org/if-archive/programming/glk/implementations/
 DISTNAME=	${PORTNAME}-0${PORTVERSION}
diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile
index 923181ca6aa0..f955c94f263b 100644
--- a/games/xgospel/Makefile
+++ b/games/xgospel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xgospel
 PORTVERSION=	1.12d
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.teaser.fr/~jlgailly/
 
diff --git a/games/xhexagons/Makefile b/games/xhexagons/Makefile
index 480c6e8e8e8e..2e0d05f84b69 100644
--- a/games/xhexagons/Makefile
+++ b/games/xhexagons/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xhexagons
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xhime/Makefile b/games/xhime/Makefile
index 3f9c3c9b8c6c..b66bcf32a330 100644
--- a/games/xhime/Makefile
+++ b/games/xhime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xhime
 PORTVERSION=	1.51
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.tcp-ip.or.jp/~shochan/linux/
 DISTFILES=	xhime151.tgz
diff --git a/games/xinfocom/Makefile b/games/xinfocom/Makefile
index 84576514bfad..1d6d1d298cdc 100644
--- a/games/xinfocom/Makefile
+++ b/games/xinfocom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xinfocom
 PORTVERSION=	1.8m
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.gmd.de/if-archive/infocom/interpreters/itf/
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 47f9c072c6de..9bfb0ff6ac1f 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xinvaders
 PORTVERSION=	2.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade/invaders
diff --git a/games/xinvaders3d/Makefile b/games/xinvaders3d/Makefile
index 102185d69e67..18ae5c1913ef 100644
--- a/games/xinvaders3d/Makefile
+++ b/games/xinvaders3d/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xinvaders3d
 PORTVERSION=	1.3.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/xisola/Makefile b/games/xisola/Makefile
index 36cea847bddc..0a3585f9f875 100644
--- a/games/xisola/Makefile
+++ b/games/xisola/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xisola
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index a86d7aa9d65a..244ddfc3ba3f 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xjewel
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/ \
 		ftp://ftp.x.org/R5contrib/
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index 7159178a89bb..4e7f69d3ae95 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xjig
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index f26c8ce4b223..41435017a35c 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xjump
 PORTVERSION=	2.7.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/games/xjumpx/Makefile b/games/xjumpx/Makefile
index 4d4c9361f72f..b4c05ddeb282 100644
--- a/games/xjumpx/Makefile
+++ b/games/xjumpx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xjumpx
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://fenix.ne.jp/~cdrtk/soft/dl/
 
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index 44018bd64d0e..1e5b88456767 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xkobo
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}  \
 		ftp://ftp.uoknor.edu/mirrors/X/contrib/games/
diff --git a/games/xkoules/Makefile b/games/xkoules/Makefile
index 37a3f56ecef3..9c4c8d230a1e 100644
--- a/games/xkoules/Makefile
+++ b/games/xkoules/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xkoules
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade/koules
diff --git a/games/xlaby/Makefile b/games/xlaby/Makefile
index dfe9c5fda787..d516a36e1f77 100644
--- a/games/xlaby/Makefile
+++ b/games/xlaby/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xlaby
 PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://quatramaran.ens.fr/pub/madore/xlaby/
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index 7eaf830e3643..fc26348735d6 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xlife
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	xlife
diff --git a/games/xlines/Makefile b/games/xlines/Makefile
index cf85e8e63e0c..411818ba3d41 100644
--- a/games/xlines/Makefile
+++ b/games/xlines/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xlines
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.trolltech.com/contrib/
 DISTNAME=	${PORTNAME}
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index a2ad654c3466..d4fb5f497710 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmahjongg
 PORTVERSION=	3.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.lcdf.org/xmahjongg/
 
diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile
index 110e2791cfd2..60c8be6c9a53 100644
--- a/games/xmastermind/Makefile
+++ b/games/xmastermind/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		xmastermind
 PORTVERSION=		0.1
+PORTREVISION=	1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/xmball/Makefile b/games/xmball/Makefile
index 4b425aed8383..1d09e1aa86b2 100644
--- a/games/xmball/Makefile
+++ b/games/xmball/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmball
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xmemory/Makefile b/games/xmemory/Makefile
index fdb377da80d0..5276e7386b2f 100644
--- a/games/xmemory/Makefile
+++ b/games/xmemory/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmemory
 PORTVERSION=	3.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/multiplayer
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index 5a936ad58d6d..df8154aa5329 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmille
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index 3f1d5635b8e9..651b26f26f19 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -7,11 +7,12 @@
 
 PORTNAME=	xmine
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.sw.ru/pub/x11/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	joerg
-DISTNAME=	${PKGNAME}-Xaw
+DISTNAME=	${PORTNAME}-${PORTVERSION}-Xaw
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	The `Athena' port of the xminesweeper game
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index a9f7e401bf5b..582a892a8d79 100644
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xminehunter
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xmines/Makefile b/games/xmines/Makefile
index f81f93da972c..d9c7b9229221 100644
--- a/games/xmines/Makefile
+++ b/games/xmines/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmines
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/xminesweep/Makefile b/games/xminesweep/Makefile
index 10f393e8ca0a..c26587d414ff 100644
--- a/games/xminesweep/Makefile
+++ b/games/xminesweep/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xminesweep
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.netlab.is.tsukuba.ac.jp/pub/X/our_collections/games/ \
 		ftp://ftp.uni-halle.de/pub/X11/contrib/games/ \
diff --git a/games/xmlink/Makefile b/games/xmlink/Makefile
index ffa95c7f9239..04249738e091 100644
--- a/games/xmlink/Makefile
+++ b/games/xmlink/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmlink
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 7b3d2ce704bb..3fc87bd1eb03 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmoto
 PORTVERSION=	0.2.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://download.tuxfamily.org/xmoto/xmoto/${PORTVERSION}/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/games/xmoto/pkg-plist b/games/xmoto/pkg-plist
index bd6889f3d511..f7841af26b19 100644
--- a/games/xmoto/pkg-plist
+++ b/games/xmoto/pkg-plist
@@ -8,16 +8,6 @@ bin/xmoto
 %%DATADIR%%/Textures/Musics/menu.ogg
 %%DATADIR%%/Textures/Musics/ridealong.ogg
 %%DATADIR%%/xmoto.bin
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
 @dirrm %%DATADIR%%/Textures/Musics
 @dirrm %%DATADIR%%/Textures
 @dirrm %%DATADIR%%
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index 70646e62f99c..5defc8219890 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xmris
 PORTVERSION=	4.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xmulti/Makefile b/games/xmulti/Makefile
index 8f159331acf8..8923db84ea49 100644
--- a/games/xmulti/Makefile
+++ b/games/xmulti/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmulti
 PORTVERSION=	2.00b4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.denpa.org/~go/xmulti/
 DISTFILES=	xmul200b4.tgz
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index 46435798afab..cba3abca8bdb 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xneko
 PORTVERSION=	1.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
diff --git a/games/xoct/Makefile b/games/xoct/Makefile
index fc97df425159..10ff3e144a58 100644
--- a/games/xoct/Makefile
+++ b/games/xoct/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xoct
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xoids/Makefile b/games/xoids/Makefile
index d4e0f6b9d312..2c138ba5fe59 100644
--- a/games/xoids/Makefile
+++ b/games/xoids/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xoids
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xoj/Makefile b/games/xoj/Makefile
index 5a2a84d0db55..fb5f845b2ca4 100644
--- a/games/xoj/Makefile
+++ b/games/xoj/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xoj
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/demos
diff --git a/games/xonix/Makefile b/games/xonix/Makefile
index 0006a2bce807..76f5f7a63069 100644
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xonix
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
 
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index c76c9fbf4a80..453cecaf1e34 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nexuiz
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/xosmulti/Makefile b/games/xosmulti/Makefile
index ee4f5871b0b5..cc304de57fa5 100644
--- a/games/xosmulti/Makefile
+++ b/games/xosmulti/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xosmulti
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flathill
@@ -18,6 +19,7 @@ COMMENT=	A little girl cartoon on the top of the active window
 
 WRKSRC=		${WRKDIR}/xosmulti
 USE_X_PREFIX=	yes
+USE_XORG=	xbitmaps
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xosmulti ${PREFIX}/bin
diff --git a/games/xpacman/Makefile b/games/xpacman/Makefile
index e8ae4440a6f5..3b6db685614f 100644
--- a/games/xpacman/Makefile
+++ b/games/xpacman/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpacman
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nvg.unit.no/pub/pacman/
 DISTNAME=	pacman10
diff --git a/games/xpanex/Makefile b/games/xpanex/Makefile
index d5228c84ca8f..6a649437f78a 100644
--- a/games/xpanex/Makefile
+++ b/games/xpanex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpanex
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index d791bb760881..d3f4f2a0799e 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpat2
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/solitaires
diff --git a/games/xpenguins/Makefile b/games/xpenguins/Makefile
index 27d12fd1f654..15819975c228 100644
--- a/games/xpenguins/Makefile
+++ b/games/xpenguins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpenguins
 PORTVERSION=	2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://xpenguins.seul.org/:xp \
 		http://www.chrisburkert.de/download/unix/:ch
diff --git a/games/xphotohunter/Makefile b/games/xphotohunter/Makefile
index 6d4867877bd1..b7ba47939dd0 100644
--- a/games/xphotohunter/Makefile
+++ b/games/xphotohunter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xphotohunter
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://micro.ee.nthu.edu.tw/~tomcat/Xphotohunter/ \
 		http://wood.ite.ntnu.edu.tw/~clive/dist/xphotohunter/
diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index 229cb112af70..80c1d3610c9c 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/games/xpilot-ng-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpilot-ng
 PORTVERSION=	4.7.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xpilot
diff --git a/games/xpilot/Makefile b/games/xpilot/Makefile
index a7dba8a41ed0..20d1cafd0b48 100644
--- a/games/xpilot/Makefile
+++ b/games/xpilot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpilot
 PORTVERSION=	4.5.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xpilotgame
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 75373f97be4c..86d3889a4b6b 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpipeman
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/xpired/Makefile b/games/xpired/Makefile
index dc2577dfbf64..84a31f549b9f 100644
--- a/games/xpired/Makefile
+++ b/games/xpired/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpired
 PORTVERSION=	1.22
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xpired
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 16781b0d2f93..2af14e396360 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpuyopuyo
 PORTVERSION=	0.9.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://chaos2.org/xpuyopuyo/
 
diff --git a/games/xpuzzletama/Makefile b/games/xpuzzletama/Makefile
index 6dce1343da81..a0d0fbc23b85 100644
--- a/games/xpuzzletama/Makefile
+++ b/games/xpuzzletama/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpuzzletama
 PORTVERSION=	1.5b
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.hanzubon.org/mirrors/Vine/VinePlus/1.1/JG-0.9.1/sources/ \
 		http://hanzubon.jp/Vine/VinePlus/1.1/JG-0.9.1/sources/ \
diff --git a/games/xpyraminx/Makefile b/games/xpyraminx/Makefile
index 0794c87eb55b..a83ff9227d98 100644
--- a/games/xpyraminx/Makefile
+++ b/games/xpyraminx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpyraminx
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index 3ff29a43ef82..3c43151af3bf 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xqf
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/xqf/pkg-plist b/games/xqf/pkg-plist
index 29b33a57a1aa..31c29b416c3a 100644
--- a/games/xqf/pkg-plist
+++ b/games/xqf/pkg-plist
@@ -138,4 +138,3 @@ share/pixmaps/xqf_48x48_2.png
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile
index 08f2d0278020..0ba738db6793 100644
--- a/games/xquarto/Makefile
+++ b/games/xquarto/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xquarto
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.math.lsa.umich.edu/~mattiasj/games/xquarto/
 
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index c4bfb12dd7ec..e196240c5e92 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xracer
 PORTVERSION=	0.94
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 MASTER_SITE_SUBDIR=	distfiles
diff --git a/games/xrally/Makefile b/games/xrally/Makefile
index 0c9c611ad44d..f8bfaeca2c15 100644
--- a/games/xrally/Makefile
+++ b/games/xrally/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xrally
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xrally
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 530c57c71932..e9548cbd4bb9 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xrick
 PORTVERSION=	021212
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.bigorno.net/xrick/
 EXTRACT_SUFX=	.tgz
diff --git a/games/xripple/Makefile b/games/xripple/Makefile
index ffc45d58fc68..69379c734663 100644
--- a/games/xripple/Makefile
+++ b/games/xripple/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xripple
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://crydee.sai.msu.ru/zeus/X11/contrib/ \
 		ftp://ftp.cin.nihon-u.ac.jp/pub/X11/enlightenment/misc/ \
diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile
index 602dec6cc3de..683362548be1 100644
--- a/games/xrisk/Makefile
+++ b/games/xrisk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xrisk
 PORTVERSION=	2.15
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://my.pages.de/pub/comp/unix/games/xrisk/old/
 
diff --git a/games/xroach/Makefile b/games/xroach/Makefile
index fe16cb8fcff2..68b4855c7888 100644
--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xroach
 PORTVERSION=	4.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 DISTNAME=	${PORTNAME}
diff --git a/games/xroads/Makefile b/games/xroads/Makefile
index bf5467eb7d16..14745995b253 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xroads
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://math.missouristate.edu/~erik/files/fbsd/\
 		http://smluc.org/~erik/files/fbsd/
diff --git a/games/xrobots/Makefile b/games/xrobots/Makefile
index 68af5f8b7ee2..bb6aec22a300 100644
--- a/games/xrobots/Makefile
+++ b/games/xrobots/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	xrobots
 PORTVERSION=	1.0
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.mavetju.org/download/adopted/
-DISTNAME=	${PKGNAME}-ss-10.20
+DISTNAME=	${PORTNAME}-${PORTVERSION}-ss-10.20
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Fight off villainous robots (X version)
diff --git a/games/xrot/Makefile b/games/xrot/Makefile
index fa7c964c8245..961d6516f02d 100644
--- a/games/xrot/Makefile
+++ b/games/xrot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xrot
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.kobe-u.ac.jp/pub/Linux/packages/Vine/VinePlus/1.1/JG-0.9.1/sources/
diff --git a/games/xrubik/Makefile b/games/xrubik/Makefile
index 674c5a4ea5dc..3c09f28de7ab 100644
--- a/games/xrubik/Makefile
+++ b/games/xrubik/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xrubik
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xsc/Makefile b/games/xsc/Makefile
index eb6ec1111085..9fd02e115ea1 100644
--- a/games/xsc/Makefile
+++ b/games/xsc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xsc
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.panix.com/~mbh/xsc/
 
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index 3debef6f352f..70d74415e37b 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xscavenger
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.xdr.com/dash/
 EXTRACT_SUFX=	.tgz
diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index 699c71e01230..5c3006b1c285 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xscorch
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://chaos2.org/xscorch/ \
 		http://mirror.dok.org/xscorch/
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 543bd38632d3..98ffb9b3f883 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xscrabble
 PORTVERSION=	2.10
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.ac-grenoble.fr/ge/educational_games/
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz ${PORTNAME}_en.tgz
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index c980ba3d05dc..8ad6cea6be5d 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xshisen
 PORTVERSION=	1.51
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.techfirm.co.jp/~masaoki/
 
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index ddd39abd7e45..dd2e60d9bcca 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xshogi
 PORTVERSION=	${GNUSHOGI_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${GNUSHOGI_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${GNUSHOGI_MASTER_SITE_SUBDIR}
diff --git a/games/xskat/Makefile b/games/xskat/Makefile
index 56dfdac9cf9d..e638c061d185 100644
--- a/games/xskat/Makefile
+++ b/games/xskat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xskat
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.xskat.de/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/xskewb/Makefile b/games/xskewb/Makefile
index 9a64922dc3d4..6d8071f40b33 100644
--- a/games/xskewb/Makefile
+++ b/games/xskewb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xskewb
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xsokoban/Makefile b/games/xsokoban/Makefile
index f7ed636df79c..c4c674c0bd1e 100644
--- a/games/xsokoban/Makefile
+++ b/games/xsokoban/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xsokoban
 PORTVERSION=	3.3c
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.cs.cornell.edu/andru/release/ \
 		ftp://ftp.pmg.lcs.mit.edu/pub/xsokoban/
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index fa3df2c99191..415bfc229444 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xsoldier
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.interq.or.jp/libra/oohara/xsoldier/
 
diff --git a/games/xspacewarp/Makefile b/games/xspacewarp/Makefile
index a9af0952a59a..fb77240c9847 100644
--- a/games/xspacewarp/Makefile
+++ b/games/xspacewarp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xspacewarp
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xspringies/Makefile b/games/xspringies/Makefile
index 1c382facfadc..9dc17b607eec 100644
--- a/games/xspringies/Makefile
+++ b/games/xspringies/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xspringies
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://aixpdslib.seas.ucla.edu/pub/xspringies/RISC/3.2/src/
 DISTFILES=	xspringies.1.1.tar.Z
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index f3e0903f0d43..32b8eb119682 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xteddy
 PORTVERSION=	2.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://staffwww.itn.liu.se/~stegu/xteddy/
 
diff --git a/games/xtet42/Makefile b/games/xtet42/Makefile
index e44719562743..225882b1d700 100644
--- a/games/xtet42/Makefile
+++ b/games/xtet42/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtet42
 PORTVERSION=	2.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://utenti.gufi.org/~gmarco/files/distfiles/
 
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index b0dbd0c0435c..7021e14c4159 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtic
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xtriangles/Makefile b/games/xtriangles/Makefile
index 4b0680793ecb..c6061e4c44b4 100644
--- a/games/xtriangles/Makefile
+++ b/games/xtriangles/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtriangles
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xtris/Makefile b/games/xtris/Makefile
index 19c8bd08a80c..1db8e665af0c 100644
--- a/games/xtris/Makefile
+++ b/games/xtris/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtris
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	games ipv6
 MASTER_SITES=	ftp://quatramaran.ens.fr/pub/orabidoo/
 
diff --git a/games/xtrojka/Makefile b/games/xtrojka/Makefile
index be1b4afdcd9f..d7b21ee4d0e2 100644
--- a/games/xtrojka/Makefile
+++ b/games/xtrojka/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtrojka
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/games/
 DISTNAME=	${PORTNAME}
diff --git a/games/xtron/Makefile b/games/xtron/Makefile
index e2f26527d1b4..c2e89944394f 100644
--- a/games/xtron/Makefile
+++ b/games/xtron/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtron
 PORTVERSION=	1.1a
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
diff --git a/games/xtruco/Makefile b/games/xtruco/Makefile
index fdc288b2cbae..f5f35dccaebd 100644
--- a/games/xtruco/Makefile
+++ b/games/xtruco/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtruco
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xtux/Makefile b/games/xtux/Makefile
index c2f9c6ac32fb..3ed2ac81af9c 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtux
 PORTVERSION=	2003.03.06
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/xvier/Makefile b/games/xvier/Makefile
index 051f43b54776..2ba7517e4bac 100644
--- a/games/xvier/Makefile
+++ b/games/xvier/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xvier
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/xvmahjongg/Makefile b/games/xvmahjongg/Makefile
index c7d79606d3f8..9bca551703ce 100644
--- a/games/xvmahjongg/Makefile
+++ b/games/xvmahjongg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xvmahjongg
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTFILES=	${PORTNAME}${PORTVERSION}.tar.Z
diff --git a/games/xvmines/Makefile b/games/xvmines/Makefile
index 5c3b73665144..1a5623bb775c 100644
--- a/games/xvmines/Makefile
+++ b/games/xvmines/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xvmines
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
diff --git a/games/xwelltris/Makefile b/games/xwelltris/Makefile
index 8d8cbfad6755..ff3ae3c69b4e 100644
--- a/games/xwelltris/Makefile
+++ b/games/xwelltris/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xwelltris
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.xnc.dubna.su/xwelltris/src/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/games/xword/Makefile b/games/xword/Makefile
index 9deaab488213..41a00c666e21 100644
--- a/games/xword/Makefile
+++ b/games/xword/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xword
 PORTVERSION=	0.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/xworm/Makefile b/games/xworm/Makefile
index f7e262f28a07..305206b9377a 100644
--- a/games/xworm/Makefile
+++ b/games/xworm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xworm
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.ekran.no/archive/x/
 DISTNAME=	${PORTNAME}102
diff --git a/games/xye/Makefile b/games/xye/Makefile
index 5cf1132eb3ed..88dace3602f9 100644
--- a/games/xye/Makefile
+++ b/games/xye/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xye
 PORTVERSION=	0.7.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/xzip/Makefile b/games/xzip/Makefile
index 9bc9678fe9bb..24e5502607a5 100644
--- a/games/xzip/Makefile
+++ b/games/xzip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xzip
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/infocom/interpreters/zip/ \
 	ftp://www.plover.net/if-archive/infocom/interpreters/zip/ \
diff --git a/games/yadex/Makefile b/games/yadex/Makefile
index b158ce021184..ea4fb5437010 100644
--- a/games/yadex/Makefile
+++ b/games/yadex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yadex
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.teaser.fr/~amajorel/yadex/ \
 		http://hjem.get2net.dk/RasII/amajorel/yadex/
diff --git a/games/yamsweeper/Makefile b/games/yamsweeper/Makefile
index 411a3874e183..4754d45cde0a 100644
--- a/games/yamsweeper/Makefile
+++ b/games/yamsweeper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yamsweeper
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.hanzubon.org/mirrors/Vine/VinePlus/1.1/JG-0.9.1/sources/ \
 		http://ftp.jaist.ac.jp/pub/Linux/Vine/VinePlus/1.1/JG-0.9.1/sources/ \
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index e311c3e7fc7e..4b1e3d35cc25 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zangband
 PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	games
 MASTER_SITES=	ftp://clockwork.dementia.org/angband/Variant/ZAngband/ \
 		ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/
@@ -18,7 +18,7 @@ COMMENT=	Zangband (Zelazny Angband) with color, X11 support
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213
+USE_AUTOTOOLS=	automake:14 autoconf:253
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/lib \
 		--with-setgid=${SHAREGRP}
diff --git a/games/zatacka/Makefile b/games/zatacka/Makefile
index eab3800b8379..e9ef4635b4a9 100644
--- a/games/zatacka/Makefile
+++ b/games/zatacka/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zatacka
 PORTVERSION=	0.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/games/zephulor/Makefile b/games/zephulor/Makefile
index fc8e23150186..16763e2b6a7a 100644
--- a/games/zephulor/Makefile
+++ b/games/zephulor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zephulor
 PORTVERSION=	1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.hollowworks.com/downloads/adventuresonplanetzephulor/files/
 DISTNAME=	${PORTNAME}-source
diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile
index b27fd1477cf7..85c70c9fe69b 100644
--- a/games/znibbles/Makefile
+++ b/games/znibbles/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	znibbles
 PORTVERSION=	0.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://koala.ilog.fr/ftp/pub/games/znibbles/
 
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index 18a8b1cacd8a..d86a6af8e70c 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zoom
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.logicalshift.co.uk/unix/zoom/
 
diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index 4ca08e5f8150..84a4ea504e9d 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	BBBike
 PORTVERSION=	3.15
+PORTREVISION=	1
 CATEGORIES=	german
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bbbike
diff --git a/german/acroread/Makefile b/german/acroread/Makefile
index e66558fd9ad8..c61e80ce50de 100644
--- a/german/acroread/Makefile
+++ b/german/acroread/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	german print linux
 MASTERDIR=	${.CURDIR}/../../print/acroread7
diff --git a/german/bsdforen-firefox-searchplugin/Makefile b/german/bsdforen-firefox-searchplugin/Makefile
index 37a6c6aa398f..cf2912d5052e 100644
--- a/german/bsdforen-firefox-searchplugin/Makefile
+++ b/german/bsdforen-firefox-searchplugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bsdforen-firefox-searchplugin
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	german www
 MASTER_SITES=	http://www.crashmail.de/files/ \
 		http://people.bsdgroup.de/~steve/files/
diff --git a/german/calligra-l10n/Makefile b/german/calligra-l10n/Makefile
index 494feefdc028..98217bb756dc 100644
--- a/german/calligra-l10n/Makefile
+++ b/german/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	german kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/german/digibux/Makefile b/german/digibux/Makefile
index 767013be8632..2fd43323d452 100644
--- a/german/digibux/Makefile
+++ b/german/digibux/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	digibux
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	german gnustep
 MASTER_SITES=	http://gnu.ethz.ch/repository/digibux/
 DISTNAME=	digibux_${PORTVERSION}+CVS20060118.orig
diff --git a/german/ding/Makefile b/german/ding/Makefile
index 52b1db665e58..db219bab1b6d 100644
--- a/german/ding/Makefile
+++ b/german/ding/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ding
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	german tk84
 MASTER_SITES=	ftp://ftp.tu-chemnitz.de/pub/Local/urz/ding/
 
diff --git a/german/jdictionary-eng-ger/Makefile b/german/jdictionary-eng-ger/Makefile
index 6cd062a15098..62ac38c621f2 100644
--- a/german/jdictionary-eng-ger/Makefile
+++ b/german/jdictionary-eng-ger/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jdictionary-eng-ger
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	german textproc
 DISTNAME=	SmartEngGer-1_4.jar
 
diff --git a/german/jdictionary-ger-hun/Makefile b/german/jdictionary-ger-hun/Makefile
index 09bb4f4c508f..ac19fb6517a2 100644
--- a/german/jdictionary-ger-hun/Makefile
+++ b/german/jdictionary-ger-hun/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jdictionary-ger-hun
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	german hungarian textproc
 DISTNAME=	SmartGerHun-1_4.jar
 
diff --git a/german/kde3-i18n/Makefile b/german/kde3-i18n/Makefile
index a8cbfb546996..8afb28af2a1d 100644
--- a/german/kde3-i18n/Makefile
+++ b/german/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	german kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/german/kde4-l10n/Makefile b/german/kde4-l10n/Makefile
index a8cbfb546996..8afb28af2a1d 100644
--- a/german/kde4-l10n/Makefile
+++ b/german/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	german kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/german/kheisereg/Makefile b/german/kheisereg/Makefile
index 122d207a39c9..efd674d4e87d 100644
--- a/german/kheisereg/Makefile
+++ b/german/kheisereg/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kheisereg
 PORTVERSION=		0.8
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		german kde
 MASTER_SITES=		http://www.gantz-edv.de/kheisereg/
 
diff --git a/german/koffice-i18n/Makefile b/german/koffice-i18n/Makefile
index 494feefdc028..98217bb756dc 100644
--- a/german/koffice-i18n/Makefile
+++ b/german/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	german kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/german/koffice-kde4-l10n/Makefile b/german/koffice-kde4-l10n/Makefile
index 494feefdc028..98217bb756dc 100644
--- a/german/koffice-kde4-l10n/Makefile
+++ b/german/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	german kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/german/ksteak/Makefile b/german/ksteak/Makefile
index 01276af89c52..aa441a551d8e 100644
--- a/german/ksteak/Makefile
+++ b/german/ksteak/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ksteak
 PORTVERSION=	1.0.0.p2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	german kde
 MASTER_SITES=	http://www.der-fritz.de/ksteak/
 DISTNAME=	ksteak-1.0.0pre2
diff --git a/german/steak/Makefile b/german/steak/Makefile
index 09dcae1cdcb5..fc431a7896f1 100644
--- a/german/steak/Makefile
+++ b/german/steak/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	steak
 PORTVERSION=	1.7.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	german
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.tm.informatik.uni-frankfurt.de/%7Erazi/steak/program/
diff --git a/german/swissgerman-ding/Makefile b/german/swissgerman-ding/Makefile
index 0c4389f1f52c..c6d96b429c2f 100644
--- a/german/swissgerman-ding/Makefile
+++ b/german/swissgerman-ding/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	swissgerman-ding
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	german
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	de-
diff --git a/graphics/4va/Makefile b/graphics/4va/Makefile
index 101bca3ac0bd..3b32dcfbfe4a 100644
--- a/graphics/4va/Makefile
+++ b/graphics/4va/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	4va
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/hacks/X
diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index 5b1d5cde9906..1f006fbe00c2 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Coin
 PORTVERSION=	2.4.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://ftp.coin3d.org/coin/src/all/ \
 		ftp://ftp.coin3d.org/pub/coin/src/all/
diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
index 8e14d9524517..dbd8af47103e 100644
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	EZWGL
 PORTVERSION=	1.50
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	ftp://ftp.ma.utexas.edu/pub/mzou/
 DISTFILES=	${DISTNAME}-demo.tgz ${DISTNAME}-doc.tgz ${DISTNAME}-src.tgz
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 020568579843..a68cce2bad11 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index 020568579843..a68cce2bad11 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index 020568579843..a68cce2bad11 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
diff --git a/graphics/IPA/Makefile b/graphics/IPA/Makefile
index 6dc8ca9e4eb0..76dd7b2a31f5 100644
--- a/graphics/IPA/Makefile
+++ b/graphics/IPA/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	IPA
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.prima.eu.org/IPA/
 
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index f14c2df9583c..b822a31132cc 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	6.3.3-5
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
diff --git a/graphics/Makefile b/graphics/Makefile
index 98d83ec17702..fee349fe7f9d 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -333,7 +333,9 @@
     SUBDIR += leafpak
     SUBDIR += lfview
     SUBDIR += lib3ds
+    SUBDIR += libGL
     SUBDIR += libGLU
+    SUBDIR += libGLw
     SUBDIR += libafterimage
     SUBDIR += libart
     SUBDIR += libart_lgpl
diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile
index 3031a81ba4ec..02c5a797a1de 100644
--- a/graphics/SciPlot/Makefile
+++ b/graphics/SciPlot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	SciPlot
 PORTVERSION=	1.36
+PORTREVISION=	1
 CATEGORIES=	graphics math
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	widgets
diff --git a/graphics/a2png/Makefile b/graphics/a2png/Makefile
index 62723ccd479c..c36f8fe1e008 100644
--- a/graphics/a2png/Makefile
+++ b/graphics/a2png/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	a2png
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 24c04b674c5f..26ef2797df0e 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aalib
 PORTVERSION=	1.4.r5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aa-project
diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index fc6acd403c91..5cea77f87975 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	agave
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://download.gna.org/colorscheme/releases/
 
diff --git a/graphics/ale/Makefile b/graphics/ale/Makefile
index 94c141082a86..00f9b893eed9 100644
--- a/graphics/ale/Makefile
+++ b/graphics/ale/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ale
 PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://auricle.dyndns.org/ALE/download/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/graphics/allegrogl/Makefile b/graphics/allegrogl/Makefile
index 0aa8c16ba11c..ad0a69f93825 100644
--- a/graphics/allegrogl/Makefile
+++ b/graphics/allegrogl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	allegrogl
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 DISTNAME=	alleggl-${PORTVERSION}
diff --git a/graphics/amanith/Makefile b/graphics/amanith/Makefile
index 9a4ac523f3af..cfbf5bb9c91f 100644
--- a/graphics/amanith/Makefile
+++ b/graphics/amanith/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amanith
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.amanith.org/download/files/ \
 		http://louhi.kempele.fi/~skyostil/projects/pyamanith/dist/
diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile
index 90e01cb0c681..4e2e5bd4bb82 100644
--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aoi
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aoi
diff --git a/graphics/aolserver-nsgd/Makefile b/graphics/aolserver-nsgd/Makefile
index 9e33a8be289a..a03257268021 100644
--- a/graphics/aolserver-nsgd/Makefile
+++ b/graphics/aolserver-nsgd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nsgd
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics www
 MASTER_SITES=	http://www.aolserver.cz/download/
 PKGNAMEPREFIX=	aolserver-
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 898a486657cc..bddbfb508eab 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	aqsis
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/autopano-sift/Makefile b/graphics/autopano-sift/Makefile
index 1cab02046a59..f60a43325b39 100644
--- a/graphics/autopano-sift/Makefile
+++ b/graphics/autopano-sift/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	autopano-sift
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://user.cs.tu-berlin.de/~nowozin/autopano-sift/
 
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 27d7cd603e04..9b4a7cf4f203 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	autotrace
 PORTVERSION=	0.31.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 7f07cb902d56..cc5fbf0ba5b0 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aview
 PORTVERSION=	1.3.0.r1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aa-project
diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile
index 3c84a6a33f92..1be61842a4b6 100644
--- a/graphics/ayam/Makefile
+++ b/graphics/ayam/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ayam
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/backfract/Makefile b/graphics/backfract/Makefile
index ac43167b6f7a..3324ff6ba222 100644
--- a/graphics/backfract/Makefile
+++ b/graphics/backfract/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	backfract
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.igoweb.org/~wms/comp/backfract/
 
diff --git a/graphics/barbecue/Makefile b/graphics/barbecue/Makefile
index c2580e95de3b..5ba3d75a19ab 100644
--- a/graphics/barbecue/Makefile
+++ b/graphics/barbecue/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	barbecue
 PORTVERSION=	1.0.6d
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/batik/Makefile b/graphics/batik/Makefile
index c58e1812d86c..6439d7666340 100644
--- a/graphics/batik/Makefile
+++ b/graphics/batik/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	batik
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	${MASTER_SITE_APACHE_XML}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/bbrb/Makefile b/graphics/bbrb/Makefile
index e1486e243629..aaee140bb27b 100644
--- a/graphics/bbrb/Makefile
+++ b/graphics/bbrb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bbrb
 PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/blender-devel/Makefile b/graphics/blender-devel/Makefile
index 20155b2585c4..16850161b6fc 100644
--- a/graphics/blender-devel/Makefile
+++ b/graphics/blender-devel/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	blender
 PORTVERSION=	2.43
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index e9b5021c7645..bf40f341d23d 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blender
 PORTVERSION=	2.25
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/release/Publisher${PORTVERSION}/
 DISTNAME=	blender-publisher-${PORTVERSION}-freebsd-4.2-i386
diff --git a/graphics/bmp-rootvis/Makefile b/graphics/bmp-rootvis/Makefile
index 158cb148be53..4e27b633259c 100644
--- a/graphics/bmp-rootvis/Makefile
+++ b/graphics/bmp-rootvis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bmp-rootvis
 PORTVERSION=	0.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	bmp-plugins
diff --git a/graphics/bmp2html/Makefile b/graphics/bmp2html/Makefile
index 12773e5652a5..c10a8325a2d1 100644
--- a/graphics/bmp2html/Makefile
+++ b/graphics/bmp2html/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bmp2html
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://critical.ch/distfiles/ \
 		http://energy.critical.ch/distfiles/
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index bbe964f5d59b..a07798103ef8 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bugle
 PORTVERSION=	0.0.20070217
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/cairo-java/Makefile b/graphics/cairo-java/Makefile
index 3feddfffc591..d5709d8f4cbb 100644
--- a/graphics/cairo-java/Makefile
+++ b/graphics/cairo-java/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cairo-java
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 776ff335d600..977a4560493b 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.4.6
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 #MASTER_SITES=	http://cairographics.org/snapshots/
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index a42295858b7c..4bb9cce7aec3 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cairomm
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
diff --git a/graphics/camera/Makefile b/graphics/camera/Makefile
index ef7cd7260787..2dfb0d6ab024 100644
--- a/graphics/camera/Makefile
+++ b/graphics/camera/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	camera
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://home.gna.org/gsimageapps/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/graphics/camerakit/Makefile b/graphics/camerakit/Makefile
index 2d2e16e28423..c1aebd6beba0 100644
--- a/graphics/camerakit/Makefile
+++ b/graphics/camerakit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	camerakit
 PORTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://download.gna.org/gsimageapps/
 DISTNAME=	CameraKit-20041011
diff --git a/graphics/cbrpager/Makefile b/graphics/cbrpager/Makefile
index 757dc8c3d5df..e9b39040df7c 100644
--- a/graphics/cbrpager/Makefile
+++ b/graphics/cbrpager/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	cbrpager
 PORTVERSION=	0.9.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/cbview/Makefile b/graphics/cbview/Makefile
index 06f68195e251..2263739cea8d 100644
--- a/graphics/cbview/Makefile
+++ b/graphics/cbview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cbview
 PORTVERSION=	0.06
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://elvine.org/code/cbview/
 
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index d7143a77dffd..574da693c9e8 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cegui
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=crayzedsgui
@@ -24,6 +24,7 @@ GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
 USE_BZIP2=	YES
+USE_GL=		YES
 USE_X_PREFIX=	YES
 USE_GNOME=	gnomehack
 
diff --git a/graphics/cegui04/Makefile b/graphics/cegui04/Makefile
index d7143a77dffd..574da693c9e8 100644
--- a/graphics/cegui04/Makefile
+++ b/graphics/cegui04/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cegui
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=crayzedsgui
@@ -24,6 +24,7 @@ GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
 USE_BZIP2=	YES
+USE_GL=		YES
 USE_X_PREFIX=	YES
 USE_GNOME=	gnomehack
 
diff --git a/graphics/cenon/Makefile b/graphics/cenon/Makefile
index d6ee27e33198..9c27fe79b434 100644
--- a/graphics/cenon/Makefile
+++ b/graphics/cenon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cenon
 PORTVERSION=	3.82
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://www.vhf-group.com/vhfInterservice/download/source/
 DISTNAME=	Cenon-${PORTVERSION}
diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile
index 2e8755d59503..ee40eed3bcb3 100644
--- a/graphics/chbg/Makefile
+++ b/graphics/chbg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chbg
 PORTVERSION=	1.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.idata.sk/~ondrej/sw/
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 11a311a46e8d..1c50d2f0c591 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cimg
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index c1a1174649a8..61087dcd2afa 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cinepaint
 PORTVERSION=	0.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/claraocr/Makefile b/graphics/claraocr/Makefile
index 23d82a615c7b..d4a3a133d330 100644
--- a/graphics/claraocr/Makefile
+++ b/graphics/claraocr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	claraocr
 PORTVERSION=	0.9.9
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	graphics accessibility
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	clara-${PORTVERSION}
diff --git a/graphics/comical/Makefile b/graphics/comical/Makefile
index 6757f5eebac5..1d7af919d9d1 100644
--- a/graphics/comical/Makefile
+++ b/graphics/comical/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	comical
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index 7c0e6ef153aa..9758e34495dc 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	comix
 PORTVERSION=	3.6.3
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/comix/pkg-plist b/graphics/comix/pkg-plist
index 3a1e7dcd2eae..64fc95766480 100644
--- a/graphics/comix/pkg-plist
+++ b/graphics/comix/pkg-plist
@@ -59,20 +59,9 @@ share/pixmaps/comix/silk-transform.png
 share/pixmaps/comix/silk-view.png
 share/pixmaps/comix/silk-zoom.png
 @dirrm share/pixmaps/comix
-@dirrmtry share/pixmaps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 %%THUMBNAILS:%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 %%THUMBNAILS:%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile
index 0cab374090ab..de64154b034c 100644
--- a/graphics/corona/Makefile
+++ b/graphics/corona/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	corona
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/cosmoplayer/Makefile b/graphics/cosmoplayer/Makefile
index 7134e6371986..b9ac2fb46e63 100644
--- a/graphics/cosmoplayer/Makefile
+++ b/graphics/cosmoplayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cosmoplayer
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://opendx.npaci.edu/libs/
 DISTNAME=	${PORTNAME}-jar
diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 7b2351e72ab0..6a1ee5bb73db 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cqcam
 PORTVERSION=	0.91
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cs.duke.edu/~reynolds/cqcam/
 
diff --git a/graphics/crystalentitylayer-devel/Makefile b/graphics/crystalentitylayer-devel/Makefile
index 43fe0d97d5f0..2060b3e9d422 100644
--- a/graphics/crystalentitylayer-devel/Makefile
+++ b/graphics/crystalentitylayer-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	crystalentitylayer
 PORTVERSION=	20061105
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://alex.foxybanana.com/freebsd/
 PKGNAMESUFFIX=	-devel
diff --git a/graphics/crystalentitylayer/Makefile b/graphics/crystalentitylayer/Makefile
index df2667dea0fe..3e5daa3ee0ca 100644
--- a/graphics/crystalentitylayer/Makefile
+++ b/graphics/crystalentitylayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	crystalentitylayer
 PORTVERSION=	0.99
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cel
diff --git a/graphics/crystalspace-devel/Makefile b/graphics/crystalspace-devel/Makefile
index 7a2c0a143fd8..f678b0127b17 100644
--- a/graphics/crystalspace-devel/Makefile
+++ b/graphics/crystalspace-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	crystalspace
 PORTVERSION=	20061105
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://alex.foxybanana.com/freebsd/
 PKGNAMESUFFIX=	-devel
diff --git a/graphics/crystalspace/Makefile b/graphics/crystalspace/Makefile
index 399ad7c3c0a5..e611ec190fe5 100644
--- a/graphics/crystalspace/Makefile
+++ b/graphics/crystalspace/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	crystalspace
 PORTVERSION=	0.99
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	crystal
diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile
index 4afa3a55bcdd..bfa7527832a9 100644
--- a/graphics/curator/Makefile
+++ b/graphics/curator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	curator
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics www python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/cuttlefish/Makefile b/graphics/cuttlefish/Makefile
index 1ad2b1ba4be3..631959db34fd 100644
--- a/graphics/cuttlefish/Makefile
+++ b/graphics/cuttlefish/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cuttlefish
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.caida.org/tools/visualization/cuttlefish/code/
 
diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile
index 37ec6105b6b5..a6fef501eeb1 100644
--- a/graphics/danpei/Makefile
+++ b/graphics/danpei/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	danpei
 PORTVERSION=	2.9.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	danpei
diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile
index c594fe1f3ce7..10128f13e613 100644
--- a/graphics/dataplot/Makefile
+++ b/graphics/dataplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dataplot
 PORTVERSION=	20061219
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.nist.gov/pub/dataplot/unix/:source \
 				http://www.alaskaparadise.com/freebsd/:source \
diff --git a/graphics/demeter/Makefile b/graphics/demeter/Makefile
index e1d896e774aa..6fd4e68db27b 100644
--- a/graphics/demeter/Makefile
+++ b/graphics/demeter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	demeter
 PORTVERSION=	3.21
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 2a1589da6455..e5e1dab67ed0 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dia
 DISTVERSION=	0.96.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index 71c6974d053e..6c68401802d4 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -1764,44 +1764,8 @@ share/locale/uk/LC_MESSAGES/dia.mo
 share/locale/vi/LC_MESSAGES/dia.mo
 share/locale/zh_CN/LC_MESSAGES/dia.mo
 share/locale/zh_TW/LC_MESSAGES/dia.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrm share/gnome/omf/dia
 @dirrm share/gnome/help/dia/pl/graphics
 @dirrm share/gnome/help/dia/pl
diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index 1c89297220f7..48bd91b4a2be 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	diacanvas2
 PORTVERSION=	0.14.4
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	diacanvas
diff --git a/graphics/digikam-doc/Makefile b/graphics/digikam-doc/Makefile
index b8c89d6ff437..c24e47441031 100644
--- a/graphics/digikam-doc/Makefile
+++ b/graphics/digikam-doc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	digikam-doc
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	digikam
diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 831b89f40d2e..31806fbc3b6a 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	digikam
 DISTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/digikam-kde4/pkg-plist b/graphics/digikam-kde4/pkg-plist
index 5a2f52087812..9e254700ddd3 100644
--- a/graphics/digikam-kde4/pkg-plist
+++ b/graphics/digikam-kde4/pkg-plist
@@ -581,37 +581,7 @@ share/servicetypes/digikamimageplugin.desktop
 @dirrm share/apps/digikam/about
 @dirrm share/apps/digikam
 @dirrm include/digikam
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
 @dirrmtry share/locale/nds/LC_MESSAGES
 @dirrmtry share/locale/nds
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/ar/LC_MESSAGES
-@dirrmtry share/locale/ar
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 831b89f40d2e..31806fbc3b6a 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	digikam
 DISTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist
index 5a2f52087812..9e254700ddd3 100644
--- a/graphics/digikam/pkg-plist
+++ b/graphics/digikam/pkg-plist
@@ -581,37 +581,7 @@ share/servicetypes/digikamimageplugin.desktop
 @dirrm share/apps/digikam/about
 @dirrm share/apps/digikam
 @dirrm include/digikam
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
 @dirrmtry share/locale/nds/LC_MESSAGES
 @dirrmtry share/locale/nds
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/ar/LC_MESSAGES
-@dirrmtry share/locale/ar
diff --git a/graphics/digikamimageplugins-doc/Makefile b/graphics/digikamimageplugins-doc/Makefile
index 1b9125e3ffe4..b64e706b173b 100644
--- a/graphics/digikamimageplugins-doc/Makefile
+++ b/graphics/digikamimageplugins-doc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	digikamimageplugins-doc
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	digikam
diff --git a/graphics/digikamimageplugins/Makefile b/graphics/digikamimageplugins/Makefile
index 8670aa4bbdf1..86edcaa304c8 100644
--- a/graphics/digikamimageplugins/Makefile
+++ b/graphics/digikamimageplugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	digikamimageplugins
 DISTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	digikam
diff --git a/graphics/digikamimageplugins/pkg-plist b/graphics/digikamimageplugins/pkg-plist
index 6f8cefce0844..967a1fd181c4 100644
--- a/graphics/digikamimageplugins/pkg-plist
+++ b/graphics/digikamimageplugins/pkg-plist
@@ -1581,34 +1581,10 @@ share/services/digikamimageplugin_unsharp.desktop
 share/services/digikamimageplugin_whitebalance.desktop
 @dirrm share/apps/digikamimageplugins/data
 @dirrm share/apps/digikamimageplugins
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
 @dirrmtry share/locale/nds/LC_MESSAGES
 @dirrmtry share/locale/nds
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/apps/digikam/icons/hicolor/scalable/actions
 @dirrmtry share/apps/digikam/icons/hicolor/scalable
 @dirrmtry share/apps/digikam/icons/hicolor/64x64/actions
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index 8421955a7288..473ec5973334 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	divxcalc
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://imagef1.net.nz/divxcalc/
 
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index b47c8217a655..676746d9bc46 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	djview
 PORTVERSION=	4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	djvu
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 9c2793ff8355..a2af6d1b6544 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	djvulibre
 PORTVERSION=	3.5.18
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	djvu
diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile
index 8e123891e9b5..4cc3af5a0c30 100644
--- a/graphics/dore/Makefile
+++ b/graphics/dore/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pdore
 PORTVERSION=	6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 58b60c4f741a..62e445c03d36 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dri
-PORTVERSION=	6.4.1
+PORTVERSION=	6.5.3
 PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -17,7 +17,7 @@ MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-BUILD_DEPENDS=	makedepend:${X_IMAKE_PORT}
+BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
 CONFLICTS=	xfree86-dri-* dri-6.2.2005* dri-6.5.2006*
 
@@ -30,9 +30,7 @@ MAKE_ENV+=	FBSDCC="${CC}" FBSDCXX="${CXX}" \
 		PTHREAD_LIBS=${PTHREAD_LIBS}
 USE_GCC=	3.4+
 
-ONLY_FOR_ARCHS=	i386 alpha amd64
-
-DRIMODDIR=	${PREFIX}/lib/modules/dri
+DRIMODDIR=	${PREFIX}/lib/dri
 
 .include <bsd.port.pre.mk>
 
@@ -44,8 +42,8 @@ do-install:
 	${MKDIR} ${DRIMODDIR}
 .if ${ARCH} == i386
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/i830_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/i965_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR}
 .elif ${ARCH} == amd64
@@ -62,11 +60,20 @@ do-install:
 
 .if ${OSVERSION} < 500000
 pre-patch:
-	${REINPLACE_CMD} -e 's|stdint.h|sys/types.h|g' \
+	@${REINPLACE_CMD} -e 's|stdint.h|sys/types.h|g' \
 		${WRKSRC}/src/mesa/drivers/dri/mga/mga_xmesa.c \
 		${WRKSRC}/src/mesa/drivers/dri/mga/mgacontext.h
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^CC =/d' -e '/^CXX =/d' \
+		-e 's|/usr/local|$$(LOCALBASE)|g' \
+		-e 's|/usr/X11R6|$$(X11BASE)|g' \
+		-e 's|-lpthread|$$(PTHREAD_LIBS)|g' \
+		-e 's|^\(SRC_DIRS =\).*|\1 mesa|' \
+		-e 's|-DHAVE_POSIX_MEMALIGN||' \
+			${WRKSRC}/configs/freebsd-dri
+
 .if ${ARCH} == i386
 PLIST_SUB+=	I386=""
 PLIST_SUB+=	I386_AMD64=""
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
index 9a6d42ae290c..127cae9262ef 100644
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-6.4.1.tar.bz2) = ea148c828ec6f645526451db1b8556f1
-SHA256 (MesaLib-6.4.1.tar.bz2) = 2c1c8784cccab416a52ef9512e3539a0063b88dcc9b0abbcf1a407f9808758cf
-SIZE (MesaLib-6.4.1.tar.bz2) = 2913887
+MD5 (MesaLib-6.5.3.tar.bz2) = 46359457147c469745f24b5074a186f0
+SHA256 (MesaLib-6.5.3.tar.bz2) = f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
+SIZE (MesaLib-6.5.3.tar.bz2) = 3351899
diff --git a/graphics/dri/files/patch-945gm b/graphics/dri/files/patch-945gm
deleted file mode 100644
index f65cdb09ce71..000000000000
--- a/graphics/dri/files/patch-945gm
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/mesa/drivers/dri/i915/intel_screen.c.orig	Fri Apr  6 16:49:46 2007
-+++ src/mesa/drivers/dri/i915/intel_screen.c	Fri Apr  6 16:50:04 2007
-@@ -340,6 +340,7 @@
-    case PCI_CHIP_I915_G:
-    case PCI_CHIP_I915_GM:
-    case PCI_CHIP_I945_G:
-+   case PCI_CHIP_I945_GM:
-       return i915CreateContext( mesaVis, driContextPriv, 
- 			       sharedContextPrivate );
-  
---- src/mesa/drivers/dri/i915/intel_context.c.orig	Fri Apr  6 16:45:51 2007
-+++ src/mesa/drivers/dri/i915/intel_context.c	Fri Apr  6 16:46:20 2007
-@@ -118,6 +118,8 @@
- 	 chipset = "Intel(R) 915GM"; break;
-       case PCI_CHIP_I945_G:
- 	 chipset = "Intel(R) 945G"; break;
-+      case PCI_CHIP_I945_GM:
-+	 chipset = "Intel(R) 945GM"; break;
-       default:
- 	 chipset = "Unknown Intel Chipset"; break;
-       }
---- src/mesa/drivers/dri/i915/i915_texstate.c.orig	Fri Apr  6 16:48:21 2007
-+++ src/mesa/drivers/dri/i915/i915_texstate.c	Fri Apr  6 16:48:48 2007
-@@ -496,7 +496,8 @@
-    }
- 
- 
--   if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G)
-+   if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G ||
-+       i915->intel.intelScreen->deviceID == PCI_CHIP_I945_GM)
-       i945LayoutTextureImages( i915, tObj );	 
-    else
-       i915LayoutTextureImages( i915, tObj );
---- src/mesa/drivers/dri/i915/intel_context.h.orig	Fri Apr  6 16:49:05 2007
-+++ src/mesa/drivers/dri/i915/intel_context.h	Fri Apr  6 16:49:31 2007
-@@ -413,6 +413,7 @@
- #define PCI_CHIP_I915_G			0x2582
- #define PCI_CHIP_I915_GM		0x2592
- #define PCI_CHIP_I945_G			0x2772
-+#define PCI_CHIP_I945_GM			0x27A2
- 
- 
- /* ================================================================
diff --git a/graphics/dri/files/patch-freebsd-dri b/graphics/dri/files/patch-freebsd-dri
deleted file mode 100644
index bd9cdbcb03b9..000000000000
--- a/graphics/dri/files/patch-freebsd-dri
+++ /dev/null
@@ -1,47 +0,0 @@
---- configs/freebsd-dri.orig	Tue Oct 25 01:11:57 2005
-+++ configs/freebsd-dri	Fri Dec 30 00:58:57 2005
-@@ -6,32 +6,32 @@
- CONFIG_NAME = freebsd-dri
- 
- # Compiler and flags
--CC = gcc
--CXX = g++
-+CC = $(FBSDCC)
-+CXX = $(FBSDCXX)
- WARN_FLAGS = -Wall
--OPT_FLAGS = -O
-+OPT_FLAGS = $(FBSDCFLAGS)
- 
--EXPAT_INCLUDES = -I/usr/local/include
--X11_INCLUDES = -I/usr/X11R6/include
-+EXPAT_INCLUDES = -I${LOCALBASE}/include
-+X11_INCLUDES = -I${X11BASE}/include -I${X11BASE}/include/X11/extensions
- DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
- 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
--CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef -fPIC \
--	-ffast-math $(X11_INCLUDES)
-+CFLAGS = $(FBSDCFLAGS) $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef \
-+	-fPIC -ffast-math $(X11_INCLUDES)
- CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
- 
- ASM_SOURCES = 
- 
- # Library/program dependencies
- LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
--DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
--GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread $(LIBDRM_LIB)
-+DRI_LIB_DEPS = -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} -lexpat $(LIBDRM_LIB)
-+GL_LIB_DEPS = -L${X11BASE}/lib -lX11 -lXext -lm ${PTHREAD_LIBS} $(LIBDRM_LIB)
- 
--GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
--GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
-+GLUT_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
-+GLW_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGL -lXt -lXm -lX11
- 
- 
- # Directories
--SRC_DIRS = glx/x11 mesa glu glut/glx glw
-+SRC_DIRS = mesa
- DRIVER_DIRS = dri
- PROGRAM_DIRS = 
- WINDOW_SYSTEM=dri
diff --git a/graphics/dri/files/patch-glheader.h b/graphics/dri/files/patch-glheader.h
new file mode 100644
index 000000000000..517e46012c02
--- /dev/null
+++ b/graphics/dri/files/patch-glheader.h
@@ -0,0 +1,22 @@
+--- src/mesa/main/glheader.h.orig	Thu Apr 13 01:52:32 2006
++++ src/mesa/main/glheader.h	Wed Dec 20 15:27:53 2006
+@@ -127,12 +127,15 @@
+  * For now, only used by some DRI hardware drivers for color/texel packing.
+  */
+ #if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
+-#if defined(__linux__)
++#if defined(__FreeBSD__)
++#include <sys/endian.h>
++#define CPU_TO_LE32( x )	bswap32( x )
++#elif defined(__linux__)
+ #include <byteswap.h>
+ #define CPU_TO_LE32( x )	bswap_32( x )
+-#else /*__linux__*/
+-#define CPU_TO_LE32( x )	( x )  /* fix me for non-Linux big-endian! */
+-#endif /*__linux__*/
++#else
++#error "Add CPU_TO_LE32 macro for this OS."
++#endif
+ #define MESA_BIG_ENDIAN 1
+ #else
+ #define CPU_TO_LE32( x )	( x )
diff --git a/graphics/dri/files/patch-mach64_context.h b/graphics/dri/files/patch-mach64_context.h
new file mode 100644
index 000000000000..bc17aea756ac
--- /dev/null
+++ b/graphics/dri/files/patch-mach64_context.h
@@ -0,0 +1,37 @@
+--- src/mesa/drivers/dri/mach64/mach64_context.h.orig	Mon Nov 28 13:17:16 2005
++++ src/mesa/drivers/dri/mach64/mach64_context.h	Wed Dec 20 15:37:34 2006
+@@ -331,25 +331,28 @@
+ /* ================================================================
+  * Byte ordering
+  */
+-#if MESA_LITTLE_ENDIAN == 1
++#if defined(MESA_LITTLE_ENDIAN) && MESA_LITTLE_ENDIAN == 1
+ #define LE32_IN( x )		( *(GLuint *)(x) )
+ #define LE32_IN_FLOAT( x )	( *(GLfloat *)(x) )
+ #define LE32_OUT( x, y )	do { *(GLuint *)(x) = (y); } while (0)
+ #define LE32_OUT_FLOAT( x, y )	do { *(GLfloat *)(x) = (y); } while (0)
+ #else
+-#include <byteswap.h>
+-#define LE32_IN( x )		bswap_32( *(GLuint *)(x) )
++#define LE32_IN( x )		CPU_TO_LE32( *(GLuint *)(x) )
+ #define LE32_IN_FLOAT( x )						\
+ ({									\
+-   GLuint __tmp = bswap_32( *(GLuint *)(x) );				\
++   GLuint __tmp = CPU_TO_LE32( *(GLuint *)(x) );			\
+    *(GLfloat *)&__tmp;							\
+ })
+-#define LE32_OUT( x, y )	do { *(GLuint *)(x) = bswap_32( y ); } while (0)
++#define LE32_OUT( x, y )	do { *(GLuint *)(x) = CPU_TO_LE32( y ); } while (0)
++#define LE32_OUT( x, y )						\
++do {									\
++   *(GLuint *)(x) = CPU_TO_LE32( y );					\
++} while (0)
+ #define LE32_OUT_FLOAT( x, y )						\
+ do {									\
+    GLuint __tmp;							\
+    *(GLfloat *)&__tmp = (y);						\
+-   *(GLuint *)(x) = bswap_32( __tmp );					\
++   *(GLuint *)(x) = CPU_TO_LE32( __tmp );				\
+ } while (0)
+ #endif
+ 
diff --git a/graphics/dri/files/patch-sis_context.h b/graphics/dri/files/patch-sis_context.h
new file mode 100644
index 000000000000..1d79d5f32263
--- /dev/null
+++ b/graphics/dri/files/patch-sis_context.h
@@ -0,0 +1,24 @@
+--- src/mesa/drivers/dri/sis/sis_context.h.orig	Tue Apr 11 13:41:11 2006
++++ src/mesa/drivers/dri/sis/sis_context.h	Wed Dec 20 18:32:46 2006
+@@ -401,8 +401,20 @@
+ #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg))
+ #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg))
+ 
+-#if defined(__i386__) || defined(__amd64__)
++#if defined(__alpha__)
++#define MMIO_WMB()	__asm __volatile("wmb" : : : "memory")
++#elif defined(__amd64__) || defined(__i386__)
+ #define MMIO_WMB()	__asm __volatile("" : : : "memory")
++#elif defined(__ia64__)
++#define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
++#elif defined(__powerpc__)
++#define MMIO_WMB()	__asm __volatile("eieio" : : : "memory")
++#elif defined(__sparc64__)
++/*
++ * #StoreStore probably would be sufficient for this driver at the
++ * time of this writing but we use #Sync for safety.
++ */
++#define MMIO_WMB()	__asm __volatile("membar #Sync" : : : "memory")
+ #else
+ #error platform needs WMB
+ #endif
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 337a52357957..16d886a121d2 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -1,15 +1,14 @@
-%%I386%%lib/modules/dri/i810_dri.so
-%%I386%%lib/modules/dri/i830_dri.so
-%%I386_AMD64%%lib/modules/dri/i915_dri.so
-lib/modules/dri/mach64_dri.so
-lib/modules/dri/mga_dri.so
-lib/modules/dri/r128_dri.so
-lib/modules/dri/r200_dri.so
-lib/modules/dri/r300_dri.so
-lib/modules/dri/radeon_dri.so
-lib/modules/dri/savage_dri.so
-lib/modules/dri/sis_dri.so
-%%I386%%lib/modules/dri/tdfx_dri.so
-%%I386%%lib/modules/dri/unichrome_dri.so
-@dirrm lib/modules/dri
-@dirrmtry lib/modules
+%%I386%%lib/dri/i810_dri.so
+%%I386_AMD64%%lib/dri/i915_dri.so
+%%I386%%lib/dri/i965_dri.so
+lib/dri/mach64_dri.so
+lib/dri/mga_dri.so
+lib/dri/r128_dri.so
+lib/dri/r200_dri.so
+lib/dri/r300_dri.so
+lib/dri/radeon_dri.so
+lib/dri/savage_dri.so
+lib/dri/sis_dri.so
+%%I386%%lib/dri/tdfx_dri.so
+%%I386%%lib/dri/unichrome_dri.so
+@dirrm lib/dri
diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile
index 20b0aabf6a1c..b8799b03084e 100644
--- a/graphics/driconf/Makefile
+++ b/graphics/driconf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	driconf
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://people.freedesktop.org/~fxkuehl/driconf/
 
diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile
index 70d50445db5a..2c804b913773 100644
--- a/graphics/dynamechs/Makefile
+++ b/graphics/dynamechs/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	dynamechs
 PORTVERSION=	4.0.p1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/ecg2png/Makefile b/graphics/ecg2png/Makefile
index 0eab9420419c..befdf2e5f33d 100644
--- a/graphics/ecg2png/Makefile
+++ b/graphics/ecg2png/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ecg2png
 PORTVERSION=	0.30
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cardiothink.com/downloads/ecg2png/
 
diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile
index 3738b19f37d1..42a2ca2b8936 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	edje
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile
index 8db37b502fcc..57e86d5c8893 100644
--- a/graphics/edje_viewer/Makefile
+++ b/graphics/edje_viewer/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	edje_viewer
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index 8b4da8330511..88d338199d0b 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	electriceyes
 PORTVERSION=	0.3.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ee/0.3
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 6b272690b45a..4306a0fc2b19 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enblend
 PORTVERSION=	3.0
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/enblend/files/patch-src__anneal.h b/graphics/enblend/files/patch-src__anneal.h
new file mode 100644
index 000000000000..e116408bb88b
--- /dev/null
+++ b/graphics/enblend/files/patch-src__anneal.h
@@ -0,0 +1,11 @@
+--- src/anneal.h.orig	Sun Nov 21 18:23:08 2004
++++ src/anneal.h	Mon May  7 21:21:12 2007
+@@ -678,7 +678,7 @@
+ 
+             localK = stateSpace->size();
+             if (localK < 2) convergedPoints[index] = true;
+-            kMax = std::max(kMax, stateProbabilities->size());
++            kMax = std::max((size_t)kMax, stateProbabilities->size());
+ 
+         }
+ 
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index c21dd21c248a..6484fe802fbe 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enfle
 PORTVERSION=	20010130
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://enfle.fennel.org/files/stable/
 
diff --git a/graphics/entice/Makefile b/graphics/entice/Makefile
index ffff6cb0d342..89d938638aed 100644
--- a/graphics/entice/Makefile
+++ b/graphics/entice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	entice
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 078177d21848..ffe9fb7a4704 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	eog
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 08a99fc188c6..7cd4f75d95e2 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -191,59 +191,21 @@ share/locale/zu/LC_MESSAGES/eog.mo
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
-@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/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index ef07567eb605..43998e342841 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	epdfview
 PORTVERSION=	0.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	http://trac.emma-soft.com/epdfview/chrome/site/releases/ \
 		LOCAL/chinsan
diff --git a/graphics/epix/Makefile b/graphics/epix/Makefile
index d24b056a3905..a8f02f2af905 100644
--- a/graphics/epix/Makefile
+++ b/graphics/epix/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	epix
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://mathcs.holycross.edu/~ahwang/epix/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_src
diff --git a/graphics/eps2png/Makefile b/graphics/eps2png/Makefile
index 358be73b3c5d..d72b42ed1c34 100644
--- a/graphics/eps2png/Makefile
+++ b/graphics/eps2png/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eps2png
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/J/JV/JV/
diff --git a/graphics/epsilon/Makefile b/graphics/epsilon/Makefile
index d11a024fd1c5..7e4a000fec9b 100644
--- a/graphics/epsilon/Makefile
+++ b/graphics/epsilon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	epsilon
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile
index 19f2a29ad0fe..84c3a477fada 100644
--- a/graphics/epstool/Makefile
+++ b/graphics/epstool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	epstool
 PORTVERSION=	3.08
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/ \
diff --git a/graphics/esmart/Makefile b/graphics/esmart/Makefile
index e3218ee3d0bc..5bdf599430e7 100644
--- a/graphics/esmart/Makefile
+++ b/graphics/esmart/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	esmart
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/graphics/eterm-bg/Makefile b/graphics/eterm-bg/Makefile
index b7d00e864359..fdb47072cc48 100644
--- a/graphics/eterm-bg/Makefile
+++ b/graphics/eterm-bg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eterm-bg
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.eterm.org/download/
 DISTNAME=	Eterm-bg-${PORTVERSION}
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 6fae39536e71..66066548b9d8 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	evas
 PORTVERSION=	20070223
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 7394141b65fd..b02ee752193a 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	evince
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index dfb1c85b7ef9..f4743188a48b 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -197,56 +197,20 @@ share/locale/wa/LC_MESSAGES/evince.mo
 share/locale/zh_CN/LC_MESSAGES/evince.mo
 share/locale/zh_HK/LC_MESSAGES/evince.mo
 share/locale/zh_TW/LC_MESSAGES/evince.mo
-@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/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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrm share/gnome/omf/evince
 @dirrm share/gnome/help/evince/uk/figures
 @dirrm share/gnome/help/evince/uk
diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile
index 803367d4f2ee..a6b21ab9b370 100644
--- a/graphics/evolvotron/Makefile
+++ b/graphics/evolvotron/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	evolvotron
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/exhibit/Makefile b/graphics/exhibit/Makefile
index cb3de1a53b30..203582ee1a20 100644
--- a/graphics/exhibit/Makefile
+++ b/graphics/exhibit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	exhibit
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 70d451877d34..9e9838b18b95 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	f-spot
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/graphics/f-spot/pkg-plist b/graphics/f-spot/pkg-plist
index ee903ea141fa..fba921cb943e 100644
--- a/graphics/f-spot/pkg-plist
+++ b/graphics/f-spot/pkg-plist
@@ -99,28 +99,10 @@ share/locale/th/LC_MESSAGES/f-spot.mo
 share/locale/vi/LC_MESSAGES/f-spot.mo
 share/locale/zh_CN/LC_MESSAGES/f-spot.mo
 share/locale/zh_TW/LC_MESSAGES/f-spot.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@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
 @dirrm share/gnome/omf/f-spot
 @dirrm share/gnome/help/f-spot/sv/figures
 @dirrm share/gnome/help/f-spot/sv
diff --git a/graphics/fbm/Makefile b/graphics/fbm/Makefile
index e608e2c34bab..334700a320b8 100644
--- a/graphics/fbm/Makefile
+++ b/graphics/fbm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fbm
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/convert
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index da84706533e3..31ed6f07eb23 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	feh
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://linuxbrit.co.uk/downloads/
 
diff --git a/graphics/ffff/Makefile b/graphics/ffff/Makefile
index e8c256a0623b..f2bdfba96e83 100644
--- a/graphics/ffff/Makefile
+++ b/graphics/ffff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ffff
 PORTVERSION=	323
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/figurine/Makefile b/graphics/figurine/Makefile
index 1427e4402e24..33ee533e1667 100644
--- a/graphics/figurine/Makefile
+++ b/graphics/figurine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	figurine
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile
index e16f9f8096b6..3012f37b817e 100644
--- a/graphics/flashplayer/Makefile
+++ b/graphics/flashplayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flashplayer
 PORTVERSION=	0.4.13
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gplflash
diff --git a/graphics/flip/Makefile b/graphics/flip/Makefile
index f5a5396f19e7..b63fbf05821d 100644
--- a/graphics/flip/Makefile
+++ b/graphics/flip/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	flip
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.reptilelabour.com/software/files/flip/
 
diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile
index bb5d0646ed75..a4939defccdf 100644
--- a/graphics/flphoto/Makefile
+++ b/graphics/flphoto/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flphoto
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fltk
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index b9a2aa505693..ad2ca66ef80e 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fly
 PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://members.optushome.com.au/martingleeson/%SUBDIR%/ \
 		http://martin.gleeson.com/%SUBDIR%/
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 347552569e40..67dc949d1c0b 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fnlib
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enlightenment
diff --git a/graphics/fortytwo/Makefile b/graphics/fortytwo/Makefile
index d102ceec2ade..72521359df5b 100644
--- a/graphics/fortytwo/Makefile
+++ b/graphics/fortytwo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fortytwo
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fortytwo
diff --git a/graphics/fpc-fpgtk/Makefile b/graphics/fpc-fpgtk/Makefile
index 4a78fff84cd4..d3c5372c486f 100644
--- a/graphics/fpc-fpgtk/Makefile
+++ b/graphics/fpc-fpgtk/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-fpgtk
 
diff --git a/graphics/fpc-ggi/Makefile b/graphics/fpc-ggi/Makefile
index 5aa0ac65e29a..b1f68e643909 100644
--- a/graphics/fpc-ggi/Makefile
+++ b/graphics/fpc-ggi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-ggi
 
diff --git a/graphics/fpc-imlib/Makefile b/graphics/fpc-imlib/Makefile
index 8d9de11381e0..4dff8741a4ca 100644
--- a/graphics/fpc-imlib/Makefile
+++ b/graphics/fpc-imlib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-imlib
 
diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile
index d3ed1439e078..228b26df3516 100644
--- a/graphics/fpc-libgd/Makefile
+++ b/graphics/fpc-libgd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-libgd
 
diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile
index 20054fff5c8f..64f997ddd5c4 100644
--- a/graphics/fpc-opengl/Makefile
+++ b/graphics/fpc-opengl/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-opengl
 
diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
index c2c2e3dc1151..e02cbc2fc16f 100644
--- a/graphics/fracplanet/Makefile
+++ b/graphics/fracplanet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fracplanet
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/fractorama/Makefile b/graphics/fractorama/Makefile
index aeaa2b811220..5038a6ccff54 100644
--- a/graphics/fractorama/Makefile
+++ b/graphics/fractorama/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fractorama
 PORTVERSION=	1.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://fractorama.com/ \
 		http://critical.ch/distfiles/${PORTNAME}/${PORTVERSION}/ \
diff --git a/graphics/fraqtive/Makefile b/graphics/fraqtive/Makefile
index 3c78e536fa90..f51322a73490 100644
--- a/graphics/fraqtive/Makefile
+++ b/graphics/fraqtive/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fraqtive
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	http://fraqtive.mimec.org/files/
 
diff --git a/graphics/fraqtive/pkg-plist b/graphics/fraqtive/pkg-plist
index 63d2de292761..ed98b3627bd0 100644
--- a/graphics/fraqtive/pkg-plist
+++ b/graphics/fraqtive/pkg-plist
@@ -30,12 +30,6 @@ share/locale/ru/LC_MESSAGES/fraqtive.mo
 share/locale/sr/LC_MESSAGES/fraqtive.mo
 share/locale/sv/LC_MESSAGES/fraqtive.mo
 share/locale/vi/LC_MESSAGES/fraqtive.mo
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrm share/doc/HTML/en/fraqtive
 @dirrm share/doc/HTML/de/fraqtive
 @dirrmtry share/config
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 2d6b57037a6a..82be5f9918ce 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		freeglut
 PORTVERSION=		2.4.0
-PORTREVISION=	1
+PORTREVISION=		3
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,6 +19,7 @@ USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_XLIB=		yes
+USE_GL=		glu
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--x-includes=${X11BASE}/include	\
 			--x-libraries=${X11BASE}/lib \
diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile
index 66839a0af5df..4ea11d77cbe9 100644
--- a/graphics/frontline/Makefile
+++ b/graphics/frontline/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	frontline
 PORTVERSION=	0.5.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	autotrace
diff --git a/graphics/ftgl/Makefile b/graphics/ftgl/Makefile
index 7e6fc4184841..52558461ad7f 100644
--- a/graphics/ftgl/Makefile
+++ b/graphics/ftgl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ftgl
 PORTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://opengl.geek.nz/ftgl/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/([[:digit:]])$/.\1/}
diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile
index da5e09ec51dd..350fd416f955 100644
--- a/graphics/fv/Makefile
+++ b/graphics/fv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fv
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.eaflux.com/fv/sources/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index 63edc8182113..1e83592d13dd 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fyre
 PORTVERSION=	1.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://samy.kerneled.org/ports/ \
 		http://www.felinemenace.org/~nemo/
diff --git a/graphics/fyre/pkg-plist b/graphics/fyre/pkg-plist
index 30f9fceb4f5f..f5cda6b07511 100644
--- a/graphics/fyre/pkg-plist
+++ b/graphics/fyre/pkg-plist
@@ -12,7 +12,6 @@ share/icons/hicolor/48x48/mimetypes/application-x-fyre-animation.png
 share/mime/application/x-fyre-animation.xml
 share/mime/packages/fyre.xml
 share/pixmaps/fyre-48x48.png
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index a355f8197cb3..37127636bd11 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	g2
 PORTVERSION=	0.40
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	libs/graphics
diff --git a/graphics/g3dviewer/Makefile b/graphics/g3dviewer/Makefile
index e11d49fa1977..548e7a77ca3f 100644
--- a/graphics/g3dviewer/Makefile
+++ b/graphics/g3dviewer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	g3dviewer
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://automagically.de/files/
 
diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile
index 3fe20a963a02..8364f8dee271 100644
--- a/graphics/gauche-gl/Makefile
+++ b/graphics/gauche-gl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gl
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	graphics scheme
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gauche
@@ -21,7 +22,7 @@ BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
 LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_GL=		yes
+USE_GL=		glut
 GNU_CONFIGURE=	yes
 USE_GCC=	3.4+
 CONFIGURE_ARGS=	--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile
index 2ac3f00a7a33..68fc555057a8 100644
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcolor
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gcolor2/Makefile b/graphics/gcolor2/Makefile
index 09e9a6e13bfd..b9c5c7b3a439 100644
--- a/graphics/gcolor2/Makefile
+++ b/graphics/gcolor2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcolor2
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 19fbb9f899c4..3e61ef13b3ed 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gd
 PORTVERSION=	2.0.34
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.libgd.org/releases/
diff --git a/graphics/gdal-grass/Makefile b/graphics/gdal-grass/Makefile
index e53e6102705c..41ebd3f2db02 100644
--- a/graphics/gdal-grass/Makefile
+++ b/graphics/gdal-grass/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdal-grass
 PORTVERSION=	1.3.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.gdal.org/dl/ \
 		ftp://ftp.remotesensing.org/gdal/ \
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 48c602db1e3c..23fbd7753666 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/gdal/ \
 		http://www.gdal.org/dl/ \
diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index e0a444a647ef..8adb02800b8f 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdchart
 PORTVERSION=	0.11.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.fred.net/brv/chart/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 657cb1086a8c..9ff30f22c52c 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	gdk-pixbuf
 PORTVERSION=	0.22.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES?=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gdk-pixbuf/0.22
diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile
index 90fe35ea51c1..e6a385c254c4 100644
--- a/graphics/gdtclft/Makefile
+++ b/graphics/gdtclft/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Gdtclft
 PORTVERSION=	2.2.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics tcl${TCL_DVER}
 MASTER_SITES=	http://www.graphviz.org/pub/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/graphics/geist/Makefile b/graphics/geist/Makefile
index 1648de0d136d..2666494730a4 100644
--- a/graphics/geist/Makefile
+++ b/graphics/geist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geist
 PORTVERSION=	0.0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://linuxbrit.co.uk/downloads/
 
diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile
index 41b61b314dba..d57f9b12ef1b 100644
--- a/graphics/geomorph/Makefile
+++ b/graphics/geomorph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	geomorph
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,6 @@ COMMENT=	Height field generator and editor
 
 LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
 
-USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/geomorph/pkg-plist b/graphics/geomorph/pkg-plist
index cd7ee8e06443..1c27ddb9aff1 100644
--- a/graphics/geomorph/pkg-plist
+++ b/graphics/geomorph/pkg-plist
@@ -52,6 +52,9 @@ bin/geomorph
 %%DATADIR%%/GeoMorph.xpm
 %%DATADIR%%/Geomorph-gnome.desktop
 %%DATADIR%%/Geomorph-kde.desktop
+share/locale/de/LC_MESSAGES/geomorph.mo
+share/locale/en/LC_MESSAGES/geomorph.mo
+share/locale/fr/LC_MESSAGES/geomorph.mo
 @dirrm %%DATADIR%%/%%PORTVERSION%%/scenes
 @dirrm %%DATADIR%%/%%PORTVERSION%%
 @dirrm %%DATADIR%%
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 75ce102afd6a..a9f089ec6298 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geomview
 PORTVERSION=	1.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	geomview
diff --git a/graphics/gephex/Makefile b/graphics/gephex/Makefile
index 58fe8e829191..d9f9e0c72ae1 100644
--- a/graphics/gephex/Makefile
+++ b/graphics/gephex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gephex
 PORTVERSION=	0.4.3b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.gephex.org/download/src/
 
diff --git a/graphics/gfont/Makefile b/graphics/gfont/Makefile
index 870ba35572e9..0bf8f6ba3663 100644
--- a/graphics/gfont/Makefile
+++ b/graphics/gfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gfont
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print www
 MASTER_SITES=	ftp://ftp.ossp.org/pkg/tool/gfont/
 
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index eab0319099a4..0f0ab059e652 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giblib
 PORTVERSION=	1.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://linuxbrit.co.uk/downloads/
 
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 7de73eb4505a..f107e2403575 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libungif
 PORTVERSION=	4.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 2415865e29a4..8932b783a465 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gifsicle
 PORTVERSION=	1.48
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.lcdf.org/gifsicle/
 
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index d81a0dba40fe..6ecc67201a10 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimageview
 PORTVERSION=	0.2.27
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmmviewer
diff --git a/graphics/gimageview/pkg-plist b/graphics/gimageview/pkg-plist
index 3a85ff5f53f6..d9feb9c2c33c 100644
--- a/graphics/gimageview/pkg-plist
+++ b/graphics/gimageview/pkg-plist
@@ -119,7 +119,6 @@ share/gnome/apps/Graphics/gimageview.desktop
 share/locale/fr/LC_MESSAGES/gimageview.mo
 share/locale/ja/LC_MESSAGES/gimageview.mo
 share/pixmaps/gimv.png
-@dirrmtry share/pixmaps
 @dirrm lib/gimageview/archiver
 @dirrm lib/gimageview/image_loader
 @dirrm lib/gimageview/image_saver
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 8bdf282ea002..1708cd557dfb 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gimp-app
 PORTVERSION=	2.3.16
+PORTREVISION=	1
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 92f3d8971b9f..fc8f68c54021 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gimp-app
 PORTVERSION=	2.2.14
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index af3f6623ea07..c27e38f78307 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gimp
 PORTVERSION?=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH?=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES?=	# empty
diff --git a/graphics/gimp-greycstoration/Makefile b/graphics/gimp-greycstoration/Makefile
index 15ac772cefea..e506d37e80f8 100644
--- a/graphics/gimp-greycstoration/Makefile
+++ b/graphics/gimp-greycstoration/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	greycstoration
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.haypocalc.com/perso/prog/greycstoration/ \
 				http://bio3k.softboard.ru/uploads/arch/
diff --git a/graphics/gimp-help/Makefile b/graphics/gimp-help/Makefile
index 39f0562a6375..48228286b390 100644
--- a/graphics/gimp-help/Makefile
+++ b/graphics/gimp-help/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp-help
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
diff --git a/graphics/gimp-manual-html/Makefile b/graphics/gimp-manual-html/Makefile
index 81781d4493ef..2d63d94c4aa3 100644
--- a/graphics/gimp-manual-html/Makefile
+++ b/graphics/gimp-manual-html/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GimpUserManual
 PORTVERSION=	2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://kefk.net/Open_Source/FS/GIMP/Download/GUM/ \
 		http://ftp.nluug.nl/ftp/graphics/gimp/manual/
diff --git a/graphics/gimp-pmosaic/Makefile b/graphics/gimp-pmosaic/Makefile
index ff1a2711cb38..22c050ff50e4 100644
--- a/graphics/gimp-pmosaic/Makefile
+++ b/graphics/gimp-pmosaic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pmosaic
 PORTVERSION=	1.08
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.kirchgessner.net/pub/gimp-1.2/
 PKGNAMEPREFIX=	gimp-
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 288dedbbd604..05477d53c0c8 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gimp
 PORTVERSION?=	2.2
+PORTREVISION=	1
 PORTEPOCH?=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES?=	# empty
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index f7457c1841bc..749e128480e4 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index e8b47efe555d..3993fbf503ef 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -1561,35 +1561,3 @@ share/locale/zh_TW/LC_MESSAGES/gimp.mo
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/tips
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 3d069d563547..724fe64199f8 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimpshop
 PORTVERSION=	2.2.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.plasticbugs.com/blogimg/ \
 		http://freebsd.powered.net/distfiles/
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 98bea6e673d8..9f998d748ad1 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1938,35 +1938,5 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrmtry etc/gimp/2.2
 @dirrmtry etc/gimp
 %%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 1614b2410135..c01c2e066e39 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giram
 PORTVERSION=	0.3.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.giram.org/downloads/
 
diff --git a/graphics/gkrellkam/Makefile b/graphics/gkrellkam/Makefile
index 80349dfbffee..a42032756360 100644
--- a/graphics/gkrellkam/Makefile
+++ b/graphics/gkrellkam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellkam
 PORTVERSION=	0.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gkrellkam2/Makefile b/graphics/gkrellkam2/Makefile
index 0c081c006f13..f532059bf3c6 100644
--- a/graphics/gkrellkam2/Makefile
+++ b/graphics/gkrellkam2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=		gkrellkam
 PORTVERSION=		2.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile
index 78a5c9233ac0..3722410742fd 100644
--- a/graphics/gle-graphics/Makefile
+++ b/graphics/gle-graphics/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gle-graphics
 PORTVERSION=	4.0.12
+PORTREVISION=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	glx
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 54144fc61c71..91b1bb4be5af 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gle
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://linas.org/gle/pub/ \
diff --git a/graphics/glean/Makefile b/graphics/glean/Makefile
index a5e27f43e019..9a6ac7e94e04 100644
--- a/graphics/glean/Makefile
+++ b/graphics/glean/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glean
 PORTVERSION=	1.0.20030925
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics benchmarks
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	anholt
diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile
index cbc3abb475ba..7592f4d831b1 100644
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glew
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/glexcess/Makefile b/graphics/glexcess/Makefile
index 29310f1221ed..39e2a72d0bb0 100644
--- a/graphics/glexcess/Makefile
+++ b/graphics/glexcess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glexcess
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.glexcess.com/files/
 DISTNAME=	${PORTNAME}
diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile
index 54829b57abc3..07b34c2dcd12 100644
--- a/graphics/glfw/Makefile
+++ b/graphics/glfw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glfw
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile
index 196a3e5ce175..2b732e309994 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glide3
 PORTVERSION=	20020113
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://people.freebsd.org/~anholt/dri/files/
 DISTNAME=	Glide3-FreeBSD-${PORTVERSION}
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index c648490a3841..8146c84f6eda 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	glitz
 PORTVERSION=	0.5.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/snapshots/
 
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index b9922d4a12ed..05a742959d73 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gliv
 PORTVERSION=	1.9.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://guichaz.free.fr/gliv/files/
 
diff --git a/graphics/glpng/Makefile b/graphics/glpng/Makefile
index 64743ca42f4b..6e21e81b683a 100644
--- a/graphics/glpng/Makefile
+++ b/graphics/glpng/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glpng
 PORTVERSION=	1.45
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.wyatt100.freeserve.co.uk/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/graphics/gltk/Makefile b/graphics/gltk/Makefile
index 1779de261b66..84fed5eb8141 100644
--- a/graphics/gltk/Makefile
+++ b/graphics/gltk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gltk
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.sgi.com/opengl/contrib/ \
 		ftp://ftp.u-aizu.ac.jp/pub/os/sgi/misc/ftp.sgi.com/pub/opengl/contrib/
diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile
index 20220fc6fe43..ae6e297460d1 100644
--- a/graphics/gltt/Makefile
+++ b/graphics/gltt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gltt
 PORTVERSION=	2.5.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://gltt.sourceforge.net/download/
 
diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile
index c5f50781484d..d92098d855bf 100644
--- a/graphics/gnash-devel/Makefile
+++ b/graphics/gnash-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index c5f50781484d..d92098d855bf 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index fc11e483448e..0e62f3f1b8e2 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnofract4d
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gnofract4d/pkg-plist b/graphics/gnofract4d/pkg-plist
index 42ba87df2d59..c1143cdd28d4 100644
--- a/graphics/gnofract4d/pkg-plist
+++ b/graphics/gnofract4d/pkg-plist
@@ -635,7 +635,6 @@ share/gnome/help/gnofract4d/C/tutorial002.xml
 share/gnome/help/gnofract4d/C/tutorial003.xml
 share/mime/packages/gnofract4d-mime.xml
 share/pixmaps/gnofract4d-logo.png
-@dirrmtry share/pixmaps
 @dirrm share/gnome/help/gnofract4d/C/figures
 @dirrm share/gnome/help/gnofract4d/C
 @dirrm share/gnome/help/gnofract4d
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index 4bd6b7073f99..fa1c147970d1 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomeiconedit
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	giconedit
diff --git a/graphics/gnustep-slideshow/Makefile b/graphics/gnustep-slideshow/Makefile
index c8d888198cdd..669061a28aef 100644
--- a/graphics/gnustep-slideshow/Makefile
+++ b/graphics/gnustep-slideshow/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	slideshow
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://download.gna.org/gsimageapps/
 PKGNAMEPREFIX=	gnustep-
diff --git a/graphics/gnustep-slideshowkit/Makefile b/graphics/gnustep-slideshowkit/Makefile
index 6a5db5ee045a..66030f933666 100644
--- a/graphics/gnustep-slideshowkit/Makefile
+++ b/graphics/gnustep-slideshowkit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slideshowkit
 PORTVERSION=	0.0.1
-PORTREVISION=	20050207
+PORTREVISION=	20050208
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://download.gna.org/gsimageapps/
 PKGNAMEPREFIX=	gnustep-
diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile
index f445bafe5480..86b90206a281 100644
--- a/graphics/gocr/Makefile
+++ b/graphics/gocr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gocr
 PORTVERSION=	0.44
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jocr
diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile
index 2b7950d83e00..4234b9da6c19 100644
--- a/graphics/goocanvas/Makefile
+++ b/graphics/goocanvas/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	goocanvas
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SOURCEFORGE
 
diff --git a/graphics/goom/Makefile b/graphics/goom/Makefile
index 19fabefb04aa..ecb96a2b244e 100644
--- a/graphics/goom/Makefile
+++ b/graphics/goom/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	goom
 PORTVERSION=	2k4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gozer/Makefile b/graphics/gozer/Makefile
index 533bfefe0c77..d587892404e1 100644
--- a/graphics/gozer/Makefile
+++ b/graphics/gozer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gozer
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://linuxbrit.co.uk/downloads/
 
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 21a4ac0a3124..75d0692ea60e 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpaint
 PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.atai.org/gpaint/
 
diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile
index 48c6702ecfd0..d7ead1a9a6d5 100644
--- a/graphics/gpdf/Makefile
+++ b/graphics/gpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpdf
 PORTVERSION=	2.10.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 5bd6511d2a49..434810fb75dd 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gphoto2
 PORTVERSION=	2.3.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gphoto
diff --git a/graphics/gpsmanshp/Makefile b/graphics/gpsmanshp/Makefile
index 8d077432969c..f633ef0cf166 100644
--- a/graphics/gpsmanshp/Makefile
+++ b/graphics/gpsmanshp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpsmanshp
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	graphics tcl${TCLVERSION:S/.//}
 MASTER_SITES=	http://www.ncc.up.pt/gpsmanshp/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index aaafff0a73da..91b850c726da 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gqview
 PORTVERSION=	2.1.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gqview-devel/pkg-plist b/graphics/gqview-devel/pkg-plist
index 9582bb0683d2..27ab1178d725 100644
--- a/graphics/gqview-devel/pkg-plist
+++ b/graphics/gqview-devel/pkg-plist
@@ -83,21 +83,3 @@ share/gnome/apps/Graphics/gqview.desktop
 share/gnome/pixmaps/gqview.png
 @dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 048c844594e8..4fdc99319ffd 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gqview
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gqview/pkg-plist b/graphics/gqview/pkg-plist
index b1dd3496d3d3..50182a6b6829 100644
--- a/graphics/gqview/pkg-plist
+++ b/graphics/gqview/pkg-plist
@@ -34,67 +34,3 @@ bin/gqview
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gqview.mo
 share/gnome/apps/Graphics/gqview.desktop
 share/gnome/pixmaps/gqview.png
-%%NLS%%@dirrmtry share/locale/ar/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ar
-%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/be
-%%NLS%%@dirrmtry share/locale/bg/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bg
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/da
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/eo/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eo
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
-%%NLS%%@dirrmtry share/locale/et/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/et
-%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu
-%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it
-%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja
-%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl
-%%NLS%%@dirrmtry share/locale/no/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/no
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sl
-%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv
-%%NLS%%@dirrmtry share/locale/th/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/th
-%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tr
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
-%%NLS%%@dirrmtry share/locale/vi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/vi
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_TW
diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile
index 3c74c295b13b..25e44262631c 100644
--- a/graphics/grads/Makefile
+++ b/graphics/grads/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grads
 PORTVERSION=	1.9b3
+PORTREVISION=	1
 CATEGORIES=	graphics science math
 MASTER_SITES=	ftp://grads.iges.org/grads/1.9/:src \
 		ftp://grads.iges.org/grads/:other
diff --git a/graphics/graphopt/Makefile b/graphics/graphopt/Makefile
index debac06a5e61..6560519ab2db 100644
--- a/graphics/graphopt/Makefile
+++ b/graphics/graphopt/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	graphopt
 PORTVERSION=	0.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 1c0628b15d4d..a7e7ca835e31 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	graphviz
 PORTVERSION=	2.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics tk84
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile
index e7361ff34805..e469fa0db978 100644
--- a/graphics/grx/Makefile
+++ b/graphics/grx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grx
 PORTVERSION=	2.4.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://grx.gnu.de/download/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index d4187c735e5d..2cdefd855eb3 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gscan2pdf
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SFE
 
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index d1646ed6ff86..07daa858c535 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gsculpt
 PORTVERSION=	0.99.39.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -30,6 +31,7 @@ USE_SCONS=	yes
 SCONS_BUILDENV=	${SCONS_ENV}
 USE_PYTHON=	2.4
 USE_XLIB=	yes
+USE_GL=		yes
 USE_GNOME=	pygtk2
 USE_LDCONFIG=	${PREFIX}/lib/gSculpt
 
diff --git a/graphics/gstreamer-plugins-aalib/Makefile b/graphics/gstreamer-plugins-aalib/Makefile
index 9920f4d869d5..48f9dc503777 100644
--- a/graphics/gstreamer-plugins-aalib/Makefile
+++ b/graphics/gstreamer-plugins-aalib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer ascii art plugin
diff --git a/graphics/gstreamer-plugins-aalib80/Makefile b/graphics/gstreamer-plugins-aalib80/Makefile
index 096724bdfc09..a815a3982007 100644
--- a/graphics/gstreamer-plugins-aalib80/Makefile
+++ b/graphics/gstreamer-plugins-aalib80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/graphics/gstreamer-plugins-aalib80/Makefile,v 1.2 2006/02/24 18:50:32 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer ascii art plugin
diff --git a/graphics/gstreamer-plugins-cairo/Makefile b/graphics/gstreamer-plugins-cairo/Makefile
index c3ab02d0d196..7f9e44bb76fa 100644
--- a/graphics/gstreamer-plugins-cairo/Makefile
+++ b/graphics/gstreamer-plugins-cairo/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/graphics/gstreamer-plugins-cairo/Makefile,v 1.2 2005/10/14 20:39:57 adamw Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer vector graphics plugin
diff --git a/graphics/gstreamer-plugins-cairo80/Makefile b/graphics/gstreamer-plugins-cairo80/Makefile
index 3c20504d738a..8e765e2607d0 100644
--- a/graphics/gstreamer-plugins-cairo80/Makefile
+++ b/graphics/gstreamer-plugins-cairo80/Makefile
@@ -7,7 +7,7 @@
 #   $MCom: ports/graphics/gstreamer-plugins-cairo80/Makefile,v 1.2 2006/02/24 18:50:32 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer vector graphics plugin
diff --git a/graphics/gstreamer-plugins-gdkpixbuf80/Makefile b/graphics/gstreamer-plugins-gdkpixbuf80/Makefile
index 53e72e25fb89..c6f42e81e54f 100644
--- a/graphics/gstreamer-plugins-gdkpixbuf80/Makefile
+++ b/graphics/gstreamer-plugins-gdkpixbuf80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/graphics/gstreamer-plugins-gdkpixbuf80/Makefile,v 1.2 2006/02/24 18:50:33 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer image decoder plugin
diff --git a/graphics/gstreamer-plugins-hermes80/Makefile b/graphics/gstreamer-plugins-hermes80/Makefile
index bf9e97b73c8a..28cda7355436 100644
--- a/graphics/gstreamer-plugins-hermes80/Makefile
+++ b/graphics/gstreamer-plugins-hermes80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/graphics/gstreamer-plugins-hermes80/Makefile,v 1.2 2006/02/24 18:50:33 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer hermes colorspace plugin
diff --git a/graphics/gstreamer-plugins-jpeg/Makefile b/graphics/gstreamer-plugins-jpeg/Makefile
index 871899e2b11e..48ec12edff5f 100644
--- a/graphics/gstreamer-plugins-jpeg/Makefile
+++ b/graphics/gstreamer-plugins-jpeg/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer jpeg encoder/decoder plugin
diff --git a/graphics/gstreamer-plugins-jpeg80/Makefile b/graphics/gstreamer-plugins-jpeg80/Makefile
index a7fe8b9f388f..674e9d3e254b 100644
--- a/graphics/gstreamer-plugins-jpeg80/Makefile
+++ b/graphics/gstreamer-plugins-jpeg80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/graphics/gstreamer-plugins-jpeg80/Makefile,v 1.2 2006/02/24 18:50:33 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer jpeg encoder/decoder plugin
diff --git a/graphics/gstreamer-plugins-libcaca/Makefile b/graphics/gstreamer-plugins-libcaca/Makefile
index 55edf6c827c3..9282ccfac855 100644
--- a/graphics/gstreamer-plugins-libcaca/Makefile
+++ b/graphics/gstreamer-plugins-libcaca/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer color ascii art plugin
diff --git a/graphics/gstreamer-plugins-libmng80/Makefile b/graphics/gstreamer-plugins-libmng80/Makefile
index 26cb8d1771ce..60e5f56a31ab 100644
--- a/graphics/gstreamer-plugins-libmng80/Makefile
+++ b/graphics/gstreamer-plugins-libmng80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/graphics/gstreamer-plugins-libmng80/Makefile,v 1.2 2006/02/24 18:50:34 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer Multiple-image Network Graphics plugin
diff --git a/graphics/gstreamer-plugins-libpng/Makefile b/graphics/gstreamer-plugins-libpng/Makefile
index 44b58fe1d0a1..0c7901a5e776 100644
--- a/graphics/gstreamer-plugins-libpng/Makefile
+++ b/graphics/gstreamer-plugins-libpng/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer png plugin
diff --git a/graphics/gstreamer-plugins-libpng80/Makefile b/graphics/gstreamer-plugins-libpng80/Makefile
index b1b845bda62d..f75ea2367a6c 100644
--- a/graphics/gstreamer-plugins-libpng80/Makefile
+++ b/graphics/gstreamer-plugins-libpng80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/graphics/gstreamer-plugins-libpng80/Makefile,v 1.2 2006/02/24 18:50:34 marcus Exp $
 #
 
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer png plugin
diff --git a/graphics/gstreamer-plugins-libvisual/Makefile b/graphics/gstreamer-plugins-libvisual/Makefile
index d65cb38f3f15..d445f68b1d12 100644
--- a/graphics/gstreamer-plugins-libvisual/Makefile
+++ b/graphics/gstreamer-plugins-libvisual/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer libvisual plugin
diff --git a/graphics/gstreamer-plugins-libvisual80/Makefile b/graphics/gstreamer-plugins-libvisual80/Makefile
index 251b2885a83c..a00778910562 100644
--- a/graphics/gstreamer-plugins-libvisual80/Makefile
+++ b/graphics/gstreamer-plugins-libvisual80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/graphics/gstreamer-plugins-libvisual80/Makefile,v 1.2 2006/02/24 18:50:34 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer libvisual plugin
diff --git a/graphics/gstreamer-plugins-swfdec/Makefile b/graphics/gstreamer-plugins-swfdec/Makefile
index 4521fe5db1d4..fb02ba2169e0 100644
--- a/graphics/gstreamer-plugins-swfdec/Makefile
+++ b/graphics/gstreamer-plugins-swfdec/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/graphics/gstreamer-plugins-swfdec80/Makefile,v 1.2 2006/02/24 18:50:34 marcus Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer flash redering plugin
diff --git a/graphics/gstreamer-plugins-swfdec80/Makefile b/graphics/gstreamer-plugins-swfdec80/Makefile
index 0b8150b6bef2..5b98abe8a166 100644
--- a/graphics/gstreamer-plugins-swfdec80/Makefile
+++ b/graphics/gstreamer-plugins-swfdec80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/graphics/gstreamer-plugins-swfdec80/Makefile,v 1.2 2006/02/24 18:50:34 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer flash redering plugin
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 7edc7689bd92..7c94c394fa6c 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gthumb
 PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 62c16f0aac9e..b1065624278f 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkam
 PORTVERSION=	0.1.14
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gphoto
diff --git a/graphics/gtkam/pkg-plist b/graphics/gtkam/pkg-plist
index f870a62bd320..65e033494582 100644
--- a/graphics/gtkam/pkg-plist
+++ b/graphics/gtkam/pkg-plist
@@ -63,11 +63,3 @@ share/locale/uk/LC_MESSAGES/gtkam.mo
 %%GNOME:%%@dirrm share/gnome/help/gtkam/C
 %%GNOME:%%@dirrm share/gnome/help/gtkam
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/graphics/gtkcairo/Makefile b/graphics/gtkcairo/Makefile
index 42fd9527e32a..eba78f744d0d 100644
--- a/graphics/gtkcairo/Makefile
+++ b/graphics/gtkcairo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkcairo
 PORTVERSION=	0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index ef057a412c22..59db8cb633fd 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkdps
 PORTVERSION=	0.3.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gyve.org/pub/gtkDPS/	\
 		${MASTER_SITE_GENTOO}
diff --git a/graphics/gtkfig/Makefile b/graphics/gtkfig/Makefile
index d7f70f1b2bd0..ca33235437ac 100644
--- a/graphics/gtkfig/Makefile
+++ b/graphics/gtkfig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkfig
 PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://k332.feld.cvut.cz/pub/local/lemming/gtkfig/ \
 		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index f3d9fd043e26..0daeea3abff0 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkgraph
 PORTVERSION=	0.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics math
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR= jedgar
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index acf55bb555fd..62d14b18a169 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtksee
 PORTVERSION=	0.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gtksee/pkg-plist b/graphics/gtksee/pkg-plist
index 8cf7341552f7..3c42a9d673af 100644
--- a/graphics/gtksee/pkg-plist
+++ b/graphics/gtksee/pkg-plist
@@ -10,5 +10,3 @@ bin/gtksee
 %%NLS%%@dirrmtry share/locale/zh_CN.EUC
 %%NLS%%@dirrmtry share/locale/ru_UA/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ru_UA
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile
index 35715568a9ff..30383f9bf93f 100644
--- a/graphics/guilib/Makefile
+++ b/graphics/guilib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	guilib
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libsdl.org/projects/GUIlib/src/
 DISTNAME=	GUIlib-${PORTVERSION}
diff --git a/graphics/gview/Makefile b/graphics/gview/Makefile
index 01984162606a..ae57b423bec4 100644
--- a/graphics/gview/Makefile
+++ b/graphics/gview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gview
 PORTVERSION=	0.1.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://homepages.petech.ac.za/~bruces/
 
diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index cbb817ae043f..2100508080dc 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gwenview
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index cbb817ae043f..2100508080dc 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gwenview
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/hobbes-icons-xpm/Makefile b/graphics/hobbes-icons-xpm/Makefile
index 6b87e6516831..df00d7b9d6cb 100644
--- a/graphics/hobbes-icons-xpm/Makefile
+++ b/graphics/hobbes-icons-xpm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hobbes-icons-xpm3
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}
diff --git a/graphics/hpoj/Makefile b/graphics/hpoj/Makefile
index 5046bdf96099..86c60b483f1b 100644
--- a/graphics/hpoj/Makefile
+++ b/graphics/hpoj/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	hpoj
 PORTVERSION=	0.91
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hpoj
diff --git a/graphics/hs-hgl/Makefile b/graphics/hs-hgl/Makefile
index 183713180e13..edc645678a69 100644
--- a/graphics/hs-hgl/Makefile
+++ b/graphics/hs-hgl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hgl
 PORTVERSION=	2.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics haskell
 MASTER_SITES=	http://haskell.org/graphics/downloads/
 PKGNAMEPREFIX=	hs-
@@ -26,13 +26,14 @@ HGL_LIBS=	${PREFIX}/lib/hugs/x11
 HGL_DOCS=	${PREFIX}/share/doc/hs-hgl
 
 BUILD_WRKSRC=	${WRKSRC}/lib/x11
-MAKE_ENV=	system=FreeBSD \
-		hugs_install=${HGL_LIBS}
+MAKE_ARGS=	system=FreeBSD \
+		hugs_install=${HGL_LIBS} \
+		X_dir=${X11BASE} \
+		CC=${CC}
 ALL_TARGET=	all
 
-.if ${MACHINE_ARCH:L} == "amd64"
-CFLAGS+=	-fPIC
-.endif
+do-build:
+	@cd ${BUILD_WRKSRC}; ${GMAKE} ${MAKE_ARGS}
 
 do-install:
 	${MKDIR} ${HGL_LIBS}
@@ -54,4 +55,10 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO} ''
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${MACHINE_ARCH:L} == "amd64"
+MAKE_ARGS+=	CFLAGS=-fPIC
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile
index f51de018c697..b04e2fd3330a 100644
--- a/graphics/hsetroot/Makefile
+++ b/graphics/hsetroot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hsetroot
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://thegraveyard.org/files/
 
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 926f89356c3a..a67ee42aad8d 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hugin
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/hugin/pkg-plist b/graphics/hugin/pkg-plist
index 1773d2f692f1..ae5af8a383ff 100644
--- a/graphics/hugin/pkg-plist
+++ b/graphics/hugin/pkg-plist
@@ -151,11 +151,8 @@ share/pixmaps/hugin.png
 %%NLS%%@dirrmtry share/locale/ca_ES
 %%NLS%%@dirrmtry share/locale/cs_CZ/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/cs_CZ
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
 @dirrmtry share/mime/packages
 @dirrmtry share/mime
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/xrc/data/help_common
 @dirrm %%DATADIR%%/xrc/data/help_en_EN
 @dirrm %%DATADIR%%/xrc/data/help_fr_FR
diff --git a/graphics/icoconvert/Makefile b/graphics/icoconvert/Makefile
index a192b312d899..7a1f556c2ab7 100644
--- a/graphics/icoconvert/Makefile
+++ b/graphics/icoconvert/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icoconvert
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.mox.net/downloads/ \
 		http://www.xunix.org/~flz/distfiles/
diff --git a/graphics/icon-slicer/Makefile b/graphics/icon-slicer/Makefile
index 3bc8e6105a22..023254ef02af 100644
--- a/graphics/icon-slicer/Makefile
+++ b/graphics/icon-slicer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	icon-slicer
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.freedesktop.org/software/icon-slicer/releases/
 
diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile
index 1d23dbe2ddff..20d7aab2d4a2 100644
--- a/graphics/ida/Makefile
+++ b/graphics/ida/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ida
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://dl.bytesex.org/releases/fbida/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/graphics/imageindex/Makefile b/graphics/imageindex/Makefile
index 1ffcc1578d94..06c5bfbef4f2 100644
--- a/graphics/imageindex/Makefile
+++ b/graphics/imageindex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imageindex
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.edwinh.org/imageindex/release/ \
 		http://www.reynoldsnet.org/imageindex/release/
diff --git a/graphics/imagesort/Makefile b/graphics/imagesort/Makefile
index e2c261c0420e..33232d69cd51 100644
--- a/graphics/imagesort/Makefile
+++ b/graphics/imagesort/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imagesort
 PORTVERSION=	2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/viewers/X
diff --git a/graphics/imageviewer/Makefile b/graphics/imageviewer/Makefile
index d0b2aa309bca..6a51eac0a4e3 100644
--- a/graphics/imageviewer/Makefile
+++ b/graphics/imageviewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imageviewer
 PORTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://www.nice.ch/~phip/
 DISTNAME=	ImageViewer-${PORTVERSION}
diff --git a/graphics/imc/Makefile b/graphics/imc/Makefile
index ec37424a6eb3..3b2e2a70ac42 100644
--- a/graphics/imc/Makefile
+++ b/graphics/imc/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	imc
 PORTVERSION=	4.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://users.skynet.be/Peter.Verthez/projects/imc/
 
diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile
index fe5e8da68324..b50e1bbc92bd 100644
--- a/graphics/imgseek/Makefile
+++ b/graphics/imgseek/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imgSeek
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SFE
 
diff --git a/graphics/imgv/Makefile b/graphics/imgv/Makefile
index c21d4c3756a8..1dd2879cd84b 100644
--- a/graphics/imgv/Makefile
+++ b/graphics/imgv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imgv
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index ae1993605d8d..5fef0e0d1bb3 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	imlib
 PORTVERSION=	1.9.15
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/imlib/1.9
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 26fa92e73d1f..b6e80fcf8daa 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imlib2
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index 9c2c4293685a..60328ca1a201 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imlib2_loaders
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index c43f5d460394..ec2e2bde38ae 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.45
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist
index c14ebce30072..e5baeaef193e 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -397,7 +397,6 @@ share/locale/vi/LC_MESSAGES/inkscape.mo
 share/locale/zh_CN/LC_MESSAGES/inkscape.mo
 share/locale/zh_TW/LC_MESSAGES/inkscape.mo
 share/pixmaps/inkscape.png
-@dirrmtry share/pixmaps
 @dirrmtry share/locale/en_US@piglatin/LC_MESSAGES
 @dirrmtry share/locale/en_US@piglatin
 @dirrm %%DATADIR%%/ui
diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile
index f7ccd2c63d4a..2a2ecf393100 100644
--- a/graphics/inventor/Makefile
+++ b/graphics/inventor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	inventor
 PORTVERSION=	2.1.5.p10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://oss.sgi.com/projects/inventor/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-/}
@@ -21,7 +21,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 
 USE_X_PREFIX=	yes
 USE_XLIB=	yes
-USE_GL=		yes
+USE_GL=		glw
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_MOTIF=	yes
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 5eb9b6ff3f96..6fab63f8a822 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ipe
 PORTVERSION=	6.0.p23
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://ipe.compgeom.org/ \
 		http://tclab.kaist.ac.kr/~otfried/Ipe/
diff --git a/graphics/irit/Makefile b/graphics/irit/Makefile
index e2c6c8d176b2..a504d27973b8 100644
--- a/graphics/irit/Makefile
+++ b/graphics/irit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	irit
 PORTVERSION=	9.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cs.technion.ac.il/~irit/
 DISTNAME=	${PORTNAME}-sm
diff --git a/graphics/isreal/Makefile b/graphics/isreal/Makefile
index 4fc2a3fdf358..760c5a7e4c97 100644
--- a/graphics/isreal/Makefile
+++ b/graphics/isreal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	isreal
 PORTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	markp
diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index b5847d948b35..bf29d0d1572f 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ivtools
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/jalbum/Makefile b/graphics/jalbum/Makefile
index 0b704b656b2f..753b9420db84 100644
--- a/graphics/jalbum/Makefile
+++ b/graphics/jalbum/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jalbum
 PORTVERSION=	6.5.4
+PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	http://jalbum.net/download/
 DISTNAME=	JAlbum${PORTVERSION}
diff --git a/graphics/jave6/Makefile b/graphics/jave6/Makefile
index 6a1b8ad1b1e8..06c12922a2e0 100644
--- a/graphics/jave6/Makefile
+++ b/graphics/jave6/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	jave6
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics java
 MASTER_SITES=	http://www.jave.de/developer/\
 		http://ikaria.informatik.uni-rostock.de/public_bsd/FreeBSD/
diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile
index b25bf0927faa..d90862a89bba 100644
--- a/graphics/jdraw/Makefile
+++ b/graphics/jdraw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jdraw
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/jgv/Makefile b/graphics/jgv/Makefile
index f3c17cea2e83..5cad311d0832 100644
--- a/graphics/jgv/Makefile
+++ b/graphics/jgv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jgv
 PORTVERSION=	0.2a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics windowmaker tkstep80
 MASTER_SITES=	http://www.aaa-int.or.jp/~jfactory/JDE/dist/ \
 		${MASTER_SITE_LOCAL}
diff --git a/graphics/jpatch/Makefile b/graphics/jpatch/Makefile
index 830f4922f26f..0e87e33940d9 100644
--- a/graphics/jpatch/Makefile
+++ b/graphics/jpatch/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jpatch
 DISTVERSION=	0.4p1
+PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/jpegpixi/Makefile b/graphics/jpegpixi/Makefile
index 37d79d518f9c..5664e0e6d75b 100644
--- a/graphics/jpegpixi/Makefile
+++ b/graphics/jpegpixi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jpegpixi
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.zero-based.org/software/jpegpixi/
 
diff --git a/graphics/jpegpixi/pkg-plist b/graphics/jpegpixi/pkg-plist
index 4952173d2380..39d5492d1d11 100644
--- a/graphics/jpegpixi/pkg-plist
+++ b/graphics/jpegpixi/pkg-plist
@@ -3,5 +3,3 @@ bin/jpegpixi
 %%NLS%%share/locale/de/LC_MESSAGES/jpegpixi.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/jpegpixi.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/jpegpixi.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
diff --git a/graphics/jpgraph/Makefile b/graphics/jpgraph/Makefile
index 58bd1c99f86c..0b0b560f71e5 100644
--- a/graphics/jpgraph/Makefile
+++ b/graphics/jpgraph/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jpgraph
 PORTVERSION=	1.20.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://web.comhem.se/jpgraph/jpgdownloads/
 
diff --git a/graphics/jpgraph2/Makefile b/graphics/jpgraph2/Makefile
index 344789a7d717..e19a0a54556d 100644
--- a/graphics/jpgraph2/Makefile
+++ b/graphics/jpgraph2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jpgraph
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://web.comhem.se/jpgraph/jpgdownloads/
 
diff --git a/graphics/jumpgis-postgis/Makefile b/graphics/jumpgis-postgis/Makefile
index 1ef53ff7b792..cea437dec7d0 100644
--- a/graphics/jumpgis-postgis/Makefile
+++ b/graphics/jumpgis-postgis/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jumpgis-postgis
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	graphics databases java
 MASTER_SITES=	http://postgis.refractions.net/download/
 DISTNAME=	postgisdriver-${PORTVERSION}
diff --git a/graphics/jumpgis/Makefile b/graphics/jumpgis/Makefile
index 723739e29016..53aaa4a86ed0 100644
--- a/graphics/jumpgis/Makefile
+++ b/graphics/jumpgis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jumpgis
 PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics java
 MASTER_SITES=	http://www.jump-project.org/downloads/jump/:main \
 		http://people.tecnik93.com/~sam/ports/:extra
diff --git a/graphics/juno-2/Makefile b/graphics/juno-2/Makefile
index 86c18d5a1001..21e5e7d003cb 100644
--- a/graphics/juno-2/Makefile
+++ b/graphics/juno-2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	juno-2
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.research.compaq.com/SRC/juno-2/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index 31f014d0bd42..425d0dd255e0 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	k3d
 PORTVERSION=	0.4.4.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/kalbum/Makefile b/graphics/kalbum/Makefile
index 0458a7747858..8d76f9241602 100644
--- a/graphics/kalbum/Makefile
+++ b/graphics/kalbum/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kalbum
 PORTVERSION=		0.8.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=		graphics kde
 MASTER_SITES=		http://www.paldandy.com/kalbum/data/${PORTNAME}-${PORTVERSION}/
 
diff --git a/graphics/kallery/Makefile b/graphics/kallery/Makefile
index 6fef321ad597..3a3258db161b 100644
--- a/graphics/kallery/Makefile
+++ b/graphics/kallery/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kallery
 PORTVERSION=	1.0.7a
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics www kde
 MASTER_SITES=	http://kallery.kdewebdev.org/releases/
 
diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile
index 355cd8ab2e24..a646334103e8 100644
--- a/graphics/kamera-kde4/Makefile
+++ b/graphics/kamera-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kamera
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kamera/Makefile b/graphics/kamera/Makefile
index 355cd8ab2e24..a646334103e8 100644
--- a/graphics/kamera/Makefile
+++ b/graphics/kamera/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kamera
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index c59f1bf24c8a..113a36212063 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kbarcode
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/kbarcode/pkg-plist b/graphics/kbarcode/pkg-plist
index 7f347f146913..d7a246927eb0 100644
--- a/graphics/kbarcode/pkg-plist
+++ b/graphics/kbarcode/pkg-plist
@@ -35,11 +35,5 @@ share/locale/pl/LC_MESSAGES/kbarcode.mo
 share/locale/sv/LC_MESSAGES/kbarcode.mo
 share/locale/tr/LC_MESSAGES/kbarcode.mo
 share/services/kfile_kbarcode.desktop
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
 @dirrm share/apps/kbarcode
 @dirrmtry share/applications/kde
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index abe09d60e488..e316a72b0b35 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index abe09d60e488..e316a72b0b35 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index b31397abd94a..3620d7a3c74b 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kipi-plugins
 PORTVERSION=	0.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/kipi-plugins-kde4/pkg-plist b/graphics/kipi-plugins-kde4/pkg-plist
index d0d556d9b73e..7271b8bf5280 100644
--- a/graphics/kipi-plugins-kde4/pkg-plist
+++ b/graphics/kipi-plugins-kde4/pkg-plist
@@ -1214,29 +1214,5 @@ share/locale/zh_CN/LC_MESSAGES/kipiplugins.mo
 @dirrm share/doc/HTML/de/kipi-plugins
 @dirrm share/doc/HTML/da/kipi-plugins
 
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index b31397abd94a..3620d7a3c74b 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kipi-plugins
 PORTVERSION=	0.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/kipi-plugins/pkg-plist b/graphics/kipi-plugins/pkg-plist
index d0d556d9b73e..7271b8bf5280 100644
--- a/graphics/kipi-plugins/pkg-plist
+++ b/graphics/kipi-plugins/pkg-plist
@@ -1214,29 +1214,5 @@ share/locale/zh_CN/LC_MESSAGES/kipiplugins.mo
 @dirrm share/doc/HTML/de/kipi-plugins
 @dirrm share/doc/HTML/da/kipi-plugins
 
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
diff --git a/graphics/kisomandel/Makefile b/graphics/kisomandel/Makefile
index c65062a62908..1d77c7bd4c03 100644
--- a/graphics/kisomandel/Makefile
+++ b/graphics/kisomandel/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kisomandel
 PORTVERSION=	0.66
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index f5b96c9550a0..dfe89af29edd 100644
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kludge3d
 PORTVERSION=	20040822
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/kooka/Makefile b/graphics/kooka/Makefile
index c2b414a39eed..8d9cf07acd81 100644
--- a/graphics/kooka/Makefile
+++ b/graphics/kooka/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kooka
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile
index 41a094192087..bb540de0edd8 100644
--- a/graphics/kphotoalbum-kde4/Makefile
+++ b/graphics/kphotoalbum-kde4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kphotoalbum
 PORTVERSION=		3.0
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		graphics kde
 MASTER_SITES=		http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/ \
 			http://www.kphotoalbum.org/download/
diff --git a/graphics/kphotoalbum-kde4/pkg-plist b/graphics/kphotoalbum-kde4/pkg-plist
index e4556e184bc9..0b5d0a6bedd3 100644
--- a/graphics/kphotoalbum-kde4/pkg-plist
+++ b/graphics/kphotoalbum-kde4/pkg-plist
@@ -342,34 +342,8 @@ share/locale/uk/LC_MESSAGES/kphotoalbum.mo
 share/locale/vi/LC_MESSAGES/kphotoalbum.mo
 share/locale/zh_CN/LC_MESSAGES/kphotoalbum.mo
 share/mimelnk/application/x-vnd.kde.kphotoalbum-import.desktop
-@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/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/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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrm share/doc/HTML/sv/kphotoalbum
 @dirrm share/doc/HTML/pt/kphotoalbum
 @dirrm share/doc/HTML/nl/kphotoalbum
diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile
index 41a094192087..bb540de0edd8 100644
--- a/graphics/kphotoalbum/Makefile
+++ b/graphics/kphotoalbum/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kphotoalbum
 PORTVERSION=		3.0
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		graphics kde
 MASTER_SITES=		http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/ \
 			http://www.kphotoalbum.org/download/
diff --git a/graphics/kphotoalbum/pkg-plist b/graphics/kphotoalbum/pkg-plist
index e4556e184bc9..0b5d0a6bedd3 100644
--- a/graphics/kphotoalbum/pkg-plist
+++ b/graphics/kphotoalbum/pkg-plist
@@ -342,34 +342,8 @@ share/locale/uk/LC_MESSAGES/kphotoalbum.mo
 share/locale/vi/LC_MESSAGES/kphotoalbum.mo
 share/locale/zh_CN/LC_MESSAGES/kphotoalbum.mo
 share/mimelnk/application/x-vnd.kde.kphotoalbum-import.desktop
-@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/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/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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrm share/doc/HTML/sv/kphotoalbum
 @dirrm share/doc/HTML/pt/kphotoalbum
 @dirrm share/doc/HTML/nl/kphotoalbum
diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile
index fff518c3b561..8e21a33a919e 100644
--- a/graphics/kudu/Makefile
+++ b/graphics/kudu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kudu
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile
index 2d31f68d4fd9..b67a91007a18 100644
--- a/graphics/kuickshow-kde4/Makefile
+++ b/graphics/kuickshow-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kuickshow
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kuickshow/Makefile b/graphics/kuickshow/Makefile
index 2d31f68d4fd9..b67a91007a18 100644
--- a/graphics/kuickshow/Makefile
+++ b/graphics/kuickshow/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kuickshow
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/l2p/Makefile b/graphics/l2p/Makefile
index 351cfb46a24a..c89c2197ff35 100644
--- a/graphics/l2p/Makefile
+++ b/graphics/l2p/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	l2p
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	graphics print perl5
 MASTER_SITES=	http://www.redsymbol.net/software/l2p/dist/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
diff --git a/graphics/landscape/Makefile b/graphics/landscape/Makefile
index d473c5731c88..f26eaa496819 100644
--- a/graphics/landscape/Makefile
+++ b/graphics/landscape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		landscape
 PORTVERSION=		0.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=		graphics kde
 MASTER_SITES=		http://www.witchspace.com/files/
 
diff --git a/graphics/lfview/Makefile b/graphics/lfview/Makefile
index d0404ea7f570..041f26449208 100644
--- a/graphics/lfview/Makefile
+++ b/graphics/lfview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lfview
 PORTVERSION=	1.1a
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://hoshina.denpa.org/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile
index 18339154c229..84a64d3e4887 100644
--- a/graphics/lib3ds/Makefile
+++ b/graphics/lib3ds/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lib3ds
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
new file mode 100644
index 000000000000..1a094bbc9680
--- /dev/null
+++ b/graphics/libGL/Makefile
@@ -0,0 +1,75 @@
+# New ports collection makefile for:    xorg-server
+# Date created:		7 May 2004
+# Whom:			anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME?=	libGL
+PORTVERSION?=	6.5.3
+PORTREVISION=	1
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
+MASTER_SITE_SUBDIR=	mesa3d
+DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX}
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT?=	OpenGL library that renders using GLX or DRI
+
+BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend
+LIB_DEPENDS+=	drm:${PORTSDIR}/graphics/libdrm
+
+CONFLICTS=	XFree86-libraries-* xorg-libraries-6.* nvidia-driver-*
+
+USE_XORG=	glproto xxf86vm xext xfixes xdamage
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/drm
+GLHEADERS=	gl.h glext.h glx.h glxext.h
+
+WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
+PREFIX?=	${X11BASE}
+USE_BZIP2=	yes
+
+pre-patch:
+	@${REINPLACE_CMD} \
+		-e 's|/usr/X11R6|${X11BASE}|g' \
+		-e 's|/usr/local|${LOCALBASE}|g' \
+		-e 's|gcc|${CC}|g' \
+		-e 's|g++|${CXX}|g' \
+		-e 's|CFLAGS = |CFLAGS = ${CFLAGS} |g' \
+		-e 's|OPT_FLAGS = .*|OPT_FLAGS = ${CFLAGS}|g' \
+		-e 's|-pthread|${PTHREAD_LIBS}|g' \
+		-e 's|SRC_DIRS = .*|SRC_DIRS = glx/x11|g' \
+		${WRKSRC}/configs/freebsd-dri
+	@${REINPLACE_CMD} \
+		-e 's|^\(MKDEP_OPTIONS.*\)|\1 --|' \
+		-e 's|^DRI_DRIVER_INSTALL_DIR.*|DRI_DRIVER_INSTALL_DIR = ${X11BASE}/lib/dri|' \
+		${WRKSRC}/configs/default
+
+do-install:
+	${MKDIR} ${PREFIX}/include/GL
+.for i in ${GLHEADERS}
+	${INSTALL_DATA} ${WRKSRC}/include/GL/${i} ${PREFIX}/include/GL
+.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libGL.so.1 ${PREFIX}/lib
+	${LN} -sf libGL.so.1 ${PREFIX}/lib/libGL.so
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == i386
+PLIST_SUB+=	I386=""
+PLIST_SUB+=	I386_AMD64=""
+ALL_TARGET=	freebsd-dri-x86
+.elif ${ARCH} == amd64
+PLIST_SUB+=	I386="@comment "
+PLIST_SUB+=	I386_AMD64=""
+ALL_TARGET=	freebsd-dri
+.else
+PLIST_SUB+=	I386="@comment "
+PLIST_SUB+=	I386_AMD64="@comment "
+ALL_TARGET=	freebsd-dri
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
new file mode 100644
index 000000000000..127cae9262ef
--- /dev/null
+++ b/graphics/libGL/distinfo
@@ -0,0 +1,3 @@
+MD5 (MesaLib-6.5.3.tar.bz2) = 46359457147c469745f24b5074a186f0
+SHA256 (MesaLib-6.5.3.tar.bz2) = f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
+SIZE (MesaLib-6.5.3.tar.bz2) = 3351899
diff --git a/graphics/libGL/pkg-descr b/graphics/libGL/pkg-descr
new file mode 100644
index 000000000000..b312015a381f
--- /dev/null
+++ b/graphics/libGL/pkg-descr
@@ -0,0 +1,7 @@
+This package contains the OpenGL library, which can perform rendering over GLX
+or using the Direct Rendering Infrastructure.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist
new file mode 100644
index 000000000000..f3fd7c6a6ea7
--- /dev/null
+++ b/graphics/libGL/pkg-plist
@@ -0,0 +1,7 @@
+include/GL/gl.h
+include/GL/glext.h
+include/GL/glx.h
+include/GL/glxext.h
+lib/libGL.so
+lib/libGL.so.1
+@dirrmtry include/GL
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index 6fb773da7d22..56df5de64162 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -6,27 +6,32 @@
 #
 
 PORTNAME=	libGLU
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	6.5.3
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R6.8.1/tars
-DISTNAME=	X11R6.8.1-src1
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	 mesa3d
+DISTNAME=	MesaLib-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL utility library
 
-LIB_DEPENDS=	GL.1:${PORTSDIR}/x11/libGL
+CONFLICTS=	XFree86-libraries-* xorg-libraries-6.*
 
-CONFLICTS=	XFree86-libraries-*
+USE_BZIP2=	yes
+USE_LDCONFIG= yes
+USE_GL=		gl
 
-EXTRA_PATCHES=	${CF_PATCHES}
+USE_X_PREFIX=   yes
+WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/src/glu/sgi
 
-XBUILD_DIRS=	lib/GLU
-INSTALLS_SHLIB=	yes
+ALL_TARGET=	libGLU.so
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/include/GL/glu.h ${PREFIX}/include/GL
+post-patch:
+	${CP} ${FILESDIR}/config ${WRKDIR}/Mesa-${PORTVERSION}/configs/current
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/libGLU.so.1 ${PREFIX}/lib
+	${LN} -sf libGLU.so.1 ${PREFIX}/lib/libGLU.so
+	${INSTALL_DATA} ${WRKDIR}/Mesa-${PORTVERSION}/include/GL/glu.h ${PREFIX}/include/GL
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.mk>
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
index c5664d26e546..127cae9262ef 100644
--- a/graphics/libGLU/distinfo
+++ b/graphics/libGLU/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
-SHA256 (xorg/X11R6.8.1-src1.tar.gz) = cba581759249a292996ae552e98c7803ef1692ce81c1b06bed472f3b3d465b70
-SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
+MD5 (MesaLib-6.5.3.tar.bz2) = 46359457147c469745f24b5074a186f0
+SHA256 (MesaLib-6.5.3.tar.bz2) = f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
+SIZE (MesaLib-6.5.3.tar.bz2) = 3351899
diff --git a/graphics/libGLU/files/config b/graphics/libGLU/files/config
new file mode 100644
index 000000000000..2d3520d90dfe
--- /dev/null
+++ b/graphics/libGLU/files/config
@@ -0,0 +1,31 @@
+# Configuration for mesa-demos port for FreeBSD
+# Taken from Mesa CVS mesa/Mesa/configs/freebsd Rev 1.2
+# $FreeBSD: /tmp/pcvs/ports/graphics/libGLU/files/Attic/config,v 1.1 2007-05-19 20:09:44 flz Exp $
+#
+
+# Set and remember $CFLAGS, $CXXFLAGS, $CC and $CXX before they are
+# overriden in default include
+
+_CC := $(CC)
+_CXX := $(CXX)
+_CFLAGS := -fPIC -pedantic -I$(X11BASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS)
+_CXXFLAGS := -fPIC -pedantic $(CXXFLAGS)
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = FreeBSD
+
+# Now reset compiler and flags
+CC = $(_CC)
+CXX = $(_CXX)
+CFLAGS = $(_CFLAGS)
+CXXFLAGS = $(_CXXFLAGS)
+
+GLUT_CFLAGS = -fexceptions
+
+LIB_DIR = $(X11BASE)/lib
+
+GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
+
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
+
diff --git a/graphics/libGLU/files/patch-GLU-Imakefile b/graphics/libGLU/files/patch-GLU-Imakefile
deleted file mode 100644
index 78fa9f847194..000000000000
--- a/graphics/libGLU/files/patch-GLU-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GLU/Imakefile.orig	Sun May  9 16:24:25 2004
-+++ lib/GLU/Imakefile	Sun May  9 16:24:53 2004
-@@ -47,7 +47,7 @@
- #define CplusplusSource
- 
- #ifdef SharedGLUReqs
--REQUIREDLIBS = SharedGLUReqs
-+REQUIREDLIBS = -L$(USRLIBDIR) SharedGLUReqs
- #endif
- 
- #ifndef SeparateSharedCompile
diff --git a/graphics/libGLU/files/patch-glu-Makefile b/graphics/libGLU/files/patch-glu-Makefile
new file mode 100644
index 000000000000..7c8b5ea2120c
--- /dev/null
+++ b/graphics/libGLU/files/patch-glu-Makefile
@@ -0,0 +1,16 @@
+--- Makefile.orig	Wed Jul 12 19:43:20 2006
++++ Makefile	Tue Oct  3 00:22:56 2006
+@@ -135,10 +135,10 @@
+ 	-mkdir $(TOP)/$(LIB_DIR)
+ 
+ # Make the library:
+-$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
+-	$(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \
++$(GLU_LIB_NAME): $(OBJECTS)
++	${TOP}/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \
+ 		-major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
+-		-cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
++		-cplusplus $(MKLIB_OPTIONS) \
+ 		$(GLU_LIB_DEPS) $(OBJECTS)
+ 
+ 
diff --git a/graphics/libGLU/pkg-plist b/graphics/libGLU/pkg-plist
index ba0970e3ba25..addb2a1722dc 100644
--- a/graphics/libGLU/pkg-plist
+++ b/graphics/libGLU/pkg-plist
@@ -1,4 +1,3 @@
 include/GL/glu.h
-lib/libGLU.a
 lib/libGLU.so
 lib/libGLU.so.1
diff --git a/graphics/libGLU/scripts/configure b/graphics/libGLU/scripts/configure
deleted file mode 100644
index d95275797c01..000000000000
--- a/graphics/libGLU/scripts/configure
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
new file mode 100644
index 000000000000..3360d06d6c08
--- /dev/null
+++ b/graphics/libGLw/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for:    libGLw
+# Date created:		7 May 2004
+# Whom:			anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libGLw
+PORTVERSION=	6.5.3
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	 mesa3d
+DISTNAME=	MesaLib-${PORTVERSION}
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	OpenGL widgets library
+
+CONFLICTS=	XFree86-libraries-* xorg-libraries-6.*
+
+LIB_DEPENDS+=	Xm.3:${PORTSDIR}/x11-toolkits/open-motif
+
+USE_BZIP2=	yes
+USE_LDCONFIG=	yes
+USE_XORG=	xt
+USE_GL=		gl
+CFLAGS+=	-D__GLX_MOTIF=1
+
+USE_X_PREFIX=	yes
+WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/src/glw/
+
+ALL_TARGET=	libGLw.so
+GLWHEADERS=	GLwDrawA.h GLwDrawAP.h GLwMDrawA.h GLwMDrawAP.h
+
+post-patch:
+	${CP} ${FILESDIR}/config ${WRKDIR}/Mesa-${PORTVERSION}/configs/current
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/libGLw.so.1 ${PREFIX}/lib
+	${LN} -sf libGLw.so.1 ${PREFIX}/lib/libGLw.so
+.for i in ${GLWHEADERS}
+	${INSTALL_DATA} ${WRKDIR}/Mesa-${PORTVERSION}/src/glw/$i ${PREFIX}/include/GL
+.endfor
+
+.include <bsd.port.mk>
diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo
new file mode 100644
index 000000000000..127cae9262ef
--- /dev/null
+++ b/graphics/libGLw/distinfo
@@ -0,0 +1,3 @@
+MD5 (MesaLib-6.5.3.tar.bz2) = 46359457147c469745f24b5074a186f0
+SHA256 (MesaLib-6.5.3.tar.bz2) = f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
+SIZE (MesaLib-6.5.3.tar.bz2) = 3351899
diff --git a/graphics/libGLw/files/config b/graphics/libGLw/files/config
new file mode 100644
index 000000000000..4a3f497b1261
--- /dev/null
+++ b/graphics/libGLw/files/config
@@ -0,0 +1,31 @@
+# Configuration for mesa-demos port for FreeBSD
+# Taken from Mesa CVS mesa/Mesa/configs/freebsd Rev 1.2
+# $FreeBSD: /tmp/pcvs/ports/graphics/libGLw/files/Attic/config,v 1.1 2007-05-19 20:09:45 flz Exp $
+#
+
+# Set and remember $CFLAGS, $CXXFLAGS, $CC and $CXX before they are
+# overriden in default include
+
+_CC := $(CC)
+_CXX := $(CXX)
+_CFLAGS := -fPIC -pedantic -I$(X11BASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS)
+_CXXFLAGS := -fPIC -pedantic $(CXXFLAGS)
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = FreeBSD
+
+# Now reset compiler and flags
+CC = $(_CC)
+CXX = $(_CXX)
+CFLAGS = $(_CFLAGS)
+CXXFLAGS = $(_CXXFLAGS)
+
+GLUT_CFLAGS = -fexceptions
+
+LIB_DIR = $(X11BASE)/lib
+
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
+
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
+
diff --git a/graphics/libGLw/files/patch-glw-GLwDrawA.c b/graphics/libGLw/files/patch-glw-GLwDrawA.c
new file mode 100644
index 000000000000..3f5db5eb769c
--- /dev/null
+++ b/graphics/libGLw/files/patch-glw-GLwDrawA.c
@@ -0,0 +1,11 @@
+--- GLwDrawA.c.orig	Tue Mar 13 21:11:41 2007
++++ GLwDrawA.c	Tue Mar 13 21:12:38 2007
+@@ -668,7 +668,7 @@
+ #endif
+ 
+ 
+-#ifndef __GLX_MOTIF
++#ifdef __GLX_MOTIF
+ 
+ /* Make context current */
+ void GLwDrawingAreaMakeCurrent(Widget w,GLXContext ctx){
diff --git a/graphics/libGLw/files/patch-glw-Makefile b/graphics/libGLw/files/patch-glw-Makefile
new file mode 100644
index 000000000000..03f9d3687549
--- /dev/null
+++ b/graphics/libGLw/files/patch-glw-Makefile
@@ -0,0 +1,15 @@
+--- Makefile.orig	Thu Dec  7 19:46:44 2006
++++ Makefile	Thu Dec  7 19:47:07 2006
+@@ -37,10 +37,10 @@
+ 
+ 
+ # Make the library
+-$(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
++$(GLW_LIB_NAME): $(OBJECTS)
+ 	$(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' \
+ 		-major $(MAJOR) -minor $(MINOR) -patch $(TINY) \
+-		$(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
++		$(MKLIB_OPTIONS) \
+ 		$(GLW_LIB_DEPS) $(OBJECTS)
+ 
+ 
diff --git a/graphics/libGLw/pkg-descr b/graphics/libGLw/pkg-descr
new file mode 100644
index 000000000000..b6ec770ff87d
--- /dev/null
+++ b/graphics/libGLw/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the OpenGL widgets library.
+
+WWW: http://www.mesa3d.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/graphics/libGLw/pkg-plist b/graphics/libGLw/pkg-plist
new file mode 100644
index 000000000000..a3105d8fd45f
--- /dev/null
+++ b/graphics/libGLw/pkg-plist
@@ -0,0 +1,6 @@
+include/GL/GLwDrawA.h
+include/GL/GLwDrawAP.h
+include/GL/GLwMDrawA.h
+include/GL/GLwMDrawAP.h
+lib/libGLw.so
+lib/libGLw.so.1
diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index de0b3faf7230..ebfa19dcbccf 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libafterimage
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	afterstep
diff --git a/graphics/libaux/Makefile b/graphics/libaux/Makefile
index 1ee28cd13131..f7dbfac48e51 100644
--- a/graphics/libaux/Makefile
+++ b/graphics/libaux/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libaux
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.freebsdbrasil.com.br/~jmelo/
 DISTFILES=	libaux${EXTRACT_SUFX} libtk${EXTRACT_SUFX}
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 2c838076d744..b90e3d3a514d 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libcaca
 DISTVERSION=	0.99.beta11
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://libcaca.zoy.org/files/
 
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index 8d0ccf0d3100..77d563a2d23a 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libdrm
-PORTVERSION=	2.0.2
+PORTVERSION=	2.3.0
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 
@@ -14,7 +14,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Userspace interface to kernel Direct Rendering Module services
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 pre-patch:
 	${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
index 5d71f547d05b..e904f7f86cba 100644
--- a/graphics/libdrm/distinfo
+++ b/graphics/libdrm/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdrm-2.0.2.tar.gz) = f198bf2dfa224e1fbe6aa9c0df08cbfe
-SHA256 (libdrm-2.0.2.tar.gz) = 51a697654a0ded965c6845608c9d5a6975450ea91154261e9721965f5c8ce8c6
-SIZE (libdrm-2.0.2.tar.gz) = 382887
+MD5 (libdrm-2.3.0.tar.gz) = f2f5d3186bee51be49e1389bed39a7ed
+SHA256 (libdrm-2.3.0.tar.gz) = 76f90a22e141832bccea3fabf14e2b2a53e1ff72fe8414e2836ea8ac7e2e3dab
+SIZE (libdrm-2.3.0.tar.gz) = 391509
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index 4e76f5cc5923..f5ca75332466 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -11,6 +11,7 @@ include/drm/sis_drm.h
 include/drm/via_3d_reg.h
 include/drm/via_drm.h
 include/xf86drm.h
+include/xf86mm.h
 lib/libdrm.la
 lib/libdrm.so
 lib/libdrm.so.2
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 5949ae9380cb..27660244d8f5 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libexif-gtk
 PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libexif
diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index 93a2dc16266a..eb58e167f4fe 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libflash
 PORTVERSION=	0.4.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gplflash
diff --git a/graphics/libgfx/Makefile b/graphics/libgfx/Makefile
index 5dbbb3f6c91f..d60b0b44ae3c 100644
--- a/graphics/libgfx/Makefile
+++ b/graphics/libgfx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgfx
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://graphics.cs.uiuc.edu/~garland/dist/ CENKES
 
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index cb2e000862fe..e7708450fd6a 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libggi
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.2/ \
diff --git a/graphics/libggigcp/Makefile b/graphics/libggigcp/Makefile
index 5911344eec36..6531d54da395 100644
--- a/graphics/libggigcp/Makefile
+++ b/graphics/libggigcp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libggigcp
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.2/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/libggimisc/Makefile b/graphics/libggimisc/Makefile
index 86993f272349..61e05a8e8c7d 100644
--- a/graphics/libggimisc/Makefile
+++ b/graphics/libggimisc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libggimisc
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.2/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/libggiwmh/Makefile b/graphics/libggiwmh/Makefile
index 532435b6fde0..032c3ef65031 100644
--- a/graphics/libggiwmh/Makefile
+++ b/graphics/libggiwmh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libggiwmh
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.2/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile
index e3a0ca4ef511..f5984535c6c3 100644
--- a/graphics/libgltext/Makefile
+++ b/graphics/libgltext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgltext
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gltext
diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile
index 4592bb96400a..d8ec8e958243 100644
--- a/graphics/libglut/Makefile
+++ b/graphics/libglut/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	libglut
-PORTVERSION=	6.4.2
+PORTVERSION=	6.5.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mesa3d
 DISTNAME=	MesaGLUT-${PORTVERSION}
 
 MAINTAINER=	shaun@FreeBSD.org
-COMMENT=	A graphics library similar to SGI's OpenGL
+COMMENT=	OpenGL utility toolkit
 
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
-USE_GL=		yes
+USE_LDCONFIG=	yes
+USE_GL=		glu
 
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/src/glut/glx
diff --git a/graphics/libglut/distinfo b/graphics/libglut/distinfo
index 4fb366b0195f..a338823c40f8 100644
--- a/graphics/libglut/distinfo
+++ b/graphics/libglut/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaGLUT-6.4.2.tar.bz2) = b157ba8ad1ea63260cf5339132e7aac6
-SHA256 (MesaGLUT-6.4.2.tar.bz2) = 1277430eb69be506eeb40e465fe205de5dadcd52f912e44bbc624d6702a26509
-SIZE (MesaGLUT-6.4.2.tar.bz2) = 270291
+MD5 (MesaGLUT-6.5.2.tar.bz2) = e84edbb11c69c8e408dfadd2ed08e95b
+SHA256 (MesaGLUT-6.5.2.tar.bz2) = 32bc1bfbdeb381de058c007a91a744017a859a692979277ac01505f17d23cf62
+SIZE (MesaGLUT-6.5.2.tar.bz2) = 313048
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 0a91f569a42d..798250f3e228 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomecanvas
 PORTVERSION=	2.14.0
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index 37e354fc0265..3a0c4850d202 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -96,59 +96,19 @@ share/locale/zh_HK/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo
 @dirrm include/libgnomecanvas-2.0/libgnomecanvas
 @dirrm include/libgnomecanvas-2.0
-@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/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
 @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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@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/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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index 1db5bde6d2fb..2ed210104c4b 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomecanvasmm
 PORTVERSION=	2.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index 8eb4561b6f89..71af34349e35 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnomecanvasmm
 PORTVERSION=	2.16.0
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile
index cc7ae05aac24..90a133b6c4b5 100644
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libimg
 PORTVERSION=	1.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	graphics tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tkimg
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index 5d5c2696045e..d127996f9976 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	libkexif
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kipi
diff --git a/graphics/libkexif/pkg-plist b/graphics/libkexif/pkg-plist
index 1c4d5f23462f..5ab94a68b078 100644
--- a/graphics/libkexif/pkg-plist
+++ b/graphics/libkexif/pkg-plist
@@ -46,25 +46,5 @@ share/locale/tr/LC_MESSAGES/libkexif.mo
 share/locale/uk/LC_MESSAGES/libkexif.mo
 share/locale/zh_CN/LC_MESSAGES/libkexif.mo
 @dirrm include/libkexif
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index f14b1a4e7f00..21fbad41f8d4 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	libkexiv2
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kipi
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index f14b1a4e7f00..21fbad41f8d4 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	libkexiv2
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kipi
diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile
index 698264492f94..b0c256cc4631 100644
--- a/graphics/libkipi-kde4/Makefile
+++ b/graphics/libkipi-kde4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	libkipi
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	graphics kde devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kipi
diff --git a/graphics/libkipi-kde4/pkg-plist b/graphics/libkipi-kde4/pkg-plist
index 289a945ad170..32bd8950353d 100644
--- a/graphics/libkipi-kde4/pkg-plist
+++ b/graphics/libkipi-kde4/pkg-plist
@@ -62,29 +62,5 @@ share/servicetypes/kipiplugin.desktop
 @dirrmtry share/apps/kipi/data
 @dirrmtry share/apps/kipi
 @dirrm include/libkipi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index 698264492f94..b0c256cc4631 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	libkipi
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	graphics kde devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kipi
diff --git a/graphics/libkipi/pkg-plist b/graphics/libkipi/pkg-plist
index 289a945ad170..32bd8950353d 100644
--- a/graphics/libkipi/pkg-plist
+++ b/graphics/libkipi/pkg-plist
@@ -62,29 +62,5 @@ share/servicetypes/kipiplugin.desktop
 @dirrmtry share/apps/kipi/data
 @dirrmtry share/apps/kipi
 @dirrm include/libkipi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
diff --git a/graphics/liblug/Makefile b/graphics/liblug/Makefile
index 42192760d065..db41d61a49bd 100644
--- a/graphics/liblug/Makefile
+++ b/graphics/liblug/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		liblug
 PORTVERSION=		1.0.6
+PORTREVISION=	1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	libs/graphics
diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile
index 414aea32631c..e231fc842aff 100644
--- a/graphics/libopenraw/Makefile
+++ b/graphics/libopenraw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libopenraw
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://libopenraw.freedesktop.org/download/
 
diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile
index 0ee8420e2f56..fa8393d5af6e 100644
--- a/graphics/libpano12/Makefile
+++ b/graphics/libpano12/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	libpano12
 PORTVERSION=	2.8.4
+PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	panotools
diff --git a/graphics/libqglviewer/Makefile b/graphics/libqglviewer/Makefile
index 589e2411c87a..b83ffefed6de 100644
--- a/graphics/libqglviewer/Makefile
+++ b/graphics/libqglviewer/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libqglviewer
 PORTVERSION=	2.2.4.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/src/
 DISTNAME=	libQGLViewer-${PORTVERSION:R}-${PORTVERSION:E}
@@ -21,6 +22,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/QGLViewer
 
 USE_QT_VER=	3
 MAKE_ENV=	QTDIR="${QT_PREFIX}"
+USE_GL=		yes
 USE_LDCONFIG=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/QGLViewer
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 7168c8b19631..60fbae9bdcb6 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	librsvg
 PORTVERSION=	1.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/librsvg/1.0
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 0c2e34bc7ae2..1d4a5ef59352 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	librsvg2
 PORTVERSION=	2.16.1
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/graphics/libsvg-cairo/Makefile b/graphics/libsvg-cairo/Makefile
index adcb0e1ced15..484b0985fb82 100644
--- a/graphics/libsvg-cairo/Makefile
+++ b/graphics/libsvg-cairo/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libsvg-cairo
 PORTVERSION=	0.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/snapshots/
 
diff --git a/graphics/libsvg/Makefile b/graphics/libsvg/Makefile
index 0188a81419b5..477fdab16cdb 100644
--- a/graphics/libsvg/Makefile
+++ b/graphics/libsvg/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libsvg
 PORTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/snapshots/
 
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 7de73eb4505a..f107e2403575 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libungif
 PORTVERSION=	4.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/libv3d/Makefile b/graphics/libv3d/Makefile
index 8d724ebe4d57..ada1e0dacc91 100644
--- a/graphics/libv3d/Makefile
+++ b/graphics/libv3d/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libv3d
 PORTVERSION=	0.1.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://wolfpack.twu.net/users/wolfpack/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/libvisual-plugins/Makefile b/graphics/libvisual-plugins/Makefile
index bbc3b1a7fce7..9a4990081ad7 100644
--- a/graphics/libvisual-plugins/Makefile
+++ b/graphics/libvisual-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libvisual-plugins
 PORTVERSION=	0.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libvisual
@@ -19,6 +19,7 @@ LIB_DEPENDS=	visual.0:${PORTSDIR}/graphics/libvisual
 
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget pkgconfig
+USE_GL=		yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa
@@ -31,11 +32,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 BROKEN=		Broken objformat handling
 .endif
 
-.if ${X_WINDOW_SYSTEM} == "xfree86-4"
-BUILD_DEPENDS=	mkdirhier:${PORTSDIR}/devel/imake-4
-.elif ${X_WINDOW_SYSTEM} == "xorg"
-BUILD_DEPENDS=	mkdirhier:${PORTSDIR}/devel/imake-6
-.endif
+BUILD_DEPENDS=	mkdirhier:${X_IMAKE_PORT}
 
 .if defined(WITH_MPLAYER)
 BUILD_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index c8f789abe7e8..1dcbb37d9307 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libwmf
 PORTVERSION=	0.2.8.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
diff --git a/graphics/libwpcg/Makefile b/graphics/libwpcg/Makefile
index 8a388d7412ba..7f8882b5cffa 100644
--- a/graphics/libwpcg/Makefile
+++ b/graphics/libwpcg/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libwpcg
 PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.paassen.tmfweb.nl/
 DISTNAME=	libWPCG-${PORTVERSION}
diff --git a/graphics/libx3dtk/Makefile b/graphics/libx3dtk/Makefile
index d5d0f9d798ee..d418e8417a1d 100644
--- a/graphics/libx3dtk/Makefile
+++ b/graphics/libx3dtk/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libx3dtk
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://artis.imag.fr/Members/Yannick.Legoc/X3D/libs/
 DISTNAME=	X3DToolKit-${PORTVERSION:R}.${PORTVERSION:E}
diff --git a/graphics/linux-ac3d/Makefile b/graphics/linux-ac3d/Makefile
index b2412c141808..0cc81bcffd3c 100644
--- a/graphics/linux-ac3d/Makefile
+++ b/graphics/linux-ac3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ac3d
 PORTVERSION=	6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics linux
 MASTER_SITES=	http://www.ac3d.org/ac3d/download/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/graphics/linux-ac3d/pkg-plist b/graphics/linux-ac3d/pkg-plist
index 8f8d37117dc2..ecd64ae7f7d4 100644
--- a/graphics/linux-ac3d/pkg-plist
+++ b/graphics/linux-ac3d/pkg-plist
@@ -176,7 +176,6 @@ share/pixmaps/ac3d.png
 %%EXAMPLESDIR%%/tree_transparent.gif
 %%EXAMPLESDIR%%/world.ac
 %%EXAMPLESDIR%%/world.rgb
-@dirrmtry share/pixmaps
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%/tcl/images
 @dirrm %%DATADIR%%/tcl
diff --git a/graphics/lodju/Makefile b/graphics/lodju/Makefile
index 56cbcd2710f9..10d610e90f92 100644
--- a/graphics/lodju/Makefile
+++ b/graphics/lodju/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lodju
 PORTVERSION=	1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES+=	graphics
 MASTER_SITES=	http://liw.iki.fi/liw/lodju/tarballs/
 
diff --git a/graphics/lphoto/Makefile b/graphics/lphoto/Makefile
index 31bcb6fe6310..2a504f4fe9b3 100644
--- a/graphics/lphoto/Makefile
+++ b/graphics/lphoto/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lphoto
 PORTVERSION=	2.0.42
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://software.linspire.com/emptypool/lindowsos/pool/main/l/lphoto/
 DISTNAME=	${PORTNAME}_${PORTVERSION}-0.0.0.45.lindows0.1
diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile
index 03602fe43885..a92b9346ab19 100644
--- a/graphics/makehuman/Makefile
+++ b/graphics/makehuman/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	makehuman
 DISTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 803b7808cbb1..cf295b583222 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		mapserver
 PORTVERSION=		4.4.1
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		graphics www
 MASTER_SITES=		http://cvs.gis.umn.edu/dist/
 
diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile
index 924c759b222c..1347ee753269 100644
--- a/graphics/mapyrus/Makefile
+++ b/graphics/mapyrus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mapyrus
 PORTVERSION=	0.702
+PORTREVISION=	1
 CATEGORIES=	graphics print java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/maverik/Makefile b/graphics/maverik/Makefile
index 0f9fdc85c1f9..647e38316b0f 100644
--- a/graphics/maverik/Makefile
+++ b/graphics/maverik/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	maverik
 PORTVERSION=	6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://aig.cs.man.ac.uk/maverik/
 
diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile
index 68c8d2d0aa9b..a7128d680646 100644
--- a/graphics/megapov/Makefile
+++ b/graphics/megapov/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	megapov
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://megapov.inetart.net/packages/unix/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index 0e94c9b8bdfe..e0fd2f477da9 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	demos
 PORTVERSION=	6.5.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mesa3d/
@@ -24,27 +25,36 @@ USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 ALL_TARGET=
-MAKE_ARGS=	SUBDIRS="progs/demos"
+MAKE_ARGS=	SUBDIRS="progs/demos progs/xdemos"
 WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
 DATADIR=	${PREFIX}/share/mesa-demos
 
-DEMO_PROGS=	glinfo winpos gamma renormal glutfx paltex clearspd glslnoise \
-		singlebuffer bounce spectex readpix arbocclude texobj texdown \
-		lodbias texcyl vao_demo arbfslight fplight fogcoord trispd \
-		drawpix multiarb cubemap tessdemo pointblast gltestperf \
-		arbfplight gears spriteblast gloss terrain gearbox teapot \
-		ipers reflect shadowtex texenv fire stex3d ray morph3d \
-		isosurf engine tunnel tunnel2 geartrain
+DEMO_PROGS=	arbfplight arbfslight arbocclude bounce clearspd cubemap \
+		drawpix engine fire fogcoord fplight fslight gamma gearbox \
+		gears geartrain glinfo gloss glslnoise gltestperf glutfx \
+		ipers isosurf lodbias morph3d multiarb paltex pointblast \
+		ray readpix reflect renormal shadowtex singlebuffer spectex \
+		spriteblast stex3d streaming_rect teapot terrain tessdemo \
+		texcyl texdown texenv texobj trispd tunnel tunnel2 vao_demo \
+		winpos
 
 DEMO_IMAGES=	arch.rgb bw.rgb girl.rgb girl2.rgb reflect.rgb s128.rgb \
 		tile.rgb tree2.rgba tree3.rgb wrs_logo.rgb
 DEMO_DATA=	geartrain.dat isosurf.dat terrain.dat
 
+XDEMO_PROGS=	glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
+		glxheads glxinfo glxpbdemo glxpixmap glxswapcontrol manywin \
+		offset overlay pbdemo pbinfo wincopy xfont xrotfontdemo \
+		yuvrect_client
+
 # Generate packing list
 PLIST_FILES=
 .for prog in ${DEMO_PROGS}
 PLIST_FILES+=	bin/${prog}
 .endfor
+.for prog in ${XDEMO_PROGS}
+PLIST_FILES+=	bin/${prog}
+.endfor
 .for img in ${DEMO_IMAGES}
 PLIST_FILES+=	%%DATADIR%%/images/${img}
 .endfor
@@ -66,6 +76,10 @@ do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/$$prog \
 			${PREFIX}/bin ; \
 	done
+	@for prog in ${XDEMO_PROGS}; do \
+		${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/$$prog \
+			${PREFIX}/bin ; \
+	done
 	${MKDIR} ${DATADIR}/images ${DATADIR}/data
 	@for img in ${DEMO_IMAGES}; do \
 		${INSTALL_DATA} ${WRKSRC}/progs/images/$$img \
@@ -81,4 +95,8 @@ do-install:
 IGNORE=		does not build with XFree86
 .endif
 
+.if defined(WITH_NVIDIA_GL)
+CFLAGS+=	-DWITH_NVIDIA_GL=1
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c b/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c
new file mode 100644
index 000000000000..1dfc2c4f672a
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c
@@ -0,0 +1,11 @@
+--- progs/xdemos/glxpixmap.c.orig	Fri Apr  6 22:29:09 2007
++++ progs/xdemos/glxpixmap.c	Fri Apr  6 22:38:33 2007
+@@ -105,7 +105,7 @@
+     *   to render correctly.  This is because Mesa allows RGB rendering
+     *   into any kind of visual, not just TrueColor or DirectColor.
+     */
+-#ifdef GLX_MESA_pixmap_colormap
++#if defined(GLX_MESA_pixmap_colormap) && !defined(WITH_NVIDIA_GL)
+    if (strstr(glXQueryExtensionsString(dpy, 0), "GLX_MESA_pixmap_colormap")) {
+       /* stand-alone Mesa, specify the colormap */
+       glxpm = glXCreateGLXPixmapMESA( dpy, visinfo, pm, attr.colormap );
diff --git a/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c b/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c
new file mode 100644
index 000000000000..1dbf8e3bd700
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c
@@ -0,0 +1,28 @@
+--- progs/xdemos/yuvrect_client.c.orig	Fri Apr  6 22:42:30 2007
++++ progs/xdemos/yuvrect_client.c	Fri Apr  6 22:48:05 2007
+@@ -140,7 +140,11 @@
+       exit(0);
+    }
+    
+-   glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
++   #ifdef WITH_NVIDIA_GL
++   	glx_memory = glXAllocateMemoryNV(ImgWidth * ImgHeight * 2, 0, 0 ,0);
++   #else
++   	glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
++   #endif
+    if (!glx_memory)
+    {
+      fprintf(stderr,"Failed to allocate MESA memory\n");
+@@ -317,7 +321,11 @@
+    glXSwapBuffers(dpy, win);
+    event_loop(dpy, win);
+ 
+-   glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
++   #ifdef WITH_NVIDIA_GL
++      glXFreeMemoryNV(glx_memory);
++   #else
++      glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
++   #endif
+    glXDestroyContext(dpy, ctx);
+    XDestroyWindow(dpy, win);
+    XCloseDisplay(dpy);
diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile
index 04e7be864ae1..3ea474a510ff 100644
--- a/graphics/meshviewer/Makefile
+++ b/graphics/meshviewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	meshviewer
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mview
diff --git a/graphics/metapixel/Makefile b/graphics/metapixel/Makefile
index 1256db4e51df..75f94b29627b 100644
--- a/graphics/metapixel/Makefile
+++ b/graphics/metapixel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	metapixel
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.complang.tuwien.ac.at/~schani/metapixel/files/ \
 		http://mirror.roe.ch/dist/metapixel/
diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile
index 3b148891218c..3c32a85afdfd 100644
--- a/graphics/mhgui/Makefile
+++ b/graphics/mhgui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mhgui
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	makehuman
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index bfadb03b3f75..0b784d8bed02 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ming
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/mingplot/Makefile b/graphics/mingplot/Makefile
index efa30eb1fb78..92a32acd94ec 100644
--- a/graphics/mingplot/Makefile
+++ b/graphics/mingplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mingplot
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics www
 MASTER_SITES=	http://namazu.org/~satoru/mingplot/
 
diff --git a/graphics/mirage/Makefile b/graphics/mirage/Makefile
index 83ad58abaa90..da58cf13f9f5 100644
--- a/graphics/mirage/Makefile
+++ b/graphics/mirage/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mirage
 PORTVERSION=	0.8.3
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	CENKES BERLIOS/mirageiv
 
diff --git a/graphics/mirage/pkg-plist b/graphics/mirage/pkg-plist
index c32cbcd5b65c..e479a63c7302 100644
--- a/graphics/mirage/pkg-plist
+++ b/graphics/mirage/pkg-plist
@@ -21,6 +21,3 @@ share/locale/pl/LC_MESSAGES/mirage.mo
 share/locale/ru/LC_MESSAGES/mirage.mo
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/pixmaps
diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile
index 34bc6df0dc03..814710b64374 100644
--- a/graphics/morpheus/Makefile
+++ b/graphics/morpheus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	morpheus
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.winnicki.net/morpheus/meat/
 
diff --git a/graphics/moth/Makefile b/graphics/moth/Makefile
index 2aa768cd3fd8..568582297218 100644
--- a/graphics/moth/Makefile
+++ b/graphics/moth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	moth
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://moth.titanothere.com/moth/
 DISTFILES=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX} \
diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile
index 49e73c6675e1..5b0210d2ffbd 100644
--- a/graphics/mtpaint/Makefile
+++ b/graphics/mtpaint/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mtpaint
 PORTVERSION=	3.11
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/multivideo/Makefile b/graphics/multivideo/Makefile
index 6249466c97bf..7409127533a3 100644
--- a/graphics/multivideo/Makefile
+++ b/graphics/multivideo/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	multivideo
 PORTVERSION=	0.1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.lis.inpg.fr/pages_perso/bonnaud/multivideo/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/graphics/mxp/Makefile b/graphics/mxp/Makefile
index bdd515f77565..ba1493783e25 100644
--- a/graphics/mxp/Makefile
+++ b/graphics/mxp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mxp
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=apps/math/fractals
@@ -17,6 +18,7 @@ COMMENT=	Application for computing/exploring Mandelbrot set
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_XPM=	yes
 ALL_TARGET=
+USE_XORG=	xbitmaps
 
 post-extract:
 	@${CP} ${WRKSRC}/Makefile.noimake ${WRKSRC}/Makefile
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 17f1d3380480..aacae2e7ae87 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nip2
 PORTVERSION=	7.10.21
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/vips-7.10/
 
diff --git a/graphics/npretty/Makefile b/graphics/npretty/Makefile
index 27d44db95ed5..1be8a11c5571 100644
--- a/graphics/npretty/Makefile
+++ b/graphics/npretty/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	npretty
 PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.pulia.nu/code/projects/npretty/ \
 		${MASTER_SITE_LOCAL:S@%SUBDIR%@gabor@}
diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index 708f0e35fa61..5ff80d49ba6b 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	images
 PORTVERSION=	2.2
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index 03d66e87ce6f..3a6baf404025 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lablgl
 PORTVERSION=	1.02
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 PKGNAMEPREFIX=	ocaml-
diff --git a/graphics/oglext/Makefile b/graphics/oglext/Makefile
index 61bce8343c1d..ad00f09ff043 100644
--- a/graphics/oglext/Makefile
+++ b/graphics/oglext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oglext
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.julius.caesar.de/files/oglext/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/graphics/ogre312/Makefile b/graphics/ogre312/Makefile
index f9e3b0239a7d..33dd53cc3fa9 100644
--- a/graphics/ogre312/Makefile
+++ b/graphics/ogre312/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogre3d
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=ogre
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index f9e3b0239a7d..33dd53cc3fa9 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogre3d
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=ogre
diff --git a/graphics/ogre3d12/Makefile b/graphics/ogre3d12/Makefile
index f9e3b0239a7d..33dd53cc3fa9 100644
--- a/graphics/ogre3d12/Makefile
+++ b/graphics/ogre3d12/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogre3d
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=ogre
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 33e57060cf49..5254824ec264 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	opendx
 PORTVERSION=	4.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics math
 MASTER_SITES=	http://opendx.npaci.edu/source/
 DISTNAME=	dx-${PORTVERSION}
diff --git a/graphics/openproducer/Makefile b/graphics/openproducer/Makefile
index 3584566115ef..860b99c0a97e 100644
--- a/graphics/openproducer/Makefile
+++ b/graphics/openproducer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openproducer
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jylefort@FreeBSD.org
diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile
index 8714ac0fe3d1..8127e33ed5f1 100644
--- a/graphics/openrm/Makefile
+++ b/graphics/openrm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		openrm
 PORTVERSION=		1.6.0
+PORTREVISION=	1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 0903142b8078..654d9c945694 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jylefort@FreeBSD.org
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 0903142b8078..654d9c945694 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jylefort@FreeBSD.org
diff --git a/graphics/p5-Acme-Steganography-Image-Png/Makefile b/graphics/p5-Acme-Steganography-Image-Png/Makefile
index 11dea18f980d..8651aa4fc8f3 100644
--- a/graphics/p5-Acme-Steganography-Image-Png/Makefile
+++ b/graphics/p5-Acme-Steganography-Image-Png/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Acme-Steganography-Image-Png
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Acme
diff --git a/graphics/p5-CAD-Drawing-Template/Makefile b/graphics/p5-CAD-Drawing-Template/Makefile
index ba35d27588ee..77d5644a992b 100644
--- a/graphics/p5-CAD-Drawing-Template/Makefile
+++ b/graphics/p5-CAD-Drawing-Template/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CAD-Drawing-Template
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CAD
diff --git a/graphics/p5-CAD-Drawing/Makefile b/graphics/p5-CAD-Drawing/Makefile
index 6d59ec9eee21..3e4f86b3d160 100644
--- a/graphics/p5-CAD-Drawing/Makefile
+++ b/graphics/p5-CAD-Drawing/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CAD-Drawing
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CAD
diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile
index c3010e6118f7..55d3c07d9fe5 100644
--- a/graphics/p5-Cairo/Makefile
+++ b/graphics/p5-Cairo/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	Cairo
 PORTVERSION=	1.031
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk2-perl
diff --git a/graphics/p5-Chart-Clicker/Makefile b/graphics/p5-Chart-Clicker/Makefile
index 13f524a94c14..eef1b1d7c488 100644
--- a/graphics/p5-Chart-Clicker/Makefile
+++ b/graphics/p5-Chart-Clicker/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Chart-Clicker
 PORTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Chart
diff --git a/graphics/p5-Chart-Graph/Makefile b/graphics/p5-Chart-Graph/Makefile
index c5662f61ff99..7f2267c80975 100644
--- a/graphics/p5-Chart-Graph/Makefile
+++ b/graphics/p5-Chart-Graph/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	Chart-Graph
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Chart
diff --git a/graphics/p5-Chart-PNGgraph/Makefile b/graphics/p5-Chart-PNGgraph/Makefile
index 6de7760e9a29..f0a7c7f03c86 100644
--- a/graphics/p5-Chart-PNGgraph/Makefile
+++ b/graphics/p5-Chart-PNGgraph/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Chart-PNGgraph
 PORTVERSION=	1.21
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Chart
diff --git a/graphics/p5-Chart/Makefile b/graphics/p5-Chart/Makefile
index 76178093fa19..1713ed5325bb 100644
--- a/graphics/p5-Chart/Makefile
+++ b/graphics/p5-Chart/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Chart
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Chart
diff --git a/graphics/p5-GD-Arrow/Makefile b/graphics/p5-GD-Arrow/Makefile
index 4a4fdde5de0b..d908b32832f4 100644
--- a/graphics/p5-GD-Arrow/Makefile
+++ b/graphics/p5-GD-Arrow/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	GD-Arrow
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../by-authors/id/T/TC/TCAINE
diff --git a/graphics/p5-GD-Barcode/Makefile b/graphics/p5-GD-Barcode/Makefile
index 635f11d4ad40..de07e1515b9c 100644
--- a/graphics/p5-GD-Barcode/Makefile
+++ b/graphics/p5-GD-Barcode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GD-Barcode
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
diff --git a/graphics/p5-GD-Graph/Makefile b/graphics/p5-GD-Graph/Makefile
index 0a754ff0d7c3..2704942bb364 100644
--- a/graphics/p5-GD-Graph/Makefile
+++ b/graphics/p5-GD-Graph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GD-Graph
 PORTVERSION=	1.44
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Test/BWARFIELD
diff --git a/graphics/p5-GD-Graph3d/Makefile b/graphics/p5-GD-Graph3d/Makefile
index db710c65413c..83fdf8b74568 100644
--- a/graphics/p5-GD-Graph3d/Makefile
+++ b/graphics/p5-GD-Graph3d/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GD-Graph3d
 PORTVERSION=	0.63
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
diff --git a/graphics/p5-GD-SVG/Makefile b/graphics/p5-GD-SVG/Makefile
index e4f49da1f503..b22a7e2e5c60 100644
--- a/graphics/p5-GD-SVG/Makefile
+++ b/graphics/p5-GD-SVG/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	GD-SVG
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
diff --git a/graphics/p5-GD-TextUtil/Makefile b/graphics/p5-GD-TextUtil/Makefile
index 4b15ee8a831a..3de696a64381 100644
--- a/graphics/p5-GD-TextUtil/Makefile
+++ b/graphics/p5-GD-TextUtil/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GD-TextUtil
 PORTVERSION=	0.86
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
diff --git a/graphics/p5-GD-Thumbnail/Makefile b/graphics/p5-GD-Thumbnail/Makefile
index a15fb2bbc08b..459dbda8f045 100644
--- a/graphics/p5-GD-Thumbnail/Makefile
+++ b/graphics/p5-GD-Thumbnail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GD-Thumbnail
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index b3aeac547f1a..9d5a9b085192 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GD
 PORTVERSION=	2.35
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
diff --git a/graphics/p5-Graph-SocialMap/Makefile b/graphics/p5-Graph-SocialMap/Makefile
index a13ccf7ed0be..2733e4d41ed5 100644
--- a/graphics/p5-Graph-SocialMap/Makefile
+++ b/graphics/p5-Graph-SocialMap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Graph-SocialMap
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Graph
diff --git a/graphics/p5-Graph-Writer-GraphViz/Makefile b/graphics/p5-Graph-Writer-GraphViz/Makefile
index d38e188ba520..f014e9e2dad1 100644
--- a/graphics/p5-Graph-Writer-GraphViz/Makefile
+++ b/graphics/p5-Graph-Writer-GraphViz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Graph-Writer-GraphViz
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Graph
diff --git a/graphics/p5-GraphViz-Data-Structure/Makefile b/graphics/p5-GraphViz-Data-Structure/Makefile
index 8a6c9b463c00..27651579dbb7 100644
--- a/graphics/p5-GraphViz-Data-Structure/Makefile
+++ b/graphics/p5-GraphViz-Data-Structure/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	GraphViz-Data-Structure
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GraphViz
diff --git a/graphics/p5-GraphViz-Traverse/Makefile b/graphics/p5-GraphViz-Traverse/Makefile
index 5e67e1f145c7..6b9018385d76 100644
--- a/graphics/p5-GraphViz-Traverse/Makefile
+++ b/graphics/p5-GraphViz-Traverse/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GraphViz-Traverse
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GraphViz
diff --git a/graphics/p5-GraphViz/Makefile b/graphics/p5-GraphViz/Makefile
index be4aaa902e85..efeb355df7fd 100644
--- a/graphics/p5-GraphViz/Makefile
+++ b/graphics/p5-GraphViz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GraphViz
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GraphViz
diff --git a/graphics/p5-Image-Compare/Makefile b/graphics/p5-Image-Compare/Makefile
index e4417b67ce1a..63ccbce6f73f 100644
--- a/graphics/p5-Image-Compare/Makefile
+++ b/graphics/p5-Image-Compare/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Image-Compare
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Image
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 534b8792eb22..423b8a8b28b1 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Image-Imlib2
 PORTVERSION=	1.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Image
diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile
index 38a8c9ff6b24..accfcb87b184 100644
--- a/graphics/p5-Image-Magick-Iterator/Makefile
+++ b/graphics/p5-Image-Magick-Iterator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Image-Magick-Iterator
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Image
diff --git a/graphics/p5-Imager-Graph/Makefile b/graphics/p5-Imager-Graph/Makefile
index 99ee81aba8ae..8b5e72c9dea6 100644
--- a/graphics/p5-Imager-Graph/Makefile
+++ b/graphics/p5-Imager-Graph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Imager-Graph
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/T/TO/TONYC
diff --git a/graphics/p5-Imager-Plot/Makefile b/graphics/p5-Imager-Plot/Makefile
index b65616a8f38f..b267d8c90c88 100644
--- a/graphics/p5-Imager-Plot/Makefile
+++ b/graphics/p5-Imager-Plot/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	Imager-Plot
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Imager
diff --git a/graphics/p5-Imager-QRCode/Makefile b/graphics/p5-Imager-QRCode/Makefile
index d6bc9780732a..50982c43014c 100644
--- a/graphics/p5-Imager-QRCode/Makefile
+++ b/graphics/p5-Imager-QRCode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Imager-QRCode
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Imager
diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile
index b0d2a91e103b..800624b482c1 100644
--- a/graphics/p5-Imager/Makefile
+++ b/graphics/p5-Imager/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	Imager
 PORTVERSION=	0.57
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile
index 817e8eaa74b9..9007ba7555c6 100644
--- a/graphics/p5-Imlib2/Makefile
+++ b/graphics/p5-Imlib2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Imlib2
 PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.muhri.net/
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/p5-OpenGL/Makefile b/graphics/p5-OpenGL/Makefile
index 9e717d0ec919..5fd923757cfd 100644
--- a/graphics/p5-OpenGL/Makefile
+++ b/graphics/p5-OpenGL/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	OpenGL
 PORTVERSION=	0.54
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../by-authors/id/I/IL/ILYAZ/modules
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 92da0143aa69..faf1a6f82069 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pgperl
 PORTVERSION=	2.19
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	PGPLOT
diff --git a/graphics/p5-SpringGraph/Makefile b/graphics/p5-SpringGraph/Makefile
index aadb1c8a6f2a..deb95e57bd6c 100644
--- a/graphics/p5-SpringGraph/Makefile
+++ b/graphics/p5-SpringGraph/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=		SpringGraph
 PORTVERSION=		0.05
+PORTREVISION=		1
 CATEGORIES=		graphics perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GraphViz/TEEJAY
diff --git a/graphics/p5-Tk-JPEG-Lite/Makefile b/graphics/p5-Tk-JPEG-Lite/Makefile
index ff308245049f..d07338c63cf0 100644
--- a/graphics/p5-Tk-JPEG-Lite/Makefile
+++ b/graphics/p5-Tk-JPEG-Lite/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-JPEG-Lite
 PORTVERSION=	2.01403
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/graphics/p5-VCG/Makefile b/graphics/p5-VCG/Makefile
index b5af5adf8ab3..f4ee13274f87 100644
--- a/graphics/p5-VCG/Makefile
+++ b/graphics/p5-VCG/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	VCG
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../by-authors/id/T/TE/TEEJAY
diff --git a/graphics/p5-chart/Makefile b/graphics/p5-chart/Makefile
index 76178093fa19..1713ed5325bb 100644
--- a/graphics/p5-chart/Makefile
+++ b/graphics/p5-chart/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Chart
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Chart
diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile
index ac6164e4f394..1d79880ad737 100644
--- a/graphics/p5-ming/Makefile
+++ b/graphics/p5-ming/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ming
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/paintlib/Makefile b/graphics/paintlib/Makefile
index f88549363fcd..13a851953895 100644
--- a/graphics/paintlib/Makefile
+++ b/graphics/paintlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	paintlib
 PORTVERSION=	2.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.paintlib.de/paintlib/
 
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index e4a1fa31c86a..5c8faf97ee64 100644
--- a/graphics/passepartout/Makefile
+++ b/graphics/passepartout/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	passepartout
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.stacken.kth.se/project/pptout/files/
 
diff --git a/graphics/pear-Image_3D/Makefile b/graphics/pear-Image_3D/Makefile
index 632cbb660d7d..c68d728fb14e 100644
--- a/graphics/pear-Image_3D/Makefile
+++ b/graphics/pear-Image_3D/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Image_3D
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics www pear
 
 MAINTAINER=	miwi@FreeBSD.org
diff --git a/graphics/pear-Image_Barcode/Makefile b/graphics/pear-Image_Barcode/Makefile
index 53b487a288cf..123f172657a8 100644
--- a/graphics/pear-Image_Barcode/Makefile
+++ b/graphics/pear-Image_Barcode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Image_Barcode
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	graphics www pear
 
 MAINTAINER=	miwi@FreeBSD.org
diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile
index b5a19e3d559c..be27d43fad7f 100644
--- a/graphics/pear-Image_Canvas/Makefile
+++ b/graphics/pear-Image_Canvas/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Image_Canvas
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	graphics www pear
 
 MAINTAINER=	numisemis@yahoo.com
diff --git a/graphics/pear-Image_Color/Makefile b/graphics/pear-Image_Color/Makefile
index f4fb80dfe745..f3a9509f53fc 100644
--- a/graphics/pear-Image_Color/Makefile
+++ b/graphics/pear-Image_Color/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Image_Color
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics www pear
 
 MAINTAINER=	gerrit.beine@gmx.de
diff --git a/graphics/pear-Image_Graph/Makefile b/graphics/pear-Image_Graph/Makefile
index 392f029668a6..6ea299cfb3b5 100644
--- a/graphics/pear-Image_Graph/Makefile
+++ b/graphics/pear-Image_Graph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Image_Graph
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	graphics www pear
 
 MAINTAINER=	nick@foobar.org
diff --git a/graphics/pear-Image_Transform/Makefile b/graphics/pear-Image_Transform/Makefile
index bdae7bfbe1d5..68c376891b43 100644
--- a/graphics/pear-Image_Transform/Makefile
+++ b/graphics/pear-Image_Transform/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Image_Transform
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	graphics www pear
 
 MAINTAINER=	miwi@FreeBSD.org
diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile
index 396ec427f98e..11f22fe7527e 100644
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imagick
 PORTVERSION=	0.9.13
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/graphics/pecl-imlib2/Makefile b/graphics/pecl-imlib2/Makefile
index 1a71299518d4..72542339dd1a 100644
--- a/graphics/pecl-imlib2/Makefile
+++ b/graphics/pecl-imlib2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imlib2
 PORTVERSION=	0.1.00
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/graphics/peps/Makefile b/graphics/peps/Makefile
index 062a1d5e230d..b91ba707b399 100644
--- a/graphics/peps/Makefile
+++ b/graphics/peps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	peps
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.peps.redprince.net/unix/peps/ \
 		http://www.peps.redprince.net/peps/2.0/
diff --git a/graphics/pgperl/Makefile b/graphics/pgperl/Makefile
index 92da0143aa69..faf1a6f82069 100644
--- a/graphics/pgperl/Makefile
+++ b/graphics/pgperl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pgperl
 PORTVERSION=	2.19
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	PGPLOT
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index b46d041bfd08..6e8dfe572be9 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pgplot
 PORTVERSION=	5.2.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.astro.caltech.edu/pub/pgplot/
 DISTNAME=	${PORTNAME}${PORTVERSION:R}
diff --git a/graphics/pho/Makefile b/graphics/pho/Makefile
index 1a7622ece07b..ea2f25da268f 100644
--- a/graphics/pho/Makefile
+++ b/graphics/pho/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pho
 DISTVERSION=	0.9.5-pre4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://shallowsky.com/software/pho/
 
diff --git a/graphics/photoclip/Makefile b/graphics/photoclip/Makefile
index 3e97ef7d7a40..d1093827bfd9 100644
--- a/graphics/photoclip/Makefile
+++ b/graphics/photoclip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	photoclip
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://www.vaisburd.net/PhotoClip/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/graphics/php-magickwand/Makefile b/graphics/php-magickwand/Makefile
index 3368d87d11c5..4332870168d4 100644
--- a/graphics/php-magickwand/Makefile
+++ b/graphics/php-magickwand/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	magickwand
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.magickwand.org/download/php/
 PKGNAMEPREFIX=	php-
diff --git a/graphics/php4-ffmpeg/Makefile b/graphics/php4-ffmpeg/Makefile
index 83a40d02e1a1..d91830a66b63 100644
--- a/graphics/php4-ffmpeg/Makefile
+++ b/graphics/php4-ffmpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}-${PKGNAMEPREFIX:S/4-//:S/5-//}
diff --git a/graphics/phplot/Makefile b/graphics/phplot/Makefile
index 016d2e7c9dd3..0740184bc15a 100644
--- a/graphics/phplot/Makefile
+++ b/graphics/phplot/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	phplot
 PORTVERSION=	4.4.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phplot
diff --git a/graphics/phpsview/Makefile b/graphics/phpsview/Makefile
index 9183b3057b46..cca00e854b58 100644
--- a/graphics/phpsview/Makefile
+++ b/graphics/phpsview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	phpsview
 PORTVERSION=	10.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.saillard.org/linux/pwc/old-releases/
 DISTNAME=	${REALNAME}-${PORTVERSION}
diff --git a/graphics/picturebook/Makefile b/graphics/picturebook/Makefile
index c64a78b212cf..dc3485667343 100644
--- a/graphics/picturebook/Makefile
+++ b/graphics/picturebook/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	picturebook
 PORTVERSION=	20010422
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://samba.org/picturebook/
 DISTNAME=	capture
diff --git a/graphics/pixelize/Makefile b/graphics/pixelize/Makefile
index c636f9eac60a..c8bab624f9b6 100644
--- a/graphics/pixelize/Makefile
+++ b/graphics/pixelize/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pixelize
 PORTVERSION=	0.9.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://lashwhip.com/pub/ \
diff --git a/graphics/pixen/Makefile b/graphics/pixen/Makefile
index 84461619787f..ff76ea8d2cac 100644
--- a/graphics/pixen/Makefile
+++ b/graphics/pixen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pixen
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://download.gna.org/gsimageapps/
 DISTNAME=	Pixen-${PORTVERSION}
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index f13bd3d0cb1b..c694de655491 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pixie
 PORTVERSION=	1.6.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 0b967cc13ea1..6b7a74316aa5 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pixieplus
 PORTVERSION=	0.5.4.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics kde
 MASTER_SITES=	http://people.fruitsalad.org/avleeuwen/distfiles/${PORTNAME}/
 
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index b246e4560914..9db582337bf5 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pixmap
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications/pixmap
diff --git a/graphics/plotmtv/Makefile b/graphics/plotmtv/Makefile
index a0f03f8d1540..9e4204a3738d 100644
--- a/graphics/plotmtv/Makefile
+++ b/graphics/plotmtv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	plotmtv
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 DISTNAME=	Plotmtv${PORTVERSION}
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 79b34276a7e5..7253472a4197 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	plotutils
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index 932b39232c9c..a3a46e76b1ad 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	png2html
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.engr.mun.ca/~holden/
 
diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile
index b4a034c91625..6140d77b8359 100644
--- a/graphics/poppler-gtk/Makefile
+++ b/graphics/poppler-gtk/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/graphics/poppler-gtk/Makefile,v 1.3 2006/03/09 01:49:50 marcus Exp $
 
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-gtk
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile
index 19ea8a81c1c2..529e74ed2850 100644
--- a/graphics/poppler-qt/Makefile
+++ b/graphics/poppler-qt/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/graphics/poppler-qt/Makefile,v 1.9 2006/10/10 20:22:10 mezz Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-qt
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile
index 841b6dd47bd4..288dd5898e06 100644
--- a/graphics/poppler-utils/Makefile
+++ b/graphics/poppler-utils/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom$
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-utils
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index f2c8df61d140..6d620b323d6c 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	poppler
 PORTVERSION=	0.5.4
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
diff --git a/graphics/popplerkit/Makefile b/graphics/popplerkit/Makefile
index f4c81986d0ff..d64f91305e2e 100644
--- a/graphics/popplerkit/Makefile
+++ b/graphics/popplerkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	popplerkit
 PORTVERSION=	0.0.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://download.gna.org/gsimageapps/PopplerKit/
 DISTNAME=	PopplerKit-${SNAPSHOT}
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index a4596e817209..e372e95fb1c9 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pornview
 PORTVERSION=	0.2.0.p.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/potracegui/Makefile b/graphics/potracegui/Makefile
index f853ec5403bd..4dbef0a989e4 100644
--- a/graphics/potracegui/Makefile
+++ b/graphics/potracegui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	potracegui
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index d9c74fd0dc59..dd347465338e 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	povray
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
diff --git a/graphics/povray31/Makefile b/graphics/povray31/Makefile
index ed22d1e1f0cf..75bb9728244e 100644
--- a/graphics/povray31/Makefile
+++ b/graphics/povray31/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	povray
 PORTVERSION=	3.1g
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
 		ftp://ftp.gigabell.net/pub/unix/apps/graphics/povray/%SUBDIR%/ \
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index d9c74fd0dc59..dd347465338e 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	povray
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index d9c74fd0dc59..dd347465338e 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	povray
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
diff --git a/graphics/preview/Makefile b/graphics/preview/Makefile
index 57f27d7bfc44..fe9e95e74742 100644
--- a/graphics/preview/Makefile
+++ b/graphics/preview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	preview
 PORTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://download.gna.org/gsimageapps/
 PKGNAMEPREFIX=	gnustep-
diff --git a/graphics/price/Makefile b/graphics/price/Makefile
index 72e10e747edf..3f78a554d1cd 100644
--- a/graphics/price/Makefile
+++ b/graphics/price/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	price
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 03921d8ed72d..c456e0524cdf 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pstoedit
 PORTVERSION=	3.44
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile
index bbb7edae34be..e2e259b3a2d5 100644
--- a/graphics/pstoepsi/Makefile
+++ b/graphics/pstoepsi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pstoepsi
 PORTVERSION=	20020711
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://bourbon.usc.edu/pub/tgif/tools/pstoepsi/
 DISTFILES=	pstoepsi README.this-site
diff --git a/graphics/pvmpov/Makefile b/graphics/pvmpov/Makefile
index 265700b39b9f..8056ffacccd7 100644
--- a/graphics/pvmpov/Makefile
+++ b/graphics/pvmpov/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pvmpov
 PORTVERSION=	3.1g.2
+PORTREVISION=	1
 CATEGORIES=	graphics parallel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/py-PyX/Makefile b/graphics/py-PyX/Makefile
index daddc256b4f5..8122bea383ce 100644
--- a/graphics/py-PyX/Makefile
+++ b/graphics/py-PyX/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	PyX
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/graphics/py-amanith/Makefile b/graphics/py-amanith/Makefile
index 484655f28a0d..45273429f2c5 100644
--- a/graphics/py-amanith/Makefile
+++ b/graphics/py-amanith/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	amanith
 PORTVERSION=	0.3.34
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://louhi.kempele.fi/~skyostil/projects/pyamanith/dist/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 35acb785eac4..7ffb7a42a885 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://cairographics.org/releases/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-cgkit/Makefile b/graphics/py-cgkit/Makefile
index 049281968341..d0446a61bbf7 100644
--- a/graphics/py-cgkit/Makefile
+++ b/graphics/py-cgkit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cgkit
 PORTVERSION=	2.0.0a7
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,6 +20,7 @@ COMMENT=	Python Computer Graphics Kit
 
 BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-python scons:${PORTSDIR}/devel/scons
 
+USE_GL=		yes
 USE_XLIB=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/graphics/py-chart/Makefile b/graphics/py-chart/Makefile
index fa7a059a5d08..857fba0e449f 100644
--- a/graphics/py-chart/Makefile
+++ b/graphics/py-chart/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	chart
 PORTVERSION=	1.39
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://download.gna.org/pychart/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index 663b32c16315..f6c002186ddf 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gd
 PORTVERSION=	0.56
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	http://newcenturycomputers.net/projects/download.cgi/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile
index f68445f4259d..01c0d7b2a90b 100644
--- a/graphics/py-gdchart/Makefile
+++ b/graphics/py-gdchart/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gdchart
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics python
 MASTER_SITES=	http://www.nullcube.com/software/pygdchart/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-gdchart2/Makefile b/graphics/py-gdchart2/Makefile
index 58c9e6eea8bf..6eb5317fba19 100644
--- a/graphics/py-gdchart2/Makefile
+++ b/graphics/py-gdchart2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdchart
 DISTVERSION=	2.0-beta1
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://www.nullcube.com/software/pygdchart2/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index c3721566a9c1..fc0394e3df6b 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/graphics/py-gimp/Makefile,v 1.2 2007/01/01 22:40:46 ahze Exp $
 
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	0
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile
index 6cf808aadbd3..3e44d0746d71 100644
--- a/graphics/py-glewpy/Makefile
+++ b/graphics/py-glewpy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glewpy
 PORTVERSION=	0.7.4
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index e08e2ac3c346..174564b80b19 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	goocanvas
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	BERLIOS
 MASTER_SITE_SUBDIR=	py${PORTNAME}
diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile
index 311841dd287b..72890c5823fe 100644
--- a/graphics/py-graphviz/Makefile
+++ b/graphics/py-graphviz/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	graphviz
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	https://networkx.lanl.gov/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index 676ecef33d7f..f22f2833e3e2 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imaging
 PORTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://effbot.org/downloads/ \
 		http://www.pythonware.net/storage/
diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index f3b0d9563fb4..d9ef9ca022d5 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ming
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index 9f89e7b6d2fb..5398fb05d426 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	2.0.1.07
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	py${PORTNAME}
diff --git a/graphics/py-pydot/Makefile b/graphics/py-pydot/Makefile
index fc6200a48a0f..29871e65b4a1 100644
--- a/graphics/py-pydot/Makefile
+++ b/graphics/py-pydot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pydot
 PORTVERSION=	0.9.10
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://dkbza.org/data/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile
index 8fa9836cff82..4fd54e1a4b13 100644
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	svg
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	graphics devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile
index 51c69d19e265..ac7a8535b5d4 100644
--- a/graphics/py-soya3d/Makefile
+++ b/graphics/py-soya3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	soya3d
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.gna.org/soya/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile
index 91b4c698abdf..7205da4861f1 100644
--- a/graphics/py-visual/Makefile
+++ b/graphics/py-visual/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	visual
 PORTVERSION=	4.b14
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	visualpython
diff --git a/graphics/pyro/Makefile b/graphics/pyro/Makefile
index 5c111200815d..5ac2525d744a 100644
--- a/graphics/pyro/Makefile
+++ b/graphics/pyro/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pyro
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://nostatic.org/pyro/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/q-graph/Makefile b/graphics/q-graph/Makefile
index 841954bd7623..827383142087 100644
--- a/graphics/q-graph/Makefile
+++ b/graphics/q-graph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	graph
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	q-lang
diff --git a/graphics/qcamview/Makefile b/graphics/qcamview/Makefile
index 8e2757953314..f2377299b067 100644
--- a/graphics/qcamview/Makefile
+++ b/graphics/qcamview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qcamview
 PORTVERSION=	0.40d
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${REALNAME}
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index 5ca70f28f9c4..e813603089c1 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qcomicbook
 PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://linux.bydg.org/~yogin/
 
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index a4f54952f934..b083aadfc485 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qgis
 PORTVERSION=	0.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile
index 6b9fabc77070..8df25740fd5c 100644
--- a/graphics/qglviewer/Makefile
+++ b/graphics/qglviewer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qglviewer
 PORTVERSION=	1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.gris.uni-tuebingen.de/grisalt/projects/qglviewer/
 
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 3d9da8856016..f8ccc9f121b3 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qiv
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.klografx.net/qiv/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index c04422be93e2..81edad98851c 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qslim
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://graphics.cs.uiuc.edu/~garland/dist/
 
diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index 4ab58fda0a76..c93bdf1ba94e 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	iconengines
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	graphics
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index 52ff4d85d2e7..0fd8f096b6a8 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	imageformats
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	graphics
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile
index e34cb45a1845..095dc633f8b4 100644
--- a/graphics/qt4-pixeltool/Makefile
+++ b/graphics/qt4-pixeltool/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pixeltool
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	graphics
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index dfefecff2de5..af9a6cc27fd6 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	svg
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	graphics
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile
index eb7adab60f88..19f1e45e8eb3 100644
--- a/graphics/quat-gui/Makefile
+++ b/graphics/quat-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quat
 PORTVERSION=	1.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.physcip.uni-stuttgart.de/phy11733/download/
 PKGNAMESUFFIX=	-gui
diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile
index 4e9cad26b297..91c1600c47eb 100644
--- a/graphics/quesa/Makefile
+++ b/graphics/quesa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	quesa
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index 404c02ecce03..e21a9c53d969 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	raster3d
 DISTVERSION=	2.7d
+PORTREVISION=	1
 CATEGORIES=	graphics biology
 MASTER_SITES=	http://skuld.bmsc.washington.edu/${PORTNAME}/		\
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/	\
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index 48786a9b648f..b12f0ff1cba6 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rayshade
 PORTVERSION=	4.0.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://graphics.stanford.edu/pub/rayshade/	\
 		ftp://ftp.princeton.edu/pub/Graphics/rayshade.4.0/
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index b9f7b3be62bf..b75fefeef258 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	reallyslick
 PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rss-glx
diff --git a/graphics/recoverjpeg/Makefile b/graphics/recoverjpeg/Makefile
index e8474acc9910..2d18f1d64178 100644
--- a/graphics/recoverjpeg/Makefile
+++ b/graphics/recoverjpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	recoverjpeg
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.rfc1149.net/download/recoverjpeg/ \
 		http://critical.ch/distfiles/ \
diff --git a/graphics/renderpark/Makefile b/graphics/renderpark/Makefile
index f423e0ab879d..b6ce9f4dc3dd 100644
--- a/graphics/renderpark/Makefile
+++ b/graphics/renderpark/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	renderpark
 PORTVERSION=	3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.kuleuven.ac.be/pub/graphics/software/RenderPark/
 DISTNAME=	RenderPark
diff --git a/graphics/rgbpaint/Makefile b/graphics/rgbpaint/Makefile
index c9649e385559..71965d5676ac 100644
--- a/graphics/rgbpaint/Makefile
+++ b/graphics/rgbpaint/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rgbpaint
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/mtpaint
 
diff --git a/graphics/robot/Makefile b/graphics/robot/Makefile
index 34f77b16cf46..c5d95dfe28c6 100644
--- a/graphics/robot/Makefile
+++ b/graphics/robot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	robot
 PORTVERSION=	4.93.89
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://lheaftp.gsfc.nasa.gov/pub/corbet/robot/
 DISTNAME=	robot-beta
diff --git a/graphics/ruby-cairo/Makefile b/graphics/ruby-cairo/Makefile
index 2300937614d3..638343622f86 100644
--- a/graphics/ruby-cairo/Makefile
+++ b/graphics/ruby-cairo/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://cairographics.org/releases/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-edje/Makefile b/graphics/ruby-edje/Makefile
index 2a6d9287cce3..ff8206b3dc7a 100644
--- a/graphics/ruby-edje/Makefile
+++ b/graphics/ruby-edje/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	edje
 PORTVERSION=	20061008
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-esmart/Makefile b/graphics/ruby-esmart/Makefile
index c1c62d234b24..aba6c904c731 100644
--- a/graphics/ruby-esmart/Makefile
+++ b/graphics/ruby-esmart/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	esmart
 PORTVERSION=	20061008
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-evas/Makefile b/graphics/ruby-evas/Makefile
index 74da7c25cb0b..78060674527a 100644
--- a/graphics/ruby-evas/Makefile
+++ b/graphics/ruby-evas/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	evas
 PORTVERSION=	20061008
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile
index 79162423b1ab..77bfe92c31b7 100644
--- a/graphics/ruby-gd/Makefile
+++ b/graphics/ruby-gd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	GD
 PORTVERSION=	0.7.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www.daifukuya.com/archive/kagemai/lib/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index 044571a1c893..9ae4192a168a 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gdk_pixbuf2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/graphics/ruby-gnomecanvas2/Makefile b/graphics/ruby-gnomecanvas2/Makefile
index 55b925a66891..4e810f245f43 100644
--- a/graphics/ruby-gnomecanvas2/Makefile
+++ b/graphics/ruby-gnomecanvas2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnomecanvas2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/graphics/ruby-graph/Makefile b/graphics/ruby-graph/Makefile
index 5e38dd8417e3..379ab058e9cb 100644
--- a/graphics/ruby-graph/Makefile
+++ b/graphics/ruby-graph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	graph
 PORTVERSION=	0.1.9
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rockit
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index 5d993fc67550..a003f315e766 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imlib2
 PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www.pablotron.org/download/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-ming/Makefile b/graphics/ruby-ming/Makefile
index 48265df3051c..2ba959e6f56f 100644
--- a/graphics/ruby-ming/Makefile
+++ b/graphics/ruby-ming/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ming
 PORTVERSION=	0.3.0.${RUBY_MING_VERSION}
+PORTREVISION=	1
 CATEGORIES+=	graphics ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	mingruby
diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile
index f086955810fc..bb80c9fbcef3 100644
--- a/graphics/ruby-opengl/Makefile
+++ b/graphics/ruby-opengl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	0.32b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www2.giganet.net/~yoshi/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-pgplot/Makefile b/graphics/ruby-pgplot/Makefile
index 324ad7360707..d3f4fe5c9e9c 100644
--- a/graphics/ruby-pgplot/Makefile
+++ b/graphics/ruby-pgplot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pgplot
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/ruby-redact/Makefile b/graphics/ruby-redact/Makefile
index fa49f2a4be1d..6c7bdec710c3 100644
--- a/graphics/ruby-redact/Makefile
+++ b/graphics/ruby-redact/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	redact
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	ftp://ftp.code-monkey.de/pub/redact/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile
index 906d6a199482..e01b2e384519 100644
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rmagick
 PORTVERSION=	1.15.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/ruby-rsvg2/Makefile b/graphics/ruby-rsvg2/Makefile
index 3d9bce49acb7..66ac6d66cda3 100644
--- a/graphics/ruby-rsvg2/Makefile
+++ b/graphics/ruby-rsvg2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	rsvg2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile
index 1115773bed66..002fcc72c2fd 100644
--- a/graphics/ruby-tgif/Makefile
+++ b/graphics/ruby-tgif/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tgif
 PORTVERSION=	20010408
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www2s.biglobe.ne.jp/~Nori/ruby/dist/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/rubygem-captcha/Makefile b/graphics/rubygem-captcha/Makefile
index 0ed849b3f6bb..82e1e4308848 100644
--- a/graphics/rubygem-captcha/Makefile
+++ b/graphics/rubygem-captcha/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	captcha
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	graphics rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/rubygem-gruff/Makefile b/graphics/rubygem-gruff/Makefile
index 85a0352a167f..33cc0b34267c 100644
--- a/graphics/rubygem-gruff/Makefile
+++ b/graphics/rubygem-gruff/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gruff
 PORTVERSION=	0.2.8
+PORTREVISION=	1
 CATEGORIES=	graphics rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/rubyphoto/Makefile b/graphics/rubyphoto/Makefile
index 8fbe36e12247..2ba3fe270154 100644
--- a/graphics/rubyphoto/Makefile
+++ b/graphics/rubyphoto/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rubyphoto
 PORTVERSION=	1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics ruby www
 MASTER_SITES=	http://www.markhj.com/rubyphoto/files/
 
diff --git a/graphics/s3switch/Makefile b/graphics/s3switch/Makefile
index fcd1790e1bff..af0586d04d71 100644
--- a/graphics/s3switch/Makefile
+++ b/graphics/s3switch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	s3switch
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.probo.com/timr/
 DISTNAME=	s3ssrc
diff --git a/graphics/sage/Makefile b/graphics/sage/Makefile
index 61cc1199a9bd..4d444217079e 100644
--- a/graphics/sage/Makefile
+++ b/graphics/sage/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sage
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	worldforge
diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile
index d53c4db9db97..1a541f3c8f0a 100644
--- a/graphics/sam2p/Makefile
+++ b/graphics/sam2p/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	sam2p
 PORTVERSION=	0.44
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.inf.bme.hu/~pts/
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 0d8cd6c5c6b1..cbc9bb837adb 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sane-backends
 PORTVERSION=	1.0.18
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://alioth.debian.org/download.php/1669/ \
 		ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 5a0e31de28ce..84b83f15df6f 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -407,16 +407,6 @@ sbin/saned
 %%NLS%%share/locale/pt/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/sane-backends.mo
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/no/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/no
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
 @exec mkdir %D/share/sane
 @exec mkdir %D/share/sane/artec_eplus48u
 @exec mkdir %D/share/sane/gt68xx
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 77c7e1fa316b..8680ed72a80b 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sane-frontends
 PORTVERSION=	1.0.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://alioth.debian.org/download.php/1140/ \
 		ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
diff --git a/graphics/sced/Makefile b/graphics/sced/Makefile
index 44daa6fadf32..78dfcf3d0ea0 100644
--- a/graphics/sced/Makefile
+++ b/graphics/sced/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sced
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cs.wisc.edu/~schenney/sced/src/
 
diff --git a/graphics/scr2png/Makefile b/graphics/scr2png/Makefile
index 6cec0017af97..881c73fc486c 100644
--- a/graphics/scr2png/Makefile
+++ b/graphics/scr2png/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scr2png
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index aa8d0efc1577..e87c716061da 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scrot
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://linuxbrit.co.uk/downloads/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/graphics/scwm-icons/Makefile b/graphics/scwm-icons/Makefile
index 252058b1e2a7..220be44f1b63 100644
--- a/graphics/scwm-icons/Makefile
+++ b/graphics/scwm-icons/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scwm-icons
 PORTVERSION=	0.99.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scwm
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index e70e79ee6bf1..5ddea3424873 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdl_gfx
 PORTVERSION=	2.0.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ferzkopp.net/Software/%SUBDIR%/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index a2ebc5459a9f..7e95908ea40b 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_image
 PORTVERSION=	1.2.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
 DISTNAME=	SDL_image-${PORTVERSION}
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index c355211a1e2d..1542f974ff1e 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_ttf
 PORTVERSION=	2.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_ttf/release/
 DISTNAME=	SDL_ttf-${PORTVERSION}
diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile
index 38d996322a41..c3c00cce5f31 100644
--- a/graphics/sharpconstruct/Makefile
+++ b/graphics/sharpconstruct/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sharpconstruct
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sharp3d
diff --git a/graphics/shim/Makefile b/graphics/shim/Makefile
index 5e615378149b..614e18d3e7a7 100644
--- a/graphics/shim/Makefile
+++ b/graphics/shim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	shim
 DISTVERSION=	1.1b
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://corp.efnet.net/~lamer/pegasosppc/download/ CENKES
 
diff --git a/graphics/show/Makefile b/graphics/show/Makefile
index 145a57af4a17..ddcbf56d7e58 100644
--- a/graphics/show/Makefile
+++ b/graphics/show/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	show
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ibiblio.org/propaganda/ \
 		http://www.freebsdbrasil.com.br/~jmelo/
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index 6fd027f20196..54bd58bb6c64 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	showimg
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.jalix.org/projects/${PORTNAME}/download/${PORTVERSION}/ \
diff --git a/graphics/showimg/pkg-plist b/graphics/showimg/pkg-plist
index 6abaf673feb0..0300bcaa2eb9 100644
--- a/graphics/showimg/pkg-plist
+++ b/graphics/showimg/pkg-plist
@@ -259,22 +259,6 @@ share/mimelnk/image/x-sia.desktop
 %%KEXIDB%%share/services/showimg_kexidb_sqlite3driver.desktop
 share/services/showimgpart.desktop
 %%KEXIDB%%share/servicetypes/showimg_kexidb_driver.desktop
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/sv/showimg
 @dirrm share/doc/HTML/ru/showimg
 @dirrm share/doc/HTML/pt/showimg
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index 871bdaf89376..d22d1ff15de7 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	simage
 PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.coin3d.org/pub/coin/src/
 
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 8641542419cc..53f093eece8c 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skencil
 PORTVERSION=	0.6.17
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sketch
diff --git a/graphics/sng/Makefile b/graphics/sng/Makefile
index 94d24b2b986b..69eff9f058b9 100644
--- a/graphics/sng/Makefile
+++ b/graphics/sng/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	sng
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/snx101util/Makefile b/graphics/snx101util/Makefile
index e1b634da5cf2..05ff06bf3a99 100644
--- a/graphics/snx101util/Makefile
+++ b/graphics/snx101util/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snx101util
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.medias.ne.jp/~takam/bsd/
 
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index b89d8404df6e..ba6d40f2b2dd 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sodipodi
 PORTVERSION=	0.34
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/spcaview/Makefile b/graphics/spcaview/Makefile
index ab0cae76de7e..a80ef5ee26d3 100644
--- a/graphics/spcaview/Makefile
+++ b/graphics/spcaview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spca5xx
 PORTVERSION=	20060402
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://mxhaard.free.fr/spca50x/Download/ \
 		http://mxhaard.free.fr/spca50x/Download/oldrelease/
diff --git a/graphics/springgraph/Makefile b/graphics/springgraph/Makefile
index 83826dc4a0ff..29e72415f08f 100644
--- a/graphics/springgraph/Makefile
+++ b/graphics/springgraph/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	springgraph
 PORTVERSION=	0.88
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.chaosreigns.com/code/springgraph/dl/
 DISTNAME=	${PORTNAME}
diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
index c74eab80ba43..e6aa68da211e 100644
--- a/graphics/stamp/Makefile
+++ b/graphics/stamp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	stamp
 PORTVERSION=	2.0.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stamp
diff --git a/graphics/svg2pdf/Makefile b/graphics/svg2pdf/Makefile
index 44dd35ed446a..5822fee0e8dd 100644
--- a/graphics/svg2pdf/Makefile
+++ b/graphics/svg2pdf/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	svg2pdf
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/snapshots/
 
diff --git a/graphics/svg2png/Makefile b/graphics/svg2png/Makefile
index a2fdabd8c08c..e3ab2e5e506e 100644
--- a/graphics/svg2png/Makefile
+++ b/graphics/svg2png/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	svg2png
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/snapshots/
 
diff --git a/graphics/svg2swf/Makefile b/graphics/svg2swf/Makefile
index 221fef22657d..70f40156f893 100644
--- a/graphics/svg2swf/Makefile
+++ b/graphics/svg2swf/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	svg2swf
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://robla.net/1996/svg2swf/
 DISTNAME=	${PORTNAME}
diff --git a/graphics/svgviewer/Makefile b/graphics/svgviewer/Makefile
index 47d70def3a48..5251f2076d1c 100644
--- a/graphics/svgviewer/Makefile
+++ b/graphics/svgviewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	svgviewer
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://web.telia.com/~u42308495/alex/
 DISTNAME=	SVGViewer-${PORTVERSION}
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index d5d938889307..83870e024f03 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	swfdec
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec/0.4/
 
diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile
index 0a35284ea74a..91277d71a068 100644
--- a/graphics/swftools/Makefile
+++ b/graphics/swftools/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	swftools
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.swftools.org/
 
diff --git a/graphics/synaesthesia/Makefile b/graphics/synaesthesia/Makefile
index d6fe2964b9df..97cfaf3a6e3d 100644
--- a/graphics/synaesthesia/Makefile
+++ b/graphics/synaesthesia/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	synaesthesia
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics audio
 MASTER_SITES=	http://www.logarithmic.net/pfh-files/synaesthesia/ CENKES
 
diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile
index 062dd395da11..652ed348046a 100644
--- a/graphics/tcm/Makefile
+++ b/graphics/tcm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcm
 PORTVERSION=	2.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.utwente.nl/pub/tcm/ \
 		ftp://ftp.cs.vu.nl/pub/tcm/
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index 0a6ee3b03ee0..866e82e01599 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	telak
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://julien.danjou.info/telak/ \
 		http://critical.ch/distfiles/ \
diff --git a/graphics/tgif-nls/Makefile b/graphics/tgif-nls/Makefile
index 8eaf93d6f556..6786ef62c972 100644
--- a/graphics/tgif-nls/Makefile
+++ b/graphics/tgif-nls/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tgif
 PORTVERSION=	4.1.45
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://bourbon.usc.edu/pub/tgif/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index d639a08c64ff..4bb6a87adf53 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tgif
 PORTVERSION=	4.1.45
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://bourbon.usc.edu/pub/tgif/ \
 		http://groups.yahoo.com/group/tgif4-announce/files/ \
diff --git a/graphics/timeless/Makefile b/graphics/timeless/Makefile
index 2753cc10caa6..2ba1a8f794fa 100644
--- a/graphics/timeless/Makefile
+++ b/graphics/timeless/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	timeless
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
diff --git a/graphics/tintfu/Makefile b/graphics/tintfu/Makefile
index 0118f96a18d9..10d10f18adae 100644
--- a/graphics/tintfu/Makefile
+++ b/graphics/tintfu/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	tintfu
 PORTVERSION=	0.0.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/tkpng/Makefile b/graphics/tkpng/Makefile
index 47efb0976179..049b26e0cab1 100644
--- a/graphics/tkpng/Makefile
+++ b/graphics/tkpng/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkpng
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	graphics tk84
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile
index 97be6d797fca..313984c2ecc6 100644
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	togl
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/tonicpoint-viewer/Makefile b/graphics/tonicpoint-viewer/Makefile
index 7824cb263e59..380ae760ce97 100644
--- a/graphics/tonicpoint-viewer/Makefile
+++ b/graphics/tonicpoint-viewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	viewer
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	http://downloads.tonicsystems.com/viewer/
 PKGNAMEPREFIX=	tonicpoint-
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index b693d6650a7a..d008c7a7eb8c 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	truevision
 PORTVERSION=	0.5.5.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index 407f91f86cda..88e3b6617dd8 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	tulip
 PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://dept-info.labri.fr/~auber/projects/tulip/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index 11855209daa8..7feaa35d7b1d 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ufraw
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 
diff --git a/graphics/ufraw/pkg-plist b/graphics/ufraw/pkg-plist
index c602e5d6bd58..670cfcf8223b 100644
--- a/graphics/ufraw/pkg-plist
+++ b/graphics/ufraw/pkg-plist
@@ -15,6 +15,3 @@ share/pixmaps/ufraw.png
 @dirrmtry share/applications
 @dirrmtry share/mime/packages
 @dirrmtry share/mime
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/pixmaps
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 3beb5054d107..adad5b3e6918 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	urt
 PORTVERSION=	3.1b1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.iastate.edu/pub/utah-raster/
 DISTNAME=	urt
diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile
index bf9383848afa..7ecf14960c81 100644
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vcg
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/
 DISTNAME=	${PORTNAME}.20050204
diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile
index f7ed8594c9df..d10caa42ed23 100644
--- a/graphics/vertex/Makefile
+++ b/graphics/vertex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vertex
 PORTVERSION=	0.1.15
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://wolfpack.twu.net/users/wolfpack/
 
diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile
index 12804cc80261..e4754d821d1c 100644
--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	view3ds
 PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/graphics/vindaloo/Makefile b/graphics/vindaloo/Makefile
index 89872a4357f4..de32662558e4 100644
--- a/graphics/vindaloo/Makefile
+++ b/graphics/vindaloo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vindaloo
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://download.gna.org/gsimageapps/Vindaloo/
 DISTNAME=	Vindaloo-${PORTVERSION}
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 17139d868804..223d99eac6d4 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vips
 PORTVERSION=	7.10.21
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/vips-7.10/
 
diff --git a/graphics/visionegg/Makefile b/graphics/visionegg/Makefile
index 2543012d55c6..ccb5d37877b0 100644
--- a/graphics/visionegg/Makefile
+++ b/graphics/visionegg/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	visionegg
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index 2c47a77a8bd0..ac36b7ed6ae9 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vp
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://math.missouristate.edu/~erik/files/
 
diff --git a/graphics/vvv/Makefile b/graphics/vvv/Makefile
index 809bcb9f0acf..285c59d67d25 100644
--- a/graphics/vvv/Makefile
+++ b/graphics/vvv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vvv
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.inf.ufes.br/~thomas/graphics/vvv/ \
 		${MASTER_SITE_LOCAL}
diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile
index 185f304716c7..418e3dfcccd4 100644
--- a/graphics/white_dune/Makefile
+++ b/graphics/white_dune/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	white_dune
 PORTVERSION=	0.28.11
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://vrml.cip.ica.uni-stuttgart.de/dune/
diff --git a/graphics/wings-devel/Makefile b/graphics/wings-devel/Makefile
index 68d4a6f46468..6192c6a698ec 100644
--- a/graphics/wings-devel/Makefile
+++ b/graphics/wings-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wings
 PORTVERSION=	0.98.36
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wings
diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile
index 68d4a6f46468..6192c6a698ec 100644
--- a/graphics/wings/Makefile
+++ b/graphics/wings/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wings
 PORTVERSION=	0.98.36
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wings
diff --git a/graphics/wmgrabimage/Makefile b/graphics/wmgrabimage/Makefile
index 7fa5e1e1175d..5dc5ab5a3f3a 100644
--- a/graphics/wmgrabimage/Makefile
+++ b/graphics/wmgrabimage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmGrabImage
 PORTVERSION=	0.72
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics windowmaker
 MASTER_SITES=	http://dockapps.org/files/12/19/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/wmicons/Makefile b/graphics/wmicons/Makefile
index 393d29264273..f4cd3814479c 100644
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmicons
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	graphics windowmaker
 MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/wmicons|} \
 		${MASTER_SITE_WINDOWMAKER} \
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index 09e9d646d373..c9e654f9d296 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wxsvg
 DISTVERSION=	1.0b7
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index 8051cf746b55..ee64b3a6e06f 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xaos
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xaos
diff --git a/graphics/xaralx-devel/Makefile b/graphics/xaralx-devel/Makefile
index 0d6778fefe0a..3a4f3724350f 100644
--- a/graphics/xaralx-devel/Makefile
+++ b/graphics/xaralx-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	0.7r1762
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2
 
diff --git a/graphics/xaralx/Makefile b/graphics/xaralx/Makefile
index 5837b1a9862e..deec15a9d741 100644
--- a/graphics/xaralx/Makefile
+++ b/graphics/xaralx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XaraLX
 PORTVERSION?=	0.7r1692
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://downloads.xara.com/opensource/ \
 		${MASTER_SITE_LOCAL}
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index c32de35c1bd6..28d2a4614dc2 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbmbrowser
 PORTVERSION=	5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile
index 97f678d4becd..e24e199f6e6d 100644
--- a/graphics/xd3d/Makefile
+++ b/graphics/xd3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xd3d
 PORTVERSION=	8.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics math
 MASTER_SITES=	http://www.cmap.polytechnique.fr/~jouve/xd3d/
 
diff --git a/graphics/xdgagrab/Makefile b/graphics/xdgagrab/Makefile
index 31eeb1569655..90e324d8f0e1 100644
--- a/graphics/xdgagrab/Makefile
+++ b/graphics/xdgagrab/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdgagrab
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/ports/
 
diff --git a/graphics/xdl/Makefile b/graphics/xdl/Makefile
index 2ee11ce96494..8fae02168303 100644
--- a/graphics/xdl/Makefile
+++ b/graphics/xdl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdl
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
diff --git a/graphics/xenomorph/Makefile b/graphics/xenomorph/Makefile
index 3d7dc62ed9f3..1c6fcd466105 100644
--- a/graphics/xenomorph/Makefile
+++ b/graphics/xenomorph/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xenomorph
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://xenomorph.sourceforge.net/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/graphics/xface.el/Makefile b/graphics/xface.el/Makefile
index f0ba3714e911..3b09c2724ca6 100644
--- a/graphics/xface.el/Makefile
+++ b/graphics/xface.el/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xface.el
 PORTVERSION=	1.3.6.24
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics elisp
 MASTER_SITES=	http://www.jpl.org/ftp/pub/elisp/ \
 		ftp://ftp.jpl.org/pub/elisp/
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index cdce2986e7c4..f3816685c5d7 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfig
 PORTVERSION=	3.2.5.a5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://xfig.org/software/xfig/${PORTVERSION:R}-alpha/
 DISTNAME=	${PORTNAME}.${PORTVERSION:S,.a,-alpha,}.full
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 726f8445770b..cd697c76e88f 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfig
 PORTVERSION=	3.2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://xfig.org/software/xfig/${PORTVERSION}/ \
 		ftp://www-epb.lbl.gov/xfig/%SUBDIR%/
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 78e6d8314baa..1d8ffd886075 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfpovray
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \
 		${MASTER_SITE_SUNSITE}
diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile
index 45dc2f7145b7..5b7c2d818428 100644
--- a/graphics/xfractint/Makefile
+++ b/graphics/xfractint/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfractint
 PORTVERSION=	3.10
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.phoenix.net/pub/USERS/twegner/ \
 		http://spanky.triumf.ca/pub/fractals/programs/unix/
diff --git a/graphics/xfree86-dri/Makefile b/graphics/xfree86-dri/Makefile
index f1593f54e536..632ac950316e 100644
--- a/graphics/xfree86-dri/Makefile
+++ b/graphics/xfree86-dri/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfree86-dri
 PORTVERSION=	4.5.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/graphics/xglurbules/Makefile b/graphics/xglurbules/Makefile
index 56833fd7be2f..b42bb650ad0b 100644
--- a/graphics/xglurbules/Makefile
+++ b/graphics/xglurbules/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xglurbules
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.pepcross.com/glurbules/
 
diff --git a/graphics/xgrasp/Makefile b/graphics/xgrasp/Makefile
index 989927285206..ce6ba3dd81a3 100644
--- a/graphics/xgrasp/Makefile
+++ b/graphics/xgrasp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xgrasp
 PORTVERSION=	1.7d
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index a14f1f83d392..47b03701211d 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xli
 PORTVERSION=	1.17.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://pantransit.reptiles.org/prog/xli/ \
 		${MASTER_SITE_XCONTRIB}
diff --git a/graphics/xmagv/Makefile b/graphics/xmagv/Makefile
index cfc93a608671..815af9a2b4b5 100644
--- a/graphics/xmagv/Makefile
+++ b/graphics/xmagv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmagv
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.vector.co.jp/pack/unix/art/graphics/loader/mag/
 DISTFILES=	xmagv111.tgz
diff --git a/graphics/xmandel/Makefile b/graphics/xmandel/Makefile
index a42a80ee50c1..1ca773cd5aa8 100644
--- a/graphics/xmandel/Makefile
+++ b/graphics/xmandel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmandel
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cray.com/src/graphics/xmandel/
 # The README says the location is ftp.cray.com:/usr/ftp/src/graphics/xmandel,
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index 5642e3d0b4de..1942e84a14ea 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmedcon
 PORTVERSION=	0.9.9.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/xmfract/Makefile b/graphics/xmfract/Makefile
index cf82cf56161d..84c826124cc1 100644
--- a/graphics/xmfract/Makefile
+++ b/graphics/xmfract/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmfract
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	graphics
diff --git a/graphics/xmms-blursk/Makefile b/graphics/xmms-blursk/Makefile
index eda0963d34af..fb53636ca18a 100644
--- a/graphics/xmms-blursk/Makefile
+++ b/graphics/xmms-blursk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blursk
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://web.cecs.pdx.edu/~kirkenda/blursk/
 PKGNAMEPREFIX=	xmms-
diff --git a/graphics/xmms-dancingparticles/Makefile b/graphics/xmms-dancingparticles/Makefile
index ddf65fd66ad0..87f00f5705ef 100644
--- a/graphics/xmms-dancingparticles/Makefile
+++ b/graphics/xmms-dancingparticles/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dancingparticles
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://tardyp.free.fr/dancingparticles/
 PKGNAMEPREFIX=	xmms-
diff --git a/graphics/xmms-dflowers/Makefile b/graphics/xmms-dflowers/Makefile
index 36e9453d81f7..6c4561f8af2c 100644
--- a/graphics/xmms-dflowers/Makefile
+++ b/graphics/xmms-dflowers/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dflowers
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
diff --git a/graphics/xmms-dscope/Makefile b/graphics/xmms-dscope/Makefile
index 5801cfdb5c32..43cefd6928c4 100644
--- a/graphics/xmms-dscope/Makefile
+++ b/graphics/xmms-dscope/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dscope
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
diff --git a/graphics/xmms-dspectogram/Makefile b/graphics/xmms-dspectogram/Makefile
index edf8443ccfc3..d3bb409eb92a 100644
--- a/graphics/xmms-dspectogram/Makefile
+++ b/graphics/xmms-dspectogram/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dspectogram
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
diff --git a/graphics/xmms-dspectral/Makefile b/graphics/xmms-dspectral/Makefile
index b4397b8b00c8..c9de862fdc08 100644
--- a/graphics/xmms-dspectral/Makefile
+++ b/graphics/xmms-dspectral/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dspectral
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
diff --git a/graphics/xmms-finespectrum/Makefile b/graphics/xmms-finespectrum/Makefile
index c40efe9d7718..8a37a3e8f635 100644
--- a/graphics/xmms-finespectrum/Makefile
+++ b/graphics/xmms-finespectrum/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-finespectrum
 PORTVERSION=	1.0.1.a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	finespectrum
diff --git a/graphics/xmms-fishmatic/Makefile b/graphics/xmms-fishmatic/Makefile
index 8db322dc6544..d5c3ed81a1fc 100644
--- a/graphics/xmms-fishmatic/Makefile
+++ b/graphics/xmms-fishmatic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-fishmatic
 PORTVERSION=	0.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://stukach.com/hosted/
 DISTNAME=	fishmatic
diff --git a/graphics/xmms-gdancer/Makefile b/graphics/xmms-gdancer/Makefile
index 1f25e645dbce..8c9db67d4f1f 100644
--- a/graphics/xmms-gdancer/Makefile
+++ b/graphics/xmms-gdancer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-gdancer
 PORTVERSION=	0.4.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.figz.com/gdancer/files/
 DISTNAME=	gdancer-$(PORTVERSION)
diff --git a/graphics/xmms-goom/Makefile b/graphics/xmms-goom/Makefile
index 9fbcd2c2657b..14e0b168a647 100644
--- a/graphics/xmms-goom/Makefile
+++ b/graphics/xmms-goom/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	goom
 PORTVERSION=	1.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	goom
diff --git a/graphics/xmms-infinity/Makefile b/graphics/xmms-infinity/Makefile
index ddcd8ed97b24..105526ce6dfc 100644
--- a/graphics/xmms-infinity/Makefile
+++ b/graphics/xmms-infinity/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-infinity
 PORTVERSION=	0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://julien.carme.free.fr/
 DISTNAME=	infinity-${PORTVERSION}
diff --git a/graphics/xmms-iris/Makefile b/graphics/xmms-iris/Makefile
index 1ad7cbf5a908..39d3951a3906 100644
--- a/graphics/xmms-iris/Makefile
+++ b/graphics/xmms-iris/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iris
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cdelfosse.free.fr/xmms-iris/
 PKGNAMEPREFIX=	xmms-
diff --git a/graphics/xmms-jess/Makefile b/graphics/xmms-jess/Makefile
index 166a02947857..15fae4e50555 100644
--- a/graphics/xmms-jess/Makefile
+++ b/graphics/xmms-jess/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-jess
 PORTVERSION=	2.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://arquier.free.fr/
 DISTNAME=	JESS-${PORTVERSION}
diff --git a/graphics/xmms-msa/Makefile b/graphics/xmms-msa/Makefile
index 88ce610178a3..c87f83113742 100644
--- a/graphics/xmms-msa/Makefile
+++ b/graphics/xmms-msa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	msa
 PORTVERSION=	0.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://republika.pl/kunik/msa/dl/
 PKGNAMEPREFIX=	xmms-
diff --git a/graphics/xmms-nebulus/Makefile b/graphics/xmms-nebulus/Makefile
index 4e61db440e78..b59fb260ed07 100644
--- a/graphics/xmms-nebulus/Makefile
+++ b/graphics/xmms-nebulus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmms-nebulus
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://nebulus.tuxfamily.org/
 
diff --git a/graphics/xmms-paranormal/Makefile b/graphics/xmms-paranormal/Makefile
index e1f69c9e36aa..8a9f5e96c694 100644
--- a/graphics/xmms-paranormal/Makefile
+++ b/graphics/xmms-paranormal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-paranormal
 PORTVERSION=	0.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	paranormal
diff --git a/graphics/xmms-plazma/Makefile b/graphics/xmms-plazma/Makefile
index 9197b4dab229..9bc872d59ae2 100644
--- a/graphics/xmms-plazma/Makefile
+++ b/graphics/xmms-plazma/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-plazma
 DISTVERSION=	0.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://membres.lycos.fr/diablolight/
 
diff --git a/graphics/xmms-scivi/Makefile b/graphics/xmms-scivi/Makefile
index c8eeb3a0964e..d31a70e466b3 100644
--- a/graphics/xmms-scivi/Makefile
+++ b/graphics/xmms-scivi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scivi
 DISTVERSION=	0.2.0-rc3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
diff --git a/graphics/xmms-vumeter/Makefile b/graphics/xmms-vumeter/Makefile
index f41490df09c3..03afa39e2a0e 100644
--- a/graphics/xmms-vumeter/Makefile
+++ b/graphics/xmms-vumeter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vumeter
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}plugin
diff --git a/graphics/xmms-waterfall/Makefile b/graphics/xmms-waterfall/Makefile
index 41b3590a8091..78388806ef49 100644
--- a/graphics/xmms-waterfall/Makefile
+++ b/graphics/xmms-waterfall/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	waterfall
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.sethoscope.net/waterfall/
 PKGNAMEPREFIX=	xmms-
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index bc552817c5c3..77486652583b 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmorph
 PORTVERSION=	2006.08.17
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,6 +26,7 @@ USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget
 USE_GCC=	3.4+
+USE_XORG=	xbitmaps
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/graphics/xmountains/Makefile b/graphics/xmountains/Makefile
index 7074a9b05d3f..1dfc154d40c6 100644
--- a/graphics/xmountains/Makefile
+++ b/graphics/xmountains/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmountains
 PORTVERSION=	2.7
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.epcc.ed.ac.uk/~spb/xmountains/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -17,6 +18,7 @@ COMMENT=	X11 based fractal landscape generator
 NO_WRKSUBDIR=	yes
 
 USE_IMAKE=	yes
+USE_XORG=	xbitmaps
 MAN6=		xmountains.6
 PLIST_FILES=	bin/xmountains
 
diff --git a/graphics/xmrm/Makefile b/graphics/xmrm/Makefile
index bc070a96c19e..6593c96b8f78 100644
--- a/graphics/xmrm/Makefile
+++ b/graphics/xmrm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmrm
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cg.tuwien.ac.at/pub/linux/xmrm/ \
 		ftp://ftp.uni-passau.de/mount/common.lib.archive.unix/Graphic/xmrm/
@@ -22,6 +22,7 @@ RUN_DEPENDS=	mpeg:${PORTSDIR}/multimedia/mpeg \
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+USE_GL=		yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 NO_WRKSUBDIR=	yes
diff --git a/graphics/xnview/Makefile b/graphics/xnview/Makefile
index dbc477e455ca..19d268585273 100644
--- a/graphics/xnview/Makefile
+++ b/graphics/xnview/Makefile
@@ -29,6 +29,7 @@ MLINKS=		nview.1 nv.1 \
 
 .if ${OSVERSION} < 500000
 PORTVERSION=	1.68
+PORTREVISION=	1
 DISTNAME=	XnView-x86-unknown-FreeBSD4.x-static
 WRKSRC=		${WRKDIR}/XnView-${PORTVERSION}-x86-unknown-FreeBSD4.x-static
 PLIST_SUB+=	FREEBSD4=""
diff --git a/graphics/xoris/Makefile b/graphics/xoris/Makefile
index 4e4bde7fcc31..c49cd5ed6a4d 100644
--- a/graphics/xoris/Makefile
+++ b/graphics/xoris/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xoris
 PORTVERSION=	0.1b
+PORTREVISION=	1
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://gromnizki.unixdev.net/soft/
 
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 734dec68a6fb..edcfc04f08fd 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpaint
 PORTVERSION=	2.7.8.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.ac-grenoble.fr/Office/
diff --git a/graphics/xpcd/Makefile b/graphics/xpcd/Makefile
index d494d826f25e..3c54720584b6 100644
--- a/graphics/xpcd/Makefile
+++ b/graphics/xpcd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpcd
 PORTVERSION=	2.09
+PORTREVISION=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://dl.bytesex.org/releases/xpcd/
 
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index befdf267577f..60d7fd982f13 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.02
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN}
diff --git a/graphics/xpx/Makefile b/graphics/xpx/Makefile
index 0981efaba394..e6a52f0e3002 100644
--- a/graphics/xpx/Makefile
+++ b/graphics/xpx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpx
 PORTVERSION=	1.41
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.oersted.co.jp/~yav/soft/xpx/
 DISTNAME=	xpx141
diff --git a/graphics/xrml/Makefile b/graphics/xrml/Makefile
index dd0037bd1372..80e1541887c7 100644
--- a/graphics/xrml/Makefile
+++ b/graphics/xrml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xrml
 PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.kuleuven.ac.be/pub/graphics/software/RenderPark/
 DISTNAME=	${PORTNAME}
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 0ef246ad15c3..e5c1ea65f032 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xsane
 PORTVERSION=	0.991
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.xsane.org/download/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \
diff --git a/graphics/xsvg/Makefile b/graphics/xsvg/Makefile
index 6cca964a9ce3..ab4afd68d86f 100644
--- a/graphics/xsvg/Makefile
+++ b/graphics/xsvg/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xsvg
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/snapshots/
 
diff --git a/graphics/xtexcad/Makefile b/graphics/xtexcad/Makefile
index d51d28fa8c29..3faab91ac375 100644
--- a/graphics/xtexcad/Makefile
+++ b/graphics/xtexcad/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xtexcad
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	graphics/xtexcad
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index c254e8f1328a..8103ce8fd96f 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xv
 PORTVERSION=	3.10a
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES+=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	../distfiles/xv
diff --git a/graphics/xwpick/Makefile b/graphics/xwpick/Makefile
index c758abd4bd86..ad5ea109469e 100644
--- a/graphics/xwpick/Makefile
+++ b/graphics/xwpick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		xwpick
 PORTVERSION=		2.20
+PORTREVISION=	1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 62f8de706165..0139ff71ad47 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xzgv
 PORTVERSION=	0.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/viewers/X
diff --git a/graphics/yap/Makefile b/graphics/yap/Makefile
index dba03d7164bc..9dcdcf0dfb4c 100644
--- a/graphics/yap/Makefile
+++ b/graphics/yap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yap
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://www.gnustep.it/marko/GPSText/
 DISTNAME=	Yap
diff --git a/graphics/zimg/Makefile b/graphics/zimg/Makefile
index a7443c7d5981..78e033c2a35b 100644
--- a/graphics/zimg/Makefile
+++ b/graphics/zimg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zimg
 PORTVERSION=	5.0.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index eedd6147882b..082effbedcd1 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zphoto
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics www
 MASTER_SITES=	http://namazu.org/~satoru/zphoto/
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/hebrew/culmus/Makefile b/hebrew/culmus/Makefile
index 4521c4ac4d50..89c49fabebd2 100644
--- a/hebrew/culmus/Makefile
+++ b/hebrew/culmus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	culmus
 PORTVERSION=	0.101
+PORTREVISION=	1
 CATEGORIES=	hebrew
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/hebrew/elmar-fonts/Makefile b/hebrew/elmar-fonts/Makefile
index 00a30b192074..595a72178462 100644
--- a/hebrew/elmar-fonts/Makefile
+++ b/hebrew/elmar-fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	elmar-fonts
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	hebrew x11-fonts
 MASTER_SITES=	ftp://ftp.elmar.co.il/Portable/fonts/
 DISTNAME=	H.fonts
diff --git a/hebrew/he2/Makefile b/hebrew/he2/Makefile
index 8046261ae55b..4e8126acbea1 100644
--- a/hebrew/he2/Makefile
+++ b/hebrew/he2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	he2
 PORTVERSION=	0.61
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	hebrew editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/hebrew/kde3-i18n/Makefile b/hebrew/kde3-i18n/Makefile
index 18dba3b7090b..1af447a0659a 100644
--- a/hebrew/kde3-i18n/Makefile
+++ b/hebrew/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	hebrew kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/hebrew/kde4-l10n/Makefile b/hebrew/kde4-l10n/Makefile
index 18dba3b7090b..1af447a0659a 100644
--- a/hebrew/kde4-l10n/Makefile
+++ b/hebrew/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	hebrew kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/hebrew/koffice-i18n/Makefile b/hebrew/koffice-i18n/Makefile
index 09a51f627ff5..f7fc3bd1a96b 100644
--- a/hebrew/koffice-i18n/Makefile
+++ b/hebrew/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	hebrew kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/hungarian/jdictionary-eng-hun-expr/Makefile b/hungarian/jdictionary-eng-hun-expr/Makefile
index c8b80b485cde..3fa611b9c61d 100644
--- a/hungarian/jdictionary-eng-hun-expr/Makefile
+++ b/hungarian/jdictionary-eng-hun-expr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdictionary-eng-hun-expr
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	hungarian textproc
 DISTNAME=	SmartEngHunExp-1_4.jar
 
diff --git a/hungarian/jdictionary-eng-hun/Makefile b/hungarian/jdictionary-eng-hun/Makefile
index d4e217f887a6..0a3a66088b0b 100644
--- a/hungarian/jdictionary-eng-hun/Makefile
+++ b/hungarian/jdictionary-eng-hun/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdictionary-eng-hun
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	hungarian textproc
 DISTNAME=	SmartEngHun-1_4.jar
 
diff --git a/hungarian/kde3-i18n/Makefile b/hungarian/kde3-i18n/Makefile
index 67cea5092312..41a01237d5da 100644
--- a/hungarian/kde3-i18n/Makefile
+++ b/hungarian/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	hungarian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/hungarian/kde4-l10n/Makefile b/hungarian/kde4-l10n/Makefile
index 67cea5092312..41a01237d5da 100644
--- a/hungarian/kde4-l10n/Makefile
+++ b/hungarian/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	hungarian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/hungarian/koffice-i18n/Makefile b/hungarian/koffice-i18n/Makefile
index 39ee94f7a245..64a255bceaf9 100644
--- a/hungarian/koffice-i18n/Makefile
+++ b/hungarian/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	hungarian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/irc/eggcreator/Makefile b/irc/eggcreator/Makefile
index f47289ee5a84..9044be7d2bcd 100644
--- a/irc/eggcreator/Makefile
+++ b/irc/eggcreator/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	eggcreator
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://free.top.bg/tcl/eggcreator/ \
 		http://www.oook.cz/bsd/distfiles/
diff --git a/irc/erc/Makefile b/irc/erc/Makefile
index c4c749dc4979..83aa390389eb 100644
--- a/irc/erc/Makefile
+++ b/irc/erc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	erc
 PORTVERSION=	5.1.2
+PORTREVISION=	1
 CATEGORIES+=	irc elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	erc
diff --git a/irc/gaim-irchelper/Makefile b/irc/gaim-irchelper/Makefile
index 2180f2df535a..219bdba1be66 100644
--- a/irc/gaim-irchelper/Makefile
+++ b/irc/gaim-irchelper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaim-irchelper
 PORTVERSION=	0.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/irc/gdesklets-irc/Makefile b/irc/gdesklets-irc/Makefile
index 049703f80844..a1e7d25fd503 100644
--- a/irc/gdesklets-irc/Makefile
+++ b/irc/gdesklets-irc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	irc
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	irc gnome deskutils
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
diff --git a/irc/irchat-pj-emacs20/Makefile b/irc/irchat-pj-emacs20/Makefile
index cc1020adc58d..aff4df00b6d4 100644
--- a/irc/irchat-pj-emacs20/Makefile
+++ b/irc/irchat-pj-emacs20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	irchat-pj
 PORTVERSION=	2.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc elisp
 MASTER_SITES=	http://his.luky.org/ftp/mirrors/irchat-pj/2.5/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/irc/kmyirc/Makefile b/irc/kmyirc/Makefile
index f27a672a1201..f8344906993c 100644
--- a/irc/kmyirc/Makefile
+++ b/irc/kmyirc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kmyirc
 PORTVERSION=		0.2.9
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		irc kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/irc/konversation-kde4/Makefile b/irc/konversation-kde4/Makefile
index c3a32a825e3d..3b0531915b72 100644
--- a/irc/konversation-kde4/Makefile
+++ b/irc/konversation-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	konversation
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	irc kde
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/irc/konversation-kde4/pkg-plist b/irc/konversation-kde4/pkg-plist
index 0a01132ae98e..5842f7597c78 100644
--- a/irc/konversation-kde4/pkg-plist
+++ b/irc/konversation-kde4/pkg-plist
@@ -324,24 +324,6 @@ share/locale/tr/LC_MESSAGES/konversation.mo
 share/locale/zh_TW/LC_MESSAGES/konversation.mo
 share/services/konvirc.protocol
 share/services/konvirc6.protocol
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/doc/HTML/sv/konversation
 @dirrm share/doc/HTML/ru/konversation
 @dirrm share/doc/HTML/pt/konversation
diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile
index c3a32a825e3d..3b0531915b72 100644
--- a/irc/konversation/Makefile
+++ b/irc/konversation/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	konversation
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	irc kde
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/irc/konversation/pkg-plist b/irc/konversation/pkg-plist
index 0a01132ae98e..5842f7597c78 100644
--- a/irc/konversation/pkg-plist
+++ b/irc/konversation/pkg-plist
@@ -324,24 +324,6 @@ share/locale/tr/LC_MESSAGES/konversation.mo
 share/locale/zh_TW/LC_MESSAGES/konversation.mo
 share/services/konvirc.protocol
 share/services/konvirc6.protocol
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/doc/HTML/sv/konversation
 @dirrm share/doc/HTML/ru/konversation
 @dirrm share/doc/HTML/pt/konversation
diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile
index dfc4d27987a6..d96741795a28 100644
--- a/irc/kvirc-devel/Makefile
+++ b/irc/kvirc-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kvirc
 PORTVERSION=	3.2.6
+PORTREVISION=	1
 CATEGORIES=	irc kde
 MASTER_SITES=	ftp://ftp.kvirc.ru/pub/source/dev/
 PKGNAMESUFFIX=	-devel
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index 4dbbb7d2fdac..e1c9cc367a06 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kvirc
 PORTVERSION=	3.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	irc kde
 MASTER_SITES=	ftp://ftp.kvirc.net/pub/%SUBDIR%/ \
 		ftp://ftp.kvirc.de/pub/%SUBDIR%/ \
diff --git a/irc/kwirc/Makefile b/irc/kwirc/Makefile
index 3749fe78ebe1..51557f374122 100644
--- a/irc/kwirc/Makefile
+++ b/irc/kwirc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kwirc
 PORTVERSION=	0.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	irc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index d2e1940fb79a..5d0108f79af5 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lostirc
 PORTVERSION=	0.4.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://demian.dyndns.org/src/
diff --git a/irc/olirc/Makefile b/irc/olirc/Makefile
index 906a8fa17d1f..f0f671e2b59c 100644
--- a/irc/olirc/Makefile
+++ b/irc/olirc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	olirc
 PORTVERSION=	0.0.38.a3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	http://olirc.sourceforge.net/
 DISTNAME=	olirc-0.0.38-alpha-3.2
diff --git a/irc/pircbot/Makefile b/irc/pircbot/Makefile
index 3a6bed02d89e..d0fb4375d098 100644
--- a/irc/pircbot/Makefile
+++ b/irc/pircbot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pircbot
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	irc java
 MASTER_SITES=	http://www.jibble.org/files/ \
 		ftp://ftp.i-scream.org/pub/www.jibble.org/files/ \
diff --git a/irc/pure-emacs20/Makefile b/irc/pure-emacs20/Makefile
index fef7b015749e..026640104ac1 100644
--- a/irc/pure-emacs20/Makefile
+++ b/irc/pure-emacs20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pure
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc elisp
 MASTER_SITES=	http://his.luky.org/ftp/mirrors/irchat-pj/2.5/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index 0980ad6a2438..ed66a9e27d6b 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	quirc
 PORTVERSION=	0.9.84
+PORTREVISION=	1
 CATEGORIES=	irc tk84
 MASTER_SITES=	${MASTER_SITE_LOCAL:S/$/:local/}
 
diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index 4dccaabb4f14..ce883066d84a 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	riece
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 4dccaabb4f14..ce883066d84a 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	riece
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
diff --git a/irc/roxirc/Makefile b/irc/roxirc/Makefile
index 3f1dc48d4291..38759e454bbb 100644
--- a/irc/roxirc/Makefile
+++ b/irc/roxirc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	roxirc
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	irc tk84
 MASTER_SITES=	http://roxirc.lighter.net/download/
 
diff --git a/irc/talksoup/Makefile b/irc/talksoup/Makefile
index 12ff57efe0cd..53cb1f178818 100644
--- a/irc/talksoup/Makefile
+++ b/irc/talksoup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	talksoup
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	irc gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/irc/tkirc/Makefile b/irc/tkirc/Makefile
index 09552b995ab9..f497070480c7 100644
--- a/irc/tkirc/Makefile
+++ b/irc/tkirc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkirc
 PORTVERSION=	2.46
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc tk84
 MASTER_SITES=	http://netsplit.de/tkirc2/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/irc/xchat-fish/Makefile b/irc/xchat-fish/Makefile
index dc060b4a5d08..724f504d2e46 100644
--- a/irc/xchat-fish/Makefile
+++ b/irc/xchat-fish/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fish
 DISTVERSION=	0.97a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc security
 MASTER_SITES=	http://fish.sekure.us/xchat/
 PKGNAMEPREFIX=	xchat-
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index e1feb7e084a7..66e2a8965986 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xchat
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://releases.navi.cx/xchat-gnome/
 PKGNAMESUFFIX=	-gnome
diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist
index 7d09ac168188..581d9256fb0a 100644
--- a/irc/xchat-gnome/pkg-plist
+++ b/irc/xchat-gnome/pkg-plist
@@ -119,43 +119,13 @@ share/locale/zh_TW/LC_MESSAGES/xchat-gnome.mo
 @dirrm share/gnome/help/xchat-gnome
 @dirrm lib/xchat-gnome/plugins
 @dirrm lib/xchat-gnome
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/tl/LC_MESSAGES
 @dirrmtry share/locale/tl
-@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/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrmtry share/locale/jbo/LC_MESSAGES
 @dirrmtry share/locale/jbo
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
-@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
diff --git a/irc/xchat-mircryption/Makefile b/irc/xchat-mircryption/Makefile
index 679b6acee9c0..33f1814e71e7 100644
--- a/irc/xchat-mircryption/Makefile
+++ b/irc/xchat-mircryption/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mircryption
 DISTVERSION=	1.1.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc security
 MASTER_SITES=	http://mircryption.sourceforge.net/Downloads/
 PKGNAMEPREFIX=	xchat-
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index d6c93a25af7b..d90c9c8b9dd8 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xchat
 PORTVERSION=	2.8.2
+PORTREVISION=	1
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
diff --git a/irc/xchat/pkg-plist b/irc/xchat/pkg-plist
index c43913697218..9c0f9939e602 100644
--- a/irc/xchat/pkg-plist
+++ b/irc/xchat/pkg-plist
@@ -34,31 +34,6 @@ share/locale/zh_CN/LC_MESSAGES/xchat.mo
 share/locale/zh_TW/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
 @exec mkdir -p %D/lib/xchat/plugins
 @dirrm lib/xchat/plugins
 @dirrm lib/xchat
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 7f790ce3c9f8..40d4eddec4f1 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		xchat
 PORTVERSION=		1.8.11
-PORTREVISION=		7
+PORTREVISION=		8
 CATEGORIES+=		irc gnome ipv6
 MASTER_SITES=		http://xchat.org/files/source/1.8/ \
 			http://xchat.linuxpower.org/files/source/1.8/
diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile
index ca786e4c288f..f974c8c8fda7 100644
--- a/irc/zircon/Makefile
+++ b/irc/zircon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zircon
 PORTVERSION=	1.18.256
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc tk84
 MASTER_SITES=	ftp://catless.ncl.ac.uk/pub/ \
 		${MASTER_SITE_LOCAL}
diff --git a/japanese/acroread/Makefile b/japanese/acroread/Makefile
index 861a76dcf436..2afd86ce8c08 100644
--- a/japanese/acroread/Makefile
+++ b/japanese/acroread/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	acroread
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese print
 
diff --git a/japanese/addttfont/Makefile b/japanese/addttfont/Makefile
index 313bff071f58..8a8178cc44c6 100644
--- a/japanese/addttfont/Makefile
+++ b/japanese/addttfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	addttfont
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	japanese perl5
 MASTER_SITES=	http://ftp.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/tt/
 EXTRACT_SUFX=	# none
diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile
index 8f939e2a93d1..ea1772a029c6 100644
--- a/japanese/alias-fonts/Makefile
+++ b/japanese/alias-fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	alias-fonts
 PORTVERSION=	1.0
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 DISTFILES=	# empty
 
diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index b28909c8f9fd..cbda97521a21 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aterm
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	japanese x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/japanese/bookview/Makefile b/japanese/bookview/Makefile
index f6a39330844f..1a4f2265cac5 100644
--- a/japanese/bookview/Makefile
+++ b/japanese/bookview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bookview
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/bookview/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/net/ndtp/bookview/
diff --git a/japanese/bugzilla/Makefile b/japanese/bugzilla/Makefile
index c3c0d8ca0fce..5a5cd3c70080 100644
--- a/japanese/bugzilla/Makefile
+++ b/japanese/bugzilla/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bugzilla
 PORTVERSION=	2.16.8
+PORTREVISION=	1
 CATEGORIES=	japanese devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
diff --git a/japanese/bugzilla3/Makefile b/japanese/bugzilla3/Makefile
index c3c0d8ca0fce..5a5cd3c70080 100644
--- a/japanese/bugzilla3/Makefile
+++ b/japanese/bugzilla3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bugzilla
 PORTVERSION=	2.16.8
+PORTREVISION=	1
 CATEGORIES=	japanese devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	webtools webtools/archived
diff --git a/japanese/chimera/Makefile b/japanese/chimera/Makefile
index 2f0b3ab4ed93..61b702119510 100644
--- a/japanese/chimera/Makefile
+++ b/japanese/chimera/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	chimera
 PORTVERSION=	1.70p1
+PORTREVISION=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
 DISTNAME=	${PORTNAME}-${PREV_VERSION}
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 0ee7b310104e..348b15b1627e 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ddskk
 PORTVERSION=	12.2.0
+PORTREVISION=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/ \
 		ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
diff --git a/japanese/diclookup-emacs20/Makefile b/japanese/diclookup-emacs20/Makefile
index ea2306ba6d24..e5decd510716 100644
--- a/japanese/diclookup-emacs20/Makefile
+++ b/japanese/diclookup-emacs20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	diclookup
 PORTVERSION=	2.3.4b8
+PORTREVISION=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tools/diclookup-mule/beta/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/japanese/diclookup-mule/Makefile b/japanese/diclookup-mule/Makefile
index 5547ec9c02c3..89c0fb72d078 100644
--- a/japanese/diclookup-mule/Makefile
+++ b/japanese/diclookup-mule/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	diclookup-mule
 PORTVERSION=	2.3.3
+PORTREVISION=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tools/diclookup-mule/
 
diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 024eb7416cb0..4b3444a131c1 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvipsk
 PORTVERSION=	5.95b
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,hrs/teTeX,:S,$,:udvipspatch,}
diff --git a/japanese/easypr/Makefile b/japanese/easypr/Makefile
index 8dd375c7bab4..b82725880b3e 100644
--- a/japanese/easypr/Makefile
+++ b/japanese/easypr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	easypr
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	http://www.linet.gr.jp/~mituiwa/
 DISTNAME=	print-${PORTVERSION}
diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index 649dbae31900..8c2d3ca4932e 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebview
 PORTVERSION=	0.3.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index 6426cc471884..bfc5b7adb956 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebview
 PORTVERSION=	0.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/japanese/egg-canna/Makefile b/japanese/egg-canna/Makefile
index f8445967a5f2..f196bcf7b75b 100644
--- a/japanese/egg-canna/Makefile
+++ b/japanese/egg-canna/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	egg-canna
 PORTVERSION=	20011110
+PORTREVISION=	1
 CATEGORIES=	japanese editors elisp
 MASTER_SITES=	http://cgi18.plala.or.jp/nyy/canna/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile
index ea9b8dc81f5e..fe183f0653db 100644
--- a/japanese/elisa8x8/Makefile
+++ b/japanese/elisa8x8/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	elisa8x8
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.bsdbbq.org/~toshi/distfiles/
 DISTNAME=	elisat10
diff --git a/japanese/elisp-manual/Makefile b/japanese/elisp-manual/Makefile
index d04181f7a947..e0c015a3f954 100644
--- a/japanese/elisp-manual/Makefile
+++ b/japanese/elisp-manual/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	elisp-manual
 PORTVERSION=	2.5.20000508
+PORTREVISION=	1
 CATEGORIES=	japanese elisp lang
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/GNU/elisp-manual-20/
 DISTNAME=	elisp-manual-20-2.5-jp
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index 8c78612b7532..a6b6fc65137d 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emcws
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
diff --git a/japanese/emacs-manual/Makefile b/japanese/emacs-manual/Makefile
index a77816a17c57..6e86012a1f75 100644
--- a/japanese/emacs-manual/Makefile
+++ b/japanese/emacs-manual/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emacs-manual
 PORTVERSION=	13.20000303
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/GNU/emacs-20.x/:ascii \
 		${MASTER_SITE_GNU:S/$/:gnu/}
diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
index 58b70ff2edde..8dd1d5c73da2 100644
--- a/japanese/emacs20-emcws/Makefile
+++ b/japanese/emacs20-emcws/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	emcws
 PORTVERSION=	20.7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
diff --git a/japanese/epson-ttfonts/Makefile b/japanese/epson-ttfonts/Makefile
index d71b560ffe8f..2d752671f86e 100644
--- a/japanese/epson-ttfonts/Makefile
+++ b/japanese/epson-ttfonts/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	epson-ttfonts
 PORTVERSION=	3.0.20050220
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=     japanese x11-fonts
 MASTER_SITES=	# empty
 DISTNAME=	${EPSONFONTS}
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
index b6a5e8500d17..eb0c4d622c81 100644
--- a/japanese/expect/Makefile
+++ b/japanese/expect/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	expect
 PORTVERSION=	5.30
+PORTREVISION=	1
 CATEGORIES=	japanese lang tk80
 MASTER_SITES=	ftp://ftp.nist.gov/mel/div826/subject/expect/old/
 
diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index 62b81470db7d..c5238be9c48c 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ipa-ttfonts
 PORTVERSION=	1.0.20060520
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile
index f6ec057c1496..46361a3afcbd 100644
--- a/japanese/font-kochi/Makefile
+++ b/japanese/font-kochi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kochi-ttfonts
 PORTVERSION=	20030809
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://downloads.sourceforge.jp/efont/5411/ \
 		${MASTER_SITE_PORTS_JP}
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 62b81470db7d..c5238be9c48c 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ipa-ttfonts
 PORTVERSION=	1.0.20060520
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile
index 7b47f6188319..ad05f2cee29b 100644
--- a/japanese/font-mplus/Makefile
+++ b/japanese/font-mplus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mplusfonts
 PORTVERSION=	2.2.4
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://downloads.sourceforge.jp/mplus-fonts/5030/ \
 		http://wids.net/archive/mplusfonts/distfiles/
diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile
index c82511e45b95..daa8fcf6c1be 100644
--- a/japanese/font-sazanami/Makefile
+++ b/japanese/font-sazanami/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sazanami-ttf
 PORTVERSION=	20040629
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	efont/10087
diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index 84c790432c36..a35364b6ebaf 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	shinonome
 PORTVERSION=	0.9.11
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://openlab.ring.gr.jp/efont/dist/shinonome/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
diff --git a/japanese/font-vlgothic/Makefile b/japanese/font-vlgothic/Makefile
index d83d930b15a0..84fd48747685 100644
--- a/japanese/font-vlgothic/Makefile
+++ b/japanese/font-vlgothic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vlgothic
 PORTVERSION=	20070328
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://vinelinux.org/~daisuke/vlgothic/ \
 		http://dicey.org/vlgothic/
diff --git a/japanese/ghostscript-gnu-jpnfont/Makefile b/japanese/ghostscript-gnu-jpnfont/Makefile
index f5cd18821567..cb17a3efab99 100644
--- a/japanese/ghostscript-gnu-jpnfont/Makefile
+++ b/japanese/ghostscript-gnu-jpnfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript-gnu-jpnfont
 PORTVERSION=	7.07
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile
index ef5a9c2690dd..a115b5240dce 100644
--- a/japanese/gicq/Makefile
+++ b/japanese/gicq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gicq
 PORTVERSION=	0.33
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese net
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.korsoft.com/pub/gicq/
diff --git a/japanese/gorua/Makefile b/japanese/gorua/Makefile
index 5cd148d1c305..6de1f0685197 100644
--- a/japanese/gorua/Makefile
+++ b/japanese/gorua/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gorua
 PORTVERSION=	0.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.unixuser.org/~haruyama/software/goRua/
 DISTNAME=	goRua-${PORTVERSION}
diff --git a/japanese/gtkicq/Makefile b/japanese/gtkicq/Makefile
index 0e0bbd9a8eda..a1ad1bf911eb 100644
--- a/japanese/gtkicq/Makefile
+++ b/japanese/gtkicq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkicq
 PORTVERSION=	0.60
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://gtkicq.pn.org/pub/gtkicq/
 
diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index 8b07582d54c0..96390df01c86 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gxditview
 PORTVERSION=	1.18.1
 DISTVERSIONSUFFIX=	.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/g/groff
diff --git a/japanese/ical/Makefile b/japanese/ical/Makefile
index d95ae8534d8a..72f615338643 100644
--- a/japanese/ical/Makefile
+++ b/japanese/ical/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ical
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	japanese deskutils tk80
 MASTER_SITES=	ftp://ftp.sco.com/skunkware/src/shellutil/ \
 		ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/ \
diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index ac90326f9c3a..f0f007830c2b 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-canna
 PORTVERSION=	12.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index 490a67759b83..c0ebf2476e96 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	im-ja
 PORTVERSION=	1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-toolkits
 MASTER_SITES=	http://im-ja.sourceforge.net/
 
diff --git a/japanese/im-ja/pkg-plist b/japanese/im-ja/pkg-plist
index b18a0e68ea87..9d1b44174217 100644
--- a/japanese/im-ja/pkg-plist
+++ b/japanese/im-ja/pkg-plist
@@ -46,5 +46,3 @@ share/locale/ja/LC_MESSAGES/im-ja.mo
 @dirrm libexec/im-ja
 @exec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
 @unexec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/japanese/ipa-ttfonts/Makefile b/japanese/ipa-ttfonts/Makefile
index 62b81470db7d..c5238be9c48c 100644
--- a/japanese/ipa-ttfonts/Makefile
+++ b/japanese/ipa-ttfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ipa-ttfonts
 PORTVERSION=	1.0.20060520
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
diff --git a/japanese/jadetex-ptex/Makefile b/japanese/jadetex-ptex/Makefile
index a3c54a8f1706..7d7cc242fd06 100644
--- a/japanese/jadetex-ptex/Makefile
+++ b/japanese/jadetex-ptex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		jadetex
 PORTVERSION=		3.13
-PORTREVISION=		4
+PORTREVISION=		5
 CATEGORIES=		japanese print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index a0090fc9dd30..1ac977568d7c 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jed
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese editors
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.kondara.org/~g/slang/
diff --git a/japanese/jishyo/Makefile b/japanese/jishyo/Makefile
index fcdac20a2eed..9d2047f0472a 100644
--- a/japanese/jishyo/Makefile
+++ b/japanese/jishyo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jishyo
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	japanese gnustep
 MASTER_SITES=	http://www.eskimo.com/~pburns/Dictionaries/files/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/japanese/jisx0213-fonts/Makefile b/japanese/jisx0213-fonts/Makefile
index b82185701581..b7db5a56eaaf 100644
--- a/japanese/jisx0213-fonts/Makefile
+++ b/japanese/jisx0213-fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jisx0213-fonts
 PORTVERSION=	20040425
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www12.ocn.ne.jp/~imamura/ \
 		http://gitatsu.hp.infoseek.co.jp/bdf/:yagi
diff --git a/japanese/jmode/Makefile b/japanese/jmode/Makefile
index 00899583fa06..db15bc2bd965 100644
--- a/japanese/jmode/Makefile
+++ b/japanese/jmode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jmode
 PORTVERSION=	0.6.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese
 MASTER_SITES=	http://downloads.sourceforge.jp/anthy/5467/
 
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index 0a768207061a..4ce7e36f1434 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jvim
 PORTVERSION=	3.0.j2.1a
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	${INPUT_METHOD}
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.vim.org/pub/vim/unix/ \
diff --git a/japanese/jyuroku/Makefile b/japanese/jyuroku/Makefile
index 852404bdca3a..f534890dce70 100644
--- a/japanese/jyuroku/Makefile
+++ b/japanese/jyuroku/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jyuroku
 PORTVERSION=	1.32
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	http://homepage3.nifty.com/seto-yoneji/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile
index 3ee5b68a4dd5..d3f2322b3d8a 100644
--- a/japanese/k10/Makefile
+++ b/japanese/k10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	naga10
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA013391/fonts/
 DISTNAME=	knj10-${PORTVERSION}
diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index 9f235201e378..a0a132ae7ee8 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kaname12
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://www.din.or.jp/~storm/fonts/
diff --git a/japanese/kana-no-quiz/Makefile b/japanese/kana-no-quiz/Makefile
index 8bf119d6644f..e44da94feffd 100644
--- a/japanese/kana-no-quiz/Makefile
+++ b/japanese/kana-no-quiz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kana-no-quiz
 DISTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile
index 3ecb4b1db9ad..1722fc2b5e61 100644
--- a/japanese/kanji18/Makefile
+++ b/japanese/kanji18/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kanji
 PORTVERSION?=	1.0
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=   ${MASTER_SITE_PORTS_JP}
 MASTER_SITE_SUBDIR=	${DISTNAME}
diff --git a/japanese/kanjipad/Makefile b/japanese/kanjipad/Makefile
index 381915f7cfde..c4a27b262098 100644
--- a/japanese/kanjipad/Makefile
+++ b/japanese/kanjipad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kanjipad
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	japanese x11
 MASTER_SITES=	http://fishsoup.net/software/kanjipad/
 
diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index af5bbf95f883..386e4710f362 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	k20fonts
 PORTVERSION=	0.396
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://khdd.net/20dot.fonts/:kappa20 \
 		http://downloads.sourceforge.jp/x-tt/8412/:ayu20
diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
index 61c3f55dc684..a98dd462a0a0 100644
--- a/japanese/kasumi/Makefile
+++ b/japanese/kasumi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kasumi
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	${PORTNAME}/22902
diff --git a/japanese/kasumi/pkg-plist b/japanese/kasumi/pkg-plist
index 513c8495e0d7..299517f4f720 100644
--- a/japanese/kasumi/pkg-plist
+++ b/japanese/kasumi/pkg-plist
@@ -4,4 +4,3 @@ bin/kasumi
 share/applications/kasumi.desktop
 share/pixmaps/kasumi.png
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/japanese/kde3-i18n/Makefile b/japanese/kde3-i18n/Makefile
index 706c96f21640..e5e1651c1f4c 100644
--- a/japanese/kde3-i18n/Makefile
+++ b/japanese/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	japanese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/japanese/kde4-l10n/Makefile b/japanese/kde4-l10n/Makefile
index 706c96f21640..e5e1651c1f4c 100644
--- a/japanese/kde4-l10n/Makefile
+++ b/japanese/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	japanese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/japanese/kdrill/Makefile b/japanese/kdrill/Makefile
index 1295eb2579bd..9d9c15f77734 100644
--- a/japanese/kdrill/Makefile
+++ b/japanese/kdrill/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdrill
 PORTVERSION=	6.4
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.bolthole.com/kdrill/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile
index 3c74d210d391..94a37933b61a 100644
--- a/japanese/kinput2-freewnn/Makefile
+++ b/japanese/kinput2-freewnn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kinput2
 PORTVERSION=	3.1
-PORTREVISION=	2
+PORTREVISION=	3
 PKGNAMESUFFIX=	${INPUT_METHOD}
 CATEGORIES=	japanese x11
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/ 
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 3c74d210d391..94a37933b61a 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kinput2
 PORTVERSION=	3.1
-PORTREVISION=	2
+PORTREVISION=	3
 PKGNAMESUFFIX=	${INPUT_METHOD}
 CATEGORIES=	japanese x11
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/ 
diff --git a/japanese/kochi-ttfonts/Makefile b/japanese/kochi-ttfonts/Makefile
index f6ec057c1496..46361a3afcbd 100644
--- a/japanese/kochi-ttfonts/Makefile
+++ b/japanese/kochi-ttfonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kochi-ttfonts
 PORTVERSION=	20030809
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://downloads.sourceforge.jp/efont/5411/ \
 		${MASTER_SITE_PORTS_JP}
diff --git a/japanese/koffice-i18n/Makefile b/japanese/koffice-i18n/Makefile
index 66bbd983d184..67a86d9bd6b2 100644
--- a/japanese/koffice-i18n/Makefile
+++ b/japanese/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	japanese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/japanese/koffice-kde4-l10n/Makefile b/japanese/koffice-kde4-l10n/Makefile
index 66bbd983d184..67a86d9bd6b2 100644
--- a/japanese/koffice-kde4-l10n/Makefile
+++ b/japanese/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	japanese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index e68a2cc51227..da2f9e8690b3 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kterm
 PORTVERSION=	6.2.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese x11
 MASTER_SITES=	${MASTER_SITE_PORTS_JP:S/$/:wp_jp/} \
 		${MASTER_SITE_XCONTRIB} \
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index 46a0767d1fc5..c6b696f29ce2 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kterm16c
 PORTVERSION=	6.2.0
+PORTREVISION=	1
 CATEGORIES=	japanese x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
 		ftp://ftp.interface-business.de/pub/outgoing/ \
diff --git a/japanese/latex2html/Makefile b/japanese/latex2html/Makefile
index 9f47651d64d9..cd145c63b086 100644
--- a/japanese/latex2html/Makefile
+++ b/japanese/latex2html/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	latex2html
 PORTVERSION=	${VERSION}j${JP_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	support/${PORTNAME}
diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
index 10c58ef98463..e7c65111bd38 100644
--- a/japanese/libtomoe-gtk/Makefile
+++ b/japanese/libtomoe-gtk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libtomoe-gtk
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 #PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile
index 348e4ccc5b35..4e414c9fae87 100644
--- a/japanese/lookup-emacs21/Makefile
+++ b/japanese/lookup-emacs21/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lookup
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/lookup/dist/
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index 348e4ccc5b35..4e414c9fae87 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lookup
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/lookup/dist/
diff --git a/japanese/lyx/Makefile b/japanese/lyx/Makefile
index 50e0716812e6..e6917d60e40b 100644
--- a/japanese/lyx/Makefile
+++ b/japanese/lyx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
diff --git a/japanese/lyx/pkg-plist b/japanese/lyx/pkg-plist
index 0577316de5b2..184d09237a89 100644
--- a/japanese/lyx/pkg-plist
+++ b/japanese/lyx/pkg-plist
@@ -236,15 +236,3 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 @dirrm %%DATADIR%%/clipart
 @dirrm %%DATADIR%%/bind
 @dirrm %%DATADIR%%
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
diff --git a/japanese/marumoji-fonts/Makefile b/japanese/marumoji-fonts/Makefile
index 46812d9f3ead..cf50c41a9ce3 100644
--- a/japanese/marumoji-fonts/Makefile
+++ b/japanese/marumoji-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	marumoji-fonts
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	yoichi
diff --git a/japanese/mikachan-ttfonts/Makefile b/japanese/mikachan-ttfonts/Makefile
index f8bf156215c4..457dac320fd2 100644
--- a/japanese/mikachan-ttfonts/Makefile
+++ b/japanese/mikachan-ttfonts/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mikachan-ttfonts
 PORTVERSION=	8.7
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://members.tripod.co.jp/mikachan_font/ \
 		${MASTER_SITE_PORTS_JP}
diff --git a/japanese/ming/Makefile b/japanese/ming/Makefile
index 1c2cdf85afcb..70b2737ce97f 100644
--- a/japanese/ming/Makefile
+++ b/japanese/ming/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ming
 PORTVERSION=	0.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese graphics
 MASTER_SITES=	http://dist.bsdlab.org/
 #MASTER_SITES=	http://blue.ribbon.to/~harpy/ming/jaming/
diff --git a/japanese/monafonts-ttf/Makefile b/japanese/monafonts-ttf/Makefile
index 89f601cb798f..57bc544a1f08 100644
--- a/japanese/monafonts-ttf/Makefile
+++ b/japanese/monafonts-ttf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	monafonts-ttf
 PORTVERSION=	2.90
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	monafont
diff --git a/japanese/monafonts/Makefile b/japanese/monafonts/Makefile
index 85c4f58278a5..bb55ce019c8c 100644
--- a/japanese/monafonts/Makefile
+++ b/japanese/monafonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	monafonts
 PORTVERSION=	2.90
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/japanese/motoya-ttfonts/Makefile b/japanese/motoya-ttfonts/Makefile
index d6bb5b3f1dce..9b1e31b30841 100644
--- a/japanese/motoya-ttfonts/Makefile
+++ b/japanese/motoya-ttfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	motoya-ttfonts
 PORTVERSION=	0.20060201
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	#
 #		You must accept following MOTOYA freefont LICENSE[1], and regist
diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index 8cc8299b7467..78f64c49e75c 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.7.13
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	ftp://ftp.mozilla-japan.org/pub/mozilla/mozilla-japan/mozilla/releases/${PORTVERSION}/ \
@@ -21,7 +21,7 @@ COMMENT=	Mozilla Japanese Language Pack (JLP)
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/${MOZILLA}/regxpcom:${PORTSDIR}/www/${MOZILLA}
 RUN_DEPENDS=	${MOZILLA}:${PORTSDIR}/www/${MOZILLA} \
-		${PKG_DBDIR}/ja-alias-fonts-1.0:${PORTSDIR}/japanese/alias-fonts
+		ja-alias-fonts>=1.0:${PORTSDIR}/japanese/alias-fonts
 
 WRKSRC=		${WRKDIR}/bin
 
diff --git a/japanese/mplusfonts/Makefile b/japanese/mplusfonts/Makefile
index 7b47f6188319..ad05f2cee29b 100644
--- a/japanese/mplusfonts/Makefile
+++ b/japanese/mplusfonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mplusfonts
 PORTVERSION=	2.2.4
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://downloads.sourceforge.jp/mplus-fonts/5030/ \
 		http://wids.net/archive/mplusfonts/distfiles/
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index cca18d617429..a8664cbae305 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -34,7 +34,7 @@ FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213
+USE_AUTOTOOLS=	automake:14 autoconf:253
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/japanese/mypaedia-fpw-package/Makefile b/japanese/mypaedia-fpw-package/Makefile
index 8cf5e80e54ee..a5c9d416bc66 100644
--- a/japanese/mypaedia-fpw-package/Makefile
+++ b/japanese/mypaedia-fpw-package/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mypaedia-fpw-package
 PORTVERSION=	1.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/mypaedia/
 
diff --git a/japanese/navi2ch-emacs20/Makefile b/japanese/navi2ch-emacs20/Makefile
index 15c778b5f7e4..422775b60840 100644
--- a/japanese/navi2ch-emacs20/Makefile
+++ b/japanese/navi2ch-emacs20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	navi2ch
 PORTVERSION=	1.7.5
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	japanese www elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile
index 9d2db1e85697..ec1b1be89792 100644
--- a/japanese/nethack32/Makefile
+++ b/japanese/nethack32/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nethack
 PORTVERSION=	1.0.5.19970924
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese games
 MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh322/src/ \
 		ftp://ftp.wtower.com/nethack/sources/
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index ed0558e688f0..655745695de7 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nethack
 PORTVERSION=	3.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/japanese/netype/Makefile b/japanese/netype/Makefile
index 2ae79e080db7..083c2af3611a 100644
--- a/japanese/netype/Makefile
+++ b/japanese/netype/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netype
 PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.i.his.fukui-u.ac.jp/~funakami/software/netype/src/
 DISTNAME=	${PORTNAME}-0.1.0
diff --git a/japanese/netypesv/Makefile b/japanese/netypesv/Makefile
index 5ba4f449b186..7ca5b63e7048 100644
--- a/japanese/netypesv/Makefile
+++ b/japanese/netypesv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netypesv
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.i.his.fukui-u.ac.jp/~funakami/software/netype/src/
 DISTNAME=	netypesv-${PORTVERSION}
diff --git a/japanese/ngraph-fonts/Makefile b/japanese/ngraph-fonts/Makefile
index 6e975f202dd5..25032aaad51b 100644
--- a/japanese/ngraph-fonts/Makefile
+++ b/japanese/ngraph-fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ngraph-fonts
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	japanese math x11-fonts
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/japanese/oleo/Makefile b/japanese/oleo/Makefile
index dcd625ead7de..97dc5a3518d1 100644
--- a/japanese/oleo/Makefile
+++ b/japanese/oleo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oleo
 PORTVERSION=	1.99.16
+PORTREVISION=	1
 CATEGORIES=	japanese math
 MASTER_SITES=	http://www.hh.iij4u.or.jp/~hayasida/oleo/ \
 		${MASTER_SITE_GNU}
diff --git a/japanese/plan/Makefile b/japanese/plan/Makefile
index 50665b524195..fd0de106fe33 100644
--- a/japanese/plan/Makefile
+++ b/japanese/plan/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	plan
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	japanese
 
 MAINTAINER=	shaun@FreeBSD.org
diff --git a/japanese/platex-jsclasses/Makefile b/japanese/platex-jsclasses/Makefile
index 8c066131dd46..4d1780a53ad3 100644
--- a/japanese/platex-jsclasses/Makefile
+++ b/japanese/platex-jsclasses/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	platex-jsclasses
 PORTVERSION=	1.0.20060212
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese print
 MASTER_SITES=	http://oku.edu.mie-u.ac.jp/~okumura/jsclasses/:0 \
 		http://oku.edu.mie-u.ac.jp/~okumura/texfaq/:1
diff --git a/japanese/platex-otf/Makefile b/japanese/platex-otf/Makefile
index d1acf3ea640b..f642aae5059a 100644
--- a/japanese/platex-otf/Makefile
+++ b/japanese/platex-otf/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	platex-otf
 PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	hrs
diff --git a/japanese/platex209/Makefile b/japanese/platex209/Makefile
index 7fe99c9ddd1f..21be098f7b10 100644
--- a/japanese/platex209/Makefile
+++ b/japanese/platex209/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	platex209
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/
 DISTNAME=	${PORTNAME}
diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile
index 8ada735a1113..314c4411cbcd 100644
--- a/japanese/postgresql-tcltk/Makefile
+++ b/japanese/postgresql-tcltk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postgresql
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese databases tcl${TCLVERSION:C/[^0-9]//g}
 PKGNAMESUFFIX=	-tcltk
 
diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index 4c2889021e39..5a4d9a39532b 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ptex
 PORTVERSION=	3.1.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/:1 \
diff --git a/japanese/ruby-ming/Makefile b/japanese/ruby-ming/Makefile
index 0842233b8e6a..c1f4c846e633 100644
--- a/japanese/ruby-ming/Makefile
+++ b/japanese/ruby-ming/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ming
 PORTVERSION=	0.2a.${RUBY_MING_VERSION}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese graphics ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
diff --git a/japanese/ruby-rdic/Makefile b/japanese/ruby-rdic/Makefile
index 7723ec6bd304..c891f806e6f1 100644
--- a/japanese/ruby-rdic/Makefile
+++ b/japanese/ruby-rdic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rdic
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	japanese ruby
 MASTER_SITES=	http://www.yasgursfarm.us/download/
 DIST_SUBDIR=	ruby
diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile
index 0bf7d6ab82ad..653db9336d5f 100644
--- a/japanese/rxvt/Makefile
+++ b/japanese/rxvt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rxvt
 PORTVERSION=	2.7.2
+PORTREVISION=	1
 CATEGORIES=	japanese x11
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/
 
diff --git a/japanese/sazanami-ttf/Makefile b/japanese/sazanami-ttf/Makefile
index c82511e45b95..daa8fcf6c1be 100644
--- a/japanese/sazanami-ttf/Makefile
+++ b/japanese/sazanami-ttf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sazanami-ttf
 PORTVERSION=	20040629
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	efont/10087
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index bf7d70bfc785..398d7f4424f7 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-anthy
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 #PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index 47ba4441a144..45a48b75dc6d 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-canna
 PORTVERSION=	1.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	scim-imengine/18849
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 925feab06879..c5acf078a0e2 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-honoka-plugin-romkan
 PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	http://nop.net-p.org/files/honoka/
 DISTNAME=	honoka-plugin-romkan-${PORTVERSION}
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index 8b43a6c217b0..00ed6be6febf 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-honoka-plugin-wnn
 PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	http://nop.net-p.org/files/honoka/
 DISTNAME=	honoka-plugin-wnn-${PORTVERSION}
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index 99e31dc2c416..21ad8c44ffbe 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-honoka
 PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	http://nop.net-p.org/files/honoka/
 DISTNAME=	honoka-${PORTVERSION}
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index d8aa25bdb4b8..7fe2dcd8b7ee 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-prime
 PORTVERSION=	0.3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	scim-imengine/17192
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index a90a8a0fb1f6..5cef60665098 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-skk
 PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	scim-imengine/18121
diff --git a/japanese/scim-tables/Makefile b/japanese/scim-tables/Makefile
index 388f55fa1537..221e30148a02 100644
--- a/japanese/scim-tables/Makefile
+++ b/japanese/scim-tables/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-tables
 PORTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index 51566f1147ce..ac8fadef744d 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-tomoe
 PORTVERSION=	0.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=scim-imengine/23343
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 69e8aa6a5ac0..dea74f318f25 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-uim
 PORTVERSION=	0.1.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://freedesktop.org/~suzhe/sources/
diff --git a/japanese/seaside/Makefile b/japanese/seaside/Makefile
index b758451f9d79..0608bffcae0c 100644
--- a/japanese/seaside/Makefile
+++ b/japanese/seaside/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	seaside
 PORTVERSION=	070105
+PORTREVISION=	1
 CATEGORIES=	japanese lang
 MASTER_SITES=	ftp://swikis.ddo.jp/SeasideJ/
 DISTNAME=	Seaside-JPatched${PORTVERSION}
diff --git a/japanese/shinonome/Makefile b/japanese/shinonome/Makefile
index 84c790432c36..a35364b6ebaf 100644
--- a/japanese/shinonome/Makefile
+++ b/japanese/shinonome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	shinonome
 PORTVERSION=	0.9.11
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://openlab.ring.gr.jp/efont/dist/shinonome/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
diff --git a/japanese/skk10-elisp-emacs20/Makefile b/japanese/skk10-elisp-emacs20/Makefile
index 2fb48cb05ac9..f96eb0ebd1a1 100644
--- a/japanese/skk10-elisp-emacs20/Makefile
+++ b/japanese/skk10-elisp-emacs20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skk-elisp
 PORTVERSION=	${SKK10_VER}
+PORTREVISION=	1
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/legacy/
diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
index 8aa2296c3da8..302f43bd375e 100644
--- a/japanese/skkinput/Makefile
+++ b/japanese/skkinput/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skkinput
 PORTVERSION=	2.06.4
+PORTREVISION=	1
 CATEGORIES=	japanese x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	skkinput2/6273
diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile
index b91c95b085db..670d6da9d57a 100644
--- a/japanese/skkinput3/Makefile
+++ b/japanese/skkinput3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skkinput3
 PORTVERSION=	3.0.6
+PORTREVISION=	1
 CATEGORIES=	japanese x11
 MASTER_SITES=	http://downloads.sourceforge.jp/skkinput3/2222/
 DISTNAME=	skkinput-${PORTVERSION}
diff --git a/japanese/srd-fpw-package/Makefile b/japanese/srd-fpw-package/Makefile
index 7bac5a84e54f..0efd19cb3d76 100644
--- a/japanese/srd-fpw-package/Makefile
+++ b/japanese/srd-fpw-package/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	srd-fpw-package
 PORTVERSION=	1.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/srd/
 
diff --git a/japanese/stardict-dict-ja/Makefile b/japanese/stardict-dict-ja/Makefile
index 6763e3c960a0..479bfd404399 100644
--- a/japanese/stardict-dict-ja/Makefile
+++ b/japanese/stardict-dict-ja/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-ja
 PORTVERSION=	2.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
diff --git a/japanese/stardict2-dict-ja/Makefile b/japanese/stardict2-dict-ja/Makefile
index 6763e3c960a0..479bfd404399 100644
--- a/japanese/stardict2-dict-ja/Makefile
+++ b/japanese/stardict2-dict-ja/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-ja
 PORTVERSION=	2.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
diff --git a/japanese/teTeX/Makefile b/japanese/teTeX/Makefile
index 12463bd143cd..22573af2313f 100644
--- a/japanese/teTeX/Makefile
+++ b/japanese/teTeX/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	teTeX
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	ja-
diff --git a/japanese/texfamily-vfn2a/Makefile b/japanese/texfamily-vfn2a/Makefile
index 77f8d07f9dce..024526da9101 100644
--- a/japanese/texfamily-vfn2a/Makefile
+++ b/japanese/texfamily-vfn2a/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	texfamily-vfn2a
 PORTVERSION=	1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/
 DISTNAME=	vftool-${PORTVERSION}
diff --git a/japanese/texfamily/Makefile b/japanese/texfamily/Makefile
index 1545f7ab52f2..4bf6f8d94af3 100644
--- a/japanese/texfamily/Makefile
+++ b/japanese/texfamily/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	texfamily
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/
 PKGNAMEPREFIX=	ja-
diff --git a/japanese/texinfo/Makefile b/japanese/texinfo/Makefile
index dfab4b3f0762..1f276be222c8 100644
--- a/japanese/texinfo/Makefile
+++ b/japanese/texinfo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	texinfo
 PORTVERSION=	4.7
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/japanese/texinfo/pkg-plist b/japanese/texinfo/pkg-plist
index 9e07888a4fac..2142b54c6e0b 100644
--- a/japanese/texinfo/pkg-plist
+++ b/japanese/texinfo/pkg-plist
@@ -53,20 +53,6 @@ share/locale/sv/LC_MESSAGES/texinfo.mo
 share/locale/tr/LC_MESSAGES/texinfo.mo
 share/locale/zh_CN/LC_MESSAGES/texinfo.mo
 share/locale/zh_TW/LC_MESSAGES/texinfo.mo
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/de_AT/LC_MESSAGES
-@dirrmtry share/locale/de_AT
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
 @dirrmtry %%TEXMFLOCAL%%/tex/generic/dvips
 @dirrmtry %%TEXMFLOCAL%%/pdftex/plain/misc
 @dirrmtry %%TEXMFLOCAL%%/pdftex/plain
diff --git a/japanese/tgif/Makefile b/japanese/tgif/Makefile
index 82e4b6577cba..9adf5d255b1a 100644
--- a/japanese/tgif/Makefile
+++ b/japanese/tgif/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tgif
 PORTVERSION=	4.1.44
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://home.jp.FreeBSD.org/~mita/LOCAL_PORTS/
 DISTNAME=	ja-${PORTNAME}-980222
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index 3fd93b0f268c..42ce5165281a 100644
--- a/japanese/tk42/Makefile
+++ b/japanese/tk42/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	japanese x11-toolkits
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl7_6/
 DISTNAME=	${PORTNAME}${PORTVERSION}p2
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 8a5b98425609..b89e879b9e7e 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-toolkits tk80
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_0
diff --git a/japanese/tkhonyaku/Makefile b/japanese/tkhonyaku/Makefile
index d718abdcfc6f..6a5f27065ff5 100644
--- a/japanese/tkhonyaku/Makefile
+++ b/japanese/tkhonyaku/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkhonyaku
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.yk.rim.or.jp/~kawagisi/
 
diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index 33e3df853cb8..919a3f5789f2 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkstep
 PORTVERSION=	8.0.5
+PORTREVISION=	1
 CATEGORIES=	japanese tk80
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_0
diff --git a/japanese/truetypefonts/Makefile b/japanese/truetypefonts/Makefile
index 92a854903f2e..e26aa05a664c 100644
--- a/japanese/truetypefonts/Makefile
+++ b/japanese/truetypefonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	truetypefonts
 PORTVERSION=	2001.08.18.5
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/t/ttf-xtt
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index 186d94c8854d..a78797d3ad90 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uim-tomoe-gtk
 PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=tomoe/23342
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 5b3591117dab..51e5098d75f0 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vflib
 PORTVERSION=	${VFLIB_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/
 DISTNAME=	VFlib2-${PORTVERSION}
diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile
index 2652dce8ec11..670f4ec293cf 100644
--- a/japanese/vje30/Makefile
+++ b/japanese/vje30/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vje
 PORTVERSION=	3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese
 MASTER_SITES=	${CD_MOUNTPTS:S,^,file:,:S,$,/freebsd/,} \
 		${CD_MOUNTPTS:S,^,file:,:S,$,/source/delta/:source,} \
diff --git a/japanese/vlgothic/Makefile b/japanese/vlgothic/Makefile
index d83d930b15a0..84fd48747685 100644
--- a/japanese/vlgothic/Makefile
+++ b/japanese/vlgothic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vlgothic
 PORTVERSION=	20070328
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://vinelinux.org/~daisuke/vlgothic/ \
 		http://dicey.org/vlgothic/
diff --git a/japanese/weather-emacs20/Makefile b/japanese/weather-emacs20/Makefile
index 4ab35f00a4e7..0acdf9a54bad 100644
--- a/japanese/weather-emacs20/Makefile
+++ b/japanese/weather-emacs20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	weather
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	ftp://ftp.opaopa.org/pub/elisp/ \
 		ftp://ftp.ring.gr.jp/pub/text/elisp/jaist/ftp.opaopa.org/elisp/ \
diff --git a/japanese/xdtp/Makefile b/japanese/xdtp/Makefile
index 104e905788ad..4a630751e6d7 100644
--- a/japanese/xdtp/Makefile
+++ b/japanese/xdtp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdtp
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES+=	http://www.ongs.co.jp/projects/xdtp/
 DISTNAME=	xdtp-${PORTVERSION}
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index cd2d96024fbc..6514f61cec28 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvik
 PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdvi
diff --git a/japanese/xgate/Makefile b/japanese/xgate/Makefile
index b67552bd2d54..a845592fcc7a 100644
--- a/japanese/xgate/Makefile
+++ b/japanese/xgate/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xgate
 PORTVERSION=	3.5pl3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese mail www java
 MASTER_SITES=	http://www.orangesoft.co.jp/xGate/download/
 DISTNAME=	${PORTNAME}pkg${PORTVERSION}
diff --git a/japanese/xjtext/Makefile b/japanese/xjtext/Makefile
index 44433308d205..157ee70ccbb4 100644
--- a/japanese/xjtext/Makefile
+++ b/japanese/xjtext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xjtext
 PORTVERSION=	1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese
 MASTER_SITES=	http://plaza.harmonix.ne.jp/~onizuka/
 DISTNAME=	XJTEXT-${PORTVERSION}
diff --git a/japanese/xmsgsaver/Makefile b/japanese/xmsgsaver/Makefile
index 9a55baa95099..65c6f651ef44 100644
--- a/japanese/xmsgsaver/Makefile
+++ b/japanese/xmsgsaver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmsgsaver
 PORTVERSION=	1.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://www19.xdsl.ne.jp/~cdr/soft/dl/
 
diff --git a/japanese/xpdf/Makefile b/japanese/xpdf/Makefile
index 92bc66d2f90a..152d07736327 100644
--- a/japanese/xpdf/Makefile
+++ b/japanese/xpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.00
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 DISTNAME=	xpdf-japanese
diff --git a/japanese/xshodo/Makefile b/japanese/xshodo/Makefile
index 57b51655c0b2..cd02dc417509 100644
--- a/japanese/xshodo/Makefile
+++ b/japanese/xshodo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xshodo
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://cclub.cc.tut.ac.jp/pub/xwin/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/japanese/xshodou/Makefile b/japanese/xshodou/Makefile
index 5f27a0295323..5918a5178ce7 100644
--- a/japanese/xshodou/Makefile
+++ b/japanese/xshodou/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xshodou
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	japanese tk80
 MASTER_SITES=	http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/
 
diff --git a/japanese/xyagamo/Makefile b/japanese/xyagamo/Makefile
index c33a4a41a54d..8930b1f81fde 100644
--- a/japanese/xyagamo/Makefile
+++ b/japanese/xyagamo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xyagamo
 PORTVERSION=	0.1b
+PORTREVISION=	1
 CATEGORIES=	japanese games
 MASTER_SITES=	http://www.dokidoki.ne.jp/home2/shinmaru/mahjong/
 
diff --git a/japanese/xyaku/Makefile b/japanese/xyaku/Makefile
index 7cc0c0a3099c..9f3df18ab349 100644
--- a/japanese/xyaku/Makefile
+++ b/japanese/xyaku/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xyaku
 PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.sepia.dti.ne.jp/inoue/software/xyaku/ \
 		http://redundancy.redundancy.org/mirror/
diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index c595b1649370..83229b3d3067 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yc.el
 PORTVERSION=	4.0.13
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://www.ceres.dti.ne.jp/~knak/
diff --git a/japanese/zangband/Makefile b/japanese/zangband/Makefile
index 6488d719e408..f36407251376 100644
--- a/japanese/zangband/Makefile
+++ b/japanese/zangband/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zangband
 PORTVERSION=	2.4.0${JA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	japanese games
 MASTER_SITES=	ftp://clockwork.dementia.org/angband/Variant/ZAngband/ \
 		ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/
diff --git a/java/avalon-logkit/Makefile b/java/avalon-logkit/Makefile
index 32f602c71889..758140ed71ac 100644
--- a/java/avalon-logkit/Makefile
+++ b/java/avalon-logkit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	logkit
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	avalon/${PORTNAME:S,-,/,}/binaries
diff --git a/java/berkeley-db/Makefile b/java/berkeley-db/Makefile
index 83ffac4e81cd..b8e079182c58 100644
--- a/java/berkeley-db/Makefile
+++ b/java/berkeley-db/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	je
 PORTVERSION=	3.2.13
+PORTREVISION=	1
 CATEGORIES=	java databases
 MASTER_SITES=	http://download.oracle.com/berkeley-db/	\
 		http://download-east.oracle.com/berkeley-db/	\
diff --git a/java/bluej/Makefile b/java/bluej/Makefile
index 3a4f4d2afb37..f70b3c5e2489 100644
--- a/java/bluej/Makefile
+++ b/java/bluej/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bluej
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	java editors
 MASTER_SITES=	http://www.bluej.org/download/files/ \
 		ftp://ftp.bluej.org/pub/bluej/
diff --git a/java/bouncycastle/Makefile b/java/bouncycastle/Makefile
index fce852139f94..0f2caf04c51c 100644
--- a/java/bouncycastle/Makefile
+++ b/java/bouncycastle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bouncycastle
 PORTVERSION=	1.36
+PORTREVISION=	1
 CATEGORIES=	java security
 MASTER_SITES=	http://www.bouncycastle.org/download/ \
 		http://polydistortion.net/bc/download/ \
diff --git a/java/bsh/Makefile b/java/bsh/Makefile
index de050639fa3b..b910ae7e0e0e 100644
--- a/java/bsh/Makefile
+++ b/java/bsh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bsh
 PORTVERSION=	2.0.b4
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	http://www.beanshell.org/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/}
diff --git a/java/cacao/Makefile b/java/cacao/Makefile
index 1a9be57a0f96..b1a13da2ce3b 100644
--- a/java/cacao/Makefile
+++ b/java/cacao/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	cacao
 PORTVERSION=	0.97
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PORTVERSION}/
 
diff --git a/java/castor/Makefile b/java/castor/Makefile
index 3fa60eda0b65..bd0915120568 100644
--- a/java/castor/Makefile
+++ b/java/castor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	castor
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://dist.codehaus.org/castor/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index bb11ef2e90cf..5e8ab5d8a28d 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	classpath
 PORTVERSION=	0.92
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		${MASTER_SITE_SAVANNAH}
diff --git a/java/cos/Makefile b/java/cos/Makefile
index d5a9f331d673..7379ad79dc4a 100644
--- a/java/cos/Makefile
+++ b/java/cos/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cos
 PORTVERSION=	2002.11.05
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.servlets.com/cos/ \
diff --git a/java/cryptix-jce/Makefile b/java/cryptix-jce/Makefile
index cb504a3b2379..202a23510216 100644
--- a/java/cryptix-jce/Makefile
+++ b/java/cryptix-jce/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cryptix-jce
 PORTVERSION=	20050328
+PORTREVISION=	1
 CATEGORIES=	java security
 MASTER_SITES=	http://www.cryptix.org/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-snap
diff --git a/java/dbvis/Makefile b/java/dbvis/Makefile
index 2b515540161a..52872e7282ce 100644
--- a/java/dbvis/Makefile
+++ b/java/dbvis/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dbvis
 PORTVERSION=	5.1.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.dbvis.com/product_download/dbvis/media/
 DISTNAME=	dbvis_unix_5_1_1
diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index 61bb5f32a93a..2e15085f8c92 100644
--- a/java/diablo-jdk15/Makefile
+++ b/java/diablo-jdk15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile
index eff20c496a9b..cf3c8250b74d 100644
--- a/java/diablo-jre15/Makefile
+++ b/java/diablo-jre15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jre
 PORTVERSION=	${JRE_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
diff --git a/java/drexelsnmp/Makefile b/java/drexelsnmp/Makefile
index b878e6f90549..bf5300759820 100644
--- a/java/drexelsnmp/Makefile
+++ b/java/drexelsnmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	drexelsnmp
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	java devel net-mgmt
 MASTER_SITES=	http://gicl.cs.drexel.edu/people/sevy/snmp/
 DISTNAME=	source_${PORTVERSION}
diff --git a/java/ecj-bootstrap/Makefile b/java/ecj-bootstrap/Makefile
index e9adce9bad2d..0138ab8556bf 100644
--- a/java/ecj-bootstrap/Makefile
+++ b/java/ecj-bootstrap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ecj-bootstrap
 PORTVERSION=	3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE:S,%SUBDIR%/,R-${PORTVERSION}-200606291905/,} \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,}
diff --git a/java/eclipse-EPIC/Makefile b/java/eclipse-EPIC/Makefile
index fa222930d49d..29915c7d3e9d 100644
--- a/java/eclipse-EPIC/Makefile
+++ b/java/eclipse-EPIC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	EPIC
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	java editors devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	e-p-i-c
diff --git a/java/eclipse-cdt/Makefile b/java/eclipse-cdt/Makefile
index c3f25bf822bd..e97d76278e06 100644
--- a/java/eclipse-cdt/Makefile
+++ b/java/eclipse-cdt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cdt
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=tools/cdt/releases/callisto/dist/${PORTVERSION}
diff --git a/java/eclipse-checkstyle/Makefile b/java/eclipse-checkstyle/Makefile
index 24e89fa3bd51..5c8c90471405 100644
--- a/java/eclipse-checkstyle/Makefile
+++ b/java/eclipse-checkstyle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	checkstyle
 PORTVERSION=	3.4.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	eclipse-cs
diff --git a/java/eclipse-clay-core/Makefile b/java/eclipse-clay-core/Makefile
index 8bdc82b7c0e4..0c81c9ea095e 100644
--- a/java/eclipse-clay-core/Makefile
+++ b/java/eclipse-clay-core/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clay
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=
 PKGNAMEPREFIX=	eclipse-
diff --git a/java/eclipse-datatools/Makefile b/java/eclipse-datatools/Makefile
index d76226637993..f502308028fd 100644
--- a/java/eclipse-datatools/Makefile
+++ b/java/eclipse-datatools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	datatools
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	java devel databases
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	eclipse-
diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile
index 15575f1d5039..c66dc7476949 100644
--- a/java/eclipse-devel/Makefile
+++ b/java/eclipse-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eclipse
 PORTVERSION=	3.1M7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	S-${PORTVERSION}-200505131415
diff --git a/java/eclipse-drjava/Makefile b/java/eclipse-drjava/Makefile
index b8a1c2ed7ed8..55f51aa82501 100644
--- a/java/eclipse-drjava/Makefile
+++ b/java/eclipse-drjava/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	drjava
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	drjava
diff --git a/java/eclipse-emf/Makefile b/java/eclipse-emf/Makefile
index edf552bf7b68..4b884acc94d5 100644
--- a/java/eclipse-emf/Makefile
+++ b/java/eclipse-emf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emf
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE:S,/eclipse/downloads/drops/,/modeling/emf/emf/downloads/drops/,}
 MASTER_SITE_SUBDIR=${PORTVERSION}/R200609210005
diff --git a/java/eclipse-examples/Makefile b/java/eclipse-examples/Makefile
index 63514341c184..cabca41d8ccf 100644
--- a/java/eclipse-examples/Makefile
+++ b/java/eclipse-examples/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	examples
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	R-3.0-200406251208
diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile
index 7579a490d36a..8bd543201046 100644
--- a/java/eclipse-findbugs/Makefile
+++ b/java/eclipse-findbugs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	findbugs
 DISTVERSION=	1.2.0.20070317
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/eclipse-gef-examples/Makefile b/java/eclipse-gef-examples/Makefile
index 82cbaf467dc1..f52d6ea8c937 100644
--- a/java/eclipse-gef-examples/Makefile
+++ b/java/eclipse-gef-examples/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gef
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.eclipse.org/tools/gef/downloads/drops/R-3.0-200406251257/
 PKGNAMEPREFIX=	eclipse-
diff --git a/java/eclipse-gef/Makefile b/java/eclipse-gef/Makefile
index 12271a842dbf..0b2705d3a3eb 100644
--- a/java/eclipse-gef/Makefile
+++ b/java/eclipse-gef/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gef
 PORTVERSION=	3.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE:S,/eclipse/downloads/drops/,/tools/gef/downloads/drops/,}
 MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200702081315
diff --git a/java/eclipse-jad/Makefile b/java/eclipse-jad/Makefile
index 0b986f413c9b..ae327eec2329 100644
--- a/java/eclipse-jad/Makefile
+++ b/java/eclipse-jad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jad
 PORTVERSION=	3.2.4
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jadclipse
diff --git a/java/eclipse-langpack/Makefile b/java/eclipse-langpack/Makefile
index 5d69e7eb8fd2..8b6e6afc6ea2 100644
--- a/java/eclipse-langpack/Makefile
+++ b/java/eclipse-langpack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eclipse
 PORTVERSION=	3.2.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	L-${PORTVERSION}_Language_Packs-200609210945
diff --git a/java/eclipse-log4e/Makefile b/java/eclipse-log4e/Makefile
index b2ddc0b1b73c..f673e37bc2fe 100644
--- a/java/eclipse-log4e/Makefile
+++ b/java/eclipse-log4e/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	log4e
 PORTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	http://log4e.jayefem.de/download/eclipse3/
 PKGNAMEPREFIX=	eclipse-
diff --git a/java/eclipse-lomboz/Makefile b/java/eclipse-lomboz/Makefile
index 32a3dcf6edfa..3467f7f2d36a 100644
--- a/java/eclipse-lomboz/Makefile
+++ b/java/eclipse-lomboz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lomboz
 PORTVERSION=	3.1.r2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.forge.objectweb.org/lomboz/ \
 		http://download.fr2.forge.objectweb.org/lomboz/ \
diff --git a/java/eclipse-pmd/Makefile b/java/eclipse-pmd/Makefile
index 8f0061bd8572..aa790c2b91f9 100644
--- a/java/eclipse-pmd/Makefile
+++ b/java/eclipse-pmd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pmd
 PORTVERSION=	2.0.5.v3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pmd
diff --git a/java/eclipse-quantum/Makefile b/java/eclipse-quantum/Makefile
index 7a45acfa7509..455798bc1b67 100644
--- a/java/eclipse-quantum/Makefile
+++ b/java/eclipse-quantum/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	quantum
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	quantum
diff --git a/java/eclipse-sqlexplorer/Makefile b/java/eclipse-sqlexplorer/Makefile
index 831276d3f4a2..e48c42510e54 100644
--- a/java/eclipse-sqlexplorer/Makefile
+++ b/java/eclipse-sqlexplorer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sqlexplorer
 PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= eclipsesql
diff --git a/java/eclipse-sysdeo-tomcat/Makefile b/java/eclipse-sysdeo-tomcat/Makefile
index b0f70760e6e7..46195d1d0301 100644
--- a/java/eclipse-sysdeo-tomcat/Makefile
+++ b/java/eclipse-sysdeo-tomcat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sysdeo
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	http://www.sysdeo.com/sysdeo/content/download/393/4930/file/
 PKGNAMEPREFIX=	eclipse-
diff --git a/java/eclipse-uml/Makefile b/java/eclipse-uml/Makefile
index 633af4b38e33..5175e3ae0805 100644
--- a/java/eclipse-uml/Makefile
+++ b/java/eclipse-uml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	uml
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.eclipse.org/tools/uml2/downloads/drops/${PORTVERSION}/R200509282050/
 PKGNAMEPREFIX=	eclipse-
diff --git a/java/eclipse-v4all/Makefile b/java/eclipse-v4all/Makefile
index 9f4f03aff774..9ba310470299 100644
--- a/java/eclipse-v4all/Makefile
+++ b/java/eclipse-v4all/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	v4all
 PORTVERSION=	2.1.1.9
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	v4all
diff --git a/java/eclipse-vep-examples/Makefile b/java/eclipse-vep-examples/Makefile
index 4dd8a8f16be4..6f97ab20dfc3 100644
--- a/java/eclipse-vep-examples/Makefile
+++ b/java/eclipse-vep-examples/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vep
 PORTVERSION=	1.1.0.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.eclipse.org/tools/ve/downloads/drops/R-1.1.0.1-200509071822/
 PKGNAMEPREFIX=	eclipse-
diff --git a/java/eclipse-vep/Makefile b/java/eclipse-vep/Makefile
index f2da8b7c2090..15fe02cd47c5 100644
--- a/java/eclipse-vep/Makefile
+++ b/java/eclipse-vep/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vep
 PORTVERSION=	1.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE:S,/eclipse/downloads/drops/,/tools/ve/downloads/drops/,}
diff --git a/java/eclipse-viplugin/Makefile b/java/eclipse-viplugin/Makefile
index d07e23e562f8..93d02578a723 100644
--- a/java/eclipse-viplugin/Makefile
+++ b/java/eclipse-viplugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	viPlugin
 PORTVERSION=	1.14.0
+PORTREVISION=	1
 CATEGORIES=	java devel editors
 MASTER_SITES=	http://www.satokar.com/viplugin/files/
 PKGNAMEPREFIX=	eclipse-
diff --git a/java/eclipse-webtools/Makefile b/java/eclipse-webtools/Makefile
index 3e2ef133e6b9..a73ac9000fc8 100644
--- a/java/eclipse-webtools/Makefile
+++ b/java/eclipse-webtools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	webtools
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	java devel www
 MASTER_SITES=	${MASTER_SITE_ECLIPSE:S,/eclipse/downloads/drops/,/webtools/downloads/drops/,}
 MASTER_SITE_SUBDIR=	R1.5/R-${PORTVERSION}-200610261841
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 6709c294000a..9e1cddafce9c 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eclipse
 PORTVERSION=	3.2.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200609210945
@@ -26,6 +26,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	yes
 USE_ZIP=	yes
 USE_GCC=	3.4+
+USE_GL=		yes
 
 .if !defined(WITHOUT_MOZILLA)
 USE_GECKO=	xulrunner firefox mozilla seamonkey
diff --git a/java/eclipseme/Makefile b/java/eclipseme/Makefile
index dd5bfc78776d..380fd481597d 100644
--- a/java/eclipseme/Makefile
+++ b/java/eclipseme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eclipseme
 PORTVERSION=	0.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/gj/Makefile b/java/gj/Makefile
index 10593ae0043c..d8c1e7d08525 100644
--- a/java/gj/Makefile
+++ b/java/gj/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gj
 PORTVERSION=	0.6m
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	http://www.cis.unisa.edu.au/~pizza/gj/Distribution/
 PKGNAMESUFFIX=	-${JDKSUBDIR}
diff --git a/java/gnu-regexp/Makefile b/java/gnu-regexp/Makefile
index 687271f92890..e3bffff96c93 100644
--- a/java/gnu-regexp/Makefile
+++ b/java/gnu-regexp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnu-regexp
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	ftp://ftp.tralfamadore.com/pub/java/
 DISTNAME=	gnu.regexp-${PORTVERSION}
diff --git a/java/j2sdkee13/Makefile b/java/j2sdkee13/Makefile
index 0ff749b764ee..8407ebb329a6 100644
--- a/java/j2sdkee13/Makefile
+++ b/java/j2sdkee13/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	j2sdkee
 PORTVERSION=	1.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	java devel
 MASTER_SITES=	# http://java.sun.com/j2ee/sdk_1.3/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}-linux
diff --git a/java/jaf/Makefile b/java/jaf/Makefile
index 784f1cbe4569..72a0894ef423 100644
--- a/java/jaf/Makefile
+++ b/java/jaf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jaf
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	#
 DISTNAME=	${PORTNAME}-${PORTVERSION:S,.,_,g}-fr
diff --git a/java/jai-imageio/Makefile b/java/jai-imageio/Makefile
index b45f6004a760..dedf6d5c980a 100644
--- a/java/jai-imageio/Makefile
+++ b/java/jai-imageio/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jai-imageio
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	java graphics
 MASTER_SITES=	#
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION:S/./_/g}-lib-linux-i586
diff --git a/java/jai/Makefile b/java/jai/Makefile
index 8da8067547c5..2d4d46e00744 100644
--- a/java/jai/Makefile
+++ b/java/jai/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jai
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java graphics
 MASTER_SITES=	#
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}-lib-linux-i586
diff --git a/java/jakarta-bcel/Makefile b/java/jakarta-bcel/Makefile
index 6fe47e12c834..db691a775fb2 100644
--- a/java/jakarta-bcel/Makefile
+++ b/java/jakarta-bcel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	bcel
 PORTVERSION=	5.2
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/binaries
diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index 80d1cbd564f0..aef7c1133223 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-beanutils
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	commons/beanutils/source/
diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile
index e92049f7d21c..ad78a69aa5d5 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/jakarta-commons-cli/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-cli
 PORTVERSION=	1.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
diff --git a/java/jakarta-commons-codec/Makefile b/java/jakarta-commons-codec/Makefile
index 17eb91b40c80..51ae48503ba5 100644
--- a/java/jakarta-commons-codec/Makefile
+++ b/java/jakarta-commons-codec/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-codec
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	java converters
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	commons/codec/source
diff --git a/java/jakarta-commons-collections/Makefile b/java/jakarta-commons-collections/Makefile
index 9750f32e1c52..fde6204cdd5f 100644
--- a/java/jakarta-commons-collections/Makefile
+++ b/java/jakarta-commons-collections/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-collections
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	commons/collections/source/
diff --git a/java/jakarta-commons-dbcp/Makefile b/java/jakarta-commons-dbcp/Makefile
index 35136c941d04..d0e154f6e769 100644
--- a/java/jakarta-commons-dbcp/Makefile
+++ b/java/jakarta-commons-dbcp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-dbcp
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	commons/dbcp/source
diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile
index 516e5ff69a7e..160ea5be180c 100644
--- a/java/jakarta-commons-discovery/Makefile
+++ b/java/jakarta-commons-discovery/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-discovery
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/binaries
diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile
index 0023fe67e299..c6f7d49f37b1 100644
--- a/java/jakarta-commons-httpclient/Makefile
+++ b/java/jakarta-commons-httpclient/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-httpclient
 DISTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	java www
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	commons/httpclient/source
diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile
index 5f6564d410ba..ad8c554e2c03 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/jakarta-commons-lang/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-lang
 PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	commons/lang/source
diff --git a/java/jakarta-commons-logging/Makefile b/java/jakarta-commons-logging/Makefile
index 55afd8d268b1..27831b117b28 100644
--- a/java/jakarta-commons-logging/Makefile
+++ b/java/jakarta-commons-logging/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-logging
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/binaries
diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile
index c70531f35f07..e58694ee22cd 100644
--- a/java/jakarta-commons-pool/Makefile
+++ b/java/jakarta-commons-pool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-pool
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/source
diff --git a/java/jakarta-commons-primitives/Makefile b/java/jakarta-commons-primitives/Makefile
index bed60c87d63f..e60ba764338c 100644
--- a/java/jakarta-commons-primitives/Makefile
+++ b/java/jakarta-commons-primitives/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	commons-primitives
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	commons/primitives/source
diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile
index 4db38a80bf0f..4a171efcb33b 100644
--- a/java/jakarta-oro/Makefile
+++ b/java/jakarta-oro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jakarta-oro
 PORTVERSION=	2.0.8
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${PORTVERSION}/ \
 		http://ftp.epix.net/apache/jakarta/oro/binaries/
diff --git a/java/jakarta-regexp/Makefile b/java/jakarta-regexp/Makefile
index cbf506e95a81..01c8ab8af1ad 100644
--- a/java/jakarta-regexp/Makefile
+++ b/java/jakarta-regexp/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	jakarta-regexp
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	regexp/binaries
diff --git a/java/jakarta-struts/Makefile b/java/jakarta-struts/Makefile
index a1d204872374..adaaafd924fc 100644
--- a/java/jakarta-struts/Makefile
+++ b/java/jakarta-struts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jakarta-struts
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=struts/binaries
diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile
index b136cf1ce835..f624f062d0fd 100644
--- a/java/jasmin/Makefile
+++ b/java/jasmin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jasmin
 PORTVERSION=	2.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	java lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/java/java-checkstyle/Makefile b/java/java-checkstyle/Makefile
index b9aaf7e1f8a0..b16eb84c4662 100644
--- a/java/java-checkstyle/Makefile
+++ b/java/java-checkstyle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	checkstyle
 PORTVERSION=	4.3
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/java-cup/Makefile b/java/java-cup/Makefile
index 113ea6fd0354..fff87ad2effb 100644
--- a/java/java-cup/Makefile
+++ b/java/java-cup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cup
 PORTVERSION=	11.a
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://www2.cs.tum.edu/projects/cup/
 PKGNAMEPREFIX=	java-
diff --git a/java/java-gcj-compat/Makefile b/java/java-gcj-compat/Makefile
index 6d82ac847a0a..d65fd1dd6463 100644
--- a/java/java-gcj-compat/Makefile
+++ b/java/java-gcj-compat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	java-gcj-compat
 PORTVERSION=	1.0.56 # =< requires gcc-4.2 (HEAD)
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	java devel
 MASTER_SITES=	ftp://sources.redhat.com/pub/rhug/
 
diff --git a/java/java-getopt/Makefile b/java/java-getopt/Makefile
index 67cc22bdf233..f08b2fc6cd1e 100644
--- a/java/java-getopt/Makefile
+++ b/java/java-getopt/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	getopt
 PORTVERSION=	1.0.13
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	ftp://ftp.urbanophile.com/pub/arenn/software/sources/
 PKGNAMEPREFIX=	java-
-DISTNAME=	${PKGNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	araujo@bsdmail.org
 COMMENT=	Java version of GNU getopt family functions
diff --git a/java/java-getopt/distinfo b/java/java-getopt/distinfo
index 904aa21e09d6..fdec9a90fe69 100644
--- a/java/java-getopt/distinfo
+++ b/java/java-getopt/distinfo
@@ -1,3 +1,3 @@
-MD5 (java-getopt-1.0.13.tar.gz) = 46336d9bc055900f0320e5c378d7bfb2
-SHA256 (java-getopt-1.0.13.tar.gz) = 106edfea5056112bc88bd3691b6b145d6f50aa3e8ad0bf0b4f23fffcf2c45975
-SIZE (java-getopt-1.0.13.tar.gz) = 45759
+MD5 (getopt-1.0.13.tar.gz) = 46336d9bc055900f0320e5c378d7bfb2
+SHA256 (getopt-1.0.13.tar.gz) = 106edfea5056112bc88bd3691b6b145d6f50aa3e8ad0bf0b4f23fffcf2c45975
+SIZE (getopt-1.0.13.tar.gz) = 45759
diff --git a/java/java3d/Makefile b/java/java3d/Makefile
index 1cb7bbb45a9e..0794f5299f83 100644
--- a/java/java3d/Makefile
+++ b/java/java3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	java3d
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java graphics
 MASTER_SITES=	ftp://ftp.tux.org/pub/java/java3d/${PORTVERSION}/i386/fcs/ \
 		ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/java3d/${PORTVERSION}/i386/fcs/
diff --git a/java/javamail/Makefile b/java/javamail/Makefile
index bad3621231f1..a2d922d14b21 100644
--- a/java/javamail/Makefile
+++ b/java/javamail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	javamail
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	java mail
 MASTER_SITES=	#
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
diff --git a/java/jaxen/Makefile b/java/jaxen/Makefile
index f54e302cff36..3db5fdfa6a59 100644
--- a/java/jaxen/Makefile
+++ b/java/jaxen/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	jaxen
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/jboss2/Makefile b/java/jboss2/Makefile
index a1688980ab44..ffba49663cbe 100644
--- a/java/jboss2/Makefile
+++ b/java/jboss2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${APP_TITLE:L}
 PORTVERSION=	2.4.11
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/jboss3/Makefile b/java/jboss3/Makefile
index b94f54575fea..9d813f0d979f 100644
--- a/java/jboss3/Makefile
+++ b/java/jboss3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${APP_TITLE:L}
 PORTVERSION=	3.2.7
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/jboss4/Makefile b/java/jboss4/Makefile
index 5a86ecf48bc0..bd7cbf77a048 100644
--- a/java/jboss4/Makefile
+++ b/java/jboss4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${APP_TITLE:L}
 PORTVERSION=	4.0.5.GA
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/java/jboss5/Makefile b/java/jboss5/Makefile
index 089dca67f619..6117439c70b4 100644
--- a/java/jboss5/Makefile
+++ b/java/jboss5/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${APP_TITLE:L}
 PORTVERSION=	5.0.0.b1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/java/jc/Makefile b/java/jc/Makefile
index 342ba33970dd..6d9a8119d3a1 100644
--- a/java/jc/Makefile
+++ b/java/jc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jc
 PORTVERSION=	1.4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=jcvm/
diff --git a/java/jcalendar/Makefile b/java/jcalendar/Makefile
index 91ea51ad21e0..99318cf49f41 100644
--- a/java/jcalendar/Makefile
+++ b/java/jcalendar/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jcalendar
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	java misc
 MASTER_SITES=	http://www.toedter.com/download/
 
diff --git a/java/jcckit/Makefile b/java/jcckit/Makefile
index cf6e45be546f..6839d9945a6d 100644
--- a/java/jcckit/Makefile
+++ b/java/jcckit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jcckit
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	java graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/jce-aba/Makefile b/java/jce-aba/Makefile
index 6b3c19ee42d3..2de2adb3478a 100644
--- a/java/jce-aba/Makefile
+++ b/java/jce-aba/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jce-aba
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	java security
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	znerd
diff --git a/java/jcommon/Makefile b/java/jcommon/Makefile
index f16e8c66da47..ae5f164c8f14 100644
--- a/java/jcommon/Makefile
+++ b/java/jcommon/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jcommon
 PORTVERSION=	1.0.9
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jfreechart
diff --git a/java/jdbcpool/Makefile b/java/jdbcpool/Makefile
index e8df41ad7b01..0139eaec6147 100644
--- a/java/jdbcpool/Makefile
+++ b/java/jdbcpool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdbcpool
 PORTVERSION=	0.99
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java databases
 MASTER_SITES=	http://www.bitmechanic.com/projects/jdbcpool/dist/
 
diff --git a/java/jde/Makefile b/java/jde/Makefile
index d9c791284ed3..d09d946f5ac9 100644
--- a/java/jde/Makefile
+++ b/java/jde/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jde
 PORTVERSION=	2.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java elisp
 MASTER_SITES=	http://jdee.sunsite.dk/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/java/jdk12/Makefile b/java/jdk12/Makefile
index 1a494bd3f53c..2a422d302c73 100644
--- a/java/jdk12/Makefile
+++ b/java/jdk12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/communitysource/j2se/java2/download.xml
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk.html
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 21aec74c409b..f414d64408bb 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/communitysource/j2se/java2/download.xml
 #		  http://www.eyesbeyond.com/freebsddom/java/jdk13.html
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index b25cbd06eb79..ee190e0e467f 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk14.html
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 9d377b9a3243..d5bea5215a12 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 9d377b9a3243..d5bea5215a12 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
diff --git a/java/jdom/Makefile b/java/jdom/Makefile
index 844ca7860ffb..bc764811905a 100644
--- a/java/jdom/Makefile
+++ b/java/jdom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jdom
 PORTVERSION=	1.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	java textproc
 MASTER_SITES=	http://www.jdom.org/dist/source/
diff --git a/java/jflex/Makefile b/java/jflex/Makefile
index 035080f69b5d..5299a094d982 100644
--- a/java/jflex/Makefile
+++ b/java/jflex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jflex
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.jflex.de/:jflexde \
 		http://jflex.sourceforge.net/jar/devel/:jflexsf
diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile
index e3e2b8159e44..67632bc7814b 100644
--- a/java/jfreechart/Makefile
+++ b/java/jfreechart/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jfreechart
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	java graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/jgraph/Makefile b/java/jgraph/Makefile
index fb5349b08249..d20edfd9f70f 100644
--- a/java/jgraph/Makefile
+++ b/java/jgraph/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jgraph
 PORTVERSION=	5.10.0.1
+PORTREVISION=	1
 CATEGORIES=	java graphics
 MASTER_SITES=	SF \
 		http://www.jgraph.com/pub/
diff --git a/java/jgrapht/Makefile b/java/jgrapht/Makefile
index a8481cef88c8..b0394cb0576d 100644
--- a/java/jgrapht/Makefile
+++ b/java/jgrapht/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jgrapht
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	java math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/jlex/Makefile b/java/jlex/Makefile
index 785918200602..c97a48211ba9 100644
--- a/java/jlex/Makefile
+++ b/java/jlex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jlex
 PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.6/
 DISTNAME=	Main
diff --git a/java/jmf/Makefile b/java/jmf/Makefile
index 2da7bac0e3a0..13c363aba5ea 100644
--- a/java/jmf/Makefile
+++ b/java/jmf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jmf
 PORTVERSION=	2.1.1e
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	#http://java.sun.com/products/java-media/jmf/2.1.1/download.html
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}-alljava
diff --git a/java/jmp/Makefile b/java/jmp/Makefile
index e6f6d8059ab8..52f6a62a2eb8 100644
--- a/java/jmp/Makefile
+++ b/java/jmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jmp
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.khelekore.org/jmp/
 
diff --git a/java/jode/Makefile b/java/jode/Makefile
index 17dbc1d36b9f..5abe89739540 100644
--- a/java/jode/Makefile
+++ b/java/jode/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	jode
 PORTVERSION=	1.1.1.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/java/jomp/Makefile b/java/jomp/Makefile
index cc937d30fc2b..7c14c2e4a2ab 100644
--- a/java/jomp/Makefile
+++ b/java/jomp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jomp
 PORTVERSION=	1.0b
+PORTREVISION=	1
 CATEGORIES=	java parallel
 MASTER_SITES=	http://www.epcc.ed.ac.uk/research/jomp/download/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/java/jsdk/Makefile b/java/jsdk/Makefile
index d6b2b6bc676c..06c16f77f0e3 100644
--- a/java/jsdk/Makefile
+++ b/java/jsdk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jsdk
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	#
 DISTNAME=	jsdk20-solaris2-sparc
diff --git a/java/jump/Makefile b/java/jump/Makefile
index 83546b70f7cd..5d043139596c 100644
--- a/java/jump/Makefile
+++ b/java/jump/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jump
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	java math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jump-math
diff --git a/java/junit/Makefile b/java/junit/Makefile
index 0da3334fefad..085ba089dba9 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	junit
 PORTVERSION=	3.8.2
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index f3aab977254e..11be64b12453 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kaffe
 PORTVERSION=	1.1.7.r1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 #MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
 MASTER_SITES=	http://www.kaffe.org/~robilad/
diff --git a/java/mx4j/Makefile b/java/mx4j/Makefile
index c824d113446e..57f1e296183e 100644
--- a/java/mx4j/Makefile
+++ b/java/mx4j/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mx4j
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/netbeans/Makefile b/java/netbeans/Makefile
index 40f1de9995d1..9a13b90dc35d 100644
--- a/java/netbeans/Makefile
+++ b/java/netbeans/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netbeans
 PORTVERSION=	5.5
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://us1.mirror.netbeans.org/download/5_5/fcs/200610171010/ \
 		http://us2.mirror.netbeans.org/download/5_5/fcs/200610171010/
diff --git a/java/netbeans3/Makefile b/java/netbeans3/Makefile
index aea8fd485e6d..9962b078c965 100644
--- a/java/netbeans3/Makefile
+++ b/java/netbeans3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netbeans3
 PORTVERSION=	3.6
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=
 DISTNAME=	netbeans-3_6
diff --git a/java/netbeans4/Makefile b/java/netbeans4/Makefile
index e52dfe12f90e..295562c8b958 100644
--- a/java/netbeans4/Makefile
+++ b/java/netbeans4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netbeans4
 PORTVERSION=	4.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=
 DISTNAME=	netbeans-4_1
diff --git a/java/netbeans5/Makefile b/java/netbeans5/Makefile
index 206ec86e72e4..336c7cf72a76 100644
--- a/java/netbeans5/Makefile
+++ b/java/netbeans5/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netbeans5
 PORTVERSION=	5
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://us1.mirror.netbeans.org/download/5_0/fcs/200601251500/
 DISTNAME=	netbeans-5_0
diff --git a/java/netbeans55/Makefile b/java/netbeans55/Makefile
index ebee1ec72778..90bd25fc0e77 100644
--- a/java/netbeans55/Makefile
+++ b/java/netbeans55/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netbeans55
 PORTVERSION=	5.5
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://us1.mirror.netbeans.org/download/5_5/mlfcs/200612070100/
 DISTNAME=	netbeans-5_5
diff --git a/java/netbeans61/Makefile b/java/netbeans61/Makefile
index 40f1de9995d1..9a13b90dc35d 100644
--- a/java/netbeans61/Makefile
+++ b/java/netbeans61/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netbeans
 PORTVERSION=	5.5
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://us1.mirror.netbeans.org/download/5_5/fcs/200610171010/ \
 		http://us2.mirror.netbeans.org/download/5_5/fcs/200610171010/
diff --git a/java/netcomponents/Makefile b/java/netcomponents/Makefile
index 809b8f6d712b..a8e6ed9dac62 100644
--- a/java/netcomponents/Makefile
+++ b/java/netcomponents/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netcomponents
 PORTVERSION=	1.3.8
+PORTREVISION=	1
 CATEGORIES=	java net
 MASTER_SITES=	http://www.savarese.org/oro/
 DISTNAME=	NetComponents-${PORTVERSION}
diff --git a/java/netrexx/Makefile b/java/netrexx/Makefile
index 4318895f15cc..cb3edc4a1d4a 100644
--- a/java/netrexx/Makefile
+++ b/java/netrexx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	NetRexx
 PORTVERSION=	2.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java lang
 MASTER_SITES=	ftp://ftp.software.ibm.com/software/awdtools/netrexx/
 DISTNAME=	NetRexx
diff --git a/java/openjit/Makefile b/java/openjit/Makefile
index ae1e2d8871a7..f81f2ab097e6 100644
--- a/java/openjit/Makefile
+++ b/java/openjit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openjit
 PORTVERSION=	1.1.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java
 MASTER_SITES=	http://www.openjit.org/dist/
 PKGNAMESUFFIX=	-${JAVA_PORT:S,java/,,}
diff --git a/java/phpeclipse/Makefile b/java/phpeclipse/Makefile
index 4d3f6e70913d..bda75f5464dc 100644
--- a/java/phpeclipse/Makefile
+++ b/java/phpeclipse/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phpeclipse
 PORTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	java editors devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/poseidon/Makefile b/java/poseidon/Makefile
index 591c164ee7ea..79706efb16ff 100644
--- a/java/poseidon/Makefile
+++ b/java/poseidon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	poseidon
 PORTVERSION=	4.2.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	ftp://88.198.45.102/ \
 		http://88.198.45.102:81/
diff --git a/java/proguard/Makefile b/java/proguard/Makefile
index d7a11f4ae38c..4664c4b7c818 100644
--- a/java/proguard/Makefile
+++ b/java/proguard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	proguard
 PORTVERSION=	3.8
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index 385d8add5f2e..3fd7a4341b02 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sablevm
 PORTVERSION=	1.1.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=sablevm
diff --git a/java/shujit/Makefile b/java/shujit/Makefile
index 1da689d25eae..d6f8af02850e 100644
--- a/java/shujit/Makefile
+++ b/java/shujit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	shujit
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	http://www.shudo.net/jit/dist/
 
diff --git a/java/simplicity/Makefile b/java/simplicity/Makefile
index b2421fd01f4e..b368102080d7 100644
--- a/java/simplicity/Makefile
+++ b/java/simplicity/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	simplicity
 PORTVERSION=	1.2.6b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.datarepresentations.com/products/simplicity/
 DISTNAME=	simpjava
diff --git a/java/sun-wtk/Makefile b/java/sun-wtk/Makefile
index f128a9199c05..3791a3efd9e6 100644
--- a/java/sun-wtk/Makefile
+++ b/java/sun-wtk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wtk
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	sun-
diff --git a/java/trove4j/Makefile b/java/trove4j/Makefile
index b92684146add..63971072c025 100644
--- a/java/trove4j/Makefile
+++ b/java/trove4j/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	trove4j
 PORTVERSION=	1.1b5
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	trove4j
diff --git a/java/veditor/Makefile b/java/veditor/Makefile
index 01c20d01faeb..d9f01b95388b 100644
--- a/java/veditor/Makefile
+++ b/java/veditor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	veditor
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	java cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/java/westhawksnmp/Makefile b/java/westhawksnmp/Makefile
index a98c8e1d0223..60199f9d4788 100644
--- a/java/westhawksnmp/Makefile
+++ b/java/westhawksnmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	westhawksnmp
 PORTVERSION=	5.1
+PORTREVISION=	1
 CATEGORIES=	java net-mgmt devel
 MASTER_SITES=	http://snmp.westhawk.co.uk/
 DISTNAME=	${PORTNAME:S/westhawk//}${PORTVERSION:S/./_/}
diff --git a/java/xdoclet/Makefile b/java/xdoclet/Makefile
index ebb8fbe69a75..4b2a1b513266 100644
--- a/java/xdoclet/Makefile
+++ b/java/xdoclet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdoclet
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/korean/acroread/Makefile b/korean/acroread/Makefile
index fab1f90f078d..00a86f4eed51 100644
--- a/korean/acroread/Makefile
+++ b/korean/acroread/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	korean print linux
 
diff --git a/korean/aleefonts-ttf/Makefile b/korean/aleefonts-ttf/Makefile
index a43cc7661a46..304e947593d8 100644
--- a/korean/aleefonts-ttf/Makefile
+++ b/korean/aleefonts-ttf/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	aleefonts
 PORTVERSION=	11.2
+PORTREVISION=	1
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/t/ttf-alee
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index d6e95dd47886..81285a59e5ca 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ami
 PORTVERSION=	1.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	korean x11
 MASTER_SITES=	http://download.kldp.net/ami/ \
 		http://www.kr.freebsd.org/~hwang/ami/:hjdic \
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index 2314f358c553..8e20309b0d9f 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -70,5 +70,3 @@ share/locale/ko/LC_MESSAGES/ami.mo
 @dirrm %%DATADIR%%/ami/pix/woody
 @dirrm %%DATADIR%%/ami/pix
 @dirrm %%DATADIR%%/ami
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
diff --git a/korean/baekmukfonts-bdf/Makefile b/korean/baekmukfonts-bdf/Makefile
index c4f351cc9843..36cd7483f06e 100644
--- a/korean/baekmukfonts-bdf/Makefile
+++ b/korean/baekmukfonts-bdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	baekmukfonts
 PORTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	ftp://ftp.mizi.com/pub/baekmuk/obsoletes/ \
 		ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
diff --git a/korean/baekmukfonts-ttf/Makefile b/korean/baekmukfonts-ttf/Makefile
index e6c408314cc7..21be1f7cdf64 100644
--- a/korean/baekmukfonts-ttf/Makefile
+++ b/korean/baekmukfonts-ttf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	baekmukfonts
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	korean
 MASTER_SITES=	ftp://ftp.mizi.com/pub/baekmuk/obsoletes/
 PKGNAMESUFFIX=	-ttf
diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index 22d960b9dada..5e3fdb5cfe58 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eterm
 PORTVERSION=	0.8.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	korean x11
 MASTER_SITES=	ftp://ftp.holywar.net/pub/FreeBSD/ \
 		ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
diff --git a/korean/gdick/Makefile b/korean/gdick/Makefile
index d8314c4a0569..0a0de08eee61 100644
--- a/korean/gdick/Makefile
+++ b/korean/gdick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdick
 PORTVERSION=	0.9.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	korean python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gdick
diff --git a/korean/ghostscript-gnu-korfont/Makefile b/korean/ghostscript-gnu-korfont/Makefile
index c9883a21d718..06eca1b4794a 100644
--- a/korean/ghostscript-gnu-korfont/Makefile
+++ b/korean/ghostscript-gnu-korfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript-gnu-korfont
 PORTVERSION=	7.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile
index aa052fbc81ea..a523d44a7f58 100644
--- a/korean/gtkcomm/Makefile
+++ b/korean/gtkcomm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkcomm
 PORTVERSION=	0.6.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean comms
 MASTER_SITES=	http://download.kldp.net/gtkcomm/
 
diff --git a/korean/hanIM/Makefile b/korean/hanIM/Makefile
index ad48be0d2a6b..c3550d1b578c 100644
--- a/korean/hanIM/Makefile
+++ b/korean/hanIM/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hanIM
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	korean x11
 MASTER_SITES=   ftp://ftp.mizi.com/pub/hanIM/
 
diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index e36509121aed..e104c87f89e8 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hanterm
 PORTVERSION=	2.0.5.173
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	korean x11
 MASTER_SITES=	http://kldp.net/frs/download.php/282/
 PKGNAMESUFFIX=	-xf
diff --git a/korean/hanterm/Makefile b/korean/hanterm/Makefile
index 36e20837d53d..fe89a207a57f 100644
--- a/korean/hanterm/Makefile
+++ b/korean/hanterm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hanterm
 PORTVERSION=	3.1.6
+PORTREVISION=	1
 CATEGORIES=	korean x11
 MASTER_SITES=	http://hanterm.org/download/ \
 		ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile
index a1af9c892c3a..0f247a677006 100644
--- a/korean/hanyangfonts/Makefile
+++ b/korean/hanyangfonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hanyangfonts
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=   ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/ \
 		ftp://ftp.kaist.ac.kr/pub/hangul/fonts/ \
diff --git a/korean/hlatex-psfonts-uhc-extra/Makefile b/korean/hlatex-psfonts-uhc-extra/Makefile
index 98d1ac01d409..15fa1ec60619 100644
--- a/korean/hlatex-psfonts-uhc-extra/Makefile
+++ b/korean/hlatex-psfonts-uhc-extra/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	HLaTeX-psfonts-${HLATEX_ENCODING}-extra
 PORTVERSION=	0.99
+PORTREVISION=	1
 CATEGORIES=	korean print
 MASTER_SITES=	ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/hlatex/
 DISTFILES=	${HLATEX_PSFONTS_EXTRA}
diff --git a/korean/hlatex/Makefile b/korean/hlatex/Makefile
index bbcda520539e..17a3f69f195f 100644
--- a/korean/hlatex/Makefile
+++ b/korean/hlatex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	HLaTeX
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	korean print
 MASTER_SITES=	ftp://ftp.ktug.or.kr/pub/ktug/hlatex/ \
 		ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/
diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile
index e047c9851b7f..96ecf5d38b8f 100644
--- a/korean/iiimf-le-hangul/Makefile
+++ b/korean/iiimf-le-hangul/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-hangul
 PORTVERSION=	12.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	korean textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
diff --git a/korean/imhangul/Makefile b/korean/imhangul/Makefile
index b0515b808abe..437b89dd075e 100644
--- a/korean/imhangul/Makefile
+++ b/korean/imhangul/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imhangul
 PORTVERSION=	0.9.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean x11-toolkits
 MASTER_SITES=	http://kldp.net/frs/download.php/2808/
 
diff --git a/korean/johabfonts/Makefile b/korean/johabfonts/Makefile
index 413185388f7e..be34d952f196 100644
--- a/korean/johabfonts/Makefile
+++ b/korean/johabfonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	johabfonts
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	http://hanterm.org/download/font/
 DISTNAME=	hanterm-font-${PORTVERSION}
diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile
index 13dd09652d2c..e4c927cba800 100644
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kaistfonts-ksc
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
 DISTNAME=	${PKGNAME}
diff --git a/korean/kde3-i18n/Makefile b/korean/kde3-i18n/Makefile
index 7ba7b6cf64d8..74d74d0fcaed 100644
--- a/korean/kde3-i18n/Makefile
+++ b/korean/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	korean kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/korean/kde4-l10n/Makefile b/korean/kde4-l10n/Makefile
index 7ba7b6cf64d8..74d74d0fcaed 100644
--- a/korean/kde4-l10n/Makefile
+++ b/korean/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	korean kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/korean/mizifont/Makefile b/korean/mizifont/Makefile
index 256caa29c0c4..89ee9b33db12 100644
--- a/korean/mizifont/Makefile
+++ b/korean/mizifont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mizifonts
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	ftp://ftp.mizi.co.kr/pub/hanIM/
 DISTNAME=	xfntmizi-1.1-2.noarch
diff --git a/korean/nabi/Makefile b/korean/nabi/Makefile
index 13a8f2ca3f93..418a63bdac90 100644
--- a/korean/nabi/Makefile
+++ b/korean/nabi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nabi
 PORTVERSION=	0.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean gnome
 MASTER_SITES=	http://kldp.net/frs/download.php/1651/
 
diff --git a/korean/pinetreefonts/Makefile b/korean/pinetreefonts/Makefile
index 6323a2e31043..3da39c565f45 100644
--- a/korean/pinetreefonts/Makefile
+++ b/korean/pinetreefonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pinetreefonts
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/ \
 		ftp://ftp.kaist.ac.kr/pub/hangul/fonts/ \
diff --git a/korean/scim-hangul/Makefile b/korean/scim-hangul/Makefile
index dd2286b9a9eb..27f043f268ee 100644
--- a/korean/scim-hangul/Makefile
+++ b/korean/scim-hangul/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-hangul
 PORTVERSION=	0.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	korean
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
diff --git a/korean/scim-hangul/pkg-plist b/korean/scim-hangul/pkg-plist
index 4a321930c6fb..ffa41f3e78c5 100644
--- a/korean/scim-hangul/pkg-plist
+++ b/korean/scim-hangul/pkg-plist
@@ -9,7 +9,3 @@ share/locale/ko/LC_MESSAGES/scim-hangul.mo
 share/locale/zh_CN/LC_MESSAGES/scim-hangul.mo
 share/scim/icons/scim-hangul.png
 @dirrmtry share/scim/icons
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
diff --git a/korean/scim-tables/Makefile b/korean/scim-tables/Makefile
index 84eb29321efd..8c62c4f767ff 100644
--- a/korean/scim-tables/Makefile
+++ b/korean/scim-tables/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-tables
 PORTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	korean
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
diff --git a/korean/texinfo/Makefile b/korean/texinfo/Makefile
index 93792cec887f..cc96249b33c5 100644
--- a/korean/texinfo/Makefile
+++ b/korean/texinfo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	texinfo
 PORTVERSION=	0.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	korean print
 MASTER_SITES=	ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
 DISTNAME=	${PORTNAME}-ko-${PORTVERSION}
diff --git a/korean/unfonts-ttf/Makefile b/korean/unfonts-ttf/Makefile
index 345fdd37737a..c19fbf180cbe 100644
--- a/korean/unfonts-ttf/Makefile
+++ b/korean/unfonts-ttf/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	unfonts
 PORTVERSION=	1.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	http://kldp.net/frs/download.php/1425/:core \
diff --git a/korean/xpdf/Makefile b/korean/xpdf/Makefile
index b404fa54b524..9829d7b98a4e 100644
--- a/korean/xpdf/Makefile
+++ b/korean/xpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	korean
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 DISTNAME=	xpdf-korean
diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index a5b1668a092a..eaa43dc238ad 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	STk
 PORTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://kaolin.unice.fr/pub/STk/
diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile
index a4d35e8acaa5..686d0737aeab 100644
--- a/lang/Sather/Makefile
+++ b/lang/Sather/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sather
 PORTVERSION=	1.2.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/lang/abcl/Makefile b/lang/abcl/Makefile
index 4a2101fa74f8..6be4130ac8d1 100644
--- a/lang/abcl/Makefile
+++ b/lang/abcl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	abcl
 DISTVERSION=	0.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang lisp java
 MASTER_SITES=	http://armedbear.org/
 
diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile
index 0e6f0262e561..57b6ceae9b66 100644
--- a/lang/bigloo/Makefile
+++ b/lang/bigloo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bigloo
 PORTVERSION=	2.6b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang scheme
 MASTER_SITES=	ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/ \
 		ftp://kaolin.unice.fr/pub/Bigloo/
diff --git a/lang/bsh/Makefile b/lang/bsh/Makefile
index de050639fa3b..b910ae7e0e0e 100644
--- a/lang/bsh/Makefile
+++ b/lang/bsh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bsh
 PORTVERSION=	2.0.b4
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	http://www.beanshell.org/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/}
diff --git a/lang/caml-light/Makefile b/lang/caml-light/Makefile
index 40574af033a7..93ee10217a4a 100644
--- a/lang/caml-light/Makefile
+++ b/lang/caml-light/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	caml
 PORTVERSION=	0.75
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang elisp
 MASTER_SITES=	ftp://ftp.inria.fr/lang/caml-light/ \
 	ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/caml-light/ \
diff --git a/lang/cduce/Makefile b/lang/cduce/Makefile
index 9d2bb0405e1f..8fef97a15f76 100644
--- a/lang/cduce/Makefile
+++ b/lang/cduce/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	cduce
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cduce.org/download/
 
diff --git a/lang/chameleon/Makefile b/lang/chameleon/Makefile
index 29bab2132f87..ac5b0f6a24b9 100644
--- a/lang/chameleon/Makefile
+++ b/lang/chameleon/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	chameleon
 DISTVERSION=	05-07
+PORTREVISION=	1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.comp.nus.edu.sg/~sulzmann/chameleon/download/
 
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 6d8bd6ee65f7..fde891eb0447 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clisp
 PORTVERSION=	2.41a
+PORTREVISION=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	GNU/${PORTNAME}/release/${PORTVERSION:C/[[:alpha:]]+$//} \
 		ftp://sunsite.unc.edu/pub/Linux/devel/lang/lisp/
diff --git a/lang/csharp-mode.el/Makefile b/lang/csharp-mode.el/Makefile
index d02cc0c8a1d5..52aa6572c8eb 100644
--- a/lang/csharp-mode.el/Makefile
+++ b/lang/csharp-mode.el/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	csharp-mode.el
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang elisp
 MASTER_SITES=	http://mfgames.com/linux/releases/
 DISTNAME=	${PORTNAME:S|.el$||}-${PORTVERSION}
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index 96c1021a73eb..c9e847848b65 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	drscheme
 PORTVERSION=	360
+PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/ \
 		http://www.cs.utah.edu/plt/download/${PORTVERSION}/plt/ \
@@ -39,6 +40,7 @@ WRKSRC=		${WRKDIR}/plt-${PORTVERSION}/src
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_XLIB=	yes
+USE_GL=		yes
 USE_AUTOTOOLS=	libtool:15:env
 
 MAN1=		drscheme.1 help-desk.1 mred.1 mzscheme.1 tex2page.1
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index c9630c0c9844..8513cfcc6a52 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	elk
 PORTVERSION=	3.99.7
+PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://sam.zoy.org/elk/
 
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 2c5c4290b9d2..d9ffbf5ada8b 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	r11b3
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	lang parallel
 MASTER_SITES=	http://www.erlang.org/download/        \
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 2c5c4290b9d2..d9ffbf5ada8b 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	r11b3
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	lang parallel
 MASTER_SITES=	http://www.erlang.org/download/        \
diff --git a/lang/etoile-io/Makefile b/lang/etoile-io/Makefile
index a0d0af089afb..6d0b16f95952 100644
--- a/lang/etoile-io/Makefile
+++ b/lang/etoile-io/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	io
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	lang gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index a8827648b769..373e32771f1a 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	expect
 PORTVERSION=	5.43.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang tcl84 tk84
 MASTER_SITES=	http://expect.nist.gov/src/
 
diff --git a/lang/fpc-tcl/Makefile b/lang/fpc-tcl/Makefile
index 4a1ea39bae9c..13ad2fefdd21 100644
--- a/lang/fpc-tcl/Makefile
+++ b/lang/fpc-tcl/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-tcl
 
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 570e44273c58..6570f6bcc53a 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	units
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	fpc-
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index 9028cf178fd0..12f57dd99144 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		gambas
 PORTVERSION=		1.0.17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index b791d7d49978..d0776fe8644d 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gawk
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gawk
diff --git a/lang/gawk/pkg-plist b/lang/gawk/pkg-plist
index 64f7da39361a..57c7ec0eaad0 100644
--- a/lang/gawk/pkg-plist
+++ b/lang/gawk/pkg-plist
@@ -43,13 +43,5 @@ share/awk/zerofile.awk
 %%NLS%%share/locale/vi/LC_MESSAGES/gawk.mo
 @dirrm share/awk
 @dirrm libexec/awk
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/vi/LC_MESSAGES
-@dirrmtry share/locale/vi
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index 1a0c4cf3ab40..172d0b68a1f3 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcl
 PORTVERSION=	2.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gcl
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index ff42881cd097..86d4847de253 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ghc
 PORTVERSION=	6.6
+PORTREVISION=	1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		http://www.haskell.org/ghc/dist/${PORTVERSION}/FreeBSD/:boot \
diff --git a/lang/gnomebasic/Makefile b/lang/gnomebasic/Makefile
index fc01b1795185..d09990f4f5a7 100644
--- a/lang/gnomebasic/Makefile
+++ b/lang/gnomebasic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomebasic
 PORTVERSION=	0.0.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gb/0.0
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index d70a9dab5e76..a49ec7ae7568 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	guile
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	lang gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	libs
diff --git a/lang/groovy/Makefile b/lang/groovy/Makefile
index 9fe049b1e641..84ae295a8fd1 100644
--- a/lang/groovy/Makefile
+++ b/lang/groovy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	groovy
 DISTVERSION=	1.0-jsr-06
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	http://dist.codehaus.org/groovy/distributions/
 
diff --git a/lang/gscheme/Makefile b/lang/gscheme/Makefile
index b3d54bcfaf68..30055b696a26 100644
--- a/lang/gscheme/Makefile
+++ b/lang/gscheme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gscheme
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	lang gnustep
 MASTER_SITES=	http://www.gnustep.it/marko/GScheme/
 DISTNAME=	GScheme
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 47b3d0fa31e8..1a6cf4df1452 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hugs98
 PORTVERSION=	200609
+PORTREVISION=	1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://cvs.haskell.org/Hugs/downloads/2006-09/
 DISTNAME=	${PORTNAME}-plus-${HUGS_DATE}
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index d4c8073121c3..66e649b2f98b 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	icon
 PORTVERSION=	9.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.arizona.edu/icon/ftp/packages/unix/
 DISTNAME=	${PORTNAME}.v${PORTVERSION:S/.//g}src
diff --git a/lang/imp-interpreter/Makefile b/lang/imp-interpreter/Makefile
index 417d09a55cff..4dffb07aba81 100644
--- a/lang/imp-interpreter/Makefile
+++ b/lang/imp-interpreter/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	IMP
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.ocaml.info/ocaml_sources/
 
diff --git a/lang/jakarta-commons-jelly/Makefile b/lang/jakarta-commons-jelly/Makefile
index 70bb5c989891..1ed47306eb16 100644
--- a/lang/jakarta-commons-jelly/Makefile
+++ b/lang/jakarta-commons-jelly/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	commons-jelly
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	lang devel java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/binaries
diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index 9caa00ae6681..d6a6f6806a4a 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jruby
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	lang ruby java
 MASTER_SITES=	http://dist.codehaus.org/jruby/
 DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
diff --git a/lang/jython/Makefile b/lang/jython/Makefile
index 5a7f1a3fe12e..0df7d690f9db 100644
--- a/lang/jython/Makefile
+++ b/lang/jython/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jython
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang python java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/lang/kawa/Makefile b/lang/kawa/Makefile
index 8fae3e664fea..a1a9d32c609d 100644
--- a/lang/kawa/Makefile
+++ b/lang/kawa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		kawa
 PORTVERSION=		1.8
+PORTREVISION=	1
 CATEGORIES=		lang scheme java
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	kawa
diff --git a/lang/klogoturtle/Makefile b/lang/klogoturtle/Makefile
index b802737a00c0..ffd449f5c083 100644
--- a/lang/klogoturtle/Makefile
+++ b/lang/klogoturtle/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	klogoturtle
 PORTVERSION=	0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang kde
 MASTER_SITES=	http://klogoturtle.sourceforge.net/
 
diff --git a/lang/kroc/Makefile b/lang/kroc/Makefile
index 0dd40106bb86..4812516dcd89 100644
--- a/lang/kroc/Makefile
+++ b/lang/kroc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kroc
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.kent.ac.uk/projects/ofa/kroc/ \
 		http://www.frmb.org/download/
diff --git a/lang/lafontaine/Makefile b/lang/lafontaine/Makefile
index 38e2bf26ee13..56aeb6a5a498 100644
--- a/lang/lafontaine/Makefile
+++ b/lang/lafontaine/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	lafontaine
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.nongnu.org/lafontaine/archives/
 DISTNAME=	${PORTNAME}_0.4-1
diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile
index efeafe5fd7bd..a9df6e69e32e 100644
--- a/lang/linux-j/Makefile
+++ b/lang/linux-j/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	j
 PORTVERSION=	504b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang linux java
 MASTER_SITES=	http://www.jsoftware.com/download/
 PKGNAMEPREFIX=	linux-
diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index e2bfe038ff8c..1e0d823360cb 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ucblogo
 PORTVERSION=	5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.berkeley.edu/~bh/downloads/
 DISTNAME=	${PORTNAME}
diff --git a/lang/lush/Makefile b/lang/lush/Makefile
index 1a4d3cb0b0e7..232376b0ce4b 100644
--- a/lang/lush/Makefile
+++ b/lang/lush/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	lush
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lush
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index e03c03f4f155..c0587487bb5b 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mdk
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	lang gnome
 MASTER_SITES=	${MASTER_SITE_GNU:S/$/:gnu/} \
 		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
diff --git a/lang/metaocaml/Makefile b/lang/metaocaml/Makefile
index 4bad347e868a..3d68be9cb557 100644
--- a/lang/metaocaml/Makefile
+++ b/lang/metaocaml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	metaocaml
 PORTVERSION=	3.09.a30
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.metaocaml.org/dist/old/
 DISTNAME=	MetaOCaml_309_alpha_030
diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile
index 395ab3660b0e..9dbc2a3b6874 100644
--- a/lang/mit-scheme/Makefile
+++ b/lang/mit-scheme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mit-scheme
 PORTVERSION=	7.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang scheme
 MASTER_SITES=	ftp://ftp.swiss.ai.mit.edu/pub/mit-scheme/7.7/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION} OLD/${PORTVERSION}
diff --git a/lang/ml-pnet/Makefile b/lang/ml-pnet/Makefile
index d26fec009137..91b044c74b12 100644
--- a/lang/ml-pnet/Makefile
+++ b/lang/ml-pnet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ml-pnet
 PORTVERSION=	${PNET_VERSION}
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${PNET_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PNET_MASTER_SITE_SUBDIR}
diff --git a/lang/mlton/Makefile b/lang/mlton/Makefile
index 3a2d5e7d1663..af3d8c26271f 100644
--- a/lang/mlton/Makefile
+++ b/lang/mlton/Makefile
@@ -12,7 +12,7 @@
 
 PORTNAME=	mlton
 PORTVERSION=	20051202
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	http://mlton.org/pages/Download/attachments/ \
 		http://mlton.org/pages/Experimental/attachments/
diff --git a/lang/mozart/Makefile b/lang/mozart/Makefile
index cfd91b9760c8..2fd4073fc260 100644
--- a/lang/mozart/Makefile
+++ b/lang/mozart/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mozart
 PORTVERSION=	1.3.1.20040616
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang tk84 parallel
 MASTER_SITES=	http://www.mozart-oz.org/download/mozart-ftp/store/1.3.1-2004-06-16/
 DISTFILES=	${DISTNAME}-src.tar.gz
diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile
index 7995d99a30c8..ff60b8ba1cb2 100644
--- a/lang/mpd/Makefile
+++ b/lang/mpd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpd
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.arizona.edu/mpd/download/ \
 		http://crypto.riken.go.jp/pub/NetBSD/packages/distfiles/mpd-language/
diff --git a/lang/ocaml-camlidl/Makefile b/lang/ocaml-camlidl/Makefile
index e6aba2921159..249c7cf3dd4c 100644
--- a/lang/ocaml-camlidl/Makefile
+++ b/lang/ocaml-camlidl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	camlidl
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
 PKGNAMEPREFIX=	ocaml-
diff --git a/lang/ocaml-mode.el/Makefile b/lang/ocaml-mode.el/Makefile
index 914c9f22250d..5c3778c49b1c 100644
--- a/lang/ocaml-mode.el/Makefile
+++ b/lang/ocaml-mode.el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	caml-mode
 PORTVERSION=	3.01
+PORTREVISION=	1
 CATEGORIES=	lang elisp
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
 		${MASTER_SITE_LOCAL}
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 905bddddb5cd..a5dcfa93c16b 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ocaml
 PORTVERSION=	3.09.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME:R}/ \
 		ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
diff --git a/lang/ocamlduce/Makefile b/lang/ocamlduce/Makefile
index 7123e5c067f8..80074ce9ae34 100644
--- a/lang/ocamlduce/Makefile
+++ b/lang/ocamlduce/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ocamlduce
 PORTVERSION=	3.09.3
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://gallium.inria.fr/~frisch/ocamlcduce/download/
 PKGNAMESUFFIX=	pl1
diff --git a/lang/ohugs/Makefile b/lang/ohugs/Makefile
index 163a5f3a7209..44f1f3ed0731 100644
--- a/lang/ohugs/Makefile
+++ b/lang/ohugs/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ohugs
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.math.chalmers.se/~nordland/ohugs/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
diff --git a/lang/osb-jscore/Makefile b/lang/osb-jscore/Makefile
index d65feb975515..ea13503f17f2 100644
--- a/lang/osb-jscore/Makefile
+++ b/lang/osb-jscore/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osb-jscore
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	lang www java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-webcore
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 4ecf555ab12a..a4c93b71c186 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	otcl
 PORTVERSION=	1.13
+PORTREVISION=	1
 DISTVERSIONPREFIX=	src-
 CATEGORIES=	lang tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/lang/p5-JSAN/Makefile b/lang/p5-JSAN/Makefile
index 820e288a151e..ca5e6411c18c 100644
--- a/lang/p5-JSAN/Makefile
+++ b/lang/p5-JSAN/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	JSAN
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/C/CW/CWEST
diff --git a/lang/pm3-forms/Makefile b/lang/pm3-forms/Makefile
index 58f8b5456c10..ea77d239aff9 100644
--- a/lang/pm3-forms/Makefile
+++ b/lang/pm3-forms/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pm3-forms
 PORTVERSION=	1.1.15
+PORTREVISION=	1
 CATEGORIES=	lang
 DISTFILES=
 
diff --git a/lang/pm3-gui/Makefile b/lang/pm3-gui/Makefile
index 80359a2eec6d..e9595adb30d8 100644
--- a/lang/pm3-gui/Makefile
+++ b/lang/pm3-gui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pm3-gui
 PORTVERSION=	1.1.15
+PORTREVISION=	1
 CATEGORIES=	lang
 DISTFILES=
 
diff --git a/lang/pnet-base/Makefile b/lang/pnet-base/Makefile
index d902ba474cd3..83d115ac0b1e 100644
--- a/lang/pnet-base/Makefile
+++ b/lang/pnet-base/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pnet
 PORTVERSION=	${PNET_VERSION}
+PORTREVISION=	1
 PORTREVISION=	${PNET_REVISION}
 CATEGORIES=	lang
 MASTER_SITES=	${PNET_MASTER_SITES}
diff --git a/lang/pnet/Makefile b/lang/pnet/Makefile
index eec03a76eedf..1bcc3328ee66 100644
--- a/lang/pnet/Makefile
+++ b/lang/pnet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pnet
 PORTVERSION=	${PNET_VERSION}
+PORTREVISION=	1
 PORTREVISION=	${PNET_REVISION}
 CATEGORIES=	lang
 MASTER_SITES=	# empty
diff --git a/lang/pnetc/Makefile b/lang/pnetc/Makefile
index 9b6d6e07f98d..aa5bbd4a15bf 100644
--- a/lang/pnetc/Makefile
+++ b/lang/pnetc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pnetC
 PORTVERSION=	${PNET_VERSION}
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${PNET_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PNET_MASTER_SITE_SUBDIR}
diff --git a/lang/pnetlib/Makefile b/lang/pnetlib/Makefile
index 264a4aa55bf7..0a49020faf7e 100644
--- a/lang/pnetlib/Makefile
+++ b/lang/pnetlib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pnetlib
 PORTVERSION=	${PNET_VERSION}
+PORTREVISION=	1
 PORTREVISION=	${PNET_REVISION}
 CATEGORIES=	lang
 MASTER_SITES=	${PNET_MASTER_SITES}
diff --git a/lang/ptoc/Makefile b/lang/ptoc/Makefile
index b73eaba9258e..20a078b7f54c 100644
--- a/lang/ptoc/Makefile
+++ b/lang/ptoc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ptoc
 PORTVERSION=	3.56
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.garret.ru/~knizhnik/
 
diff --git a/lang/pugs/Makefile b/lang/pugs/Makefile
index e53324a209d6..c5ec4107a100 100644
--- a/lang/pugs/Makefile
+++ b/lang/pugs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pugs
 PORTVERSION=	6.2.13
+PORTREVISION=	1
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Perl6
diff --git a/lang/q/Makefile b/lang/q/Makefile
index a5ffa5930e85..ba9d370d2b74 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	q
 PORTVERSION=	6.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	q-lang
diff --git a/lang/quack/Makefile b/lang/quack/Makefile
index 9b22924bdeaa..84b05e9ba317 100644
--- a/lang/quack/Makefile
+++ b/lang/quack/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	quack
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	lang scheme elisp
 MASTER_SITES=	http://www.neilvandyke.org/quack/
 DISTNAME=	${PORTNAME}
diff --git a/lang/schemetoc/Makefile b/lang/schemetoc/Makefile
index a7e64ea8e7a2..0d4a8990b07f 100644
--- a/lang/schemetoc/Makefile
+++ b/lang/schemetoc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	schemetoc
 PORTVERSION=	93.3.15
+PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://www.cs.indiana.edu/pub/scheme-repository/imp/Scheme-to-C/
 DISTNAME=	15mar93
diff --git a/lang/sisc/Makefile b/lang/sisc/Makefile
index b011a03b4bbc..7e0b3c8f662f 100644
--- a/lang/sisc/Makefile
+++ b/lang/sisc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sisc
 PORTVERSION=	1.16.6
+PORTREVISION=	1
 CATEGORIES=	lang scheme java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 7629dd07ff5a..742b2164f9e4 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	smalltalk
 PORTVERSION=	2.3.3
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/lang/sml-mode.el/Makefile b/lang/sml-mode.el/Makefile
index 0419d86243b6..51c40ee9650f 100644
--- a/lang/sml-mode.el/Makefile
+++ b/lang/sml-mode.el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sml-mode
 PORTVERSION=	3.9.5
+PORTREVISION=	1
 CATEGORIES=	lang elisp
 MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/contrib/emacs/ \
 		${MASTER_SITE_LOCAL}
diff --git a/lang/squeak-dev/Makefile b/lang/squeak-dev/Makefile
index 206c66a92dff..65668533fb57 100644
--- a/lang/squeak-dev/Makefile
+++ b/lang/squeak-dev/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		squeak
 PORTVERSION=		3.7
+PORTREVISION=		1
 CATEGORIES=		lang
 ##################################################
 MASTER_SITES=		http://www.squeakvm.org/unix/release/ \
@@ -111,6 +112,7 @@ CONFIGURE_ARGS+=	--without-x
 PLIST_X=		"@comment feature not wanted - "
 .else
 USE_XLIB=		yes
+USE_GL=			yes
 CONFIGURE_ARGS+=	--with-x
 PLIST_X=
 .endif
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 206c66a92dff..65668533fb57 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		squeak
 PORTVERSION=		3.7
+PORTREVISION=		1
 CATEGORIES=		lang
 ##################################################
 MASTER_SITES=		http://www.squeakvm.org/unix/release/ \
@@ -111,6 +112,7 @@ CONFIGURE_ARGS+=	--without-x
 PLIST_X=		"@comment feature not wanted - "
 .else
 USE_XLIB=		yes
+USE_GL=			yes
 CONFIGURE_ARGS+=	--with-x
 PLIST_X=
 .endif
diff --git a/lang/sr/Makefile b/lang/sr/Makefile
index 7197ac7162a7..edc843d22602 100644
--- a/lang/sr/Makefile
+++ b/lang/sr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sr
 PORTVERSION=	2.3.1
+PORTREVISION=	1
 CATEGORIES=	lang parallel
 MASTER_SITES=	ftp://ftp.uu.net/.vol/1/languages/sr/ \
 		http://www.it.uc3m.es/~ptb/clases/sr/inst/src/ \
diff --git a/lang/starlogo/Makefile b/lang/starlogo/Makefile
index cfcddb9e6fa6..686129c7bb15 100644
--- a/lang/starlogo/Makefile
+++ b/lang/starlogo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	starlogo
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	http://education.mit.edu/starlogo/download/
 DISTNAME=	${PORTNAME}-2.0
diff --git a/lang/steptalk/Makefile b/lang/steptalk/Makefile
index 89181fa1fd89..84cd65103a7d 100644
--- a/lang/steptalk/Makefile
+++ b/lang/steptalk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	steptalk
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	lang gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	libs
diff --git a/lang/tcltutor/Makefile b/lang/tcltutor/Makefile
index 9d36fec9e9e9..6c96840488ab 100644
--- a/lang/tcltutor/Makefile
+++ b/lang/tcltutor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcltutor
 PORTVERSION=	2.b.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang tk84 tcl84
 MASTER_SITES=	http://www.msen.com/~clif/
 DISTNAME=	Tutor2b4
diff --git a/lang/tuareg-mode.el/Makefile b/lang/tuareg-mode.el/Makefile
index 1f2143cb2aee..af05d87b11bb 100644
--- a/lang/tuareg-mode.el/Makefile
+++ b/lang/tuareg-mode.el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tuareg-mode
 PORTVERSION=	1.46.0
+PORTREVISION=	1
 CATEGORIES=	lang elisp
 MASTER_SITES=	http://www-rocq.inria.fr/~acohen/tuareg/mode/
 
diff --git a/lang/whitespace/Makefile b/lang/whitespace/Makefile
index 27a0f54a8969..dd0059a08681 100644
--- a/lang/whitespace/Makefile
+++ b/lang/whitespace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	whitespace
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://compsoc.dur.ac.uk/whitespace/downloads/
 DISTNAME=	wspace-${PORTVERSION}
diff --git a/lang/xds-c/Makefile b/lang/xds-c/Makefile
index f6748d39c8b2..af2cd7ada456 100644
--- a/lang/xds-c/Makefile
+++ b/lang/xds-c/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xds-c
 PORTVERSION=	2.51
+PORTREVISION=	1
 CATEGORIES=	lang linux devel
 MASTER_SITES=	http://www.excelsior-usa.com/download/xds25x/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//}-enduser-linux
diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile
index c56208f4a846..ab7687d5219f 100644
--- a/lang/yabasic/Makefile
+++ b/lang/yabasic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yabasic
 PORTVERSION=	2.763
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.yabasic.de/download/
 
diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index e04196cba31c..f0cad4ca53dd 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yorick
 PORTVERSION=	2.1.04
+PORTREVISION=	1
 CATEGORIES=	lang math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/addresses-goodies/Makefile b/mail/addresses-goodies/Makefile
index 8c1ac40d0714..bb41ec7f8bef 100644
--- a/mail/addresses-goodies/Makefile
+++ b/mail/addresses-goodies/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	addresses
 PORTVERSION=	0.4.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://giesler.biz/bjoern/downloads/ \
 		http://www.energyhq.es.eu.org/files/
diff --git a/mail/addresses/Makefile b/mail/addresses/Makefile
index 2842c04ef0b9..dd12c7631f84 100644
--- a/mail/addresses/Makefile
+++ b/mail/addresses/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	addresses
 PORTVERSION=	0.4.6
+PORTREVISION=	1
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://giesler.biz/bjoern/downloads/ \
 		http://www.energyhq.es.eu.org/files/
diff --git a/mail/althea/Makefile b/mail/althea/Makefile
index 930d43604549..f4d4d08cb026 100644
--- a/mail/althea/Makefile
+++ b/mail/althea/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	althea
 PORTVERSION=	0.5.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index 665ff24e82eb..5c94da6ef374 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asmail
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	mail afterstep
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asmail/
 
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index b90081cc06f0..696fc20e37f1 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	balsa
 PORTVERSION=	2.3.15
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/
 DISTNAME=	balsa-${PORTVERSION}
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index db8dd313a447..d5bd143b29ac 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -152,43 +152,11 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo
 @dirrm share/gnome/balsa/hicolor/16x16
 @dirrm share/gnome/balsa/hicolor
 @dirrm share/gnome/balsa
-@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/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/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/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index b59e7a320d30..19e42437ae8f 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bbmail
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bbtools
diff --git a/mail/biffer/Makefile b/mail/biffer/Makefile
index 6ca0cc1fea1f..7b3371fa6e72 100644
--- a/mail/biffer/Makefile
+++ b/mail/biffer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	biffer
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.generalconcepts.com/resources/software/
 
diff --git a/mail/c-sig-emacs21/Makefile b/mail/c-sig-emacs21/Makefile
index 637302cecd0e..49498f15e3ce 100644
--- a/mail/c-sig-emacs21/Makefile
+++ b/mail/c-sig-emacs21/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	c-sig
 PORTVERSION=	3.8
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.threeweb.ad.jp/~kshibata/c-sig/programs/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/mail/c-sig/Makefile b/mail/c-sig/Makefile
index 637302cecd0e..49498f15e3ce 100644
--- a/mail/c-sig/Makefile
+++ b/mail/c-sig/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	c-sig
 PORTVERSION=	3.8
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.threeweb.ad.jp/~kshibata/c-sig/programs/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/mail/claws-mail-att_remover/Makefile b/mail/claws-mail-att_remover/Makefile
index ff9577f142ea..beaa23bd82b3 100644
--- a/mail/claws-mail-att_remover/Makefile
+++ b/mail/claws-mail-att_remover/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	att_remover
 PORTVERSION=	1.0.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index aae974d3b835..57c23910de08 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	attach_warner
 PORTVERSION=	0.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index d763728ea5ed..a6bf21d6e622 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cachesaver
 PORTVERSION=	0.10.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-etpan_privacy/Makefile b/mail/claws-mail-etpan_privacy/Makefile
index 561635f547bc..51c6d913b7b0 100644
--- a/mail/claws-mail-etpan_privacy/Makefile
+++ b/mail/claws-mail-etpan_privacy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etpan_privacy
 PORTVERSION=	0.15.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index f9f0af106410..b12e898ce5fd 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fetchinfo
 PORTVERSION=	0.4.18
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index 06e0e2b577f2..b0db5b66a47c 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkhtml2_viewer
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-maildir/Makefile b/mail/claws-mail-maildir/Makefile
index e7f6fb2eda9c..d4356fb71b62 100644
--- a/mail/claws-mail-maildir/Makefile
+++ b/mail/claws-mail-maildir/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	maildir
 PORTVERSION=	0.24.4
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 9638a1371c27..59a7d7687ec5 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mailmbox
 PORTVERSION=	1.13
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 600a1d43301b..46e61988845d 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	newmail
 PORTVERSION=	0.0.9
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index bc50a30b0bf1..a3558b835207 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	notification
 PORTVERSION=	0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 73df1a2a4109..15ab982aa48b 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pdf_viewer
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-perl/Makefile b/mail/claws-mail-perl/Makefile
index 7ceb0be00ddb..3f712ec680e5 100644
--- a/mail/claws-mail-perl/Makefile
+++ b/mail/claws-mail-perl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 29c1ec03c230..83fe2f513132 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rssyl
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 685d68d3d964..cd68f7113e37 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smime
 PORTVERSION=	0.7
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index d994b372392b..3ea68420f4e0 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	synce
 PORTVERSION=	0.7
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index bc618ffdf3ca..479a5ad41ba3 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vcalendar
 PORTVERSION=	1.95
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/ \
 		${MASTER_SITE_LOCAL}
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index cc5e156ac223..2273e0f08075 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	claws-mail
 PORTVERSION=	2.9.1
+PORTREVISION=	1
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 3ed43b0b757f..94c32572a33f 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -2665,7 +2665,6 @@ share/pixmaps/claws-mail.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
 @dirrmtry lib/claws-mail/plugins
 @dirrmtry lib/claws-mail
diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile
index caa00ee5137d..5ee6bc281aa2 100644
--- a/mail/contact-lookup-applet/Makefile
+++ b/mail/contact-lookup-applet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	contact
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
 PKGNAMESUFFIX=	-lookup-applet
diff --git a/mail/contact-lookup-applet/pkg-plist b/mail/contact-lookup-applet/pkg-plist
index 7c6a8865f85e..d84b9f061bed 100644
--- a/mail/contact-lookup-applet/pkg-plist
+++ b/mail/contact-lookup-applet/pkg-plist
@@ -31,25 +31,7 @@ share/locale/vi/LC_MESSAGES/contact-lookup-applet.mo
 share/locale/xh/LC_MESSAGES/contact-lookup-applet.mo
 share/locale/zh_CN/LC_MESSAGES/contact-lookup-applet.mo
 @dirrm share/gnome/lookup-applet
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@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
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index b4ac513ead8b..7bfb216aad8a 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	coolmail
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=system/mail/biffs
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index a026c8606ff2..81c4fe8a8b88 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	elmo
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/elmo-devel/pkg-plist b/mail/elmo-devel/pkg-plist
index 40f933de938b..d1a7aced595b 100644
--- a/mail/elmo-devel/pkg-plist
+++ b/mail/elmo-devel/pkg-plist
@@ -7,7 +7,5 @@ bin/elmoconf.pl
 %%DATADIR%%/tutorial
 %%NLS%%share/locale/de/LC_MESSAGES/elmo.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/elmo.mo
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 376e90be9a32..5a8944b217c0 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	elmo
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/elmo/pkg-plist b/mail/elmo/pkg-plist
index 9f1744f49be1..738bf6a0b551 100644
--- a/mail/elmo/pkg-plist
+++ b/mail/elmo/pkg-plist
@@ -4,6 +4,4 @@ bin/elmoconf.pl
 %%DATADIR%%/tutorial
 %%NLS%%share/locale/de/LC_MESSAGES/elmo.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/elmo.mo
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
 @dirrm %%DATADIR%%
diff --git a/mail/emh/Makefile b/mail/emh/Makefile
index 8e4e6314b606..d93354a67ffc 100644
--- a/mail/emh/Makefile
+++ b/mail/emh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emh
 PORTVERSION=	1.14.1
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ring.aist.go.jp/pub/elisp/semi/semi-1.14-for-flim-1.14/ \
 		http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/semi/semi-1.14-for-flim-1.14/
diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile
index b8e3966db7ac..034a3e98b7d0 100644
--- a/mail/enigmail-thunderbird/Makefile
+++ b/mail/enigmail-thunderbird/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enigmail
 PORTVERSION=	0.95.0
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.mozilla-enigmail.org/downloads/src/
 PKGNAMEPREFIX?=	thunderbird-
diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
index 8f08ac544172..de8f2d34a619 100644
--- a/mail/enigmail/Makefile
+++ b/mail/enigmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enigmail
 PORTVERSION?=	0.93.0
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	mail security
 MASTER_SITES=	\
 		http://mozdev.secsup.org/enigmail/src/ \
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 638e94f67bed..c639c86b8985 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	2.10.1
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index d378103d0d0d..697e9261deea 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -144,49 +144,15 @@ share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 @dirrm share/gnome/evolution-exchange/%%VERSION%%
 @dirrm share/gnome/evolution-exchange
 @dirrm %%OLDDOCSDIR%%
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index d908418cc532..40e5880a0667 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	evolution-sharp
 PORTVERSION=	0.12.2
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.12
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 8cfce8a40317..9f20c4b3073d 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	2.10.1
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 5cf46798c05b..0fa8d02c1fe4 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1230,57 +1230,19 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm include/evolution-%%VERSION%%/addressbook
 @dirrm include/evolution-%%VERSION%%
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
-@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/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 594acd9637ea..466a05dc49a7 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	exmh
 PORTVERSION=	2.7.2
+PORTREVISION=	1
 CATEGORIES+=	mail tk84
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE}
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index ace2562d9e8a..5c8b7f53b71d 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	faces
 PORTVERSION=	1.7.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 17dc16939df6..f0e59ed8594e 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -11,6 +11,7 @@
 
 PORTNAME=	fetchmail
 PORTVERSION=	6.3.8
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_BERLIOS} \
 		${MASTER_SITE_SUNSITE:S/$/:sunsite/}\
diff --git a/mail/fetchmail/pkg-plist b/mail/fetchmail/pkg-plist
index 962f1f91db66..7a9fcb0dfa8e 100644
--- a/mail/fetchmail/pkg-plist
+++ b/mail/fetchmail/pkg-plist
@@ -25,12 +25,6 @@ libexec/fetchmailconf.py
 %%NLS%%share/locale/ru/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/fetchmail.mo
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
 @unexec if cmp -s %D/etc/fetchmailrc.sample %D/etc/fetchmailrc; then rm -f %D/etc/fetchmailrc; fi
 etc/fetchmailrc.sample
 @exec if [ ! -f %D/etc/fetchmailrc ] ; then cp -p %D/%F %B/fetchmailrc; fi
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index d7303db8a520..6559140d5349 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	filtermail
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://home.in.tum.de/baueran/%SUBDIR%/
diff --git a/mail/filtermail/pkg-plist b/mail/filtermail/pkg-plist
index f97c1c8cca4f..a5f062278a15 100644
--- a/mail/filtermail/pkg-plist
+++ b/mail/filtermail/pkg-plist
@@ -6,5 +6,3 @@ bin/filtermail
 %%NLS%%share/locale/it/LC_MESSAGES/filtermail.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/filtermail.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/filtermail.mo
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile
index ab1f508a1dfe..7b0493fba743 100644
--- a/mail/gbuffy/Makefile
+++ b/mail/gbuffy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gbuffy
 PORTVERSION=	0.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.fiction.net/blong/programs/gbuffy/gbuffy-${PORTVERSION}/
 
diff --git a/mail/gkrellmmailwatch/Makefile b/mail/gkrellmmailwatch/Makefile
index 8e383a63a6b1..ba37e6ef3fce 100644
--- a/mail/gkrellmmailwatch/Makefile
+++ b/mail/gkrellmmailwatch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmmailwatch
 PORTVERSION=	0.7.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://gkrellm.luon.net/files/
 DISTNAME=	mailwatch-${PORTVERSION}
diff --git a/mail/gkrellmmailwatch2/Makefile b/mail/gkrellmmailwatch2/Makefile
index 12efcc67346f..0d2632494430 100644
--- a/mail/gkrellmmailwatch2/Makefile
+++ b/mail/gkrellmmailwatch2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gkrellmmailwatch
 PORTVERSION=	2.4.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://gkrellm.luon.net/files/
 DISTNAME=	gkrellm-mailwatch-${PORTVERSION}
diff --git a/mail/glbiff/Makefile b/mail/glbiff/Makefile
index 54be47797dfa..f5ba4241badd 100644
--- a/mail/glbiff/Makefile
+++ b/mail/glbiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glbiff
 PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dgp.utoronto.ca/~mac/code/projects/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/mail/gmail-notify/Makefile b/mail/gmail-notify/Makefile
index 416e79fdb3c3..4fba0aa38388 100644
--- a/mail/gmail-notify/Makefile
+++ b/mail/gmail-notify/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmail-notify
 PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index fb8585d71fba..ecb15a4b7efe 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmime
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://spruce.sourceforge.net/gmime/sources/v1.0/
 
diff --git a/mail/gmime2-sharp/Makefile b/mail/gmime2-sharp/Makefile
index 085fe5146ff1..ff79813b9f10 100644
--- a/mail/gmime2-sharp/Makefile
+++ b/mail/gmime2-sharp/Makefile
@@ -6,7 +6,7 @@
 #   $Id: Makefile,v 1.17 2006/10/26 18:37:29 tmclau02 Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-sharp
 
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 98f171b960f0..c36a86fb4b6b 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnubiff
 PORTVERSION=	2.2.4
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index 2801426571af..8fd6a8dcf32d 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -36,9 +36,6 @@ bin/gnubiff
 @dirrmtry %%BONOBODIR%%
 @dirrmtry %%SHAREDIR%%/gnome-2.0/ui
 @dirrmtry %%SHAREDIR%%/gnome-2.0
-@dirrmtry share/pixmaps
-@dirrmtry share/locale/fr_FR/LC_MESSAGES
-@dirrmtry share/locale/fr_FR
 @dirrmtry share/locale/fr_CA/LC_MESSAGES
 @dirrmtry share/locale/fr_CA
 @dirrm %%SHAREDIR%%/gnubiff
diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index bed2d63fc061..b5b643d66c54 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnumail
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://www.collaboration-world.com/gnumail.data/releases/Stable/
 DISTNAME=	GNUMail-${PORTVERSION}pre3
diff --git a/mail/gtray/Makefile b/mail/gtray/Makefile
index 7450445c33a2..dfcdb43ed237 100644
--- a/mail/gtray/Makefile
+++ b/mail/gtray/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtray
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://gnome-gtray.sourceforge.net/
 
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index e35f976cf170..45ba22dac276 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	hbiff
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/misc/  \
 		${MASTER_SITE_LOCAL}
diff --git a/mail/horde-forwards/Makefile b/mail/horde-forwards/Makefile
index d10ed41bc383..68a7db5a2e42 100644
--- a/mail/horde-forwards/Makefile
+++ b/mail/horde-forwards/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	forwards
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	mail www
 PKGNAMEPREFIX=	horde-
 DIST_SUBDIR=	horde
diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 7c12481824c1..3e9723fefff3 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imp
 PORTVERSION=	4.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index a17b4d34104f..44d378b67e76 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ingo
 PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/mail/horde-mimp/Makefile b/mail/horde-mimp/Makefile
index c8abd67b2b31..369d520e689b 100644
--- a/mail/horde-mimp/Makefile
+++ b/mail/horde-mimp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mimp
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index d1a0a7d8accd..bca12b738545 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	turba
 PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/mail/horde-vacation/Makefile b/mail/horde-vacation/Makefile
index 53b751a42cb3..386ea469235e 100644
--- a/mail/horde-vacation/Makefile
+++ b/mail/horde-vacation/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vacation
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	mail www
 PKGNAMEPREFIX=	horde-
 DIST_SUBDIR=	horde
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index 7c12481824c1..3e9723fefff3 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imp
 PORTVERSION=	4.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile
index a17b4d34104f..44d378b67e76 100644
--- a/mail/horde4-ingo/Makefile
+++ b/mail/horde4-ingo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ingo
 PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index d1a0a7d8accd..bca12b738545 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	turba
 PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 7c12481824c1..3e9723fefff3 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imp
 PORTVERSION=	4.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile
index a17b4d34104f..44d378b67e76 100644
--- a/mail/ingo/Makefile
+++ b/mail/ingo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ingo
 PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/mail/james/Makefile b/mail/james/Makefile
index d00dc04dbdaa..03c038939296 100644
--- a/mail/james/Makefile
+++ b/mail/james/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	james
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	mail java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	${PORTNAME}/server/binaries
diff --git a/mail/jboss-mailservices/Makefile b/mail/jboss-mailservices/Makefile
index fb92fd4a83fe..7c210c56bec8 100644
--- a/mail/jboss-mailservices/Makefile
+++ b/mail/jboss-mailservices/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jboss-mailservices
 PORTVERSION=	m1
+PORTREVISION=	1
 CATEGORIES=	mail java
 MASTER_SITES=	http://www.jboss.org/wiki/attach?page=MailServicesMilestoneReleases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-final
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index d38820421dae..2a789ba053b6 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kbiff
 PORTVERSION=	3.8
+PORTREVISION=	1
 CATEGORIES=	mail kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/kbiff/pkg-plist b/mail/kbiff/pkg-plist
index 321c01716e02..1d48e557be96 100644
--- a/mail/kbiff/pkg-plist
+++ b/mail/kbiff/pkg-plist
@@ -67,25 +67,5 @@ share/locale/zh_TW.Big5/LC_MESSAGES/kbiff.mo
 @dirrm share/doc/HTML/de/kbiff
 @dirrm share/apps/kbiff/pics
 @dirrm share/apps/kbiff
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrmtry share/locale/no_NY/LC_MESSAGES
 @dirrmtry share/locale/no_NY
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
diff --git a/mail/kiltdown/Makefile b/mail/kiltdown/Makefile
index c7fde1645d70..345e2e6be25a 100644
--- a/mail/kiltdown/Makefile
+++ b/mail/kiltdown/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kiltdown
 PORTVERSION=	0.8.045
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kiltdown
diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index ae4b9454628d..b390bf5f771d 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kshowmail
 PORTVERSION=		3.1.0
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		mail kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/lightning/Makefile b/mail/lightning/Makefile
index 1e61f1c2ef73..2892102c0336 100644
--- a/mail/lightning/Makefile
+++ b/mail/lightning/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lightning
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	mail deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	calendar/${PORTNAME}/releases/${DISTVERSION}/source
@@ -74,7 +75,6 @@ port-pre-install:
 pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${MOZILLA_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 	${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
 
 do-install:
diff --git a/mail/mahogany/Makefile b/mail/mahogany/Makefile
index bf8e16c2030f..56e35d319edc 100644
--- a/mail/mahogany/Makefile
+++ b/mail/mahogany/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mahogany
 PORTVERSION=	0.67
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index ccc3f2a71b76..13f08bdfb4db 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mail-notification
 DISTVERSION=	4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	mailnotify
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
index 38fa8ca8ed34..f8656893f675 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -46,13 +46,3 @@ share/locale/sv/LC_MESSAGES/mail-notification.mo
 @dirrm share/gnome/help/mail-notification/C
 @dirrm share/gnome/help/mail-notification
 @dirrmtry etc/xdg/autostart
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index 34a630184e22..415db9b67aaf 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mailcrypt
 PORTVERSION=	3.5.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/mailscanner-mrtg/Makefile b/mail/mailscanner-mrtg/Makefile
index 15debfde0309..454e154ec995 100644
--- a/mail/mailscanner-mrtg/Makefile
+++ b/mail/mailscanner-mrtg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mailscanner-mrtg
 PORTVERSION=	0.11.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mailscannermrtg
diff --git a/mail/mavbiff/Makefile b/mail/mavbiff/Makefile
index de4fc38f5eab..53c364737f3d 100644
--- a/mail/mavbiff/Makefile
+++ b/mail/mavbiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mavbiff
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mavetju.org/download/
 
diff --git a/mail/mboxcheck-applet/Makefile b/mail/mboxcheck-applet/Makefile
index 0ed0f8efe69a..9f514af50bdf 100644
--- a/mail/mboxcheck-applet/Makefile
+++ b/mail/mboxcheck-applet/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mboxcheck-applet
 PORTVERSION=	0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	http://perso.orange.fr/seb128/fichiers/
 
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index f76cb728da27..88d1d06e1305 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	metamail
 PORTVERSION=	2.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://ftp.funet.fi/pub/unix/mail/metamail/ \
 		ftp://ftp.research.telcordia.com/pub/nsb/
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index e2177d90d48b..8febd61c0658 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mew
 PORTVERSION=	5.2
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.Mew.org/Release/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/mail/mew2/Makefile b/mail/mew2/Makefile
index b7b74a34f6c2..c94daa759003 100644
--- a/mail/mew2/Makefile
+++ b/mail/mew2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mew
 PORTVERSION=	${MEW_VER}
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.mew.org/Release/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile
index 5c0322574f7b..20cc93489e07 100644
--- a/mail/mew3/Makefile
+++ b/mail/mew3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mew
 PORTVERSION=	${MEW_VER}
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.mew.org/Release/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/mail/mimp/Makefile b/mail/mimp/Makefile
index c8abd67b2b31..369d520e689b 100644
--- a/mail/mimp/Makefile
+++ b/mail/mimp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mimp
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/mail/ml/Makefile b/mail/ml/Makefile
index d047bb08d10b..66a9202c9d32 100644
--- a/mail/ml/Makefile
+++ b/mail/ml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ml
 PORTVERSION=	3.4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://ftp.uni-koeln.de/windows/xcontrib/
 
diff --git a/mail/mmc/Makefile b/mail/mmc/Makefile
index 4f3d582afe44..bc1af6b2ca37 100644
--- a/mail/mmc/Makefile
+++ b/mail/mmc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mmc
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/moztraybiff/Makefile b/mail/moztraybiff/Makefile
index 8f15a200fe19..58317c99d90a 100644
--- a/mail/moztraybiff/Makefile
+++ b/mail/moztraybiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moztraybiff
 PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/mulberry/Makefile b/mail/mulberry/Makefile
index e59556a1211a..0d6a4aef6e7d 100644
--- a/mail/mulberry/Makefile
+++ b/mail/mulberry/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mulberry
 PORTVERSION=	4.0.8
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mulberrymail.com/downloads/Mulberry/%SUBDIR%/
 MASTER_SITE_SUBDIR=v${PORTVERSION:S/./_/g}
diff --git a/mail/mulberry/pkg-plist b/mail/mulberry/pkg-plist
index 226b7b55f87e..8830fa57fce2 100644
--- a/mail/mulberry/pkg-plist
+++ b/mail/mulberry/pkg-plist
@@ -48,4 +48,3 @@ lib/%%PORTNAME%%/Resources/UI.xml
 @dirrm %%EXAMPLESDIR%%
 share/pixmaps/%%PORTNAME%%.png
 share/pixmaps/%%PORTNAME%%.xpm
-@dirrmtry share/pixmaps
diff --git a/mail/mutt-ng/Makefile b/mail/mutt-ng/Makefile
index 963d77337457..52ae423cf262 100644
--- a/mail/mutt-ng/Makefile
+++ b/mail/mutt-ng/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mutt-ng
 PORTVERSION=	20061125
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://nion.modprobe.de/mutt-ng/snapshots/		\
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/mail/mutt-ng/pkg-plist b/mail/mutt-ng/pkg-plist
index 6f0e47f70084..bb8a5569af73 100644
--- a/mail/mutt-ng/pkg-plist
+++ b/mail/mutt-ng/pkg-plist
@@ -87,26 +87,6 @@ etc/muttng-mime.types
 %%NLS%%share/locale/uk/LC_MESSAGES/muttng.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/muttng.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/muttng.mo
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_TW
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
 @dirrm %%EXAMPLESDIR%%/iconv
 @dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 83e5a198aebf..90130776811c 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	offlineimap
 PORTVERSION=	4.0.11
+PORTREVISION=	1
 CATEGORIES=	mail python
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.quux.org/devel/offlineimap/
diff --git a/mail/p5-FuzzyOcr-devel/Makefile b/mail/p5-FuzzyOcr-devel/Makefile
index 4d9baa5419eb..e0ee53b9f4a8 100644
--- a/mail/p5-FuzzyOcr-devel/Makefile
+++ b/mail/p5-FuzzyOcr-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	FuzzyOcr
 DISTVERSION=	3.4.2
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://users.own-hero.net/~decoder/${PORTNAME:L}/	\
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/mail/p5-FuzzyOcr/Makefile b/mail/p5-FuzzyOcr/Makefile
index 61a20bace320..b2d0b5015f52 100644
--- a/mail/p5-FuzzyOcr/Makefile
+++ b/mail/p5-FuzzyOcr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	FuzzyOcr
 DISTVERSION=	2.3b
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://users.own-hero.net/~decoder/${PORTNAME:L}/	\
diff --git a/mail/p5-Mail-Graph/Makefile b/mail/p5-Mail-Graph/Makefile
index 2b8d2d8cb31c..be0bba2abd82 100644
--- a/mail/p5-Mail-Graph/Makefile
+++ b/mail/p5-Mail-Graph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Mail-Graph
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index c8818b84bce5..ebbea3dc7a15 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pantomime
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://www.collaboration-world.com/pantomime.data/releases/Stable/
 DISTNAME=	Pantomime-${PORTVERSION}pre3
diff --git a/mail/pmail/Makefile b/mail/pmail/Makefile
index 15c364e99d10..8199bfd88de3 100644
--- a/mail/pmail/Makefile
+++ b/mail/pmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pmail
 PORTVERSION=	0.5.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail python gnome
 MASTER_SITES=	# previous mastersites disappeared in 2001 and 2002
 
diff --git a/mail/postilion/Makefile b/mail/postilion/Makefile
index 237d58b25889..d5b8a3ed1f09 100644
--- a/mail/postilion/Makefile
+++ b/mail/postilion/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	postilion
 PORTVERSION=	0.9.3c
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail tk83
 MASTER_SITES=	http://www.postilion.org/software/Postilion/
 DISTNAME=	${PORTNAME}-current
diff --git a/mail/pronto/Makefile b/mail/pronto/Makefile
index 718a4704b5c5..550ef6180c18 100644
--- a/mail/pronto/Makefile
+++ b/mail/pronto/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	pronto
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://muhri.net/pronto/
 
diff --git a/mail/pygmy/Makefile b/mail/pygmy/Makefile
index c9bbb8c3042e..4cf7d829666c 100644
--- a/mail/pygmy/Makefile
+++ b/mail/pygmy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pygmy
 PORTVERSION=	0.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail python gnome
 MASTER_SITES=	http://pygmy.sourceforge.net/
 
diff --git a/mail/qmailmrtg7/Makefile b/mail/qmailmrtg7/Makefile
index 4c0a79da7ca7..1c2b6a0e424c 100644
--- a/mail/qmailmrtg7/Makefile
+++ b/mail/qmailmrtg7/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmailmrtg7
 PORTVERSION=	4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail net-mgmt
 MASTER_SITES=	http://www.inter7.com/qmailmrtg7/
 
diff --git a/mail/qmrtg/Makefile b/mail/qmrtg/Makefile
index f17a75193058..a2eb89147680 100644
--- a/mail/qmrtg/Makefile
+++ b/mail/qmrtg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmrtg
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail net-mgmt
 MASTER_SITES=	http://dev.publicshout.org/qmrtg/download/
 
diff --git a/mail/quickml/Makefile b/mail/quickml/Makefile
index a72514f9e47f..075e53e8838b 100644
--- a/mail/quickml/Makefile
+++ b/mail/quickml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quickml
 PORTVERSION=	0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://0xcc.net/quickml/
 
diff --git a/mail/rmime/Makefile b/mail/rmime/Makefile
index a043c1acdd19..f5dfda07aac0 100644
--- a/mail/rmime/Makefile
+++ b/mail/rmime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rmime
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.subterrain.net/code/
 DISTNAME=	rmime.el
diff --git a/mail/spamoracle/Makefile b/mail/spamoracle/Makefile
index 561c726904f9..61c874c436ae 100644
--- a/mail/spamoracle/Makefile
+++ b/mail/spamoracle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spamoracle
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://cristal.inria.fr/~xleroy/software/
 
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index 56e4b83787ab..bc9ea4cc8521 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -14,6 +14,7 @@
 
 PORTNAME=	spamprobe
 PORTVERSION=	1.4d
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index a2a92cb734f9..8159dfeb9b24 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spruce
 PORTVERSION=	0.6.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 3309da979d45..667da1ddd5f6 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	1.0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v1.0/
 
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 84e4c706bc9f..7fc0faab602c 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	2.4.0.b7
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v2.4beta/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.b/beta/}
diff --git a/mail/sylpheed2-devel/pkg-plist b/mail/sylpheed2-devel/pkg-plist
index aaa265028d7e..c6ba8f3b5e11 100644
--- a/mail/sylpheed2-devel/pkg-plist
+++ b/mail/sylpheed2-devel/pkg-plist
@@ -116,5 +116,4 @@ share/pixmaps/sylpheed.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index 36e9a0a71ad7..ca951f43fdfd 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/
 
diff --git a/mail/sylpheed2/pkg-plist b/mail/sylpheed2/pkg-plist
index 427d6839a8cb..e3bbc6b4b9f9 100644
--- a/mail/sylpheed2/pkg-plist
+++ b/mail/sylpheed2/pkg-plist
@@ -117,4 +117,3 @@ share/pixmaps/sylpheed.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 36e9a0a71ad7..ca951f43fdfd 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/
 
diff --git a/mail/sylpheed3/pkg-plist b/mail/sylpheed3/pkg-plist
index 427d6839a8cb..e3bbc6b4b9f9 100644
--- a/mail/sylpheed3/pkg-plist
+++ b/mail/sylpheed3/pkg-plist
@@ -117,4 +117,3 @@ share/pixmaps/sylpheed.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/mail/sympa5/Makefile b/mail/sympa5/Makefile
index 7d746802964d..d788dbbdee5b 100644
--- a/mail/sympa5/Makefile
+++ b/mail/sympa5/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sympa
 PORTVERSION=	5.2.4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES?=	http://www.sympa.org/distribution/
 
diff --git a/mail/sympa5/pkg-plist b/mail/sympa5/pkg-plist
index c0064e34b833..bb3871b69ec3 100644
--- a/mail/sympa5/pkg-plist
+++ b/mail/sympa5/pkg-plist
@@ -421,28 +421,12 @@ sympa/icons/unknown.png
 @dirrm %%DATADIR%%/create_list_templates/discussion_list
 @dirrm %%DATADIR%%/create_list_templates
 @dirrm %%DATADIR%%
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
 %%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/en_US
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 %%NLS%%@dirrmtry share/locale/nb_NO/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/nb_NO
 %%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/oc
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_TW
 @dirrm %%EXAMPLESDIR%%/sample-list
 @dirrm %%EXAMPLESDIR%%
 @dirrm libexec/sympa
diff --git a/mail/thunderbird-dictionaries/Makefile b/mail/thunderbird-dictionaries/Makefile
index 7ea7831f46d4..89879b505e54 100644
--- a/mail/thunderbird-dictionaries/Makefile
+++ b/mail/thunderbird-dictionaries/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	thunderbird-dictionaries
 PORTVERSION=	20060220
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	dictionaries
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 308e68cb4311..b1fe456e0ebe 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	2.0.0.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 308e68cb4311..b1fe456e0ebe 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	2.0.0.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index 308e68cb4311..b1fe456e0ebe 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	2.0.0.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index f5c13d6bee20..fb63ceecc363 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkrat
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 CATEGORIES=	mail tk84
 MASTER_SITES=	http://tkrat.org/downloads/stable/ \
 		ftp://ftp.tkrat.org/pub/tkrat/
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index d1a0a7d8accd..bca12b738545 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	turba
 PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 3352d9ddbc2a..251b5308441e 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vm
 PORTVERSION=	7.19
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.seanet.com/~kylemonger/vm/ \
 		ftp://ftp.uni-mainz.de/pub/software/gnu/vm/ \
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 1cb99063e850..4ccc0ec61eed 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wanderlust
 PORTVERSION=	2.14.0
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/elisp/wl/stable/&,} \
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 604567ad1f88..aea377ece01e 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmbiff
 PORTVERSION=	0.4.27
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail windowmaker afterstep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 559e727cde50..89635d2144ba 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmmail
 PORTVERSION=	0.64
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	# none
 DISTNAME=	WMMail.app-${PORTVERSION}
diff --git a/mail/wmmaiload/Makefile b/mail/wmmaiload/Makefile
index 0df5afc50f78..482dccb13c84 100644
--- a/mail/wmmaiload/Makefile
+++ b/mail/wmmaiload/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmmaiload
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 
diff --git a/mail/wmmultipop3/Makefile b/mail/wmmultipop3/Makefile
index ac9d24690226..67e4430d3370 100644
--- a/mail/wmmultipop3/Makefile
+++ b/mail/wmmultipop3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmmultipop3
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	http://bart.sm.luth.se/~dansun-8/software/wmMultiPop3/
 DISTNAME=	wmMultiPop3-${PORTVERSION}
diff --git a/mail/wmpop3/Makefile b/mail/wmpop3/Makefile
index ffdd90d35910..a8c4af5dbe57 100644
--- a/mail/wmpop3/Makefile
+++ b/mail/wmpop3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmpop3
 PORTVERSION=	0.5.6a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	#
 DISTNAME=	WMPop3-${PORTVERSION}
diff --git a/mail/wmymail/Makefile b/mail/wmymail/Makefile
index 1b4cd1afa874..9ca7e1929615 100644
--- a/mail/wmymail/Makefile
+++ b/mail/wmymail/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmymail
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail x11
 MASTER_SITES=	http://yath.mine.nu/wmymail/ \
 		http://dockapps.org/files/65/96/
diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
index 33ed737eb37e..2153fcc570a2 100644
--- a/mail/xbuffy/Makefile
+++ b/mail/xbuffy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbuffy
 PORTVERSION=	3.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.fiction.net/blong/programs/xbuffy/
 DISTNAME=	${PORTNAME}-3.3.bl.3
diff --git a/mail/xc-mail/Makefile b/mail/xc-mail/Makefile
index 02face9dde91..b8bf47c861e2 100644
--- a/mail/xc-mail/Makefile
+++ b/mail/xc-mail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xc-mail
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile
index fda7cbefe6c3..18dfb5be9e75 100644
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xfaces
 PORTVERSION=	3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/xfaces/ \
 		http://www.mavetju.org/download/adopted/xfaces/
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 26f01460f3a7..f26da79744e6 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-mailwatch-plugin
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail xfce
 MASTER_SITES=	http://spuriousinterrupt.org/files/mailwatch/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/mail/xfce4-mailwatch-plugin/pkg-plist b/mail/xfce4-mailwatch-plugin/pkg-plist
index 9acc82039192..a7245ea85f66 100644
--- a/mail/xfce4-mailwatch-plugin/pkg-plist
+++ b/mail/xfce4-mailwatch-plugin/pkg-plist
@@ -35,14 +35,6 @@ share/xfce4/panel-plugins/mailwatch.desktop
 @dirrm share/xfce4/doc/C
 @dirrm share/xfce4/doc
 @dirrm share/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/icons/hicolor/scalable/apps
 @dirrm share/icons/hicolor/scalable
 @dirrm share/icons/hicolor/48x48/apps
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index d2aca9a77dde..41d6e84d9e29 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfmail
 PORTVERSION=	1.5.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	ftp://xfmail.cfreeze.com/pub/xfmail/release/%SUBDIR%/	\
 		ftp://ftp.welcomes-you.com/pub/xfmail/release/%SUBDIR%/	\
diff --git a/mail/xlbiff/Makefile b/mail/xlbiff/Makefile
index fe944d159377..617eac974b8d 100644
--- a/mail/xlbiff/Makefile
+++ b/mail/xlbiff/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xlbiff
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index b4873326ae4a..6c2a184d76f3 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmail
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
@@ -17,6 +18,7 @@ COMMENT=	An X-based interface to the Berkeley mail program
 
 USE_IMAKE=	yes
 USE_XPM=	yes
+USE_XORG=	xbitmaps
 MAN1=		xmail.1
 
 .include <bsd.port.mk>
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 32ba0e37db57..318e233c3b35 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		xmailbox
 PORTVERSION=		2.5
+PORTREVISION=	1
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
diff --git a/mail/xmailwatcher/Makefile b/mail/xmailwatcher/Makefile
index a7dfeb307b67..38e0265e95ad 100644
--- a/mail/xmailwatcher/Makefile
+++ b/mail/xmailwatcher/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		xmailwatcher
 PORTVERSION=		1.6
+PORTREVISION=	1
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dcs.ed.ac.uk/home/gdmr/X11/
 DISTNAME=		xmailwatcher
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index b57d9252503e..72dc58d7e053 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	xpbiff
 PORTVERSION?=	1.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/xpbiff/
 DISTNAME=	xpbiff
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index adcaee65ddb6..eedcf7b5bc0c 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	PDL
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	math perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
 		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
diff --git a/math/R/Makefile b/math/R/Makefile
index 99c7ec70a152..494188856699 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	R
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	math lang
 MASTER_SITES=	http://cran.r-project.org/src/base/R-2/ \
 		ftp://cran.r-project.org/pub/R/src/base/R-2/ \
diff --git a/math/abakus/Makefile b/math/abakus/Makefile
index b7fe9ef99b00..d86f86a310ef 100644
--- a/math/abakus/Makefile
+++ b/math/abakus/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	abakus
 PORTVERSION=	0.91
+PORTREVISION=	1
 CATEGORIES=	math kde
 MASTER_SITES=	http://grammarian.homelinux.net/abakus/ \
 		http://www.athame.co.uk/mirror/
diff --git a/math/abs/Makefile b/math/abs/Makefile
index 8e0d84c67722..154a3f738b24 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	abs
 PORTVERSION=	0908
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://utenti.gufi.org/~gmarco/files/distfiles/ \
 		http://fresh.t-systems-sfr.com/unix/src/privat2/
diff --git a/math/algotutor/Makefile b/math/algotutor/Makefile
index f8713d311837..5becf9aa056b 100644
--- a/math/algotutor/Makefile
+++ b/math/algotutor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	algotutor
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://saturn.stu.edu.tw/~ckhung/dl/
 EXTRACT_SUFX=	.tgz
diff --git a/math/apc/Makefile b/math/apc/Makefile
index 9116fe9d6b0e..ee7b8b1378d1 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apc
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index 5bdf3d52f8ab..ebeb1b0a1acd 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asir
 PORTVERSION=	20060417
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.jssac.org/pub/distfiles/asir/ \
 		ftp://ftp.asir.org/pub/asir/src/ \
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index 0c749d648abe..c24db903b104 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asymptote
 PORTVERSION=	1.25
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/bamg/Makefile b/math/bamg/Makefile
index 910731fa891d..f7ad0f3b04ea 100644
--- a/math/bamg/Makefile
+++ b/math/bamg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bamg
 PORTVERSION=	0.68
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math science
 MASTER_SITES=	http://pauillac.inria.fr/cdrom/ftp/bamg/	\
 		http://www-rocq1.inria.fr/gamma/cdrom/ftp/bamg/	\
diff --git a/math/biggles/Makefile b/math/biggles/Makefile
index 7708f6e1f69d..01dce83dceb2 100644
--- a/math/biggles/Makefile
+++ b/math/biggles/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	biggles
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index 0252932c7abd..b3f2cb078ad8 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blacs
 PORTVERSION=	1.7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/blacs/
 DISTNAME=	BLACS
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index fb3c99eb6860..5339d25a7179 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	blitz++
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	blitz
diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile
index 6cefa4edcb82..eaa78d7cd763 100644
--- a/math/blocksolve95/Makefile
+++ b/math/blocksolve95/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blocksolve95
 PORTVERSION=	3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://info.mcs.anl.gov/pub/BlockSolve95/	\
 		ftp://ftp.irisa.fr/pub/mirrors/BlockSolve95/
diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index 41438db87218..f11d06dfc312 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	calcoo
 PORTVERSION=	1.3.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://webusers.physics.umn.edu/~kaminski/calcoo/
diff --git a/math/calctool/Makefile b/math/calctool/Makefile
index 6da6ac7b85c2..5a7d86d90516 100644
--- a/math/calctool/Makefile
+++ b/math/calctool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	calctool
 PORTVERSION=	2.4.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nsayer
diff --git a/math/chryzodus/Makefile b/math/chryzodus/Makefile
index 011d3ae12aa8..f8c135e77905 100644
--- a/math/chryzodus/Makefile
+++ b/math/chryzodus/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	chryzodus
 PORTVERSION=	0.32
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/clarence/Makefile b/math/clarence/Makefile
index 0dff933f496e..58e4f399b4e0 100644
--- a/math/clarence/Makefile
+++ b/math/clarence/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	clarence
 PORTVERSION=	0.4.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math python
 MASTER_SITES=	http://clay.ll.pl/download/
 
diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index 42cf4d7c8da2..80c851e3d40f 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	convertall
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://bellz.org/convertall/
 
diff --git a/math/coq/Makefile b/math/coq/Makefile
index 3c22d6a57363..42d11f84a923 100644
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	coq
 PORTVERSION=	8.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/coq/V${PORTVERSION}/
 
diff --git a/math/digitizer/Makefile b/math/digitizer/Makefile
index 60b9e5252696..6ea023b0be1f 100644
--- a/math/digitizer/Makefile
+++ b/math/digitizer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	digitizer
 PORTVERSION=	4.1
+PORTREVISION=	1
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/dislin/Makefile b/math/dislin/Makefile
index a4ba717ef15c..48d723169323 100644
--- a/math/dislin/Makefile
+++ b/math/dislin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dislin
 PORTVERSION=	9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.gwdg.de/pub/grafik/dislin/unix/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.fbsd${BINVER}
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index 3313ff4452f3..31d31043d52e 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drgeo
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ofset
diff --git a/math/edenmath/Makefile b/math/edenmath/Makefile
index cafb2c731fec..4e4a8d228724 100644
--- a/math/edenmath/Makefile
+++ b/math/edenmath/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	edenmath
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	math gnustep
 MASTER_SITES=	http://www.eskimo.com/~pburns/EdenMath/files/
 DISTNAME=	EdenMath_GNUstep-${PORTVERSION}
diff --git a/math/emacs-calc/Makefile b/math/emacs-calc/Makefile
index 9e2cba271886..5ddfd3ece2f0 100644
--- a/math/emacs-calc/Makefile
+++ b/math/emacs-calc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	calc
 PORTVERSION=	2.02f
+PORTREVISION=	1
 CATEGORIES=	math editors
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/emc2/Makefile b/math/emc2/Makefile
index 1cd80e6d32d4..c74599e38c44 100644
--- a/math/emc2/Makefile
+++ b/math/emc2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emc2
 PORTVERSION=	2.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math science
 MASTER_SITES=	http://www-rocq1.inria.fr/gamma/cdrom/ftp/emc2/
 .if !defined(NOPORTDOCS)
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 112ca6d74533..b53eb63c9f6a 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	eukleides
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.eukleides.org/download/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
diff --git a/math/femlab/Makefile b/math/femlab/Makefile
index 309990042976..7f3090b46640 100644
--- a/math/femlab/Makefile
+++ b/math/femlab/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	femlab
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math science
 # mastersite disappeared in April 2000
 MASTER_SITES=	# ftp://ftp.md.chalmers.se/pub/Femlab/
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index fec4c1de4a47..d94553bc6848 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	fityk
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF
 
diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index 2bdff3c976ef..b8610af0058b 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freefem++
 DISTVERSION=	2.16-2
+PORTREVISION=	1
 CATEGORIES=	math science
 MASTER_SITES=	http://www.freefem.org/ff++/ftp/
 
diff --git a/math/freefem/Makefile b/math/freefem/Makefile
index 07c88f52a963..c4a3b0b834de 100644
--- a/math/freefem/Makefile
+++ b/math/freefem/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freefem
 PORTVERSION=	3.5.7
+PORTREVISION=	1
 CATEGORIES=	math science
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kfem
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 96a6969e87b1..6739fec2d86b 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		FreeMat
 PORTVERSION=		3.2
+PORTREVISION=	1
 CATEGORIES=		math science
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index efd8a15c2738..5097ec6d97b7 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	fung-calc
 PORTVERSION=	1.3.2b
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index 01aca06fb894..5c222ce2784f 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	galculator
 PORTVERSION=	1.2.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/galculator/pkg-plist b/math/galculator/pkg-plist
index d2ef160c166e..83443c2c7691 100644
--- a/math/galculator/pkg-plist
+++ b/math/galculator/pkg-plist
@@ -20,7 +20,3 @@ share/locale/ro/LC_MESSAGES/galculator.mo
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
diff --git a/math/gambit/Makefile b/math/gambit/Makefile
index a3048050fb8e..3d3fae63a74b 100644
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gambit
 PORTVERSION=	0.2006.01.20
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index f7653443185d..0a7744b34deb 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gcalctool
 PORTVERSION=	5.9.14
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index 4375af83f49f..34d2f4c3c8c8 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -182,59 +182,23 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
 @dirrm share/gnome/help/gcalctool/C/figures
 @dirrm share/gnome/help/gcalctool/C
 @dirrm share/gnome/help/gcalctool
-@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/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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
-@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/math/gdcalc/Makefile b/math/gdcalc/Makefile
index 34d8bdf8ae3c..23d96b22229c 100644
--- a/math/gdcalc/Makefile
+++ b/math/gdcalc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdcalc
 PORTVERSION=	2.15
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://bhepple.freeshell.org/dcalc/unix/
 
diff --git a/math/gdcalc/pkg-plist b/math/gdcalc/pkg-plist
index 07be35361106..73bd7b81094c 100644
--- a/math/gdcalc/pkg-plist
+++ b/math/gdcalc/pkg-plist
@@ -7,7 +7,6 @@ share/pixmaps/HP-16C-48.xpm
 share/pixmaps/mini-HP-16C-48.xpm
 share/pixmaps/HP-16C-48.png
 share/icons/HP-16C-48.png
-@dirrmtry share/pixmaps
 @dirrmtry share/icons
 @dirrmtry share/applnk/Applications
 @dirrmtry share/applnk
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 43b85248505a..6cbbf377c878 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geg
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.infolaunch.com/~daveb/
diff --git a/math/geogebra-i18n/Makefile b/math/geogebra-i18n/Makefile
index 03904534a924..c2f5ca2fc70a 100644
--- a/math/geogebra-i18n/Makefile
+++ b/math/geogebra-i18n/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geogebra-i18n
 PORTVERSION=	2.6b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math java
 MASTER_SITES=	http://www.geogebra.at/download/InstData/Java/ \
 		http://nivi.interfree.it/distfiles/${DIST_SUBDIR}/
diff --git a/math/geonext/Makefile b/math/geonext/Makefile
index b19c069db083..ff66ece6716c 100644
--- a/math/geonext/Makefile
+++ b/math/geonext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	geonext
 PORTVERSION=	1.51
+PORTREVISION=	1
 CATEGORIES+=	math graphics java
 MASTER_SITES=	http://geonext.uni-bayreuth.de/data/download/\
 		http://home.arcor.de/fehlner/site/download/\
diff --git a/math/glgraph/Makefile b/math/glgraph/Makefile
index 64e765159751..7c4d71e2fa67 100644
--- a/math/glgraph/Makefile
+++ b/math/glgraph/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	glgraph
 PORTVERSION=	0.2.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://glgraph.kaosu.ch/downl/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 8f88844d6480..0d46dd3c3ec5 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnumeric
 PORTVERSION=	1.7.9
+PORTREVISION=	1
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index e0507088991f..15911e3b2af9 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -940,43 +940,11 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/goffice/0.3.8/plugins/gnumeric
 @dirrm include/libspreadsheet-1-7
 @unexec update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 0f9d75248b29..ae8d46d40cb4 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnuplot371+
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math japanese graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.yama-ga.com/gnuplot/:patch \
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index a7eadc0eddeb..ccfa106c67c7 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnuplot
 PORTVERSION=	4.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/gnuplot/pkg-plist b/math/gnuplot/pkg-plist
index e4d65213dec1..2e66391a4e14 100644
--- a/math/gnuplot/pkg-plist
+++ b/math/gnuplot/pkg-plist
@@ -168,5 +168,3 @@ share/texmf-local/tex/latex/gnuplot/gnuplot.cfg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/gnuplot/4.2
 @dirrm libexec/gnuplot
-@dirrm lib/X11/app-defaults
-@dirrm lib/X11
diff --git a/math/goblin/Makefile b/math/goblin/Makefile
index c5992653b0d3..3857c72f81ad 100644
--- a/math/goblin/Makefile
+++ b/math/goblin/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	goblin
 PORTVERSION=	2.6.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.math.uni-augsburg.de/~fremuth/goblin.docs/  \
 		${MASTER_SITE_LOCAL}
diff --git a/math/grace/Makefile b/math/grace/Makefile
index e546e874ea3e..23f026e13757 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grace
 PORTVERSION=	5.1.21
+PORTREVISION=	1
 CATEGORIES=	math print
 #
 MASTER_SITES=	ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/ \
diff --git a/math/graphthing/Makefile b/math/graphthing/Makefile
index a24720e50927..2654581fb8a6 100644
--- a/math/graphthing/Makefile
+++ b/math/graphthing/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	graphthing
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://graph.seul.org/
 
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 679a04ae4d11..49e3dc546d52 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gretl
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/gri/Makefile b/math/gri/Makefile
index 85eda8906b1c..07f135b19b86 100644
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gri
 PORTVERSION=	2.12.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 20efdf77d0f0..85d6535a503f 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grpn
 PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://lashwhip.com/grpn/
 
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index c74eb071f7c8..62c1f86705e4 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guppi
 PORTVERSION=	0.40.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/Guppi/0.40
diff --git a/math/guppi/pkg-plist b/math/guppi/pkg-plist
index 266ca186aa74..a69ce37d6014 100644
--- a/math/guppi/pkg-plist
+++ b/math/guppi/pkg-plist
@@ -309,17 +309,3 @@ share/locale/zh_CN/LC_MESSAGES/Guppi.mo
 @dirrm lib/guppi
 @dirrm include/gnome-1.0/libguppitank
 @dirrm include/gnome-1.0/libguppi
-@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/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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
diff --git a/math/hexcalc/Makefile b/math/hexcalc/Makefile
index b9179fdf4d68..e6cb309c899e 100644
--- a/math/hexcalc/Makefile
+++ b/math/hexcalc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hexcalc
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://aixpdslib.seas.ucla.edu/pub/hexcalc/RISC/3.2/src/
 DISTNAME=	${PORTNAME}
diff --git a/math/isabelle/Makefile b/math/isabelle/Makefile
index ae74eda7f151..61384f95ae92 100644
--- a/math/isabelle/Makefile
+++ b/math/isabelle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	isabelle
 PORTVERSION=	2005
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://isabelle.in.tum.de/dist/ \
 		http://www.cl.cam.ac.uk/Research/HVG/Isabelle/dist/ \
diff --git a/math/jakarta-commons-math/Makefile b/math/jakarta-commons-math/Makefile
index c70eb8379776..559413680be7 100644
--- a/math/jakarta-commons-math/Makefile
+++ b/math/jakarta-commons-math/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-math
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	math java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/source
diff --git a/math/javaview/Makefile b/math/javaview/Makefile
index 62792f2986e8..bb22f257b01d 100644
--- a/math/javaview/Makefile
+++ b/math/javaview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	javaview-lite
 PORTVERSION=	3.95
+PORTREVISION=	1
 CATEGORIES=	math java graphics
 MASTER_SITES=	http://www.javaview.de/download/data/
 DISTFILES=	javaview.zip jv_models.zip jv_tutor.zip
diff --git a/math/k3dsurf/Makefile b/math/k3dsurf/Makefile
index eb97e77f9a3a..4735ae30e7f0 100644
--- a/math/k3dsurf/Makefile
+++ b/math/k3dsurf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	k3dsurf
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/kaskade/Makefile b/math/kaskade/Makefile
index cdcbefb71c01..d92413f2d853 100644
--- a/math/kaskade/Makefile
+++ b/math/kaskade/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kaskade
 PORTVERSION=	3.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math science
 MASTER_SITES=	ftp://ftp.zib.de/pub/kaskade/3.x/
 DISTNAME=	${PORTVERSION}
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index d2a8b1c1613f..349568482863 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/math/koctave/Makefile b/math/koctave/Makefile
index bf593462e005..0293be8f0b20 100644
--- a/math/koctave/Makefile
+++ b/math/koctave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	koctave3
 PORTVERSION=	0.65
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math kde
 MASTER_SITES=	http://lehmann.in-berlin.de/bsd/
 
diff --git a/math/kseg/Makefile b/math/kseg/Makefile
index 95f731917582..2440b1416274 100644
--- a/math/kseg/Makefile
+++ b/math/kseg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kseg
 PORTVERSION=	0.403
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.mit.edu/~ibaran/
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 02e2173735aa..e7c483565847 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	LabPlot
 PORTVERSION=	1.5.1.5
+PORTREVISION=	1
 CATEGORIES=	math kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=labplot
diff --git a/math/libjbigi/Makefile b/math/libjbigi/Makefile
index b62a3423f2aa..07a19a7d5732 100644
--- a/math/libjbigi/Makefile
+++ b/math/libjbigi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libjbigi
 PORTVERSION=	0.6.1.13
+PORTREVISION=	1
 CATEGORIES=	math java
 MASTER_SITES=	http://dev.i2p.net/i2p/
 DISTNAME=	i2p-${PORTVERSION}
diff --git a/math/matrices/Makefile b/math/matrices/Makefile
index ffc4b9ec6ad9..35baf9b222b8 100644
--- a/math/matrices/Makefile
+++ b/math/matrices/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	matrices
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://mplus.dk/${PORTNAME}/
 
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 2495e2f1df42..181526105c47 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	maxima
 PORTVERSION=	5.10.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/math/mbasecalc/Makefile b/math/mbasecalc/Makefile
index 25ee2704f15a..fc8c175d7e82 100644
--- a/math/mbasecalc/Makefile
+++ b/math/mbasecalc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mbasecalc
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.muquit.com/muquit/software/mbasecalc/
 DISTNAME=	${PORTNAME}
diff --git a/math/naturalmath/Makefile b/math/naturalmath/Makefile
index 9be505db38d0..9e9295124c03 100644
--- a/math/naturalmath/Makefile
+++ b/math/naturalmath/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	naturalmath
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.math.missouri.edu/~stephen/naturalmath/
 
diff --git a/math/ngraph/Makefile b/math/ngraph/Makefile
index 4044704a1d6a..64fc1247cc1d 100644
--- a/math/ngraph/Makefile
+++ b/math/ngraph/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ngraph
 PORTVERSION=	6.3.30
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://www2e.biglobe.ne.jp/~isizaka/bin/ \
 		${MASTER_SITE_PORTS_JP}
diff --git a/math/ocaml-ocamlgraph/Makefile b/math/ocaml-ocamlgraph/Makefile
index c45f0564bf7f..5c54b3afe64a 100644
--- a/math/ocaml-ocamlgraph/Makefile
+++ b/math/ocaml-ocamlgraph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ocamlgraph
 PORTVERSION=	0.95
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.lri.fr/~filliatr/ftp/ocamlgraph/
 PKGNAMEPREFIX=	ocaml-
diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile
index 60f152c9fd17..2f3fcf2c4e9f 100644
--- a/math/octave-devel/Makefile
+++ b/math/octave-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	2.9.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/\
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index f4b36effb2a3..ceeddc216b13 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	octave-forge
 PORTVERSION=	2006.03.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	octave
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 73ee7c8aaa8d..e1cca0d6fceb 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	2.1.73
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ \
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index bbf1b47569ed..f349da34beff 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oleo
 PORTVERSION=	1.99.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/orpie/Makefile b/math/orpie/Makefile
index 2991a1ed3f82..1c510c186b9a 100644
--- a/math/orpie/Makefile
+++ b/math/orpie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	orpie
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES+=	math
 MASTER_SITES=	http://www.eecs.umich.edu/~pelzlpj/orpie/
 
diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile
index ae251f15af9c..6219be5bd56a 100644
--- a/math/parmetis/Makefile
+++ b/math/parmetis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ParMetis
 PORTVERSION=	3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math parallel
 MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/
 
diff --git a/math/petsc/Makefile b/math/petsc/Makefile
index 3c0924985484..936da70b9165 100644
--- a/math/petsc/Makefile
+++ b/math/petsc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	petsc
 DISTVERSION=	2.3.2-p8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/
diff --git a/math/pgcalc/Makefile b/math/pgcalc/Makefile
index 34796584b910..e8d90cf60fa7 100644
--- a/math/pgcalc/Makefile
+++ b/math/pgcalc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pgcalc2
 DISTVERSION=	2.2-4
+PORTREVISION=	1
 CATEGORIES=	math kde
 MASTER_SITES=	http://www.pgcalc.net/
 
diff --git a/math/plman/Makefile b/math/plman/Makefile
index bbc2dce879a9..257c37ab1953 100644
--- a/math/plman/Makefile
+++ b/math/plman/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	plman
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	math java
 MASTER_SITES=	http://${PORTNAME}.sourceforge.net/dist/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}.sourceforge.net/
diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index 4d9fa962a00a..07917516cc58 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ploticus
 PORTVERSION=	2.32
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://ploticus.sourceforge.net/download/
 DISTNAME=	pl${PORTVERSION:S/.//}src
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 276481b95efd..5dc231b4e9ae 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	plplot
 PORTVERSION=	5.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile
index 8b4199e81025..6d91c0373f74 100644
--- a/math/proofgeneral/Makefile
+++ b/math/proofgeneral/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proofgeneral
 PORTVERSION=	3.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math elisp
 MASTER_SITES=	http://proofgeneral.inf.ed.ac.uk/releases/
 DISTNAME=	ProofGeneral-3.6pre061107
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 28348c8c0d73..55c04e8d2ccd 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pspp
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/py-basemap/Makefile b/math/py-basemap/Makefile
index e609b07c5f8a..d719fee0f54f 100644
--- a/math/py-basemap/Makefile
+++ b/math/py-basemap/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	basemap
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	matplotlib
diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile
index fc33f80e2b29..791a5b7f6790 100644
--- a/math/py-gato/Makefile
+++ b/math/py-gato/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gato
 PORTVERSION=	0.99
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gato
diff --git a/math/py-gnuplot/Makefile b/math/py-gnuplot/Makefile
index 41022bb9dda7..6dbdfb191fee 100644
--- a/math/py-gnuplot/Makefile
+++ b/math/py-gnuplot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	py-gnuplot
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnuplot-py
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index ee317e996a9f..6f7e5732f424 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	matplotlib
 PORTVERSION=	0.90.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 789a972b248e..c891066b09a3 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qalculate
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/qgfe/Makefile b/math/qgfe/Makefile
index 871a29f998f4..406bb42ede9b 100644
--- a/math/qgfe/Makefile
+++ b/math/qgfe/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qgfe
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.xm1math.net/qgfe/
 
diff --git a/math/qscanplot/Makefile b/math/qscanplot/Makefile
index 7ebb34b273f4..01ac5d7a7617 100644
--- a/math/qscanplot/Makefile
+++ b/math/qscanplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qscanplot
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 # per distfile survey, mastersite disappeared in March 2003
 MASTER_SITES=	# http://www.gae.ucm.es/~gonzalez/qscanplot/
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index 94f924336255..339972a312ca 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qtiplot
 PORTVERSION=	0.8.9
+PORTREVISION=	1
 CATEGORIES=	math science
 MASTER_SITES=	http://soft.proindependent.com/src/
 
diff --git a/math/qwtplot3d-qt4/Makefile b/math/qwtplot3d-qt4/Makefile
index 98fa5be3c3cb..2e4e38ab3f28 100644
--- a/math/qwtplot3d-qt4/Makefile
+++ b/math/qwtplot3d-qt4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qwtplot3d
 PORTVERSION=	0.2.6
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,6 +20,8 @@ COMMENT=	A 3D plotting widget for scientific data and mathematical expressions
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
 USE_QT_VER=	3
+USE_XLIB=	yes
+USE_GL=		yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_ENV=	QTDIR=${QT_PREFIX}
 USE_LDCONFIG=	yes
diff --git a/math/qwtplot3d/Makefile b/math/qwtplot3d/Makefile
index 98fa5be3c3cb..2e4e38ab3f28 100644
--- a/math/qwtplot3d/Makefile
+++ b/math/qwtplot3d/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qwtplot3d
 PORTVERSION=	0.2.6
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,6 +20,8 @@ COMMENT=	A 3D plotting widget for scientific data and mathematical expressions
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
 USE_QT_VER=	3
+USE_XLIB=	yes
+USE_GL=		yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_ENV=	QTDIR=${QT_PREFIX}
 USE_LDCONFIG=	yes
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index 5b2341d84be0..ac8aa6fa5b59 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rkward
 PORTVERSION=	0.4.7
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/rkward-kde4/pkg-plist b/math/rkward-kde4/pkg-plist
index f26b53277560..d6be6560b15c 100644
--- a/math/rkward-kde4/pkg-plist
+++ b/math/rkward-kde4/pkg-plist
@@ -398,8 +398,6 @@ share/icons/locolor/32x32/apps/rkward.png
 %%NLS%%share/locale/it/LC_MESSAGES/rkward.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/rkward.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/rkward.mo
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/apps/rkward/x11device
 @dirrm share/apps/rkward/uni1.2
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 5b2341d84be0..ac8aa6fa5b59 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rkward
 PORTVERSION=	0.4.7
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/rkward/pkg-plist b/math/rkward/pkg-plist
index f26b53277560..d6be6560b15c 100644
--- a/math/rkward/pkg-plist
+++ b/math/rkward/pkg-plist
@@ -398,8 +398,6 @@ share/icons/locolor/32x32/apps/rkward.png
 %%NLS%%share/locale/it/LC_MESSAGES/rkward.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/rkward.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/rkward.mo
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/apps/rkward/x11device
 @dirrm share/apps/rkward/uni1.2
diff --git a/math/rpy/Makefile b/math/rpy/Makefile
index 1b80517b4eb9..420e59f28fd8 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	rpy
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index 1b80517b4eb9..420e59f28fd8 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	rpy
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/ruby-gnuplot/Makefile b/math/ruby-gnuplot/Makefile
index 5a65b284f9a2..03a56ff03c69 100644
--- a/math/ruby-gnuplot/Makefile
+++ b/math/ruby-gnuplot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnuplot
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	math ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	r${PORTNAME}
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index d10f54998e2a..fb1fef8e7bd0 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scalapack
 PORTVERSION=	1.7.5
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/scalapack/
 DISTFILES=	scalapack-${PORTVERSION}.tgz manpages.tgz
diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile
index f274f308f1c2..4f97f2da6949 100644
--- a/math/scigraphica/Makefile
+++ b/math/scigraphica/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scigraphica
 PORTVERSION=	0.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math gnome
 MASTER_SITES=	http://scigraphica.sourceforge.net/src/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile
index 3a4cd6d1bec8..1c3fdb6f559a 100644
--- a/math/scilab-toolbox-swt/Makefile
+++ b/math/scilab-toolbox-swt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	swt
 PORTVERSION=	0.1.0.r3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scwt
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 7ce9011591ff..16aa84b060bc 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math cad parallel
 MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/math/sdpara/Makefile b/math/sdpara/Makefile
index 5aa379595d40..bb0a400d23ca 100644
--- a/math/sdpara/Makefile
+++ b/math/sdpara/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdpara
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math parallel
 MASTER_SITES=   http://sdpa.indsys.chuo-u.ac.jp/sdpa/files/
 DISTFILES=	${PORTNAME}.${PORTVERSION}.src.tar.gz
diff --git a/math/ses/Makefile b/math/ses/Makefile
index cd731d78c555..6633905abfb7 100644
--- a/math/ses/Makefile
+++ b/math/ses/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ses
 PORTVERSION=	031130
+PORTREVISION=	1
 CATEGORIES=	math elisp
 MASTER_SITES=	http://home.comcast.net/~jyavner/ses/
 DISTNAME=	ses21-${PORTVERSION}
diff --git a/math/snns/Makefile b/math/snns/Makefile
index 4292209421ec..a34fd691320e 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snns
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/ \
 		ftp://ftp.informatik.uni-stuttgart.de/pub/SNNS/
diff --git a/math/stepulator/Makefile b/math/stepulator/Makefile
index b3285ce02f36..e95e05f0112c 100644
--- a/math/stepulator/Makefile
+++ b/math/stepulator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stepulator
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	math gnustep
 MASTER_SITES=	http://www.linuks.mine.nu/stepulator/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/math/surf/Makefile b/math/surf/Makefile
index 7d190429f9a7..269b8826579d 100644
--- a/math/surf/Makefile
+++ b/math/surf/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	surf
 PORTVERSION=	1.0.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/tablix/Makefile b/math/tablix/Makefile
index fcc998197fcf..d85bdcb07079 100644
--- a/math/tablix/Makefile
+++ b/math/tablix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tablix2
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	math www
 MASTER_SITES=	http://www.tablix.org/releases/stable/ \
 		http://my.samba.org/
diff --git a/math/topaz/Makefile b/math/topaz/Makefile
index 13125321cbcf..daa99ffcabe0 100644
--- a/math/topaz/Makefile
+++ b/math/topaz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	topaz
 PORTVERSION=	3.40
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA007663/topaz/bin/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/}-src
diff --git a/math/triangle/Makefile b/math/triangle/Makefile
index cc1398a645c1..b02cee8cd8b0 100644
--- a/math/triangle/Makefile
+++ b/math/triangle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	triangle
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://cm.bell-labs.com/netlib/voronoi/
 DISTNAME=	${PORTNAME}
diff --git a/math/truthtable/Makefile b/math/truthtable/Makefile
index 682912135571..24e60047772d 100644
--- a/math/truthtable/Makefile
+++ b/math/truthtable/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	truthtable
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	math java
 MASTER_SITES=	http://www.kinostudios.com/java/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
diff --git a/math/ump/Makefile b/math/ump/Makefile
index 4701a4508201..704a90f3fcdd 100644
--- a/math/ump/Makefile
+++ b/math/ump/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ump
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	u-m-p
@@ -21,6 +22,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_XLIB=	yes
+USE_GL=		yes
 USE_X_PREFIX=	yes
 
 ALL_TARGET=	${PORTNAME}
diff --git a/math/vtk/Makefile b/math/vtk/Makefile
index f1cdfb01f817..e7ec8ecbb6c5 100644
--- a/math/vtk/Makefile
+++ b/math/vtk/Makefile
@@ -15,7 +15,7 @@
 
 PORTNAME=	vtk
 PORTVERSION=	4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math graphics
 MASTER_SITES=	http://ovt.irfu.se/vtk/files/
 DISTFILES?=	VTK-${PORTVERSION}-LatestRelease.tar.gz
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index f1cdfb01f817..e7ec8ecbb6c5 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -15,7 +15,7 @@
 
 PORTNAME=	vtk
 PORTVERSION=	4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math graphics
 MASTER_SITES=	http://ovt.irfu.se/vtk/files/
 DISTFILES?=	VTK-${PORTVERSION}-LatestRelease.tar.gz
diff --git a/math/wmcalc/Makefile b/math/wmcalc/Makefile
index 7480f21e0518..bdd780a1e6dd 100644
--- a/math/wmcalc/Makefile
+++ b/math/wmcalc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmcalc
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	math windowmaker
 MASTER_SITES=	http://members.cox.net/ehf_dockapps/wmcalc/ \
 		${MASTER_SITE_LOCAL}
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index 21a0ee56c89b..aee2e23436a4 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wxMaxima
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile
index 309dec60ec84..3d059a3d727d 100644
--- a/math/xgfe/Makefile
+++ b/math/xgfe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xgfe
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	graphics/gnuplot/contrib
diff --git a/math/xgobi/Makefile b/math/xgobi/Makefile
index 4024e780adbc..6aa3456a6bec 100644
--- a/math/xgobi/Makefile
+++ b/math/xgobi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xgobi
 PORTVERSION=	2002.06.20
+PORTREVISION=	1
 CATEGORIES=	math graphics
 MASTER_SITES=	http://public.research.att.com/~stat/xgobi/
 DISTNAME=	xgobi
@@ -23,6 +24,7 @@ BUILD_WRKSRC=	${PATCH_WRKSRC}
 
 USE_IMAKE=	true
 USE_XPM=	yes
+USE_XORG=	xbitmaps
 
 XFREE86_HTML_MAN=	no
 MANCOMPRESSED=	no
diff --git a/math/xgraph/Makefile b/math/xgraph/Makefile
index 70ac9af3ff6e..c2c87afce841 100644
--- a/math/xgraph/Makefile
+++ b/math/xgraph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xgraph
 PORTVERSION=	11.3.2.20000910
+PORTREVISION=	1
 CATEGORIES=	math print
 MASTER_SITES=	ftp://ftp.cs.utoronto.ca/pub/radford/
 DISTNAME=	xgraph-11
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 842f10758a8e..119c5bfbf179 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xldlas
 PORTVERSION=	0.85
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/visualization
diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index 62d31fe6194c..c4df03e6cf44 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xlispstat
 PORTVERSION=	3.52.20
+PORTREVISION=	1
 CATEGORIES=	math lang lisp
 MASTER_SITES=	ftp://ftp.stat.umn.edu/pub/xlispstat/current/   \
 		http://lib.stat.cmu.edu/xlispstat/Src/current/  \
diff --git a/math/xplot/Makefile b/math/xplot/Makefile
index 851d0dfe3dac..a6e59c956c79 100644
--- a/math/xplot/Makefile
+++ b/math/xplot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xplot
 PORTVERSION=	0.90.7.1
+PORTREVISION=	1
 CATEGORIES=	math graphics net
 MASTER_SITES=	http://www.xplot.org/xplot/
 
diff --git a/math/xppaut/Makefile b/math/xppaut/Makefile
index add781e8af9e..6756fffb1db1 100644
--- a/math/xppaut/Makefile
+++ b/math/xppaut/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xppaut
 PORTVERSION=	5.96
+PORTREVISION=	1
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.math.pitt.edu/~bard/bardware/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -16,6 +17,7 @@ COMMENT=	Graphical tool for solving differential equations, etc
 
 MAN1=		xppaut.1
 USE_X_PREFIX=	yes
+USE_XORG=	xbitmaps
 MAKE_ARGS=	CC="${CC}"
 
 WRKSRC=		${WRKDIR}
diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index 506fcfeac69b..1bb0f2fc9e78 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xspread
 PORTVERSION=	3.1.1c
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	# disappeared
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index 9cf49cf2e12a..dd5ebaddfb53 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imm
 PORTVERSION=	3.5a1
+PORTREVISION=	1
 CATEGORIES=	mbone tk82
 MASTER_SITES=	ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
 DISTNAME=	imm.source
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index dac9b0de4de4..faec015e4f18 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nte
 PORTVERSION=	1.5a29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mbone tk80
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/1.5a29/
 
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index c1bc686afa8a..1282f9036d8e 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rat
 PORTVERSION=	4.2.25
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mbone audio ipv6 tk84
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/releases/${PORTVERSION}/ \
 		http://www.icir.org/hodson/ucl-mirror/
diff --git a/mbone/rat30/Makefile b/mbone/rat30/Makefile
index 636213f08b19..ffc96d611e3f 100644
--- a/mbone/rat30/Makefile
+++ b/mbone/rat30/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rat
 PORTVERSION=	3.0.35
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mbone audio
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/releases/${PORTVERSION}/
 
diff --git a/mbone/relate/Makefile b/mbone/relate/Makefile
index d1ac6005d779..cacfccb1f0d4 100644
--- a/mbone/relate/Makefile
+++ b/mbone/relate/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	relate
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	mbone
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/relate-ui/${PORTVERSION}/
 
diff --git a/mbone/rqm/Makefile b/mbone/rqm/Makefile
index c651b7f9defb..a78d7fc6fab7 100644
--- a/mbone/rqm/Makefile
+++ b/mbone/rqm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rqm
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	mbone
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/
 
diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index d9302b50d6f9..c0d828d70c87 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rtpmon
 PORTVERSION=	1.0a7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mbone tk83
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fenner
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index a4003f4bb28c..a05f351b6f64 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdr
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	mbone tk84
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/
 
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 6328fabca0ce..f68945deb3a7 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vat
 PORTVERSION=	4.0b2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mbone tk83
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
 DISTFILES=	vatsrc-4.0b2.tar.gz
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index d1ad10b8651f..5779f9ff15fd 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vic
 PORTVERSION=	2.8.1.1.6
+PORTREVISION=	1
 CATEGORIES=	mbone tk84 ipv6
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl1.1.6/
 DISTNAME=	${PORTNAME}-2.8ucl1.1.6
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index 83a0ce98bbd0..a1b4cf4ee682 100644
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wb
 PORTVERSION=	1.59
+PORTREVISION=	1
 CATEGORIES=	mbone
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/wb/
 DISTFILES=	i386-wb-1.59.tar.Z
diff --git a/mbone/wbd/Makefile b/mbone/wbd/Makefile
index 45122e9fa1bb..bf3397b5181b 100644
--- a/mbone/wbd/Makefile
+++ b/mbone/wbd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wbd
 PORTVERSION=	1.0u4
+PORTREVISION=	1
 CATEGORIES=	mbone
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/wbd/1.0ucl4/
 DISTNAME=	wbd-1.0ucl4
diff --git a/mbone/xspeakfree/Makefile b/mbone/xspeakfree/Makefile
index 70232501eefe..d52027cd4048 100644
--- a/mbone/xspeakfree/Makefile
+++ b/mbone/xspeakfree/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xspeakfree
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	mbone net audio
 MASTER_SITES=	http://www.liquidx.org/distfiles/
 
diff --git a/misc/alevt/Makefile b/misc/alevt/Makefile
index 6b26374e88f5..9216db6eb181 100644
--- a/misc/alevt/Makefile
+++ b/misc/alevt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alevt
 PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.goron.de/~froese/alevt/
 
diff --git a/misc/asbutton/Makefile b/misc/asbutton/Makefile
index e8732f75b30c..fa29fac73c65 100644
--- a/misc/asbutton/Makefile
+++ b/misc/asbutton/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asbutton
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	misc windowmaker afterstep
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asbutton/
 
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 1e6583621586..e628a8d8dc07 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	astrolog
 PORTVERSION=	5.40
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://www.astrolog.org/ftp/ephem/ \
 		http://www.astrolog.org/ftp/ \
diff --git a/misc/bb/Makefile b/misc/bb/Makefile
index c811a5b25e1c..0fbd5b6686bf 100644
--- a/misc/bb/Makefile
+++ b/misc/bb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bb
 PORTVERSION=	1.3.r1
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=aa-project
diff --git a/misc/bibletime-devel/Makefile b/misc/bibletime-devel/Makefile
index 8dbb59a3bde0..478391d684c4 100644
--- a/misc/bibletime-devel/Makefile
+++ b/misc/bibletime-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bibletime
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/bibletime-kde3/Makefile b/misc/bibletime-kde3/Makefile
index 8dbb59a3bde0..478391d684c4 100644
--- a/misc/bibletime-kde3/Makefile
+++ b/misc/bibletime-kde3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bibletime
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime-kde4/Makefile
index 8dbb59a3bde0..478391d684c4 100644
--- a/misc/bibletime-kde4/Makefile
+++ b/misc/bibletime-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bibletime
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index 8dbb59a3bde0..478391d684c4 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bibletime
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile
index c2210cea95d5..59515d80755f 100644
--- a/misc/bidwatcher/Makefile
+++ b/misc/bidwatcher/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bidwatcher
 PORTVERSION=	1.3.17
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/chord2html/Makefile b/misc/chord2html/Makefile
index e2abd1df4f04..54b121ad2104 100644
--- a/misc/chord2html/Makefile
+++ b/misc/chord2html/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	chord2html
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://sce-tindy.tecnik93.com/FreeBSD/ports/${PORTNAME}/sources/ \
 		http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
diff --git a/misc/cs/Makefile b/misc/cs/Makefile
index c4cab20dba58..7e768578e5c2 100644
--- a/misc/cs/Makefile
+++ b/misc/cs/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cs
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://njhurst.org/programming/cross-stitch/ \
 		${MASTER_SITE_LOCAL}
diff --git a/misc/cuecat/Makefile b/misc/cuecat/Makefile
index d98492747ae8..abc3e2d45406 100644
--- a/misc/cuecat/Makefile
+++ b/misc/cuecat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cuecat
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	http://www.mired.org/downloads/
 
diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile
index f8843b5d48b5..44f369d938cd 100644
--- a/misc/dejagnu/Makefile
+++ b/misc/dejagnu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dejagnu
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	misc tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/demoniac/Makefile b/misc/demoniac/Makefile
index 46d90ca967b0..e5c9fe39ead0 100644
--- a/misc/demoniac/Makefile
+++ b/misc/demoniac/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	demoniac
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.calodox.scene.org/demoniac/files/
 
diff --git a/misc/diary-hercules/Makefile b/misc/diary-hercules/Makefile
index 437597e0bea2..9136b5b9f91a 100644
--- a/misc/diary-hercules/Makefile
+++ b/misc/diary-hercules/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hercules
 PORTVERSION=	0.0.3.2
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	diary-
diff --git a/misc/diary-hercules/pkg-plist b/misc/diary-hercules/pkg-plist
index baf44f322ff9..8ed815251a71 100644
--- a/misc/diary-hercules/pkg-plist
+++ b/misc/diary-hercules/pkg-plist
@@ -42,5 +42,3 @@ share/locale/ru/LC_MESSAGES/hercules.mo
 %%PYTHON_SITELIBDIR%%/Hercules/workoutsql.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/Hercules/gui
 @dirrm %%PYTHON_SITELIBDIR%%/Hercules
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/misc/documancer/Makefile b/misc/documancer/Makefile
index a0c6d393f3b1..0130656e0089 100644
--- a/misc/documancer/Makefile
+++ b/misc/documancer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	documancer
 PORTVERSION=	0.2.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index c1e85c9edf69..81f01386d8fd 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dotfile
 PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc tk82
 MASTER_SITES=	http://www.blackie.dk/dotfile/download/
 
diff --git a/misc/earthview/Makefile b/misc/earthview/Makefile
index 6e7eaf86bda3..da59ee76c887 100644
--- a/misc/earthview/Makefile
+++ b/misc/earthview/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	earthview
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://fresh.t-systems-sfr.com/unix/src/privat2/
 EXTRACT_SUFX=	.tgz
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index 08653616a6df..66833f534671 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	elscreen
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	misc elisp
 MASTER_SITES=	ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
diff --git a/misc/estic/Makefile b/misc/estic/Makefile
index 3deb19714b87..db0c3e6bbcf8 100644
--- a/misc/estic/Makefile
+++ b/misc/estic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		estic
 PORTVERSION=		1.61
+PORTREVISION=	1
 CATEGORIES=		misc comms
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/misc/ewipe/Makefile b/misc/ewipe/Makefile
index fb5aaffdb404..172d152bb795 100644
--- a/misc/ewipe/Makefile
+++ b/misc/ewipe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ewipe
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	misc tk84
 MASTER_SITES=	http://www.jnet-jp.to/~sekisita/ewipe/ \
 		http://www.carpetsmoker.net/distfiles/ \
diff --git a/misc/explosions/Makefile b/misc/explosions/Makefile
index 8752f00ee8cc..9565baf9522c 100644
--- a/misc/explosions/Makefile
+++ b/misc/explosions/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	explosions
 PORTVERSION=	0.2005.07.31
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/explosions/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/^0.//}
diff --git a/misc/fcalc/Makefile b/misc/fcalc/Makefile
index 1f1ff8c71b4d..f661d9ea5f88 100644
--- a/misc/fcalc/Makefile
+++ b/misc/fcalc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fcalc
 PORTVERSION=	1
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://tangentsoft.net/fcalc/
 DISTNAME=	${PORTNAME}-tcl
diff --git a/misc/findutils/Makefile b/misc/findutils/Makefile
index c2050b60a32a..3b4ca24fad10 100644
--- a/misc/findutils/Makefile
+++ b/misc/findutils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	findutils
 PORTVERSION=	4.2.30
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	findutils
diff --git a/misc/findutils/pkg-plist b/misc/findutils/pkg-plist
index 161a5c39668d..70bc30aaf444 100644
--- a/misc/findutils/pkg-plist
+++ b/misc/findutils/pkg-plist
@@ -41,35 +41,7 @@ share/locale/tr/LC_MESSAGES/findutils.mo
 share/locale/vi/LC_MESSAGES/findutils.mo
 share/locale/zh_CN/LC_MESSAGES/findutils.mo
 share/locale/zh_TW/LC_MESSAGES/findutils.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@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/lg/LC_MESSAGES
 @dirrmtry share/locale/lg
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/misc/floatator/Makefile b/misc/floatator/Makefile
index e7f8aafe0ea1..0f3dcd77c2b2 100644
--- a/misc/floatator/Makefile
+++ b/misc/floatator/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	floatator
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://floatator.cichon.com/download/
 
diff --git a/misc/flyway/Makefile b/misc/flyway/Makefile
index 41000b49e7f1..9ae4cdb29ba1 100644
--- a/misc/flyway/Makefile
+++ b/misc/flyway/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	flyway
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	http://www.bellz.org/flyway/
 
diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile
index 592630e0d247..fcf5c037d016 100644
--- a/misc/freeguide/Makefile
+++ b/misc/freeguide/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freeguide
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	misc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freeguide-tv
diff --git a/misc/gkrellm-gamma/Makefile b/misc/gkrellm-gamma/Makefile
index a9e8900ea4b3..66d61d3d6aad 100644
--- a/misc/gkrellm-gamma/Makefile
+++ b/misc/gkrellm-gamma/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellm-gamma
 PORTVERSION=	2.03
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	misc
 MASTER_SITES=	http://www.sweb.cz/tripie/gkrellm/gamma/dist/
 
diff --git a/misc/gkrellm-helium/Makefile b/misc/gkrellm-helium/Makefile
index e5fc0f5556a9..346f0117ab51 100644
--- a/misc/gkrellm-helium/Makefile
+++ b/misc/gkrellm-helium/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellm-helium
 PORTVERSION=	2.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
 EXTRACT_SUFX=	.tgz
diff --git a/misc/gkrellm-xkb/Makefile b/misc/gkrellm-xkb/Makefile
index 4de5dce6e620..b4296a35cf02 100644
--- a/misc/gkrellm-xkb/Makefile
+++ b/misc/gkrellm-xkb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellm-xkb
 PORTVERSION=	1.05
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc x11
 MASTER_SITES=	http://www.sweb.cz/tripie/gkrellm/xkb/dist/
 
diff --git a/misc/gkrellmbgchg/Makefile b/misc/gkrellmbgchg/Makefile
index 268d6ef08eb7..20b74b0b3a3a 100644
--- a/misc/gkrellmbgchg/Makefile
+++ b/misc/gkrellmbgchg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmbgchg
 PORTVERSION=	0.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://www.bender-suhl.de/stefan/comp/sources/
 
diff --git a/misc/gkrellmbgchg2/Makefile b/misc/gkrellmbgchg2/Makefile
index ebf09713d7a7..d952d80901d1 100644
--- a/misc/gkrellmbgchg2/Makefile
+++ b/misc/gkrellmbgchg2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gkrellmbgchg2
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.bender-suhl.de/stefan/comp/sources/
 
diff --git a/misc/gkrellmfmonitor/Makefile b/misc/gkrellmfmonitor/Makefile
index ba161b6f2a8f..2152eddf8d86 100644
--- a/misc/gkrellmfmonitor/Makefile
+++ b/misc/gkrellmfmonitor/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gkrellmfmonitor
 PORTVERSION=	0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	# none
 DISTNAME=	fmonitor-${PORTVERSION}
diff --git a/misc/gkrellmfmonitor2/Makefile b/misc/gkrellmfmonitor2/Makefile
index d9860e0c7365..d5b11d7f116e 100644
--- a/misc/gkrellmfmonitor2/Makefile
+++ b/misc/gkrellmfmonitor2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gkrellmfmonitor
 PORTVERSION=	2.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
 DISTNAME=	gkrellm-fmonitor-${PORTVERSION}
diff --git a/misc/gkrellmlaunch/Makefile b/misc/gkrellmlaunch/Makefile
index 259e5fbea5d6..f3ab32119710 100644
--- a/misc/gkrellmlaunch/Makefile
+++ b/misc/gkrellmlaunch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmlaunch
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gkrellmlaunch2/Makefile b/misc/gkrellmlaunch2/Makefile
index 25a0c8a28d7c..ecc899556cde 100644
--- a/misc/gkrellmlaunch2/Makefile
+++ b/misc/gkrellmlaunch2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmlaunch
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gkrellscore/Makefile b/misc/gkrellscore/Makefile
index 8c56b8178594..5bdf52a25b49 100644
--- a/misc/gkrellscore/Makefile
+++ b/misc/gkrellscore/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellscore
 PORTVERSION=	0.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ \
 		http://voodoo.bawue.com/download/
diff --git a/misc/gkrellshoot/Makefile b/misc/gkrellshoot/Makefile
index d597d0bd75b3..5e78e85a954b 100644
--- a/misc/gkrellshoot/Makefile
+++ b/misc/gkrellshoot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellshoot
 PORTVERSION=	0.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gkrellshoot2/Makefile b/misc/gkrellshoot2/Makefile
index 795cf3f5f437..b1f561a9e15e 100644
--- a/misc/gkrellshoot2/Makefile
+++ b/misc/gkrellshoot2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gkrellshoot
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gkrellweather2/Makefile b/misc/gkrellweather2/Makefile
index 32a02b042e06..23615c7128e7 100644
--- a/misc/gkrellweather2/Makefile
+++ b/misc/gkrellweather2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellweather
 PORTVERSION=	2.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
 EXTRACT_SUFX=	.tgz
diff --git a/misc/gkx86info/Makefile b/misc/gkx86info/Makefile
index f387e3d81abc..ee18bb5f155d 100644
--- a/misc/gkx86info/Makefile
+++ b/misc/gkx86info/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkx86info
 PORTVERSION=	0.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/misc/gkx86info2/Makefile b/misc/gkx86info2/Makefile
index e9f1cefe5f89..315fbcbfa074 100644
--- a/misc/gkx86info2/Makefile
+++ b/misc/gkx86info2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkx86info2
 PORTVERSION=	0.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://anchois.free.fr/ \
 		http://depot.fsck.ch/mirror/distfiles/
diff --git a/misc/gman/Makefile b/misc/gman/Makefile
index 8923ac48d2e8..8d6fd7241175 100644
--- a/misc/gman/Makefile
+++ b/misc/gman/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gman
 PORTVERSION=	0.9.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/g/gman
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 40e51e57be43..c8e38bae8b91 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-icon-theme
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index 777b1b3079a3..4d2fef94a506 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -5489,62 +5489,22 @@ share/icons/gnome/scalable/status/weather-snow.svg
 share/icons/gnome/scalable/status/weather-storm.svg
 share/icons/gnome/scalable/status/xfce-trash_full.svg
 share/icons/gnome/scalable/stock/generic/stock_person.svg
-@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/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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrmtry share/icons/gnome/scalable/stock/generic
 @dirrmtry share/icons/gnome/scalable/stock
 @dirrmtry share/icons/gnome/scalable/status
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 9835c797bdc2..5d671f97e6a4 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-mime-data
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/misc/gnome-mime-data/pkg-plist b/misc/gnome-mime-data/pkg-plist
index 6222e99fef0b..fcffef85746d 100644
--- a/misc/gnome-mime-data/pkg-plist
+++ b/misc/gnome-mime-data/pkg-plist
@@ -78,53 +78,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zu/LC_MESSAGES/gnome-mime-data.mo
 @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_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/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/li/LC_MESSAGES
-@dirrmtry share/locale/li
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile
index b92a327a081d..f587621052fb 100644
--- a/misc/gnome-osd/Makefile
+++ b/misc/gnome-osd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-osd
 DISTVERSION=	0.11.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://telecom.inescporto.pt/~gjc/gnome-osd/${DISTVERSION:C|-.*$||}/
 
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index d26ca8ac93f6..396129acfc32 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-user-docs
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
index 739912fbfe61..822c877db699 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	gnomehier
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile
index 291342a3e0af..4cb310c255c7 100644
--- a/misc/gnomesword/Makefile
+++ b/misc/gnomesword/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomesword
 PORTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile
index 639b2cf35318..4f66335b15d4 100644
--- a/misc/gnustep-examples/Makefile
+++ b/misc/gnustep-examples/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnustep-examples
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	misc gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
diff --git a/misc/goblin/Makefile b/misc/goblin/Makefile
index c5992653b0d3..3857c72f81ad 100644
--- a/misc/goblin/Makefile
+++ b/misc/goblin/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	goblin
 PORTVERSION=	2.6.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.math.uni-augsburg.de/~fremuth/goblin.docs/  \
 		${MASTER_SITE_LOCAL}
diff --git a/misc/gonvert/Makefile b/misc/gonvert/Makefile
index c794f0e56789..e9562a90f2d0 100644
--- a/misc/gonvert/Makefile
+++ b/misc/gonvert/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gonvert
 PORTVERSION=	0.2.17
+PORTREVISION=	1
 CATEGORIES=	misc python gnome
 MASTER_SITES=	http://www.unihedron.com/projects/gonvert/downloads/
 
diff --git a/misc/gonvert/pkg-plist b/misc/gonvert/pkg-plist
index 0b0b175058ef..6e1452dc5bcb 100644
--- a/misc/gonvert/pkg-plist
+++ b/misc/gonvert/pkg-plist
@@ -10,7 +10,6 @@ share/applications/gonvert.desktop
 %%DATADIR%%/pixmaps/gonvert-icon_alternative.png
 share/locale/pl/LC_MESSAGES/gonvert.mo
 share/pixmaps/gonvert.png
-@comment @dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/gplbp/Makefile b/misc/gplbp/Makefile
index 73c8b95ff1dd..b4f306f25505 100644
--- a/misc/gplbp/Makefile
+++ b/misc/gplbp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gplbp
 PORTVERSION=	0.92
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.stampede.org/skibum/gplbp/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/misc/gregexp/Makefile b/misc/gregexp/Makefile
index a0fe6a94e76f..1a99398a71d9 100644
--- a/misc/gregexp/Makefile
+++ b/misc/gregexp/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gregexp
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	http://dentrassi.de/download/gregexp/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile
index 679a04ae4d11..49e3dc546d52 100644
--- a/misc/gretl/Makefile
+++ b/misc/gretl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gretl
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/grun/Makefile b/misc/grun/Makefile
index 7c6a89f6fbb8..ce629976b4b6 100644
--- a/misc/grun/Makefile
+++ b/misc/grun/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grun
 PORTVERSION=	0.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	http://www.brettnacher.org/users/dominik/FreeBSD/
 
diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile
index b092d74e56f8..c6b05c9ce255 100644
--- a/misc/gtkfind/Makefile
+++ b/misc/gtkfind/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gtkfind
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The program to use to have to remember all the options to find(1)
 
-BUILD_DEPENDS=	xterm:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	appres:${X_CLIENTS_PORT}
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/misc/gtktalog/Makefile b/misc/gtktalog/Makefile
index 9f22dbf5ccdd..204a2070e581 100644
--- a/misc/gtktalog/Makefile
+++ b/misc/gtktalog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtktalog
 PORTVERSION=	1.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gwenview-i18n/Makefile b/misc/gwenview-i18n/Makefile
index 68be2b4cf19c..622b00746acf 100644
--- a/misc/gwenview-i18n/Makefile
+++ b/misc/gwenview-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gwenview-i18n
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/-i18n//}
diff --git a/misc/gwenview-i18n/pkg-plist b/misc/gwenview-i18n/pkg-plist
index 80a5aba19ed0..1ebd45056113 100644
--- a/misc/gwenview-i18n/pkg-plist
+++ b/misc/gwenview-i18n/pkg-plist
@@ -149,44 +149,16 @@ share/locale/zh_TW/LC_MESSAGES/gwenview.mo
 share/locale/zu/LC_MESSAGES/gwenview.mo
 @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_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/ven/LC_MESSAGES
 @dirrmtry share/locale/ven
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
 @dirrmtry share/locale/fo/LC_MESSAGES
 @dirrmtry share/locale/fo
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@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/sv/gwenview
 @dirrm share/doc/HTML/ru/gwenview
 @dirrm share/doc/HTML/pt_BR/gwenview
diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile
index 8d8214dad960..74a90d4c3bfc 100644
--- a/misc/hotkeys/Makefile
+++ b/misc/hotkeys/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	hotkeys
 PORTVERSION=	0.5.7.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc
 MASTER_SITES=	http://ypwong.org/hotkeys/${PORTVERSION}/	\
 		${MASTER_SITE_XCONTRIB}
diff --git a/misc/instant-server/Makefile b/misc/instant-server/Makefile
index 650480b9e2e0..77f6a715e196 100644
--- a/misc/instant-server/Makefile
+++ b/misc/instant-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	instant-server
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	# Empty
 DISTFILES=	# None
diff --git a/misc/iso-codes/Makefile b/misc/iso-codes/Makefile
index 18f90e892958..c9ba10225e92 100644
--- a/misc/iso-codes/Makefile
+++ b/misc/iso-codes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	iso-codes
 DISTVERSION=	0.58
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL} \
 		http://freebsd.powered.net/distfiles/
diff --git a/misc/iso-codes/pkg-plist b/misc/iso-codes/pkg-plist
index 44dc84f78c76..848e4f293bb6 100644
--- a/misc/iso-codes/pkg-plist
+++ b/misc/iso-codes/pkg-plist
@@ -415,12 +415,8 @@ share/xml/iso-codes/iso_639_3.xml
 @dirrm share/xml/iso-codes
 @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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/wo/LC_MESSAGES
@@ -429,18 +425,12 @@ share/xml/iso-codes/iso_639_3.xml
 @dirrmtry share/locale/wal
 @dirrmtry share/locale/ve/LC_MESSAGES
 @dirrmtry share/locale/ve
-@dirrmtry share/locale/uz/LC_MESSAGES
-@dirrmtry share/locale/uz
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
 @dirrmtry share/locale/tl/LC_MESSAGES
 @dirrmtry share/locale/tl
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
 @dirrmtry share/locale/tig/LC_MESSAGES
 @dirrmtry share/locale/tig
 @dirrmtry share/locale/ti/LC_MESSAGES
@@ -451,40 +441,22 @@ share/xml/iso-codes/iso_639_3.xml
 @dirrmtry share/locale/syr
 @dirrmtry share/locale/sw/LC_MESSAGES
 @dirrmtry share/locale/sw
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/so/LC_MESSAGES
 @dirrmtry share/locale/so
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/sid/LC_MESSAGES
 @dirrmtry share/locale/sid
 @dirrmtry share/locale/sa/LC_MESSAGES
 @dirrmtry share/locale/sa
 @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/ps/LC_MESSAGES
 @dirrmtry share/locale/ps
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrmtry share/locale/om/LC_MESSAGES
 @dirrmtry share/locale/om
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
@@ -497,8 +469,6 @@ share/xml/iso-codes/iso_639_3.xml
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/kok/LC_MESSAGES
 @dirrmtry share/locale/kok
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
 @dirrmtry share/locale/kl/LC_MESSAGES
@@ -513,28 +483,16 @@ share/xml/iso-codes/iso_639_3.xml
 @dirrmtry share/locale/haw
 @dirrmtry share/locale/gv/LC_MESSAGES
 @dirrmtry share/locale/gv
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
 @dirrmtry share/locale/gez/LC_MESSAGES
 @dirrmtry share/locale/gez
 @dirrmtry share/locale/fo/LC_MESSAGES
 @dirrmtry share/locale/fo
-@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/dv/LC_MESSAGES
 @dirrmtry share/locale/dv
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/locale/byn/LC_MESSAGES
 @dirrmtry share/locale/byn
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrmtry share/locale/aa/LC_MESSAGES
 @dirrmtry share/locale/aa
 @dirrm %%DATADIR%%
diff --git a/misc/jbidwatcher/Makefile b/misc/jbidwatcher/Makefile
index e22816db2f8a..c7c389c85677 100644
--- a/misc/jbidwatcher/Makefile
+++ b/misc/jbidwatcher/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jbidwatcher
 DISTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	misc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/k3b-i18n/Makefile b/misc/k3b-i18n/Makefile
index 7efcf5bfb537..cc4b7bbcff7d 100644
--- a/misc/k3b-i18n/Makefile
+++ b/misc/k3b-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	k3b-i18n
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/-i18n//}
diff --git a/misc/k3b-i18n/pkg-plist b/misc/k3b-i18n/pkg-plist
index b8a73ffd6f15..06a9d9bb2b5e 100644
--- a/misc/k3b-i18n/pkg-plist
+++ b/misc/k3b-i18n/pkg-plist
@@ -348,40 +348,12 @@ share/locale/zh_TW/LC_MESSAGES/k3b.mo
 share/locale/zh_TW/LC_MESSAGES/k3bsetup.mo
 share/locale/zh_TW/LC_MESSAGES/libk3b.mo
 share/locale/zh_TW/LC_MESSAGES/libk3bdevice.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uz/LC_MESSAGES
-@dirrmtry share/locale/uz
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/se/LC_MESSAGES
 @dirrmtry share/locale/se
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
 @dirrmtry share/locale/nds/LC_MESSAGES
 @dirrmtry share/locale/nds
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
 @dirrm share/doc/HTML/uk/k3b
 @dirrm share/doc/HTML/sv/k3b
 @dirrm share/doc/HTML/ru/k3b
diff --git a/misc/kaddressbook-plugins/Makefile b/misc/kaddressbook-plugins/Makefile
index 83b4fbb63ac9..e92cdf138503 100644
--- a/misc/kaddressbook-plugins/Makefile
+++ b/misc/kaddressbook-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${KADDRESSBOOKPLUG_PORTNAME}
 PORTVERSION=	${KADDRESSBOOKPLUG_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${KADDRESSBOOKPLUG_PORTREVISION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/misc/katalog/Makefile b/misc/katalog/Makefile
index 788ca6a7a1d4..6690471b9311 100644
--- a/misc/katalog/Makefile
+++ b/misc/katalog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	katalog
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc kde
 MASTER_SITES=	http://salvaste.altervista.org/files/
 
diff --git a/misc/kbfx/Makefile b/misc/kbfx/Makefile
index afb25e05a12f..7409dad3bbc3 100644
--- a/misc/kbfx/Makefile
+++ b/misc/kbfx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kbfx
 PORTVERSION=	0.4.9.3.20070117
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=kbfx
diff --git a/misc/kde3-i18n-af/Makefile b/misc/kde3-i18n-af/Makefile
index 3b573cd565d1..366e0cb81ba9 100644
--- a/misc/kde3-i18n-af/Makefile
+++ b/misc/kde3-i18n-af/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-az/Makefile b/misc/kde3-i18n-az/Makefile
index 10cf52f2ab40..69c68db41172 100644
--- a/misc/kde3-i18n-az/Makefile
+++ b/misc/kde3-i18n-az/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-bg/Makefile b/misc/kde3-i18n-bg/Makefile
index 4c3f95343306..a8091a2b23b3 100644
--- a/misc/kde3-i18n-bg/Makefile
+++ b/misc/kde3-i18n-bg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-bn/Makefile b/misc/kde3-i18n-bn/Makefile
index 22686b8907fb..02b14f707f74 100644
--- a/misc/kde3-i18n-bn/Makefile
+++ b/misc/kde3-i18n-bn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-br/Makefile b/misc/kde3-i18n-br/Makefile
index c1a80b3c1d8b..2fd538939c05 100644
--- a/misc/kde3-i18n-br/Makefile
+++ b/misc/kde3-i18n-br/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-bs/Makefile b/misc/kde3-i18n-bs/Makefile
index 2e02eeb4c5e5..fd2f1ab411ba 100644
--- a/misc/kde3-i18n-bs/Makefile
+++ b/misc/kde3-i18n-bs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ca/Makefile b/misc/kde3-i18n-ca/Makefile
index 36aedc744d1d..7cdb88516ee6 100644
--- a/misc/kde3-i18n-ca/Makefile
+++ b/misc/kde3-i18n-ca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-cs/Makefile b/misc/kde3-i18n-cs/Makefile
index 1f921c5c8ab0..511bc0a74395 100644
--- a/misc/kde3-i18n-cs/Makefile
+++ b/misc/kde3-i18n-cs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-cy/Makefile b/misc/kde3-i18n-cy/Makefile
index 8f634f005b09..13929d64d4d7 100644
--- a/misc/kde3-i18n-cy/Makefile
+++ b/misc/kde3-i18n-cy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-da/Makefile b/misc/kde3-i18n-da/Makefile
index 722dd51c4c20..3e7a8d2315fd 100644
--- a/misc/kde3-i18n-da/Makefile
+++ b/misc/kde3-i18n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-el/Makefile b/misc/kde3-i18n-el/Makefile
index 3954ab647bc5..602bc6fff9f2 100644
--- a/misc/kde3-i18n-el/Makefile
+++ b/misc/kde3-i18n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-en_GB/Makefile b/misc/kde3-i18n-en_GB/Makefile
index cf4a2a238097..c84a0e0e72d2 100644
--- a/misc/kde3-i18n-en_GB/Makefile
+++ b/misc/kde3-i18n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-eo/Makefile b/misc/kde3-i18n-eo/Makefile
index b49da51c0177..9c494f4e517f 100644
--- a/misc/kde3-i18n-eo/Makefile
+++ b/misc/kde3-i18n-eo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-es/Makefile b/misc/kde3-i18n-es/Makefile
index 12373d5055ea..ae1901cdef4c 100644
--- a/misc/kde3-i18n-es/Makefile
+++ b/misc/kde3-i18n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde spanish
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-et/Makefile b/misc/kde3-i18n-et/Makefile
index 0f47d3450067..78913a282cb0 100644
--- a/misc/kde3-i18n-et/Makefile
+++ b/misc/kde3-i18n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-eu/Makefile b/misc/kde3-i18n-eu/Makefile
index 2e78cdeb9979..8677d5c2a168 100644
--- a/misc/kde3-i18n-eu/Makefile
+++ b/misc/kde3-i18n-eu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-fa/Makefile b/misc/kde3-i18n-fa/Makefile
index 270228a00f2b..4cb879147979 100644
--- a/misc/kde3-i18n-fa/Makefile
+++ b/misc/kde3-i18n-fa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-fi/Makefile b/misc/kde3-i18n-fi/Makefile
index 26aae8db2543..4e7e8dd50a68 100644
--- a/misc/kde3-i18n-fi/Makefile
+++ b/misc/kde3-i18n-fi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-fy/Makefile b/misc/kde3-i18n-fy/Makefile
index 0685552f94d1..760cdfbf451a 100644
--- a/misc/kde3-i18n-fy/Makefile
+++ b/misc/kde3-i18n-fy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ga/Makefile b/misc/kde3-i18n-ga/Makefile
index 1c7c6ece944b..f7835df3f4a7 100644
--- a/misc/kde3-i18n-ga/Makefile
+++ b/misc/kde3-i18n-ga/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-gl/Makefile b/misc/kde3-i18n-gl/Makefile
index 86391d93b5bc..a7ada192d7ba 100644
--- a/misc/kde3-i18n-gl/Makefile
+++ b/misc/kde3-i18n-gl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-hi/Makefile b/misc/kde3-i18n-hi/Makefile
index 5ff64615e641..1db55d650f02 100644
--- a/misc/kde3-i18n-hi/Makefile
+++ b/misc/kde3-i18n-hi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-hr/Makefile b/misc/kde3-i18n-hr/Makefile
index 0a3abcd620be..df1e4f078c3b 100644
--- a/misc/kde3-i18n-hr/Makefile
+++ b/misc/kde3-i18n-hr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-hsb/Makefile b/misc/kde3-i18n-hsb/Makefile
index 94ae48cc9def..3bd876270db7 100644
--- a/misc/kde3-i18n-hsb/Makefile
+++ b/misc/kde3-i18n-hsb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	3.4.3
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-id/Makefile b/misc/kde3-i18n-id/Makefile
index 3358f1531f03..77398b23ae7f 100644
--- a/misc/kde3-i18n-id/Makefile
+++ b/misc/kde3-i18n-id/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	3.0.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	Attic/${PORTVERSION}/src/kde-i18n
diff --git a/misc/kde3-i18n-is/Makefile b/misc/kde3-i18n-is/Makefile
index b9ca8ecb6eb3..78097121896e 100644
--- a/misc/kde3-i18n-is/Makefile
+++ b/misc/kde3-i18n-is/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-it/Makefile b/misc/kde3-i18n-it/Makefile
index 4d8881fcf0a2..9ad17a5e4dbf 100644
--- a/misc/kde3-i18n-it/Makefile
+++ b/misc/kde3-i18n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-kk/Makefile b/misc/kde3-i18n-kk/Makefile
index 46270ebb4484..86e75fb70444 100644
--- a/misc/kde3-i18n-kk/Makefile
+++ b/misc/kde3-i18n-kk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-km/Makefile b/misc/kde3-i18n-km/Makefile
index a1f3bf8daaef..c9fcb185f025 100644
--- a/misc/kde3-i18n-km/Makefile
+++ b/misc/kde3-i18n-km/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-lt/Makefile b/misc/kde3-i18n-lt/Makefile
index ca674f6ee051..17954e8fbd85 100644
--- a/misc/kde3-i18n-lt/Makefile
+++ b/misc/kde3-i18n-lt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-lv/Makefile b/misc/kde3-i18n-lv/Makefile
index 53e333fac370..cfbee13f005c 100644
--- a/misc/kde3-i18n-lv/Makefile
+++ b/misc/kde3-i18n-lv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-mk/Makefile b/misc/kde3-i18n-mk/Makefile
index 7bbe451f8b8d..50943a5feb62 100644
--- a/misc/kde3-i18n-mk/Makefile
+++ b/misc/kde3-i18n-mk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-mn/Makefile b/misc/kde3-i18n-mn/Makefile
index 8506ec16d1ab..33a78142927f 100644
--- a/misc/kde3-i18n-mn/Makefile
+++ b/misc/kde3-i18n-mn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ms/Makefile b/misc/kde3-i18n-ms/Makefile
index 3c0de8a00834..754b0e01eedc 100644
--- a/misc/kde3-i18n-ms/Makefile
+++ b/misc/kde3-i18n-ms/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-mt/Makefile b/misc/kde3-i18n-mt/Makefile
index 0c0731b1a453..df0c09bc7827 100644
--- a/misc/kde3-i18n-mt/Makefile
+++ b/misc/kde3-i18n-mt/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	kde-i18n
 # PORTVERSION=	${KDE_VERSION}
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	Attic/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile
index e4c633ea3b83..4d04be9fec5a 100644
--- a/misc/kde3-i18n-nb/Makefile
+++ b/misc/kde3-i18n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-nds/Makefile b/misc/kde3-i18n-nds/Makefile
index 9d046f243902..445f75f6391c 100644
--- a/misc/kde3-i18n-nds/Makefile
+++ b/misc/kde3-i18n-nds/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-nl/Makefile b/misc/kde3-i18n-nl/Makefile
index 18b2ea8ec46d..2ea778441169 100644
--- a/misc/kde3-i18n-nl/Makefile
+++ b/misc/kde3-i18n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-nn/Makefile b/misc/kde3-i18n-nn/Makefile
index 06c4a39c8dcf..7c11dd9422ea 100644
--- a/misc/kde3-i18n-nn/Makefile
+++ b/misc/kde3-i18n-nn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-nso/Makefile b/misc/kde3-i18n-nso/Makefile
index 7d028e8ac258..dc60a5ea4e30 100644
--- a/misc/kde3-i18n-nso/Makefile
+++ b/misc/kde3-i18n-nso/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	kde-i18n
 # PORTVERSION=	${KDE_VERSION}
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	Attic/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-pa/Makefile b/misc/kde3-i18n-pa/Makefile
index 3a02eefaf9f6..056202eb6016 100644
--- a/misc/kde3-i18n-pa/Makefile
+++ b/misc/kde3-i18n-pa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ro/Makefile b/misc/kde3-i18n-ro/Makefile
index 79f1d7e5ae2c..e9fb93f419bb 100644
--- a/misc/kde3-i18n-ro/Makefile
+++ b/misc/kde3-i18n-ro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-rw/Makefile b/misc/kde3-i18n-rw/Makefile
index dfba95220771..9c476e4d402f 100644
--- a/misc/kde3-i18n-rw/Makefile
+++ b/misc/kde3-i18n-rw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-se/Makefile b/misc/kde3-i18n-se/Makefile
index 1320b95a9abd..c167e3ab0b7b 100644
--- a/misc/kde3-i18n-se/Makefile
+++ b/misc/kde3-i18n-se/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-sk/Makefile b/misc/kde3-i18n-sk/Makefile
index 486be8bb4fd5..1fad62c6ed02 100644
--- a/misc/kde3-i18n-sk/Makefile
+++ b/misc/kde3-i18n-sk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-sl/Makefile b/misc/kde3-i18n-sl/Makefile
index 9609a48ec4d3..b1a6ca8ae393 100644
--- a/misc/kde3-i18n-sl/Makefile
+++ b/misc/kde3-i18n-sl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-sr/Makefile b/misc/kde3-i18n-sr/Makefile
index 4ecd0ba799fd..7edc42782549 100644
--- a/misc/kde3-i18n-sr/Makefile
+++ b/misc/kde3-i18n-sr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-sr@Latn/Makefile b/misc/kde3-i18n-sr@Latn/Makefile
index 5dd3fdaaa697..3e515410464f 100644
--- a/misc/kde3-i18n-sr@Latn/Makefile
+++ b/misc/kde3-i18n-sr@Latn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-sr_Latn/Makefile b/misc/kde3-i18n-sr_Latn/Makefile
index 5dd3fdaaa697..3e515410464f 100644
--- a/misc/kde3-i18n-sr_Latn/Makefile
+++ b/misc/kde3-i18n-sr_Latn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ss/Makefile b/misc/kde3-i18n-ss/Makefile
index a1d1b5097b13..042b29740e2e 100644
--- a/misc/kde3-i18n-ss/Makefile
+++ b/misc/kde3-i18n-ss/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-sv/Makefile b/misc/kde3-i18n-sv/Makefile
index d84ab728a1ea..b333e0ce3a19 100644
--- a/misc/kde3-i18n-sv/Makefile
+++ b/misc/kde3-i18n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ta/Makefile b/misc/kde3-i18n-ta/Makefile
index 8a2737ae5229..ba472c822a41 100644
--- a/misc/kde3-i18n-ta/Makefile
+++ b/misc/kde3-i18n-ta/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-tg/Makefile b/misc/kde3-i18n-tg/Makefile
index fbe344b97667..1ff581e14f1c 100644
--- a/misc/kde3-i18n-tg/Makefile
+++ b/misc/kde3-i18n-tg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-th/Makefile b/misc/kde3-i18n-th/Makefile
index 46ad62e9479f..339d6299eb11 100644
--- a/misc/kde3-i18n-th/Makefile
+++ b/misc/kde3-i18n-th/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	kde-i18n
 # PORTVERSION=	${KDE_VERSION}
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	Attic/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-tr/Makefile b/misc/kde3-i18n-tr/Makefile
index 5184a48ed9c7..70aad49d2f64 100644
--- a/misc/kde3-i18n-tr/Makefile
+++ b/misc/kde3-i18n-tr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-uz/Makefile b/misc/kde3-i18n-uz/Makefile
index 808501e16205..aa50ee9f6234 100644
--- a/misc/kde3-i18n-uz/Makefile
+++ b/misc/kde3-i18n-uz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-uz/pkg-plist b/misc/kde3-i18n-uz/pkg-plist
index d976f2e199d4..342772459df1 100644
--- a/misc/kde3-i18n-uz/pkg-plist
+++ b/misc/kde3-i18n-uz/pkg-plist
@@ -350,5 +350,3 @@ share/locale/uz/LC_MESSAGES/webarchiver.mo
 share/locale/uz/charset
 share/locale/uz/entry.desktop
 share/locale/uz/flag.png
-@dirrm share/locale/uz/LC_MESSAGES
-@dirrm share/locale/uz
diff --git a/misc/kde3-i18n-ven/Makefile b/misc/kde3-i18n-ven/Makefile
index 19921450c666..cee19db02651 100644
--- a/misc/kde3-i18n-ven/Makefile
+++ b/misc/kde3-i18n-ven/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	kde-i18n
 # PORTVERSION=	${KDE_VERSION}
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	Attic/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-xh/Makefile b/misc/kde3-i18n-xh/Makefile
index 9f0ec07ae770..9400fde34faf 100644
--- a/misc/kde3-i18n-xh/Makefile
+++ b/misc/kde3-i18n-xh/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	kde-i18n
 # PORTVERSION=	${KDE_VERSION}
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	Attic/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-zu/Makefile b/misc/kde3-i18n-zu/Makefile
index 24532bfa4102..83cac2341378 100644
--- a/misc/kde3-i18n-zu/Makefile
+++ b/misc/kde3-i18n-zu/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	kde-i18n
 # PORTVERSION=	${KDE_VERSION}
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	Attic/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n/Makefile b/misc/kde3-i18n/Makefile
index 9c9ae2ce42bc..01c04d902987 100644
--- a/misc/kde3-i18n/Makefile
+++ b/misc/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/kde4-i18n-is/Makefile b/misc/kde4-i18n-is/Makefile
index b9ca8ecb6eb3..78097121896e 100644
--- a/misc/kde4-i18n-is/Makefile
+++ b/misc/kde4-i18n-is/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-bg/Makefile b/misc/kde4-l10n-bg/Makefile
index 4c3f95343306..a8091a2b23b3 100644
--- a/misc/kde4-l10n-bg/Makefile
+++ b/misc/kde4-l10n-bg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-ca/Makefile b/misc/kde4-l10n-ca/Makefile
index 36aedc744d1d..7cdb88516ee6 100644
--- a/misc/kde4-l10n-ca/Makefile
+++ b/misc/kde4-l10n-ca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-cs/Makefile b/misc/kde4-l10n-cs/Makefile
index 1f921c5c8ab0..511bc0a74395 100644
--- a/misc/kde4-l10n-cs/Makefile
+++ b/misc/kde4-l10n-cs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-da/Makefile b/misc/kde4-l10n-da/Makefile
index 722dd51c4c20..3e7a8d2315fd 100644
--- a/misc/kde4-l10n-da/Makefile
+++ b/misc/kde4-l10n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-el/Makefile b/misc/kde4-l10n-el/Makefile
index 3954ab647bc5..602bc6fff9f2 100644
--- a/misc/kde4-l10n-el/Makefile
+++ b/misc/kde4-l10n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-en_GB/Makefile b/misc/kde4-l10n-en_GB/Makefile
index cf4a2a238097..c84a0e0e72d2 100644
--- a/misc/kde4-l10n-en_GB/Makefile
+++ b/misc/kde4-l10n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-eo/Makefile b/misc/kde4-l10n-eo/Makefile
index b49da51c0177..9c494f4e517f 100644
--- a/misc/kde4-l10n-eo/Makefile
+++ b/misc/kde4-l10n-eo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-es/Makefile b/misc/kde4-l10n-es/Makefile
index 12373d5055ea..ae1901cdef4c 100644
--- a/misc/kde4-l10n-es/Makefile
+++ b/misc/kde4-l10n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde spanish
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile
index 0f47d3450067..78913a282cb0 100644
--- a/misc/kde4-l10n-et/Makefile
+++ b/misc/kde4-l10n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-eu/Makefile b/misc/kde4-l10n-eu/Makefile
index 2e78cdeb9979..8677d5c2a168 100644
--- a/misc/kde4-l10n-eu/Makefile
+++ b/misc/kde4-l10n-eu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-fi/Makefile b/misc/kde4-l10n-fi/Makefile
index 26aae8db2543..4e7e8dd50a68 100644
--- a/misc/kde4-l10n-fi/Makefile
+++ b/misc/kde4-l10n-fi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-fy/Makefile b/misc/kde4-l10n-fy/Makefile
index 0685552f94d1..760cdfbf451a 100644
--- a/misc/kde4-l10n-fy/Makefile
+++ b/misc/kde4-l10n-fy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-ga/Makefile b/misc/kde4-l10n-ga/Makefile
index 1c7c6ece944b..f7835df3f4a7 100644
--- a/misc/kde4-l10n-ga/Makefile
+++ b/misc/kde4-l10n-ga/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-gl/Makefile b/misc/kde4-l10n-gl/Makefile
index 86391d93b5bc..a7ada192d7ba 100644
--- a/misc/kde4-l10n-gl/Makefile
+++ b/misc/kde4-l10n-gl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-hi/Makefile b/misc/kde4-l10n-hi/Makefile
index 5ff64615e641..1db55d650f02 100644
--- a/misc/kde4-l10n-hi/Makefile
+++ b/misc/kde4-l10n-hi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-is/Makefile b/misc/kde4-l10n-is/Makefile
index b9ca8ecb6eb3..78097121896e 100644
--- a/misc/kde4-l10n-is/Makefile
+++ b/misc/kde4-l10n-is/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-it/Makefile b/misc/kde4-l10n-it/Makefile
index 4d8881fcf0a2..9ad17a5e4dbf 100644
--- a/misc/kde4-l10n-it/Makefile
+++ b/misc/kde4-l10n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-kk/Makefile b/misc/kde4-l10n-kk/Makefile
index 46270ebb4484..86e75fb70444 100644
--- a/misc/kde4-l10n-kk/Makefile
+++ b/misc/kde4-l10n-kk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-km/Makefile b/misc/kde4-l10n-km/Makefile
index a1f3bf8daaef..c9fcb185f025 100644
--- a/misc/kde4-l10n-km/Makefile
+++ b/misc/kde4-l10n-km/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-lt/Makefile b/misc/kde4-l10n-lt/Makefile
index ca674f6ee051..17954e8fbd85 100644
--- a/misc/kde4-l10n-lt/Makefile
+++ b/misc/kde4-l10n-lt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-lv/Makefile b/misc/kde4-l10n-lv/Makefile
index 53e333fac370..cfbee13f005c 100644
--- a/misc/kde4-l10n-lv/Makefile
+++ b/misc/kde4-l10n-lv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-mk/Makefile b/misc/kde4-l10n-mk/Makefile
index 7bbe451f8b8d..50943a5feb62 100644
--- a/misc/kde4-l10n-mk/Makefile
+++ b/misc/kde4-l10n-mk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile
index e4c633ea3b83..4d04be9fec5a 100644
--- a/misc/kde4-l10n-nb/Makefile
+++ b/misc/kde4-l10n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-nds/Makefile b/misc/kde4-l10n-nds/Makefile
index 9d046f243902..445f75f6391c 100644
--- a/misc/kde4-l10n-nds/Makefile
+++ b/misc/kde4-l10n-nds/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-nl/Makefile b/misc/kde4-l10n-nl/Makefile
index 18b2ea8ec46d..2ea778441169 100644
--- a/misc/kde4-l10n-nl/Makefile
+++ b/misc/kde4-l10n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-nn/Makefile b/misc/kde4-l10n-nn/Makefile
index 06c4a39c8dcf..7c11dd9422ea 100644
--- a/misc/kde4-l10n-nn/Makefile
+++ b/misc/kde4-l10n-nn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-pa/Makefile b/misc/kde4-l10n-pa/Makefile
index 3a02eefaf9f6..056202eb6016 100644
--- a/misc/kde4-l10n-pa/Makefile
+++ b/misc/kde4-l10n-pa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-ro/Makefile b/misc/kde4-l10n-ro/Makefile
index 79f1d7e5ae2c..e9fb93f419bb 100644
--- a/misc/kde4-l10n-ro/Makefile
+++ b/misc/kde4-l10n-ro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-sk/Makefile b/misc/kde4-l10n-sk/Makefile
index 486be8bb4fd5..1fad62c6ed02 100644
--- a/misc/kde4-l10n-sk/Makefile
+++ b/misc/kde4-l10n-sk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-sl/Makefile b/misc/kde4-l10n-sl/Makefile
index 9609a48ec4d3..b1a6ca8ae393 100644
--- a/misc/kde4-l10n-sl/Makefile
+++ b/misc/kde4-l10n-sl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-sr/Makefile b/misc/kde4-l10n-sr/Makefile
index 4ecd0ba799fd..7edc42782549 100644
--- a/misc/kde4-l10n-sr/Makefile
+++ b/misc/kde4-l10n-sr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-sv/Makefile b/misc/kde4-l10n-sv/Makefile
index d84ab728a1ea..b333e0ce3a19 100644
--- a/misc/kde4-l10n-sv/Makefile
+++ b/misc/kde4-l10n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-ta/Makefile b/misc/kde4-l10n-ta/Makefile
index 8a2737ae5229..ba472c822a41 100644
--- a/misc/kde4-l10n-ta/Makefile
+++ b/misc/kde4-l10n-ta/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-tg/Makefile b/misc/kde4-l10n-tg/Makefile
index fbe344b97667..1ff581e14f1c 100644
--- a/misc/kde4-l10n-tg/Makefile
+++ b/misc/kde4-l10n-tg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-th/Makefile b/misc/kde4-l10n-th/Makefile
index 46ad62e9479f..339d6299eb11 100644
--- a/misc/kde4-l10n-th/Makefile
+++ b/misc/kde4-l10n-th/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	kde-i18n
 # PORTVERSION=	${KDE_VERSION}
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	Attic/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-tr/Makefile b/misc/kde4-l10n-tr/Makefile
index 5184a48ed9c7..70aad49d2f64 100644
--- a/misc/kde4-l10n-tr/Makefile
+++ b/misc/kde4-l10n-tr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile
index 9c9ae2ce42bc..01c04d902987 100644
--- a/misc/kde4-l10n/Makefile
+++ b/misc/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 32852b39fbfc..bd0049534b75 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaddons
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index 3f23b4d8eb0c..b2d8f69b6ddb 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeedu
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index 3f23b4d8eb0c..b2d8f69b6ddb 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeedu
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index d2a8b1c1613f..349568482863 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index d2a8b1c1613f..349568482863 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/misc/kfile-plugins/Makefile b/misc/kfile-plugins/Makefile
index d3e16c0e22b9..41d2f71ca074 100644
--- a/misc/kfile-plugins/Makefile
+++ b/misc/kfile-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${KFILEPLUGINS_PORTNAME}
 PORTVERSION=	${KFILEPLUGINS_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${KFILEPLUGINS_PORTREVISION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/misc/kicker-applets/Makefile b/misc/kicker-applets/Makefile
index 86d2b5530aaa..0e2500294adb 100644
--- a/misc/kicker-applets/Makefile
+++ b/misc/kicker-applets/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${KICKERAPPLETS_PORTNAME}
 PORTVERSION=	${KICKERAPPLETS_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${KICKERAPPLETS_PORTREVISION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/misc/knewsticker-scripts/Makefile b/misc/knewsticker-scripts/Makefile
index 80ad9288cfa3..b3fec946c9b4 100644
--- a/misc/knewsticker-scripts/Makefile
+++ b/misc/knewsticker-scripts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${KNEWSTICKERAPP_PORTNAME}
 PORTVERSION=	${KNEWSTICKERAPP_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${KNEWSTICKERAPP_PORTREVISION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/misc/koffice-i18n-af/Makefile b/misc/koffice-i18n-af/Makefile
index e4b9ec692332..c4b8ef003f59 100644
--- a/misc/koffice-i18n-af/Makefile
+++ b/misc/koffice-i18n-af/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n/
diff --git a/misc/koffice-i18n-bg/Makefile b/misc/koffice-i18n-bg/Makefile
index 2ecbec660515..61ad16bb6803 100644
--- a/misc/koffice-i18n-bg/Makefile
+++ b/misc/koffice-i18n-bg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-br/Makefile b/misc/koffice-i18n-br/Makefile
index 8fd8edc0fb11..b789af177a69 100644
--- a/misc/koffice-i18n-br/Makefile
+++ b/misc/koffice-i18n-br/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-bs/Makefile b/misc/koffice-i18n-bs/Makefile
index 7de5ad949abf..4b0157e0af0f 100644
--- a/misc/koffice-i18n-bs/Makefile
+++ b/misc/koffice-i18n-bs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-ca/Makefile b/misc/koffice-i18n-ca/Makefile
index b4bd5f13bd25..edd3c17689e2 100644
--- a/misc/koffice-i18n-ca/Makefile
+++ b/misc/koffice-i18n-ca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-cs/Makefile b/misc/koffice-i18n-cs/Makefile
index 49126017d9aa..017b80526efa 100644
--- a/misc/koffice-i18n-cs/Makefile
+++ b/misc/koffice-i18n-cs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-cy/Makefile b/misc/koffice-i18n-cy/Makefile
index ea51b9d6672c..373ae03cb3b0 100644
--- a/misc/koffice-i18n-cy/Makefile
+++ b/misc/koffice-i18n-cy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-da/Makefile b/misc/koffice-i18n-da/Makefile
index d30b137918ee..58eeabfa8e82 100644
--- a/misc/koffice-i18n-da/Makefile
+++ b/misc/koffice-i18n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-el/Makefile b/misc/koffice-i18n-el/Makefile
index c88ced91fae5..0fb3423786da 100644
--- a/misc/koffice-i18n-el/Makefile
+++ b/misc/koffice-i18n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-en_GB/Makefile b/misc/koffice-i18n-en_GB/Makefile
index 2ceee8de12a2..85760b4ce37a 100644
--- a/misc/koffice-i18n-en_GB/Makefile
+++ b/misc/koffice-i18n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-eo/Makefile b/misc/koffice-i18n-eo/Makefile
index 86a742fdc68a..e398b2bff3a6 100644
--- a/misc/koffice-i18n-eo/Makefile
+++ b/misc/koffice-i18n-eo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-es/Makefile b/misc/koffice-i18n-es/Makefile
index 22bf89236885..fe8ef8d4467d 100644
--- a/misc/koffice-i18n-es/Makefile
+++ b/misc/koffice-i18n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde spanish
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-et/Makefile b/misc/koffice-i18n-et/Makefile
index 7f2db742519a..34673dd52a15 100644
--- a/misc/koffice-i18n-et/Makefile
+++ b/misc/koffice-i18n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-eu/Makefile b/misc/koffice-i18n-eu/Makefile
index f1a3591b8054..675cf0c91d76 100644
--- a/misc/koffice-i18n-eu/Makefile
+++ b/misc/koffice-i18n-eu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-fa/Makefile b/misc/koffice-i18n-fa/Makefile
index 3973b3ccdea8..619c3a17cec6 100644
--- a/misc/koffice-i18n-fa/Makefile
+++ b/misc/koffice-i18n-fa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-fi/Makefile b/misc/koffice-i18n-fi/Makefile
index cf720071bf73..d1c864407b5a 100644
--- a/misc/koffice-i18n-fi/Makefile
+++ b/misc/koffice-i18n-fi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-ga/Makefile b/misc/koffice-i18n-ga/Makefile
index 672d43e4ecb6..1c5188ff7dbf 100644
--- a/misc/koffice-i18n-ga/Makefile
+++ b/misc/koffice-i18n-ga/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-gl/Makefile b/misc/koffice-i18n-gl/Makefile
index d91721e5ce05..56633f036c10 100644
--- a/misc/koffice-i18n-gl/Makefile
+++ b/misc/koffice-i18n-gl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-hi/Makefile b/misc/koffice-i18n-hi/Makefile
index 7b830f40a021..de510025815e 100644
--- a/misc/koffice-i18n-hi/Makefile
+++ b/misc/koffice-i18n-hi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-hsb/Makefile b/misc/koffice-i18n-hsb/Makefile
index 7a2bc5d1df7f..68528fdc2f8d 100644
--- a/misc/koffice-i18n-hsb/Makefile
+++ b/misc/koffice-i18n-hsb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/misc/koffice-i18n-is/Makefile b/misc/koffice-i18n-is/Makefile
index a1271111d093..5fb8c04a1966 100644
--- a/misc/koffice-i18n-is/Makefile
+++ b/misc/koffice-i18n-is/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-it/Makefile b/misc/koffice-i18n-it/Makefile
index a5913ca8a679..f6ffc3023b6e 100644
--- a/misc/koffice-i18n-it/Makefile
+++ b/misc/koffice-i18n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-km/Makefile b/misc/koffice-i18n-km/Makefile
index 0931776a6a16..8c09f634ca2f 100644
--- a/misc/koffice-i18n-km/Makefile
+++ b/misc/koffice-i18n-km/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-lo/Makefile b/misc/koffice-i18n-lo/Makefile
index cf87b1235830..eceaec885a4a 100644
--- a/misc/koffice-i18n-lo/Makefile
+++ b/misc/koffice-i18n-lo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/misc/koffice-i18n-lt/Makefile b/misc/koffice-i18n-lt/Makefile
index 9d620d27b56e..24db363899d1 100644
--- a/misc/koffice-i18n-lt/Makefile
+++ b/misc/koffice-i18n-lt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-lv/Makefile b/misc/koffice-i18n-lv/Makefile
index 106daf74b643..fa7ec73cf827 100644
--- a/misc/koffice-i18n-lv/Makefile
+++ b/misc/koffice-i18n-lv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-mk/Makefile b/misc/koffice-i18n-mk/Makefile
index 45a7dce0da58..f8b26b27f915 100644
--- a/misc/koffice-i18n-mk/Makefile
+++ b/misc/koffice-i18n-mk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-ms/Makefile b/misc/koffice-i18n-ms/Makefile
index 143d7c5f7fdb..54884f2cbe9f 100644
--- a/misc/koffice-i18n-ms/Makefile
+++ b/misc/koffice-i18n-ms/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-mt/Makefile b/misc/koffice-i18n-mt/Makefile
index d407f02227af..eb8428d5a52d 100644
--- a/misc/koffice-i18n-mt/Makefile
+++ b/misc/koffice-i18n-mt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/misc/koffice-i18n-nb/Makefile b/misc/koffice-i18n-nb/Makefile
index d0b367291515..c6a4f3f7feb8 100644
--- a/misc/koffice-i18n-nb/Makefile
+++ b/misc/koffice-i18n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-nl/Makefile b/misc/koffice-i18n-nl/Makefile
index 07f2907f9abf..2411d50c0953 100644
--- a/misc/koffice-i18n-nl/Makefile
+++ b/misc/koffice-i18n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-nn/Makefile b/misc/koffice-i18n-nn/Makefile
index fde1226727f6..9f6376e6e4ab 100644
--- a/misc/koffice-i18n-nn/Makefile
+++ b/misc/koffice-i18n-nn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-ro/Makefile b/misc/koffice-i18n-ro/Makefile
index 9032169e0637..e27d0af1b79f 100644
--- a/misc/koffice-i18n-ro/Makefile
+++ b/misc/koffice-i18n-ro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-se/Makefile b/misc/koffice-i18n-se/Makefile
index 9763599d3b81..8808112a3081 100644
--- a/misc/koffice-i18n-se/Makefile
+++ b/misc/koffice-i18n-se/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-sk/Makefile b/misc/koffice-i18n-sk/Makefile
index fb5d0adf4a3b..ae19ada8c266 100644
--- a/misc/koffice-i18n-sk/Makefile
+++ b/misc/koffice-i18n-sk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-sl/Makefile b/misc/koffice-i18n-sl/Makefile
index a4ae3da03d9e..cc3c209eb719 100644
--- a/misc/koffice-i18n-sl/Makefile
+++ b/misc/koffice-i18n-sl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-sr/Makefile b/misc/koffice-i18n-sr/Makefile
index 12976dc3fbdd..e1fca0b2c0a4 100644
--- a/misc/koffice-i18n-sr/Makefile
+++ b/misc/koffice-i18n-sr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-sr@Latn/Makefile b/misc/koffice-i18n-sr@Latn/Makefile
index ef6cb3f78c8f..a386b2c5f925 100644
--- a/misc/koffice-i18n-sr@Latn/Makefile
+++ b/misc/koffice-i18n-sr@Latn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-sv/Makefile b/misc/koffice-i18n-sv/Makefile
index d3a487787ce0..91bbabbc5a94 100644
--- a/misc/koffice-i18n-sv/Makefile
+++ b/misc/koffice-i18n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-ta/Makefile b/misc/koffice-i18n-ta/Makefile
index 2de79fb19713..34939ef05142 100644
--- a/misc/koffice-i18n-ta/Makefile
+++ b/misc/koffice-i18n-ta/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-tg/Makefile b/misc/koffice-i18n-tg/Makefile
index 53952441adfe..4dbac99b9344 100644
--- a/misc/koffice-i18n-tg/Makefile
+++ b/misc/koffice-i18n-tg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-th/Makefile b/misc/koffice-i18n-th/Makefile
index a6554304a092..ac2e27ade196 100644
--- a/misc/koffice-i18n-th/Makefile
+++ b/misc/koffice-i18n-th/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/misc/koffice-i18n-tr/Makefile b/misc/koffice-i18n-tr/Makefile
index d8370e503c5d..16d95bb52935 100644
--- a/misc/koffice-i18n-tr/Makefile
+++ b/misc/koffice-i18n-tr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-uz/Makefile b/misc/koffice-i18n-uz/Makefile
index b68dddb6bbc6..48c5d904c5c0 100644
--- a/misc/koffice-i18n-uz/Makefile
+++ b/misc/koffice-i18n-uz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/misc/koffice-i18n-uz/pkg-plist b/misc/koffice-i18n-uz/pkg-plist
index 004d1c86c9fa..b7c61cacebf5 100644
--- a/misc/koffice-i18n-uz/pkg-plist
+++ b/misc/koffice-i18n-uz/pkg-plist
@@ -23,5 +23,3 @@ share/locale/uz/LC_MESSAGES/kthesaurus.mo
 share/locale/uz/LC_MESSAGES/kugar.mo
 share/locale/uz/LC_MESSAGES/kword.mo
 share/locale/uz/LC_MESSAGES/thesaurus_tool.mo
-@dirrm share/locale/uz/LC_MESSAGES
-@dirrm share/locale/uz
diff --git a/misc/koffice-i18n-ven/Makefile b/misc/koffice-i18n-ven/Makefile
index 852f90d03a4e..245d7d58ceb7 100644
--- a/misc/koffice-i18n-ven/Makefile
+++ b/misc/koffice-i18n-ven/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/misc/koffice-i18n-xh/Makefile b/misc/koffice-i18n-xh/Makefile
index fdb440f6d59a..04703d316bd9 100644
--- a/misc/koffice-i18n-xh/Makefile
+++ b/misc/koffice-i18n-xh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/misc/koffice-i18n-zu/Makefile b/misc/koffice-i18n-zu/Makefile
index a4e08e99df21..9af9419fcd19 100644
--- a/misc/koffice-i18n-zu/Makefile
+++ b/misc/koffice-i18n-zu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/
diff --git a/misc/koffice-i18n/Makefile b/misc/koffice-i18n/Makefile
index 8cdef1089255..5993a4a7d55c 100644
--- a/misc/koffice-i18n/Makefile
+++ b/misc/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/konq-plugins-kde4/Makefile b/misc/konq-plugins-kde4/Makefile
index 33dfe53301c3..912050523316 100644
--- a/misc/konq-plugins-kde4/Makefile
+++ b/misc/konq-plugins-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${KONQPLUGINS_PORTNAME}
 PORTVERSION=	${KONQPLUGINS_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${KONQPLUGINS_PORTREVISION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/misc/konq-plugins/Makefile b/misc/konq-plugins/Makefile
index 33dfe53301c3..912050523316 100644
--- a/misc/konq-plugins/Makefile
+++ b/misc/konq-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${KONQPLUGINS_PORTNAME}
 PORTVERSION=	${KONQPLUGINS_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${KONQPLUGINS_PORTREVISION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 0d703321b84f..101abc79c1ed 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kp
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index 3c83d960ccbb..9fd873fff1b6 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	krecipes
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/krecipes/Makefile b/misc/krecipes/Makefile
index 3c83d960ccbb..9fd873fff1b6 100644
--- a/misc/krecipes/Makefile
+++ b/misc/krecipes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	krecipes
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/ksig/Makefile b/misc/ksig/Makefile
index 00cbfd255f33..85b499a429c5 100644
--- a/misc/ksig/Makefile
+++ b/misc/ksig/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${KSIG_PORTNAME}
 PORTVERSION=	${KSIG_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${KSIG_PORTREVISION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 5d6d05decbc8..e186b185200b 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kwatch
 PORTVERSION=	2.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc kde
 MASTER_SITES=	http://www.m-j-s.net/pub/kde/
 
diff --git a/misc/latex-mk/Makefile b/misc/latex-mk/Makefile
index 2186c52630dc..4900a80736aa 100644
--- a/misc/latex-mk/Makefile
+++ b/misc/latex-mk/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	latex-mk
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	misc print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index f4e8a5802376..59f2359fae69 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lingoteach
 PORTVERSION=	0.3.9
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index da64a25b20f9..6e0a179ab0a8 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	linm
 PORTVERSION=	${LINM_VER}.1
+PORTREVISION=	1
 CATEGORIES=	misc shells
 MASTER_SITES=	http://kldp.net/frs/download.php/3152/ \
 		ftp://ftp.kr.freebsd.org/pub/kldp.net/download/mls/1.LinMStable/LinM${LINM_VER}/
diff --git a/misc/linm/pkg-plist b/misc/linm/pkg-plist
index 94fbc10f9864..15fb92901f25 100644
--- a/misc/linm/pkg-plist
+++ b/misc/linm/pkg-plist
@@ -27,5 +27,3 @@ lib/liblinmpluginsftp.so.0
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%NLS%%share/locale/ko/LC_MESSAGES/linm_euckr.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/linm_utf8.mo
-%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index 10a9b87098af..2b280091a8cd 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	magicpoint
 PORTVERSION=	1.11b
+PORTREVISION=	1
 CATEGORIES?=	misc
 MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
 
diff --git a/misc/mango/Makefile b/misc/mango/Makefile
index 7bec83076b00..a0fb940ddcb4 100644
--- a/misc/mango/Makefile
+++ b/misc/mango/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mango
 PORTVERSION=	0.27
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=mango
@@ -27,6 +28,7 @@ PKGNAMESUFFIX=	-nokde
 
 PLIST_FILES=	bin/mango
 USE_BZIP2=	yes
+USE_GL=		yes
 MAKE_ENV+=	QTDIR=${QT_PREFIX} LDFLAGS="-lkextmdi"
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=	3
diff --git a/misc/menushki/Makefile b/misc/menushki/Makefile
index ccd38b8bafaa..befd4e5ea583 100644
--- a/misc/menushki/Makefile
+++ b/misc/menushki/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	menushki
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/metromap/Makefile b/misc/metromap/Makefile
index f8370229c323..85fa8c5bb9be 100644
--- a/misc/metromap/Makefile
+++ b/misc/metromap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	metromap
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://metromap.antex.ru/ \
 		http://www.amdmi3.ru/distfiles/
diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile
index 7932c3d8ec90..33e841fba8c2 100644
--- a/misc/misterproper/Makefile
+++ b/misc/misterproper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	misterproper
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 #ftp://misterproper.sourceforge.net/pub/misterproper/releases/ \
diff --git a/misc/opencyc/Makefile b/misc/opencyc/Makefile
index b7da34e30cf4..694ceb482109 100644
--- a/misc/opencyc/Makefile
+++ b/misc/opencyc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	opencyc
 PORTVERSION=	0.7.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc linux
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/pdfmap/Makefile b/misc/pdfmap/Makefile
index 09ebfb28d1ac..268f5ad81ea3 100644
--- a/misc/pdfmap/Makefile
+++ b/misc/pdfmap/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pdfmap
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF
 
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index ccacf00193ed..d921d276600e 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pinfo
 PORTVERSION=	0.6.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://alioth.debian.org/download.php/1502/
 
diff --git a/misc/pinfo/pkg-plist b/misc/pinfo/pkg-plist
index 142cabe71c12..289deb9e7eeb 100644
--- a/misc/pinfo/pkg-plist
+++ b/misc/pinfo/pkg-plist
@@ -11,9 +11,3 @@ etc/pinforc
 %%NLS%%share/locale/ru/LC_MESSAGES/pinfo.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pinfo.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/pinfo.mo
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
diff --git a/misc/pipe/Makefile b/misc/pipe/Makefile
index 57cc44a71e39..2325b33e9335 100644
--- a/misc/pipe/Makefile
+++ b/misc/pipe/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pipe
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	misc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pipe2
diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile
index 39828a85266c..c782977a7c47 100644
--- a/misc/py-osd/Makefile
+++ b/misc/py-osd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	osd
 PORTVERSION=	0.2.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc python
 MASTER_SITES=	http://repose.cx/pyosd/ \
 		http://damien.kangaweb.com/moving/stuff/pyosd/
diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile
index 311c61277ace..1723acb83421 100644
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	demo
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	misc devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index f983135219ba..ed8bf2dbe396 100644
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pybliographer
 PORTVERSION=	1.0.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/pybliographer/1.0
diff --git a/misc/pylize/Makefile b/misc/pylize/Makefile
index c06f666aa866..2c28bb3cfea2 100644
--- a/misc/pylize/Makefile
+++ b/misc/pylize/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pylize
 PORTVERSION=	1.3.b
+PORTREVISION=	1
 CATEGORIES=	misc textproc
 MASTER_SITES=	http://www.chrisarndt.de/en/software/pylize/download/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/misc/pypanda/Makefile b/misc/pypanda/Makefile
index 45caef165a9a..6d27a76fb59e 100644
--- a/misc/pypanda/Makefile
+++ b/misc/pypanda/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pypanda
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	# none
 
diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index 25b6ce0f77ff..674eb6663722 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qbrew
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.usermode.org/code/
 
diff --git a/misc/qmc/Makefile b/misc/qmc/Makefile
index 6d09ed9743b0..8aee9f335532 100644
--- a/misc/qmc/Makefile
+++ b/misc/qmc/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qmc
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://qmc.pollaknet.at/program/
 
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index d7da81b85a2b..d09d18a66c1e 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qtconfig
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index 318b5244cc2c..e88c8c031f26 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qtdemo
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index 293d05fe0b55..393b398d2ade 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	quick-lounge-applet
 PORTVERSION=	2.12.4
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
diff --git a/misc/quranref/Makefile b/misc/quranref/Makefile
index 536f5f7eb452..3cd3c818dfee 100644
--- a/misc/quranref/Makefile
+++ b/misc/quranref/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	quranref
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.unknown.nu/ports/
 
diff --git a/misc/renamedlgplugins/Makefile b/misc/renamedlgplugins/Makefile
index 9f6da38fa017..1d610927f2b6 100644
--- a/misc/renamedlgplugins/Makefile
+++ b/misc/renamedlgplugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${RENAMEDLGPLUG_PORTNAME}
 PORTVERSION=	${RENAMEDLGPLUG_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${RENAMEDLGPLUG_PORTREVISION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/misc/seizedesktop/Makefile b/misc/seizedesktop/Makefile
index e574c09d13ed..a2664eff0cd0 100644
--- a/misc/seizedesktop/Makefile
+++ b/misc/seizedesktop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	seizedesktop
 PORTVERSION=	0.1a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc windowmaker tkstep80
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kiri
diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist
index 0363b2e92aa5..0289a2fd28de 100644
--- a/misc/shared-mime-info/pkg-plist
+++ b/misc/shared-mime-info/pkg-plist
@@ -577,23 +577,5 @@ share/mime/video/x-theora+ogg.xml
 @unexec rmdir %%X11BASE%%/share/mime/application 2>/dev/null || true
 @unexec [ -f %%X11BASE%%/share/mime/mime.cache ] && rm -f %%X11BASE%%/share/mime/mime.cache || true
 @unexec rmdir %%X11BASE%%/share/mime 2>/dev/null || true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/misc/snowflake/Makefile b/misc/snowflake/Makefile
index a4c9ba9d94b9..d2c4c4ee2ff6 100644
--- a/misc/snowflake/Makefile
+++ b/misc/snowflake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snowflake
 PORTVERSION=	0.01a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/misc/sonytv/Makefile b/misc/sonytv/Makefile
index 7b452ad5d121..4b983cbc4c68 100644
--- a/misc/sonytv/Makefile
+++ b/misc/sonytv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sonytv
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	misc tk83
 MASTER_SITES=	http://tools.ana.com/demos/
 
diff --git a/misc/sshbuddy/Makefile b/misc/sshbuddy/Makefile
index 56344133d72b..50fd12d8d03c 100644
--- a/misc/sshbuddy/Makefile
+++ b/misc/sshbuddy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sshbuddy
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://linuxmafia.com/pub/linux/security/sshbuddy/
 
diff --git a/misc/telbook/Makefile b/misc/telbook/Makefile
index 413835f1df81..fe8fcf47fb10 100644
--- a/misc/telbook/Makefile
+++ b/misc/telbook/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	telbook
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://home.arcor.de/kaffeetisch/downloads/
 
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index b34a3e567259..dcaf0c2fea80 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tellico
 PORTVERSION=	1.2.10
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	http://www.periapsis.org/tellico/download/
 
diff --git a/misc/tellico-kde4/pkg-plist b/misc/tellico-kde4/pkg-plist
index f31618545ed3..5971dc0e1803 100644
--- a/misc/tellico-kde4/pkg-plist
+++ b/misc/tellico-kde4/pkg-plist
@@ -202,20 +202,6 @@ share/locale/ro/LC_MESSAGES/tellico.mo
 share/locale/ru/LC_MESSAGES/tellico.mo
 share/locale/sv/LC_MESSAGES/tellico.mo
 share/mimelnk/application/x-tellico.desktop
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/doc/HTML/fr/tellico
 @dirrm share/doc/HTML/en/tellico
 @dirrm share/apps/tellico/report-templates
diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
index b34a3e567259..dcaf0c2fea80 100644
--- a/misc/tellico/Makefile
+++ b/misc/tellico/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tellico
 PORTVERSION=	1.2.10
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	http://www.periapsis.org/tellico/download/
 
diff --git a/misc/tellico/pkg-plist b/misc/tellico/pkg-plist
index f31618545ed3..5971dc0e1803 100644
--- a/misc/tellico/pkg-plist
+++ b/misc/tellico/pkg-plist
@@ -202,20 +202,6 @@ share/locale/ro/LC_MESSAGES/tellico.mo
 share/locale/ru/LC_MESSAGES/tellico.mo
 share/locale/sv/LC_MESSAGES/tellico.mo
 share/mimelnk/application/x-tellico.desktop
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/doc/HTML/fr/tellico
 @dirrm share/doc/HTML/en/tellico
 @dirrm share/apps/tellico/report-templates
diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile
index e4282f20cc27..ad41920e7c38 100644
--- a/misc/terraform/Makefile
+++ b/misc/terraform/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	terraform
 PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/tkinfo/Makefile b/misc/tkinfo/Makefile
index 9ed73960a167..04bf4201fa16 100644
--- a/misc/tkinfo/Makefile
+++ b/misc/tkinfo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkinfo
 PORTVERSION=	2.8
+PORTREVISION=	1
 CATEGORIES=	misc tk84
 MASTER_SITES=	http://math-www.uni-paderborn.de/~axel/tkinfo/
 
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 818af776c446..2b2400f7672c 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkman
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/tkregexp/Makefile b/misc/tkregexp/Makefile
index 40f4289dd660..0ebf335e8910 100644
--- a/misc/tkregexp/Makefile
+++ b/misc/tkregexp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkregexp
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc tk84
 MASTER_SITES=	http://laurent.riesterer.free.fr/regexp/
 DISTNAME=	visual_regexp-${PORTVERSION}
diff --git a/misc/tkrunit/Makefile b/misc/tkrunit/Makefile
index 0cdd5303a75f..adf858c54240 100644
--- a/misc/tkrunit/Makefile
+++ b/misc/tkrunit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkRunIt
 PORTVERSION=	0.94.1
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=   http://thaumaturgy.net/~etgold/software/tkRunIt/
 DISTNAME=	tkRunIt-0941
diff --git a/misc/translator/Makefile b/misc/translator/Makefile
index 2e7eb7db2e39..30bc4333cb92 100644
--- a/misc/translator/Makefile
+++ b/misc/translator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	translator
 PORTVERSION=	0.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://jodrell.net/files/attic/translator/
 
diff --git a/misc/tvbrowser/Makefile b/misc/tvbrowser/Makefile
index b51540596ba0..c081d445c201 100644
--- a/misc/tvbrowser/Makefile
+++ b/misc/tvbrowser/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tvbrowser
 PORTVERSION=	2.5.2
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	tvbrowser
diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile
index 3687900d17a6..bcf7066439a3 100644
--- a/misc/uf-view/Makefile
+++ b/misc/uf-view/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uf-view
 PORTVERSION=	2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	http://www.hadess.net/files/software/uf-view/
 
diff --git a/misc/unclutter/Makefile b/misc/unclutter/Makefile
index 7e5ad305c564..4ae667f8bc5a 100644
--- a/misc/unclutter/Makefile
+++ b/misc/unclutter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	unclutter
 PORTVERSION=	8
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/misc/videotext/Makefile b/misc/videotext/Makefile
index 015e3ac836e3..b127b2f178b6 100644
--- a/misc/videotext/Makefile
+++ b/misc/videotext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	videotext
 PORTVERSION=	0.6.19991029
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://elektra.e-technik.uni-ulm.de/~mbuck/download/
 
diff --git a/misc/wmScoreBoard/Makefile b/misc/wmScoreBoard/Makefile
index ab9a118137cd..dbdc4366db38 100644
--- a/misc/wmScoreBoard/Makefile
+++ b/misc/wmScoreBoard/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmScoreBoard
 PORTVERSION=	0.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pat
diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index 368574279d00..e66f06e46edc 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmcalendar
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/wmfirew/Makefile b/misc/wmfirew/Makefile
index 5bae7861f39d..edf7de064551 100644
--- a/misc/wmfirew/Makefile
+++ b/misc/wmfirew/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmfirew
 PORTVERSION=	0.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc windowmaker afterstep
 MASTER_SITES=	http://web.novalis.org/programs/
 
diff --git a/misc/wminfo/Makefile b/misc/wminfo/Makefile
index 0876cec9cc88..26f87d73b131 100644
--- a/misc/wminfo/Makefile
+++ b/misc/wminfo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wminfo
 PORTVERSION=	1.51
+PORTREVISION=	1
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav
diff --git a/misc/wmjulia/Makefile b/misc/wmjulia/Makefile
index ea6391736052..c173b7b966ad 100644
--- a/misc/wmjulia/Makefile
+++ b/misc/wmjulia/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmjulia
 PORTVERSION=	0.40
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc windowmaker afterstep
 MASTER_SITES=	http://web.novalis.org/programs/
 
diff --git a/misc/wmpal/Makefile b/misc/wmpal/Makefile
index 9b42fc907a5f..b01f42b6973c 100644
--- a/misc/wmpal/Makefile
+++ b/misc/wmpal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmpal
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/wmtunlo/Makefile b/misc/wmtunlo/Makefile
index 0a51db93b88a..b48f3d00772e 100644
--- a/misc/wmtunlo/Makefile
+++ b/misc/wmtunlo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmtunlo
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	http://clay.ll.pl/download/
 
diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index 96d4efe63a82..b29ee075f01d 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmweather+
 PORTVERSION=	2.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wmweatherplus
diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile
index 80df7eb39831..30f290f90316 100644
--- a/misc/wmweather/Makefile
+++ b/misc/wmweather/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmweather
 PORTVERSION=	2.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	http://www.godisch.de/debian/wmweather/
 
diff --git a/misc/wmwork/Makefile b/misc/wmwork/Makefile
index 08dc6f62befa..6d70d01b9000 100644
--- a/misc/wmwork/Makefile
+++ b/misc/wmwork/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmwork
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	misc windowmaker afterstep
 MASTER_SITES=	http://www.godisch.de/debian/wmwork/
 
diff --git a/misc/wmx10/Makefile b/misc/wmx10/Makefile
index 6f9044dc995e..1471935e5273 100644
--- a/misc/wmx10/Makefile
+++ b/misc/wmx10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmx10
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc windowmaker
 MASTER_SITES=	http://www.cs.uml.edu/~jhawkins/wmx10/
 
diff --git a/misc/wotsap/Makefile b/misc/wotsap/Makefile
index d51f7cec5d8b..1a34f12da006 100644
--- a/misc/wotsap/Makefile
+++ b/misc/wotsap/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wotsap
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.lysator.liu.se/~jc/wotsap/download/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index bb589f9ec8c1..2cc3f213b25e 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-appfinder
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	misc xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/misc/xfce4-artwork/Makefile b/misc/xfce4-artwork/Makefile
index bf64642f2e22..cd90ad4ed80d 100644
--- a/misc/xfce4-artwork/Makefile
+++ b/misc/xfce4-artwork/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-artwork
 PORTVERSION=	0.0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	misc xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DIST_SUBDIR=	xfce4
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 53283f5906c5..5f4dbc902ac3 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-weather-plugin
 PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/misc/xgas/Makefile b/misc/xgas/Makefile
index dec4a920e655..43fd50acc4b1 100644
--- a/misc/xgas/Makefile
+++ b/misc/xgas/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xgas
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/demos
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 291342a3e0af..4cb310c255c7 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomesword
 PORTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/xless/Makefile b/misc/xless/Makefile
index 384ce3ea6ba0..8380bcd24454 100644
--- a/misc/xless/Makefile
+++ b/misc/xless/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xless
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
 		ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile
index 0ed0571d5f97..d964ad7455f3 100644
--- a/misc/xosd/Makefile
+++ b/misc/xosd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xosd
 PORTVERSION=	2.2.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.ignavus.net/ \
 		${MASTER_SITE_LOCAL}
diff --git a/misc/xpns/Makefile b/misc/xpns/Makefile
index 1e891f1199e1..fc78b33f8047 100644
--- a/misc/xpns/Makefile
+++ b/misc/xpns/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpns
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	misc cad
 MASTER_SITES=	http://robotics.ee.uwa.edu.au/pns/ftp/
 DISTFILES=	pns_source.tar.Z
diff --git a/misc/xtar/Makefile b/misc/xtar/Makefile
index 2dd5f8a2404c..06ef26137d67 100644
--- a/misc/xtar/Makefile
+++ b/misc/xtar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtar
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/misc/xtypo/Makefile b/misc/xtypo/Makefile
index 6ce0a11f4c09..187f10742dde 100644
--- a/misc/xtypo/Makefile
+++ b/misc/xtypo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtypo
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.intec.co.jp/pub/utils/
 
diff --git a/multimedia/acidrip/Makefile b/multimedia/acidrip/Makefile
index 0c9ef68b4f59..44ba4451dd73 100644
--- a/multimedia/acidrip/Makefile
+++ b/multimedia/acidrip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	acidrip
 PORTVERSION=	0.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/audacious-docklet/Makefile b/multimedia/audacious-docklet/Makefile
index de76d8c47943..bb93b7d6de2a 100644
--- a/multimedia/audacious-docklet/Makefile
+++ b/multimedia/audacious-docklet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	audacious-docklet
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://nedudu.hu/downloads/
 
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 01fb4ae7a075..332919137d14 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	audacious-plugins
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://static.audacious-media-player.org/release/
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index eae028a374b9..6e0348eff90f 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	audacious
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://static.audacious-media-player.org/release/
 EXTRACT_SUFX=.tgz
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 7ec2e6ed67e7..73ea6af0d656 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -173,6 +173,3 @@ share/pixmaps/audacious.png
 @dirrm include/audacious
 @dirrmtry lib/audacious
 @dirrmtry share/applications
-%%NLS%%@dirrmtry share/locale/sr@Latn/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sr@Latn
-@dirrmtry share/pixmaps
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index b5d62b9eb2df..9ad182842b72 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	avidemux2
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/ \
 		${MASTER_SITE_BERLIOS}
diff --git a/multimedia/avidemux2/pkg-plist b/multimedia/avidemux2/pkg-plist
index 19ddd8963578..71103430d37e 100644
--- a/multimedia/avidemux2/pkg-plist
+++ b/multimedia/avidemux2/pkg-plist
@@ -6,11 +6,3 @@ share/locale/cs/LC_MESSAGES/avidemux.mo
 share/locale/klingon/LC_MESSAGES/avidemux.mo
 @dirrmtry share/locale/klingon/LC_MESSAGES
 @dirrmtry share/locale/klingon
-@dirrmtry share/locale/es/LC_MESSAGES
-@dirrmtry share/locale/es
-@dirrmtry share/locale/fr/LC_MESSAGES
-@dirrmtry share/locale/fr
-@dirrmtry share/locale/ru/LC_MESSAGES
-@dirrmtry share/locale/ru
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index f574fdeac436..a4536082494e 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	avifile
 PORTVERSION=	0.7.43
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index cc41f90d2d25..479343e10ecc 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	beep-media-player
 PORTVERSION=	0.9.7.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/multimedia/beep-media-player/pkg-plist b/multimedia/beep-media-player/pkg-plist
index 892b39c9d185..e8127504855a 100644
--- a/multimedia/beep-media-player/pkg-plist
+++ b/multimedia/beep-media-player/pkg-plist
@@ -106,5 +106,3 @@ share/pixmaps/bmp.png
 @dirrm include/bmp
 @exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || true
 @unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || true
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
diff --git a/multimedia/bmp-extra-plugins/Makefile b/multimedia/bmp-extra-plugins/Makefile
index 1c2e48bd8f89..85e5505721b7 100644
--- a/multimedia/bmp-extra-plugins/Makefile
+++ b/multimedia/bmp-extra-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bmp-extra-plugins
 PORTVERSION=	0.2.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://wrzask.pl/files/
 
diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index 7b55755534cd..4b42c4a6651e 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bmpx
 PORTVERSION=	0.36.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://files.beep-media-player.org/releases/0.36/
 
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 66f17a7a10f4..573304ba1e14 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	camserv
 PORTVERSION=	0.5.1
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/multimedia/castpodder/Makefile b/multimedia/castpodder/Makefile
index 4114b340f65e..d89d23333e8c 100644
--- a/multimedia/castpodder/Makefile
+++ b/multimedia/castpodder/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	castpodder
 PORTVERSION=	5.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/
 DISTNAME=	CastPodder-${PORTVERSION}
diff --git a/multimedia/dtv/Makefile b/multimedia/dtv/Makefile
index ffde9f9d23e1..c389bcb55691 100644
--- a/multimedia/dtv/Makefile
+++ b/multimedia/dtv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dtv
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://apollo.backplane.com/FreeBSDPorts/
 
@@ -18,4 +19,7 @@ RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
 NOT_FOR_ARCHS=	sparc64
 
+post-patch:
+	@${REINPLACE_CMD} 's|^\(LDADD +=.*\)|\1 -lXau -lXdmcp|' ${WRKSRC}/Makefile
+
 .include <bsd.port.mk>
diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile
index fe3784986a1b..73b095fbd789 100644
--- a/multimedia/dumpmpeg/Makefile
+++ b/multimedia/dumpmpeg/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	dumpmpeg
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/dv2jpg/Makefile b/multimedia/dv2jpg/Makefile
index 888fc3a3f865..6c1899b3289c 100644
--- a/multimedia/dv2jpg/Makefile
+++ b/multimedia/dv2jpg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dv2jpg
 PORTVERSION=	1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index 991881d6dbb0..0507820367cd 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dvbcut
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=dvbcut
diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index 79d324009691..74953112187d 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dvd-slideshow
 PORTVERSION=	0.7.5
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 0044f23a86b3..d2b8d61fbade 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dvdrip
 PORTVERSION=	0.98.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.exit1.org/dvdrip/dist/ \
 		${MASTER_SITE_PERL_CPAN}
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 64c49b5e5ec1..a34e47e2ae08 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvdstyler
 DISTVERSION=	1.5b5
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/multimedia/eclair/Makefile b/multimedia/eclair/Makefile
index 5053bb9ae6df..04d9ffec593f 100644
--- a/multimedia/eclair/Makefile
+++ b/multimedia/eclair/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	eclair
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/multimedia/emotion/Makefile b/multimedia/emotion/Makefile
index 1ba8b1102b89..729f37b7f68d 100644
--- a/multimedia/emotion/Makefile
+++ b/multimedia/emotion/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	emotion
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/multimedia/enjoympeg/Makefile b/multimedia/enjoympeg/Makefile
index 8fff45b49f0d..a505c28dbd01 100644
--- a/multimedia/enjoympeg/Makefile
+++ b/multimedia/enjoympeg/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	enjoympeg
 PORTVERSION=	0.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://people.freenet.de/for_Ki/
 
diff --git a/multimedia/etoile-babbler/Makefile b/multimedia/etoile-babbler/Makefile
index a5a995f6c522..d0f6007268c9 100644
--- a/multimedia/etoile-babbler/Makefile
+++ b/multimedia/etoile-babbler/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	babbler
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	multimedia gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/multimedia/etoile-multimediakit/Makefile b/multimedia/etoile-multimediakit/Makefile
index 087d04c9f9c5..7c09e7b941b1 100644
--- a/multimedia/etoile-multimediakit/Makefile
+++ b/multimedia/etoile-multimediakit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	multimediakit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	multimedia gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/multimedia/exportvideo/Makefile b/multimedia/exportvideo/Makefile
index 18efcd00bb82..b1c94a348d3a 100644
--- a/multimedia/exportvideo/Makefile
+++ b/multimedia/exportvideo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	exportvideo
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://tigerente.htu.tuwien.ac.at/~aoe/mystuff/mpeg2_movie-avipatch/
 DISTNAME=	${PORTNAME}.7e-pre9
diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index 961ef3ea0c98..9abc659638a1 100644
--- a/multimedia/freevo/Makefile
+++ b/multimedia/freevo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freevo
 PORTVERSION=	1.5.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freevo
diff --git a/multimedia/freevo/pkg-plist b/multimedia/freevo/pkg-plist
index 8bb9b2f4a219..ef3207ad17e2 100644
--- a/multimedia/freevo/pkg-plist
+++ b/multimedia/freevo/pkg-plist
@@ -1026,11 +1026,3 @@ share/locale/sv/LC_MESSAGES/freevo.po
 @dirrm %%PYTHON_SITELIBDIR%%/freevo/animation
 @dirrm %%PYTHON_SITELIBDIR%%/freevo
 @dirrm etc/freevo
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 1f325d62587e..5a0cbcead5c9 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fxtv
 PORTVERSION=	1.03
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	rhh
diff --git a/multimedia/gaim-xmms-remote/Makefile b/multimedia/gaim-xmms-remote/Makefile
index 725649c8956f..6adb1813661b 100644
--- a/multimedia/gaim-xmms-remote/Makefile
+++ b/multimedia/gaim-xmms-remote/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaim-xmms-remote
 PORTVERSION=	1.8
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	guifications
diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile
index f2b64ef7efb9..1be189f8c62c 100644
--- a/multimedia/gaupol/Makefile
+++ b/multimedia/gaupol/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gaupol
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.gna.org/gaupol/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ CENKES
 
diff --git a/multimedia/gaupol/pkg-plist b/multimedia/gaupol/pkg-plist
index fe7a59a64e1e..751499f7c2a2 100644
--- a/multimedia/gaupol/pkg-plist
+++ b/multimedia/gaupol/pkg-plist
@@ -399,7 +399,3 @@ share/locale/sv/LC_MESSAGES/gaupol.mo
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/sv/LC_MESSAGES
-@dirrmtry share/locale/sv
diff --git a/multimedia/gcfilms/Makefile b/multimedia/gcfilms/Makefile
index 41ee9e517132..198c5d79ea39 100644
--- a/multimedia/gcfilms/Makefile
+++ b/multimedia/gcfilms/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gcfilms
 PORTVERSION=	6.0
+PORTREVISION=	1
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	http://download.gna.org/gcfilms/
 
diff --git a/multimedia/gdvrecv/Makefile b/multimedia/gdvrecv/Makefile
index 4855d133eb99..9ab1172a40d3 100644
--- a/multimedia/gdvrecv/Makefile
+++ b/multimedia/gdvrecv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdvrecv
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=gdvrecv
diff --git a/multimedia/gdvrecv/pkg-plist b/multimedia/gdvrecv/pkg-plist
index 3b8a545a70cb..533aa95ae2f5 100644
--- a/multimedia/gdvrecv/pkg-plist
+++ b/multimedia/gdvrecv/pkg-plist
@@ -8,5 +8,4 @@ share/pixmaps/gdvrecv/camcorder.png
 share/pixmaps/gdvrecv/dv.png
 share/misc/OUI.db
 @dirrm share/pixmaps/gdvrecv
-@dirrm share/pixmaps
 @dirrm %%PYTHON_SITELIBDIR%%/avc_crom
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 358724b93c4f..fa4941b7dafb 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmencoder
 PORTVERSION=	0.1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index 127baad0f3af..325ff6f70a1b 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-subtitles
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/gnustep-mplayer/Makefile b/multimedia/gnustep-mplayer/Makefile
index cef70e06284f..85711d782702 100644
--- a/multimedia/gnustep-mplayer/Makefile
+++ b/multimedia/gnustep-mplayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	multimedia gnustep
 MASTER_SITES=	http://www.sonappart.net/gnustep/mplayer/
 PKGNAMEPREFIX=	gnustep-
diff --git a/multimedia/goggles/Makefile b/multimedia/goggles/Makefile
index 7b26834e419b..9c1993160061 100644
--- a/multimedia/goggles/Makefile
+++ b/multimedia/goggles/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	goggles
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.fifthplanet.net/files/
 
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 30570c93301c..c2991b80f81e 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gopchop
 PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://outflux.net/unix/software/GOPchop/download/
diff --git a/multimedia/grpplaylist/Makefile b/multimedia/grpplaylist/Makefile
index 854b211d548d..a052e5aa5081 100644
--- a/multimedia/grpplaylist/Makefile
+++ b/multimedia/grpplaylist/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	grpplaylist
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/gstreamer-editor/Makefile b/multimedia/gstreamer-editor/Makefile
index 34796d6176be..29f930b74cda 100644
--- a/multimedia/gstreamer-editor/Makefile
+++ b/multimedia/gstreamer-editor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.8.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-editor/
 PKGNAMESUFFIX=	-editor
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index efed93b9a0e2..ab03beda49b6 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.10.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-ffmpeg/
 PKGNAMESUFFIX=	-ffmpeg
diff --git a/multimedia/gstreamer-ffmpeg80/Makefile b/multimedia/gstreamer-ffmpeg80/Makefile
index a5036f36f569..561d69ecca9d 100644
--- a/multimedia/gstreamer-ffmpeg80/Makefile
+++ b/multimedia/gstreamer-ffmpeg80/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.8.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-ffmpeg/
 PKGNAMESUFFIX=	-ffmpeg80
diff --git a/multimedia/gstreamer-pitfdll/Makefile b/multimedia/gstreamer-pitfdll/Makefile
index 8fe6d1971732..d560549aa9cb 100644
--- a/multimedia/gstreamer-pitfdll/Makefile
+++ b/multimedia/gstreamer-pitfdll/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer-pitfdll
 PORTVERSION=	0.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pitfdll
diff --git a/multimedia/gstreamer-plugins-all/Makefile b/multimedia/gstreamer-plugins-all/Makefile
index ef963e4607cd..5f7ba2276a2b 100644
--- a/multimedia/gstreamer-plugins-all/Makefile
+++ b/multimedia/gstreamer-plugins-all/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gstreamer-plugins-all
 PORTVERSION=	1.3.${GST_VERSION}.${GST_SHLIB_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/multimedia/gstreamer-plugins-all80/Makefile b/multimedia/gstreamer-plugins-all80/Makefile
index 9b03cad64d5a..860e3f826619 100644
--- a/multimedia/gstreamer-plugins-all80/Makefile
+++ b/multimedia/gstreamer-plugins-all80/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gstreamer-plugins-all80
 PORTVERSION=	1.1.${GST80_VERSION}.${GST80_SHLIB_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/multimedia/gstreamer-plugins-annodex/Makefile b/multimedia/gstreamer-plugins-annodex/Makefile
index 616754bb647f..71a0383f0b24 100644
--- a/multimedia/gstreamer-plugins-annodex/Makefile
+++ b/multimedia/gstreamer-plugins-annodex/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/multimedia/gstreamer-plugins-annodex/Makefile,v 1.1 2006/07/06 19:48:44 ahze Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer annodex CMML plugin
diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile
index bcd922c86b5c..828c966a4f43 100644
--- a/multimedia/gstreamer-plugins-bad/Makefile
+++ b/multimedia/gstreamer-plugins-bad/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.7 2006/09/14 21:25:16 ahze Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	Bad gstreamer-plugins
@@ -25,6 +25,8 @@ PLIST_SUB=	VERSION="${GST_VERSION}"
 NO_GSTREAMER_COMMON=	yes
 PLIST=	${.CURDIR}/pkg-plist
 
+USE_GL=		yes
+
 do-build:
 .for dir in ${BAD_GST_DIRS}
 	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
diff --git a/multimedia/gstreamer-plugins-bad/pkg-plist b/multimedia/gstreamer-plugins-bad/pkg-plist
index c2439ca5b9c2..03ba3e7df201 100644
--- a/multimedia/gstreamer-plugins-bad/pkg-plist
+++ b/multimedia/gstreamer-plugins-bad/pkg-plist
@@ -72,9 +72,3 @@ share/locale/sr/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins-bz2/Makefile b/multimedia/gstreamer-plugins-bz2/Makefile
index 3253ba323318..1f04b3c4c4b5 100644
--- a/multimedia/gstreamer-plugins-bz2/Makefile
+++ b/multimedia/gstreamer-plugins-bz2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/multimedia/gstreamer-plugins-bz2/Makefile,v 1.2 2006/07/06 19:32:35 ahze Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer bz2 plugin
diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile
index 67e9c8c716f6..5b16cf30791c 100644
--- a/multimedia/gstreamer-plugins-core/Makefile
+++ b/multimedia/gstreamer-plugins-core/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer-plugins-core
 PORTVERSION=	0.10
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia audio
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/multimedia/gstreamer-plugins-core80/Makefile b/multimedia/gstreamer-plugins-core80/Makefile
index 2fbf96bffc1a..88c5b8efc324 100644
--- a/multimedia/gstreamer-plugins-core80/Makefile
+++ b/multimedia/gstreamer-plugins-core80/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer-plugins-core80
 PORTVERSION=	0.8.11
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia audio
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/multimedia/gstreamer-plugins-dts/Makefile b/multimedia/gstreamer-plugins-dts/Makefile
index 9eef5facf16e..4cb3c0673a60 100644
--- a/multimedia/gstreamer-plugins-dts/Makefile
+++ b/multimedia/gstreamer-plugins-dts/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer dts plugin
diff --git a/multimedia/gstreamer-plugins-dts80/Makefile b/multimedia/gstreamer-plugins-dts80/Makefile
index a39125e4fee4..74a32255781c 100644
--- a/multimedia/gstreamer-plugins-dts80/Makefile
+++ b/multimedia/gstreamer-plugins-dts80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-dts80/Makefile,v 1.1 2006/01/20 02:56:05 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer dts plugin
diff --git a/multimedia/gstreamer-plugins-dv/Makefile b/multimedia/gstreamer-plugins-dv/Makefile
index fd65fd23e7de..e55f4a6cc5bd 100644
--- a/multimedia/gstreamer-plugins-dv/Makefile
+++ b/multimedia/gstreamer-plugins-dv/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer dv plugin
diff --git a/multimedia/gstreamer-plugins-dv80/Makefile b/multimedia/gstreamer-plugins-dv80/Makefile
index 7cf85881fde1..9d4d2b150afd 100644
--- a/multimedia/gstreamer-plugins-dv80/Makefile
+++ b/multimedia/gstreamer-plugins-dv80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-dv80/Makefile,v 1.2 2006/01/25 02:18:17 ahze Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer dv plugin
diff --git a/multimedia/gstreamer-plugins-dvd/Makefile b/multimedia/gstreamer-plugins-dvd/Makefile
index 5c303671cb1b..adff7a3134ee 100644
--- a/multimedia/gstreamer-plugins-dvd/Makefile
+++ b/multimedia/gstreamer-plugins-dvd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer dvd plugin set
diff --git a/multimedia/gstreamer-plugins-dvd80/Makefile b/multimedia/gstreamer-plugins-dvd80/Makefile
index 19df09cbf085..a798ed70b816 100644
--- a/multimedia/gstreamer-plugins-dvd80/Makefile
+++ b/multimedia/gstreamer-plugins-dvd80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-dvd80/Makefile,v 1.1 2006/01/20 02:56:06 ahze Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer dvd plugin set
diff --git a/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile b/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
index f3b3f0198ba6..0c0a934a03a9 100644
--- a/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
+++ b/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gstreamer-plugins-fluendo-mpegdemux
 PORTVERSION=	0.10.11
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/
 DISTNAME=	gst-fluendo-mpegdemux-${PORTVERSION}
diff --git a/multimedia/gstreamer-plugins-gnonlin/Makefile b/multimedia/gstreamer-plugins-gnonlin/Makefile
index 599b311cf2b9..41acfcacfb1f 100644
--- a/multimedia/gstreamer-plugins-gnonlin/Makefile
+++ b/multimedia/gstreamer-plugins-gnonlin/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gstreamer-plugins-gnonlin
 PORTVERSION=	0.10.7
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gnonlin/
 DISTNAME=	gnonlin-${PORTVERSION}
diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile
index 5947d34bf29d..9160d023acb0 100644
--- a/multimedia/gstreamer-plugins-good/Makefile
+++ b/multimedia/gstreamer-plugins-good/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.10 2006/09/14 22:41:06 ahze Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Good gstreamer-plugins
diff --git a/multimedia/gstreamer-plugins-good/pkg-plist b/multimedia/gstreamer-plugins-good/pkg-plist
index ae51a5fb4eaa..a64c6152ac9e 100644
--- a/multimedia/gstreamer-plugins-good/pkg-plist
+++ b/multimedia/gstreamer-plugins-good/pkg-plist
@@ -108,9 +108,3 @@ share/locale/sr/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins-libfame80/Makefile b/multimedia/gstreamer-plugins-libfame80/Makefile
index 752ef939fdd2..9e41d3f71b29 100644
--- a/multimedia/gstreamer-plugins-libfame80/Makefile
+++ b/multimedia/gstreamer-plugins-libfame80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-libfame80/Makefile,v 1.1 2006/01/20 02:56:06 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 GST_PLUGIN=	libfame
diff --git a/multimedia/gstreamer-plugins-mpeg2dec/Makefile b/multimedia/gstreamer-plugins-mpeg2dec/Makefile
index 87628cc2a4ec..14f61a5b88d4 100644
--- a/multimedia/gstreamer-plugins-mpeg2dec/Makefile
+++ b/multimedia/gstreamer-plugins-mpeg2dec/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer mpeg decode plugin
diff --git a/multimedia/gstreamer-plugins-mpeg2dec80/Makefile b/multimedia/gstreamer-plugins-mpeg2dec80/Makefile
index f65bfab04c94..d6e904c975a5 100644
--- a/multimedia/gstreamer-plugins-mpeg2dec80/Makefile
+++ b/multimedia/gstreamer-plugins-mpeg2dec80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-mpeg2dec80/Makefile,v 1.1 2006/01/20 02:56:06 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer mpeg decode plugin
diff --git a/multimedia/gstreamer-plugins-mpeg2enc/Makefile b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
index 97f4f481b2a7..5c90220cad3a 100644
--- a/multimedia/gstreamer-plugins-mpeg2enc/Makefile
+++ b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer mpeg encoder plugin
diff --git a/multimedia/gstreamer-plugins-mplex80/Makefile b/multimedia/gstreamer-plugins-mplex80/Makefile
index 1f79656b6829..4fb285048821 100644
--- a/multimedia/gstreamer-plugins-mplex80/Makefile
+++ b/multimedia/gstreamer-plugins-mplex80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-mplex80/Makefile,v 1.1 2006/01/20 02:56:07 ahze Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer mplex plugin
diff --git a/multimedia/gstreamer-plugins-theora/Makefile b/multimedia/gstreamer-plugins-theora/Makefile
index d77bf6be7022..cc0a3c6c64c4 100644
--- a/multimedia/gstreamer-plugins-theora/Makefile
+++ b/multimedia/gstreamer-plugins-theora/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer theora plugin
diff --git a/multimedia/gstreamer-plugins-theora80/Makefile b/multimedia/gstreamer-plugins-theora80/Makefile
index ea13713ec792..019b79b5e877 100644
--- a/multimedia/gstreamer-plugins-theora80/Makefile
+++ b/multimedia/gstreamer-plugins-theora80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-theora80/Makefile,v 1.1 2006/01/20 02:56:07 ahze Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer theora plugin
diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile
index 6c8c2ea21ffb..8002340257f6 100644
--- a/multimedia/gstreamer-plugins-ugly/Makefile
+++ b/multimedia/gstreamer-plugins-ugly/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.8 2006/09/14 21:20:43 ahze Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 
 COMMENT=	Ugly gstreamer-plugins
diff --git a/multimedia/gstreamer-plugins-ugly/pkg-plist b/multimedia/gstreamer-plugins-ugly/pkg-plist
index 5c14161c79c2..a6b3c7b40ff0 100644
--- a/multimedia/gstreamer-plugins-ugly/pkg-plist
+++ b/multimedia/gstreamer-plugins-ugly/pkg-plist
@@ -33,9 +33,3 @@ share/locale/sr/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins-x26480/Makefile b/multimedia/gstreamer-plugins-x26480/Makefile
index ab49563dd4a1..097fe76e383d 100644
--- a/multimedia/gstreamer-plugins-x26480/Makefile
+++ b/multimedia/gstreamer-plugins-x26480/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-x26480/Makefile,v 1.1 2006/01/20 02:56:07 ahze Exp $
 #
 
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer x264 plugin
diff --git a/multimedia/gstreamer-plugins-xvid/Makefile b/multimedia/gstreamer-plugins-xvid/Makefile
index 6b5cc6590a95..c205f8625c93 100644
--- a/multimedia/gstreamer-plugins-xvid/Makefile
+++ b/multimedia/gstreamer-plugins-xvid/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-xvid80/Makefile,v 1.1 2006/01/20 02:56:07 ahze Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer xvid plugin
diff --git a/multimedia/gstreamer-plugins-xvid80/Makefile b/multimedia/gstreamer-plugins-xvid80/Makefile
index b462d4ddfba5..fa3141086cef 100644
--- a/multimedia/gstreamer-plugins-xvid80/Makefile
+++ b/multimedia/gstreamer-plugins-xvid80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-xvid80/Makefile,v 1.1 2006/01/20 02:56:07 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer xvid plugin
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 4d7cccfe666f..6af1f95b0ead 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION?=	${BASE_PORTVERSION}
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	3
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index 430ca893c350..12b6923fe879 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -163,9 +163,3 @@ share/locale/vi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 @dirrm include/gstreamer-%%VERSION%%/gst/floatcast
 @dirrm include/gstreamer-%%VERSION%%/gst/cdda
 @dirrm include/gstreamer-%%VERSION%%/gst/audio
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 0e0cd94ac1f3..b3bc725b825f 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.8.12
-PORTREVISION?=	2
+PORTREVISION?=	3
 PORTEPOCH=	1
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index c6f619f79127..f13b40e24f73 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -398,11 +398,3 @@ share/locale/zh_TW/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 @dirrmtry include/gstreamer-%%VERSION%%
 @exec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
 @unexec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 6e6c808eb184..342ae7d3d50d 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.10.12
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gstreamer/ \
 		${MASTER_SITE_LOCAL}
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index 8044755914ed..be68c1d4cfb0 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -133,15 +133,3 @@ share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 @dirrm include/gstreamer-%%VERSION%%/gst
 @dirrm include/gstreamer-%%VERSION%%
 @dirrm lib/gstreamer-%%VERSION%%
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile
index 83af9ab9c098..7b6b8832d480 100644
--- a/multimedia/gstreamer80/Makefile
+++ b/multimedia/gstreamer80/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.8.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gstreamer/
 PKGNAMESUFFIX=	80
diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist
index ba4ae6aa23fb..638edaeefb3c 100644
--- a/multimedia/gstreamer80/pkg-plist
+++ b/multimedia/gstreamer80/pkg-plist
@@ -153,13 +153,3 @@ share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 @dirrm include/gstreamer-%%VERSION%%/gst
 @dirrm include/gstreamer-%%VERSION%%
 @exec %D/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/multimedia/gsubedit/Makefile b/multimedia/gsubedit/Makefile
index 74864c050040..51d8da39456d 100644
--- a/multimedia/gsubedit/Makefile
+++ b/multimedia/gsubedit/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	GSubEdit
 PORTVERSION=	0.4.p1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/multimedia/gtksubtitler/Makefile b/multimedia/gtksubtitler/Makefile
index ac5c8cb39c75..cbcff322c371 100644
--- a/multimedia/gtksubtitler/Makefile
+++ b/multimedia/gtksubtitler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	GTKsubtitler
 PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://matrix.kamp.pl/~pawelb/gtksubtitler/download/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
diff --git a/multimedia/gxanim/Makefile b/multimedia/gxanim/Makefile
index b0907b4d2889..d0a3d2321a90 100644
--- a/multimedia/gxanim/Makefile
+++ b/multimedia/gxanim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxanim
 PORTVERSION=	0.50
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.rswarren.com/code/
 DISTNAME=	GXAnim-${PORTVERSION}
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 9770282616aa..dbceeee35285 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gxine
 PORTVERSION=	0.5.11
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xine
diff --git a/multimedia/gxine/pkg-plist b/multimedia/gxine/pkg-plist
index 47bb524a6580..4ca9430d9475 100644
--- a/multimedia/gxine/pkg-plist
+++ b/multimedia/gxine/pkg-plist
@@ -42,15 +42,6 @@ share/icons/hicolor/64x64/apps/gxine.png
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gxine.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gxine.theme.mo
 share/pixmaps/gxine.png
-@dirrmtry share/pixmaps
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
 @dirrmtry share/icons/hicolor/64x64/apps
 @dirrmtry share/icons/hicolor/64x64
 @dirrmtry share/icons/hicolor
diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile
index 31a5fe9d9d21..5eacc49cb7e6 100644
--- a/multimedia/gxmms/Makefile
+++ b/multimedia/gxmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxmms
 PORTVERSION=	0.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/handbrake-gtk2/Makefile b/multimedia/handbrake-gtk2/Makefile
index 514575ab767a..d5f5c5155f35 100644
--- a/multimedia/handbrake-gtk2/Makefile
+++ b/multimedia/handbrake-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	handbrake
 PORTVERSION=	0.6.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.m0k.org/${PORTNAME}/ \
 		http://www.mirrors.ausmac.net/ftp/AudioVisual-SW/HandBrake/ \
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index f985b41d0e58..e8d31604719e 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	handbrake
 PORTVERSION=	0.7.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.m0k.org/${PORTNAME}/ \
 		http://www.mirrors.ausmac.net/ftp/AudioVisual-SW/HandBrake/ \
diff --git a/multimedia/hayes/Makefile b/multimedia/hayes/Makefile
index c5c9f7a2cb88..afa74ac08a78 100644
--- a/multimedia/hayes/Makefile
+++ b/multimedia/hayes/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		hayes
 PORTVERSION=		1.4
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		multimedia kde
 MASTER_SITES=		http://www.hakubi.us/hayes/
 
diff --git a/multimedia/helixplayer/Makefile b/multimedia/helixplayer/Makefile
index 729893bbfa5b..14e11ed0e1dd 100644
--- a/multimedia/helixplayer/Makefile
+++ b/multimedia/helixplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hxplay
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	https://helixcommunity.org/frs/download.php/1950/	\
 		${MASTER_SITE_LOCAL}
diff --git a/multimedia/iriverter/Makefile b/multimedia/iriverter/Makefile
index 4de289fe66ff..33d008d1a7da 100644
--- a/multimedia/iriverter/Makefile
+++ b/multimedia/iriverter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iriverter
 PORTVERSION=	0.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia java
 MASTER_SITES=	SOURCEFORGE
 
diff --git a/multimedia/iriverter/pkg-plist b/multimedia/iriverter/pkg-plist
index aeba0ee2030a..a75601c952cf 100644
--- a/multimedia/iriverter/pkg-plist
+++ b/multimedia/iriverter/pkg-plist
@@ -34,7 +34,6 @@ share/applications/iriverter.desktop
 %%DATADIR%%/profiles/x5.profile
 %%DATADIR%%/profiles/zvm.profile
 share/pixmaps/iriverter.png
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/profiles
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/doc/images
diff --git a/multimedia/iso2mkv/Makefile b/multimedia/iso2mkv/Makefile
index 207d90b63fd4..872f505822ff 100644
--- a/multimedia/iso2mkv/Makefile
+++ b/multimedia/iso2mkv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	iso2mkv
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://5ko.free.fr/dl/
 DISTNAME=	${PORTNAME}
diff --git a/multimedia/istanbul/Makefile b/multimedia/istanbul/Makefile
index 8a2bd6d5aa52..255485d9e89d 100644
--- a/multimedia/istanbul/Makefile
+++ b/multimedia/istanbul/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		istanbul
 PORTVERSION=		0.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=		multimedia
 MASTER_SITES=		http://live.hujjat.org/
 
diff --git a/multimedia/jahshaka/Makefile b/multimedia/jahshaka/Makefile
index 28e8e07a4ae3..7f534a1d4bc0 100644
--- a/multimedia/jahshaka/Makefile
+++ b/multimedia/jahshaka/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jahshaka
 PORTVERSION=	1.9a9
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}fx
diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile
index c1f0ff9f8bd5..019da58da729 100644
--- a/multimedia/k9copy-kde4/Makefile
+++ b/multimedia/k9copy-kde4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	k9copy
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile
index c1f0ff9f8bd5..019da58da729 100644
--- a/multimedia/k9copy/Makefile
+++ b/multimedia/k9copy/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	k9copy
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile
index bc4182bdf336..00bc2fcfdadd 100644
--- a/multimedia/kaffeine-mozilla/Makefile
+++ b/multimedia/kaffeine-mozilla/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kaffeine-mozilla
 PORTVERSION=	0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kaffeine
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 85e97267ad60..5e10f60ad91d 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kaffeine
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kaffeine
diff --git a/multimedia/kaffeine/pkg-plist b/multimedia/kaffeine/pkg-plist
index 1f4cfc1d6549..a16ae509d948 100644
--- a/multimedia/kaffeine/pkg-plist
+++ b/multimedia/kaffeine/pkg-plist
@@ -146,6 +146,4 @@ share/servicetypes/kaffeineaudioencoder.desktop
 @dirrmtry share/apps/konqueror
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
-@dirrmtry share/locale/uz/LC_MESSAGES
-@dirrmtry share/locale/uz
 %%NOGSTREAMER%%@dirrm share/apps/gstreamerpart
diff --git a/multimedia/katchtv/Makefile b/multimedia/katchtv/Makefile
index 4e2f278b6718..0636689dc88a 100644
--- a/multimedia/katchtv/Makefile
+++ b/multimedia/katchtv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	katchtv
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia kde python
 MASTER_SITES=	http://www.digitalunleashed.com/downloads/${PORTNAME}/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
diff --git a/multimedia/kbtv/Makefile b/multimedia/kbtv/Makefile
index f3845b063e81..4f3067bd61e4 100644
--- a/multimedia/kbtv/Makefile
+++ b/multimedia/kbtv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kbtv
 DISTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	multimedia python kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 08f08468273c..1f48eea91a84 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 08f08468273c..1f48eea91a84 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 3d42303ca59c..1433ed026f92 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kino
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/kmenc15/Makefile b/multimedia/kmenc15/Makefile
index 405c2bd966a7..1c8ce4f28113 100644
--- a/multimedia/kmenc15/Makefile
+++ b/multimedia/kmenc15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kmenc15
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=kmenc15
diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index e566e4bcaaa8..2c0ce8f06897 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kmplayer
 DISTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	http://kmplayer.kde.org/pkgs/
diff --git a/multimedia/kmplayer-kde4/pkg-plist b/multimedia/kmplayer-kde4/pkg-plist
index 768489fbb0d2..9b3e4d670cef 100644
--- a/multimedia/kmplayer-kde4/pkg-plist
+++ b/multimedia/kmplayer-kde4/pkg-plist
@@ -104,34 +104,10 @@ share/locale/xx/LC_MESSAGES/kmplayer.mo
 share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
 share/services/kmplayer_part.desktop
 @dirrmtry share/services
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xx/LC_MESSAGES
 @dirrmtry share/locale/xx
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/64x64/apps
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index e566e4bcaaa8..2c0ce8f06897 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kmplayer
 DISTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	http://kmplayer.kde.org/pkgs/
diff --git a/multimedia/kmplayer/pkg-plist b/multimedia/kmplayer/pkg-plist
index 768489fbb0d2..9b3e4d670cef 100644
--- a/multimedia/kmplayer/pkg-plist
+++ b/multimedia/kmplayer/pkg-plist
@@ -104,34 +104,10 @@ share/locale/xx/LC_MESSAGES/kmplayer.mo
 share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
 share/services/kmplayer_part.desktop
 @dirrmtry share/services
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xx/LC_MESSAGES
 @dirrmtry share/locale/xx
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/64x64/apps
diff --git a/multimedia/konverter/Makefile b/multimedia/konverter/Makefile
index bd9163679377..62ada9c5aa52 100644
--- a/multimedia/konverter/Makefile
+++ b/multimedia/konverter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	konverter
 DISTVERSION=	0.92-beta1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://www.tr0ll.net/kraus.tk/projects/konverter/sources/
 
diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile
index b9c796fe466a..aadfacda7177 100644
--- a/multimedia/kplayer-kde4/Makefile
+++ b/multimedia/kplayer-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kplayer
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/kplayer/Makefile b/multimedia/kplayer/Makefile
index b9c796fe466a..aadfacda7177 100644
--- a/multimedia/kplayer/Makefile
+++ b/multimedia/kplayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kplayer
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/ksubeditor/Makefile b/multimedia/ksubeditor/Makefile
index 515e7694522b..7768074de425 100644
--- a/multimedia/ksubeditor/Makefile
+++ b/multimedia/ksubeditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	KSubeditor
 PORTVERSION=	0.2
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/multimedia/ldvd/Makefile b/multimedia/ldvd/Makefile
index 5534a914521a..d36dcc477a64 100644
--- a/multimedia/ldvd/Makefile
+++ b/multimedia/ldvd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ldvd
 PORTVERSION=	2.0.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
 
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index ba8ea7823f86..9666d4540084 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdv
 PORTVERSION=	0.104
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile
index 5ee9162ad50d..53a4e656a021 100644
--- a/multimedia/libmovtar/Makefile
+++ b/multimedia/libmovtar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmovtar
 PORTVERSION=	0.1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mjpeg
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 5cd08c175e8a..10d17dec4609 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libmpeg2
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://libmpeg2.sourceforge.net/files/
 DISTNAME=	mpeg2dec-${PORTVERSION}
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index eb63906ced3d..1bb1c51da308 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	0.9.10
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index e85af1b31368..a1499fcffdb7 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -108,9 +108,14 @@ PLIST_SUB+=	WITH_PULSEAUDIO="@comment "
 CONFIGURE_ARGS+=	--disable-pulseaudio
 .endif
 
-.if !defined(WITHOUT_XVMC) && (exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) || defined(WITH_XVMC))
+.if !defined(WITHOUT_XVMC) && (exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) || exists(${X11BASE}/lib/libXvMC.so.1) || defined(WITH_XVMC))
+.if defined(WITH_NVIDIA_GL)
 CONFIGURE_ARGS+=--with-xvmc-lib=XvMCNVIDIA
 LIB_DEPENDS+=	XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver
+.else
+CONFIGURE_ARGS+=--with-xvmc-lib=XvMC
+LIB_DEPENDS+=	XvMC.1:${PORTSDIR}/x11/libXvMC
+.endif
 PLIST_SUB+=	WITH_XVMC=""
 .else
 PLIST_SUB+=	WITH_XVMC="@comment "
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 478ff312a78e..d55a77c03a36 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -145,6 +145,7 @@ lib/xine/plugins/1.1.4/xineplug_vo_out_sdl.so
 lib/xine/plugins/1.1.4/xineplug_vo_out_xshm.so
 lib/xine/plugins/1.1.4/xineplug_vo_out_xv.so
 %%WITH_XVMC%%lib/xine/plugins/1.1.4/xineplug_vo_out_xvmc.so
+%%WITH_XVMC%%lib/xine/plugins/1.1.4/xineplug_vo_out_xxmc.so
 libdata/pkgconfig/libxine.pc
 share/aclocal/xine.m4
 %%DOCSDIR%%/README
diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index d1850567e6a4..65114b78fa88 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	linux-realplayer
 DISTVERSION=	10.0.8.805-20060718
+PORTREVISION=	1
 CATEGORIES=	multimedia audio linux
 MASTER_SITES=	https://helixcommunity.org/download.php/2152/:player \
 		http://ftp.nluug.nl/ftp/pub/os/Linux/distr/pardusrepo/sources/:playeralt \
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index d99abe3dadae..ef0a3155c3f8 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lives
 DISTVERSION=	0.9.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.xs4all.nl/%7Esalsaman/lives/current/ CENKES
 DISTNAME=	LiVES-${DISTVERSION}
diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile
index 79993943fb0e..1e0562a42fbf 100644
--- a/multimedia/lxdvdrip/Makefile
+++ b/multimedia/lxdvdrip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lxdvdrip
 PORTVERSION=	1.62
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/lxdvdrip/ \
 		ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/
diff --git a/multimedia/mandvd/Makefile b/multimedia/mandvd/Makefile
index f40c3cc47162..c2d7aa3a5339 100644
--- a/multimedia/mandvd/Makefile
+++ b/multimedia/mandvd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mandvd
 DISTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://csgib36.ifrance.com/FTP/
 DISTNAME=	ManDVD
diff --git a/multimedia/manencode/Makefile b/multimedia/manencode/Makefile
index 7e57d72a1e42..6d1157fd4c6f 100644
--- a/multimedia/manencode/Makefile
+++ b/multimedia/manencode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	manencode
 DISTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://csgib36.ifrance.com/Manencode/
 DISTNAME=	Manencode-${DISTVERSION}
diff --git a/multimedia/manslide/Makefile b/multimedia/manslide/Makefile
index f5495217a9c8..2831706e9bcc 100644
--- a/multimedia/manslide/Makefile
+++ b/multimedia/manslide/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	manslide
 DISTVERSION=	1.5.5
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://csgib36.ifrance.com/Manslide/
 
diff --git a/multimedia/mjpegtools-yuvfilters/Makefile b/multimedia/mjpegtools-yuvfilters/Makefile
index 03b62974971e..d850977e1b85 100644
--- a/multimedia/mjpegtools-yuvfilters/Makefile
+++ b/multimedia/mjpegtools-yuvfilters/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mjpegtools-yuvfilters
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://silicontrip.net/~mark/lavtools/ \
 		${MASTER_SITE_LOCAL}
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 0cf0b03d1aa6..70dbfd0cede5 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mjpegtools
 DISTVERSION=	1.8.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mjpeg
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 26a422bd01e6..4cf40eaa1be0 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mkvtoolnix
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ CSME
 
diff --git a/multimedia/mkxvcd/Makefile b/multimedia/mkxvcd/Makefile
index 13a9ba089fe8..29fc1db871a2 100644
--- a/multimedia/mkxvcd/Makefile
+++ b/multimedia/mkxvcd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mkxvcd
 PORTVERSION=	2.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kvcd4nix
diff --git a/multimedia/mpeg2codec/Makefile b/multimedia/mpeg2codec/Makefile
index d98a0efba6e9..b9d9cdf9bc97 100644
--- a/multimedia/mpeg2codec/Makefile
+++ b/multimedia/mpeg2codec/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg2codec
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.mpeg.org/pub/mpeg/mssg/
 DISTFILES=	mpeg2vidcodec_v12.tar.gz
diff --git a/multimedia/mpeg2play/Makefile b/multimedia/mpeg2play/Makefile
index a2988ea892a7..40696ca9d2ea 100644
--- a/multimedia/mpeg2play/Makefile
+++ b/multimedia/mpeg2play/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg2play
 PORTVERSION=	1.1b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.funet.fi/pub/graphics/packages/mpeg/mpeg2play/
 
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 8f285119b080..dd36295a3f24 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.5.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile
index 86008f34e89a..9e35ce3e32d3 100644
--- a/multimedia/mpeg_play/Makefile
+++ b/multimedia/mpeg_play/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpeg_play
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.bsd-geek.de/FreeBSD/distfiles/ \
 		ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/play/
diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile
index b61f4f2c6638..652c1c42eda1 100644
--- a/multimedia/mpegedit/Makefile
+++ b/multimedia/mpegedit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpegedit
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.netsw.org/graphic/movie/mpeg/mpegedit/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 509f2a5a6cd2..be06bd7921f3 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -83,7 +83,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.99.10
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -261,6 +261,7 @@ CFLAGS+=	-fno-force-addr
 
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
+CONFIGURE_ARGS+=--with-x11libdir="${LOCALBASE}/lib"
 .else
 WITHOUT_GUI=	yes
 CONFIGURE_ARGS+=--disable-x11 \
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index e3edf0b8d4bb..e2e4e332fc83 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mplayerxp
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index c8322ea58169..b257262e835b 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mythtv
 PORTVERSION=	0.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://chuggalug.clues.com/mythtv/
 DISTNAME=	mythtv-fixes-0.20-13053
diff --git a/multimedia/noatun-plugins/Makefile b/multimedia/noatun-plugins/Makefile
index 4c5cfdbc2021..99e5d23f554f 100644
--- a/multimedia/noatun-plugins/Makefile
+++ b/multimedia/noatun-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${NOATUNPLUG_PORTNAME}
 PORTVERSION=	${NOATUNPLUG_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${NOATUNPLUG_PORTREVISION}
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/multimedia/nuppelvideo/Makefile b/multimedia/nuppelvideo/Makefile
index 8c26d03f000d..4b9aee8da617 100644
--- a/multimedia/nuppelvideo/Makefile
+++ b/multimedia/nuppelvideo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	NuppelVideo
 PORTVERSION=	0.52.a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile
index 688fb08dd6c0..dfa000b18572 100644
--- a/multimedia/nxtvepg/Makefile
+++ b/multimedia/nxtvepg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nxtvepg
 PORTVERSION=	2.7.6
+PORTREVISION=	1
 CATEGORIES=	multimedia tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index 73afb825f4a0..8f4a85980b0f 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ogle
 PORTVERSION=	0.9.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 PKGNAMESUFFIX=	-gui
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
index 21e36a02bdfa..b3a235aa99de 100644
--- a/multimedia/ogle-gui/pkg-plist
+++ b/multimedia/ogle-gui/pkg-plist
@@ -31,5 +31,3 @@ share/locale/sv/LC_MESSAGES/ogle_gui.mo
 @dirrmtry share/locale
 @dirrm share/gnome/ogle_gui
 @dirrm lib/ogle
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 3d9f14db6dce..f103d76c2af5 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ogle
 PORTVERSION=	0.9.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index 9f5122e14332..358375bc4b9d 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ogmrip
 DISTVERSION=	0.10.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/okle/Makefile b/multimedia/okle/Makefile
index bf1ba8144d4d..71dc664e0788 100644
--- a/multimedia/okle/Makefile
+++ b/multimedia/okle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	okle
 PORTVERSION=	0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://okle.sourceforge.net/
 
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index f83622b9b048..2ac7082c3ea5 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openquicktime
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openquicktime
diff --git a/multimedia/oqtencoder/Makefile b/multimedia/oqtencoder/Makefile
index c60d9166d46f..2684c8807235 100644
--- a/multimedia/oqtencoder/Makefile
+++ b/multimedia/oqtencoder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	OQTEncoder
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openquicktime
diff --git a/multimedia/oqtplayer/Makefile b/multimedia/oqtplayer/Makefile
index 2c9472c9be5a..f47eef39d220 100644
--- a/multimedia/oqtplayer/Makefile
+++ b/multimedia/oqtplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	OQTPlayer
 PORTVERSION=	0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openquicktime
diff --git a/multimedia/p5-GStreamer/Makefile b/multimedia/p5-GStreamer/Makefile
index 11f0890e13d8..832a84eea2cb 100644
--- a/multimedia/p5-GStreamer/Makefile
+++ b/multimedia/p5-GStreamer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GStreamer
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk2-perl
diff --git a/multimedia/p5-Video-OpenQuicktime/Makefile b/multimedia/p5-Video-OpenQuicktime/Makefile
index 9cba35c53a3b..15bdec97be84 100644
--- a/multimedia/p5-Video-OpenQuicktime/Makefile
+++ b/multimedia/p5-Video-OpenQuicktime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Video-OpenQuicktime
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Video
diff --git a/multimedia/poe/Makefile b/multimedia/poe/Makefile
index 036cef00d97d..046a823e900b 100644
--- a/multimedia/poe/Makefile
+++ b/multimedia/poe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	poe
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	multimedia gnustep
 MASTER_SITES=	http://www.eskimo.com/~pburns/Poe/files/
 DISTNAME=	Poe-${PORTVERSION}
diff --git a/multimedia/projectx/Makefile b/multimedia/projectx/Makefile
index 2b77af8eb414..d3c4bf5e2e68 100644
--- a/multimedia/projectx/Makefile
+++ b/multimedia/projectx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	projectx
 PORTVERSION=	0.90.4.00
+PORTREVISION=	1
 CATEGORIES=	multimedia java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	project-x
diff --git a/multimedia/pwcbsd/Makefile b/multimedia/pwcbsd/Makefile
index 1a35706747eb..0564e4cbb1c4 100644
--- a/multimedia/pwcbsd/Makefile
+++ b/multimedia/pwcbsd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pwcbsd
 PORTVERSION=	1.3.1
-PORTREVISION=   1
+PORTREVISION=   2
 CATEGORIES=	multimedia sysutils
 MASTER_SITES=	http://raaf.atspace.org/ \
 		${MASTER_SITE_LOCAL}
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index d5a6c49ae8a0..9ebade4b6347 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.10.7
+PORTREVISION=	1
 CATEGORIES=	multimedia python gnome
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/py-gstreamer80/Makefile b/multimedia/py-gstreamer80/Makefile
index 3d4d231768a8..9d93dbcebc67 100644
--- a/multimedia/py-gstreamer80/Makefile
+++ b/multimedia/py-gstreamer80/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia python gnome
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-python/ \
 		${MASTER_SITE_LOCAL}
diff --git a/multimedia/py-pybmp/Makefile b/multimedia/py-pybmp/Makefile
index 2954f89ce55e..4607c6e7a3ea 100644
--- a/multimedia/py-pybmp/Makefile
+++ b/multimedia/py-pybmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pyBMP
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/ \
 		LOCAL/nivit/${PORTNAME}/
diff --git a/multimedia/qdvdauthor/Makefile b/multimedia/qdvdauthor/Makefile
index 2d68b326ce72..c73f3cf1e161 100644
--- a/multimedia/qdvdauthor/Makefile
+++ b/multimedia/qdvdauthor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qdvdauthor
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/quark/Makefile b/multimedia/quark/Makefile
index ab994538740a..3c4232e9b0b4 100644
--- a/multimedia/quark/Makefile
+++ b/multimedia/quark/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	quark
 PORTVERSION=	3.21
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://quark.sunsite.dk/ \
 		http://demian.dyndns.org/src/
diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile
index f25578257cfb..c466121a4e82 100644
--- a/multimedia/quodlibet/Makefile
+++ b/multimedia/quodlibet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quodlibet
 PORTVERSION=	0.24
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia audio python gnome
 MASTER_SITES=	http://www.sacredchao.net/~piman/software/ \
 		http://www.tortall.net/mirrors/piman-software/
diff --git a/multimedia/rox-videothumbnail/Makefile b/multimedia/rox-videothumbnail/Makefile
index 7f9082e74973..ba8a27fe6461 100644
--- a/multimedia/rox-videothumbnail/Makefile
+++ b/multimedia/rox-videothumbnail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rox-videothumbnail
 PORTVERSION=	0.1.9
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.kerofin.demon.co.uk/rox/
 DISTNAME=	VideoThumbnail-${PORTVERSION}
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index 22889a2a7a56..527913ba4ab0 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sabbu
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index 2b18b3b3ee56..98fdb233bf2d 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smpeg-xmms
 PORTVERSION=	0.3.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://www.xmms.org/files/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/multimedia/xmms/%SUBDIR%/
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 2fb61bb25aee..86ddf345deaa 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smpeg
 PORTVERSION=	0.4.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \
 		${MASTER_SITE_GENTOO}
diff --git a/multimedia/snd-music-duplicates/Makefile b/multimedia/snd-music-duplicates/Makefile
index 4ddb7e5ed68e..290318a04262 100644
--- a/multimedia/snd-music-duplicates/Makefile
+++ b/multimedia/snd-music-duplicates/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snd-music-duplicates
 PORTVERSION=	1.9.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia java
 MASTER_SITES=	http://www.pekarna.si/ \
 		http://olofsson.de/mirror/distfiles/
diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index ba8a584285b6..cb44bab60815 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	subtitleeditor
 PORTVERSION=	0.13.6
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://kitone.free.fr/subtitleeditor/files/ CENKES
 
diff --git a/multimedia/subtitleeditor/pkg-plist b/multimedia/subtitleeditor/pkg-plist
index c3d6e7a48242..936ff17a9e98 100644
--- a/multimedia/subtitleeditor/pkg-plist
+++ b/multimedia/subtitleeditor/pkg-plist
@@ -24,10 +24,4 @@ share/locale/pl/LC_MESSAGES/subtitleeditor.mo
 share/locale/pt_BR/LC_MESSAGES/subtitleeditor.mo
 share/locale/pt_PT/LC_MESSAGES/subtitleeditor.mo
 @dirrmtry %%DESKTOPDIR%%
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrm %%DATADIR%%
diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile
index 34378d4a48cb..dfb88e06258f 100644
--- a/multimedia/subtitleripper/Makefile
+++ b/multimedia/subtitleripper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	subtitleripper
 DISTVERSION=	0.3-4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/tkxanim/Makefile b/multimedia/tkxanim/Makefile
index e583ab4389ce..00d67238ce23 100644
--- a/multimedia/tkxanim/Makefile
+++ b/multimedia/tkxanim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkxanim
 PORTVERSION=	0.43
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia tk84
 MASTER_SITES=	http://freshmeat.net/redir/tkxanim/10652/url_tgz/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/multimedia/tosvcd/Makefile b/multimedia/tosvcd/Makefile
index 25425a51eaa9..92d1686f5068 100644
--- a/multimedia/tosvcd/Makefile
+++ b/multimedia/tosvcd/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	tosvcd
 PORTVERSION=	0.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://linvdr.org/download/tosvcd/
 
diff --git a/multimedia/totem-xine/Makefile b/multimedia/totem-xine/Makefile
index 4b9d2fb2710a..45b0a8a114e6 100644
--- a/multimedia/totem-xine/Makefile
+++ b/multimedia/totem-xine/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/multimedia/totem-xine/Makefile,v 1.1 2007/03/15 14:29:57 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-xine
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index c0482f185b85..bc4749934a02 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	totem
 PORTVERSION=	2.18.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 551c6fc0753c..a3218adcdfbe 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -235,61 +235,25 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
 @dirrm include/totem
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile
index 467ae2105108..49bf6e07f9b0 100644
--- a/multimedia/tovid/Makefile
+++ b/multimedia/tovid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tovid
 PORTVERSION=	0.24
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia python
 MASTER_SITES=	http://download.berlios.de/tovid/
 
diff --git a/multimedia/toxine/Makefile b/multimedia/toxine/Makefile
index 7abc60da3147..8d4eaca93c73 100644
--- a/multimedia/toxine/Makefile
+++ b/multimedia/toxine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	toxine
 PORTVERSION=	0.6.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	toxine
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 15be0c7ba043..8d59a230726f 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fromani.exit1.org/
 
diff --git a/multimedia/tunapie/Makefile b/multimedia/tunapie/Makefile
index 103cfcd87118..83f210453d20 100644
--- a/multimedia/tunapie/Makefile
+++ b/multimedia/tunapie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tunapie
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 #PORTREVISION=	0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/multimedia/tv_grab_au/Makefile b/multimedia/tv_grab_au/Makefile
index 3060fcf4a77d..dcf6a590abdd 100644
--- a/multimedia/tv_grab_au/Makefile
+++ b/multimedia/tv_grab_au/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tv_grab_au
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.onlinetractorparts.com.au/rohbags/xmltvau/
 # DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index d1ad10b8651f..5779f9ff15fd 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vic
 PORTVERSION=	2.8.1.1.6
+PORTREVISION=	1
 CATEGORIES=	mbone tk84 ipv6
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl1.1.6/
 DISTNAME=	${PORTNAME}-2.8ucl1.1.6
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 6299054939cd..12f16be1ec7f 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	0.9.0.20070501
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://nightlies.videolan.org/build/source/
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
index 0b0fde2b6729..facc694f95cf 100644
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -307,7 +307,6 @@ pre-install: build
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
 .endfor
-		${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 .if !defined(NOPORTDOCS)
 	cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's|^|share/doc/|' >> ${PLIST} \
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index e8f7b855184e..a58a2fad117f 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	0.8.6b
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index 7dcbdb0cb951..fef71f2a4bbb 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -311,7 +311,6 @@ pre-install: build
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
 .endfor
-		${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 .if !defined(NOPORTDOCS)
 	cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's|^|share/doc/|' >> ${PLIST} \
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 0e560374014e..40cb8e25b39d 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.0.20070402
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 0e560374014e..40cb8e25b39d 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.0.20070402
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index d22769e2b121..ef2b42ab3328 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xanim
 PORTVERSION=	2.92.0
+PORTREVISION=	1
 CATEGORIES=	multimedia graphics
 MASTER_SITES=	ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/:main \
 		${MASTER_SITE_LOCAL} \
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 14f7e67201b8..01db0931a481 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xawtv
 PORTVERSION=	3.95
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://dl.bytesex.org/releases/xawtv/
 
diff --git a/multimedia/xdvshow/Makefile b/multimedia/xdvshow/Makefile
index 865094ba9070..4f1034365f4f 100644
--- a/multimedia/xdvshow/Makefile
+++ b/multimedia/xdvshow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvshow
 PORTVERSION=	00.2003.09.03
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.sfc.wide.ad.jp/DVTS/software/xdvshow/
 DISTNAME=	${PORTNAME}
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 457adca98faa..22341f628c34 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-media
 PORTVERSION=	0.9.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia xfce
 MASTER_SITES=	http://spuriousinterrupt.org/files/xfmedia/
 DISTNAME=	xfmedia-${PORTVERSION}
diff --git a/multimedia/xfce4-media/pkg-plist b/multimedia/xfce4-media/pkg-plist
index 4bb7a4772d4e..84ed24687e17 100644
--- a/multimedia/xfce4-media/pkg-plist
+++ b/multimedia/xfce4-media/pkg-plist
@@ -68,33 +68,5 @@ share/xfmedia/doc/xfce.css
 @dirrm lib/xfmedia/plugins
 @dirrm lib/xfmedia
 @dirrmtry share/applications
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/he/LC_MESSAGES
-@dirrmtry share/locale/he
-@dirrmtry share/locale/it/LC_MESSAGES
-@dirrmtry share/locale/it
-@dirrmtry share/locale/ja/LC_MESSAGES
-@dirrmtry share/locale/ja
-@dirrmtry share/locale/ka/LC_MESSAGES
-@dirrmtry share/locale/ka
-@dirrmtry share/locale/ru/LC_MESSAGES
-@dirrmtry share/locale/ru
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
diff --git a/multimedia/xfce4-xmms-controller-plugin/Makefile b/multimedia/xfce4-xmms-controller-plugin/Makefile
index b43f2caab18d..51dfd8116655 100644
--- a/multimedia/xfce4-xmms-controller-plugin/Makefile
+++ b/multimedia/xfce4-xmms-controller-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-xmms-controller-plugin
 PORTVERSION=	1.4.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia audio xfce
 MASTER_SITES=	http://eoin.angrystickman.com/files/
 DIST_SUBDIR=	xfce4
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index 21d70e010913..2e1bf93632ef 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-xmms-plugin
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 0400e412c93b..37422ba8ab82 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	0.99.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile
index ddbfe72d7159..020557494b5f 100644
--- a/multimedia/xine_artsplugin/Makefile
+++ b/multimedia/xine_artsplugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine_artsplugin
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile
index b45758884798..777d9568852b 100644
--- a/multimedia/xmms-avi/Makefile
+++ b/multimedia/xmms-avi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-avi
 PORTVERSION=	1.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.xmms.org/files/plugins/avi-xmms/ \
 		ftp://ftp.sunet.se/pub/multimedia/xmms/plugins/avi-xmms/ \
diff --git a/multimedia/xmms-skins/Makefile b/multimedia/xmms-skins/Makefile
index f3acb83ff5e3..b74c987939ed 100644
--- a/multimedia/xmms-skins/Makefile
+++ b/multimedia/xmms-skins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-skins
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.xmms.org/files/Skins/
 DISTFILES=	AbsoluteE_Xmms.zip \
diff --git a/multimedia/xmms-status-plugin/Makefile b/multimedia/xmms-status-plugin/Makefile
index 903cac0d6a29..7078a2e29a45 100644
--- a/multimedia/xmms-status-plugin/Makefile
+++ b/multimedia/xmms-status-plugin/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xmms-status-plugin
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.hellion.org.uk/source/
 
diff --git a/multimedia/xmms-weasel/Makefile b/multimedia/xmms-weasel/Makefile
index 9c9f655c1334..16d945293740 100644
--- a/multimedia/xmms-weasel/Makefile
+++ b/multimedia/xmms-weasel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-weasel
 PORTVERSION=	0.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 1439e708dd6b..2773ba5b0a0c 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms
 PORTVERSION=	1.2.10
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES+=	multimedia audio ipv6
 MASTER_SITES=	http://www.xmms.org/files/1.2.x/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index 67fbf31fd448..4149b34b1105 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmps-win32-plugin
 PORTVERSION=	0.0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.vin.bg.ac.yu/linux/mmedia/xmps/
 
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index ff88caaea7ed..cf776e65cc22 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmps
 PORTVERSION=	0.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://ftp.vin.bg.ac.yu/linux/mmedia/xmps/
 
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 349320fd9cd5..dc90749206c8 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xtheater
 PORTVERSION=	1.0.0.p1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/multimedia/xvid4conf/Makefile b/multimedia/xvid4conf/Makefile
index 6a12921c32a7..1a55ffdee154 100644
--- a/multimedia/xvid4conf/Makefile
+++ b/multimedia/xvid4conf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xvid4conf
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.nerim.net/debian-marillat/pool/main/x/xvid4conf/ \
 		${MASTER_SITE_LOCAL}
diff --git a/multimedia/y4mscaler/Makefile b/multimedia/y4mscaler/Makefile
index b02c47ba3cf3..0bdf463af73b 100644
--- a/multimedia/y4mscaler/Makefile
+++ b/multimedia/y4mscaler/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	y4mscaler
 PORTVERSION=	9.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.mir.com/DMG/Software/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/net-im/aim/Makefile b/net-im/aim/Makefile
index 0f3f93ddce36..6f30b9411b0a 100644
--- a/net-im/aim/Makefile
+++ b/net-im/aim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aim
 PORTVERSION=	1.5.286
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im linux
 MASTER_SITES=	ftp://ftp.newaol.com/aimgen/380469/
 DISTNAME=	aim-${PORTVERSION}
diff --git a/net-im/amsn/Makefile b/net-im/amsn/Makefile
index 28be7ae762d9..9c4c971abf14 100644
--- a/net-im/amsn/Makefile
+++ b/net-im/amsn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	amsn
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 7d3e6a6df326..d2efbe34950e 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ayttm
 PORTVERSION=	0.4.6.17
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/ccmsn/Makefile b/net-im/ccmsn/Makefile
index 4f1b400c3061..4e8d9e951afd 100644
--- a/net-im/ccmsn/Makefile
+++ b/net-im/ccmsn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ccmsn
 PORTVERSION=	0.3p3
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://msn.CompuCreations.com/
 EXTRACT_SUFX=	.tgz
diff --git a/net-im/coccinella/Makefile b/net-im/coccinella/Makefile
index a9ac3775868b..d6e3ef1f5c60 100644
--- a/net-im/coccinella/Makefile
+++ b/net-im/coccinella/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	coccinella
 PORTVERSION=	0.95.1
+PORTREVISION=	1
 CATEGORIES=	net-im tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/convey/Makefile b/net-im/convey/Makefile
index 92b89548fa81..38767a25555e 100644
--- a/net-im/convey/Makefile
+++ b/net-im/convey/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	convey
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	net-im java
 MASTER_SITES=	http://convey.sourceforge.net/downloads/ \
 		http://nivi.interfree.it/tmp/convey.sourceforge.net/
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index a56b426c89b2..30dbd79bc1ec 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ejabberd
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.process-one.net/en/projects/ejabberd/download/${PORTVERSION}/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/net-im/eva/Makefile b/net-im/eva/Makefile
index 452cd6597147..f70e77e4f8ec 100644
--- a/net-im/eva/Makefile
+++ b/net-im/eva/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eva
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	evaq
diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index bc1e7e44923f..3d0cd061733e 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	finch
-PORTREVISION=	0
+PORTREVISION=	1
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Finch multi-protocol messaging client (Console UI)
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index 1a88c01b0b3e..716c09965d0c 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fugu
 PORTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	net-im python
 MASTER_SITES=	http://fugu.gale.org/dist/old/
 
diff --git a/net-im/gaim-assistant/Makefile b/net-im/gaim-assistant/Makefile
index 89e7047095ba..150bc0f7f738 100644
--- a/net-im/gaim-assistant/Makefile
+++ b/net-im/gaim-assistant/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gaim-assistant
 PORTVERSION=	0.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/gaim-bangexec/Makefile b/net-im/gaim-bangexec/Makefile
index 721d230d0404..4dfe478337c5 100644
--- a/net-im/gaim-bangexec/Makefile
+++ b/net-im/gaim-bangexec/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bangexec
 PORTVERSION=	1.3.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im
 MASTER_SITES=	http://thefnords.googlepages.com/
 PKGNAMEPREFIX=	gaim-
diff --git a/net-im/gaim-extprefs/Makefile b/net-im/gaim-extprefs/Makefile
index f27b713bcf7e..7e1a93ffbc5c 100644
--- a/net-im/gaim-extprefs/Makefile
+++ b/net-im/gaim-extprefs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaim-extprefs
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gaim-extprefs
diff --git a/net-im/gaim-guifications/Makefile b/net-im/gaim-guifications/Makefile
index 43e340f83c3a..8af10531e009 100644
--- a/net-im/gaim-guifications/Makefile
+++ b/net-im/gaim-guifications/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guifications
 PORTVERSION=	2.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/gaim-hotkeys/Makefile b/net-im/gaim-hotkeys/Makefile
index 74ccc269f6d4..43da30f81de8 100644
--- a/net-im/gaim-hotkeys/Makefile
+++ b/net-im/gaim-hotkeys/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gaim-hotkeys
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
diff --git a/net-im/gaim-ignorance/Makefile b/net-im/gaim-ignorance/Makefile
index 72e7035079e2..c23f4942ed17 100644
--- a/net-im/gaim-ignorance/Makefile
+++ b/net-im/gaim-ignorance/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ignorance
 PORTVERSION=	2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://thefnords.googlepages.com/
 PKGNAMEPREFIX=	gaim-
diff --git a/net-im/gaim-latex/Makefile b/net-im/gaim-latex/Makefile
index 16c2a6ceb90d..43ec88c0db78 100644
--- a/net-im/gaim-latex/Makefile
+++ b/net-im/gaim-latex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	latex
 PORTVERSION=	0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
diff --git a/net-im/gaim-openq/Makefile b/net-im/gaim-openq/Makefile
index 566ac6c8777c..a1e6d4a60d6e 100644
--- a/net-im/gaim-openq/Makefile
+++ b/net-im/gaim-openq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openq
 PORTVERSION=	0.3.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/gaim-openq/pkg-plist b/net-im/gaim-openq/pkg-plist
index 4a67c5d0c8bc..9c1104fd2fef 100644
--- a/net-im/gaim-openq/pkg-plist
+++ b/net-im/gaim-openq/pkg-plist
@@ -531,5 +531,3 @@ share/locale/zh_CN/LC_MESSAGES/openq.mo
 @dirrm share/gnome/pixmaps/gaim/smileys/2003iii
 @dirrmtry share/gnome/doc
 @dirrmtry share/gnome/gaim
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
diff --git a/net-im/gaim-slashexec/Makefile b/net-im/gaim-slashexec/Makefile
index f61f7971b499..b2214bba85dd 100644
--- a/net-im/gaim-slashexec/Makefile
+++ b/net-im/gaim-slashexec/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slashexec
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	guifications
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 2438480e4739..bf12f71a9f91 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaim
 PORTVERSION=	1.5.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 1e669c973126..0e138f6817a7 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -494,37 +494,7 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 %%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim
 @dirrm lib/gaim
 @dirrm include/gaim
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
 @dirrmtry share/locale/my_MM/LC_MESSAGES
 @dirrmtry share/locale/my_MM
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
index 51d2223a19f7..11ac866679f7 100644
--- a/net-im/gajim-devel/Makefile
+++ b/net-im/gajim-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gajim
 PORTVERSION=	20070402
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://ports.internal.vlink.ru/distfiles/
 PKGNAMESUFFIX=	-devel
diff --git a/net-im/gajim-devel/pkg-plist b/net-im/gajim-devel/pkg-plist
index 6e4e638a4a8f..0c115706dee5 100644
--- a/net-im/gajim-devel/pkg-plist
+++ b/net-im/gajim-devel/pkg-plist
@@ -825,7 +825,6 @@ share/pixmaps/gajim_about.png
 %%DOCSDIR%%/THANKS
 @dirrm lib/gajim
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/src/common/xmpp
 @dirrm %%DATADIR%%/src/common/zeroconf
 @dirrm %%DATADIR%%/src/common
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index ba1addfa5b6f..c38c4ccb918a 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gajim
 PORTVERSION=	0.11.1
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.gajim.org/downloads/ \
 		http://ports.internal.vlink.ru/distfiles/
diff --git a/net-im/gajim/pkg-plist b/net-im/gajim/pkg-plist
index 553160ec7b9a..211ef080b5b9 100644
--- a/net-im/gajim/pkg-plist
+++ b/net-im/gajim/pkg-plist
@@ -822,7 +822,6 @@ share/pixmaps/gajim_about.png
 %%DOCSDIR%%/THANKS
 @dirrm lib/gajim
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/src/common/xmpp
 @dirrm %%DATADIR%%/src/common/zeroconf
 @dirrm %%DATADIR%%/src/common
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index 78f341624418..4034f2f528d3 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gicq
 PORTVERSION=	0.33
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://download.sourceforge.net/gicq/ \
 		${MASTER_SITE_LOCAL}
diff --git a/net-im/ginsu/Makefile b/net-im/ginsu/Makefile
index 85f9ad522166..fa07b99c5686 100644
--- a/net-im/ginsu/Makefile
+++ b/net-im/ginsu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ginsu
 PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	http://repetae.net/john/computer/ginsu/drop/
 
diff --git a/net-im/gnome-jabber/Makefile b/net-im/gnome-jabber/Makefile
index 8f72093859f7..8c8f95fcfe1d 100644
--- a/net-im/gnome-jabber/Makefile
+++ b/net-im/gnome-jabber/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-jabber
 PORTVERSION=	0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 38194681ca43..43469084ca8d 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomeicu
 PORTVERSION=	0.99.12
+PORTREVISION=	1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnomeicu
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index ee35844ffee1..3cef8a3319f1 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gossip
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/net-im/gossip/pkg-plist b/net-im/gossip/pkg-plist
index ec389ed9fcc9..5e92cead4780 100644
--- a/net-im/gossip/pkg-plist
+++ b/net-im/gossip/pkg-plist
@@ -121,29 +121,7 @@ share/locale/zh_TW/LC_MESSAGES/gossip.mo
 @dirrm share/gnome/sounds/gossip
 @dirrm share/gnome/gossip/protocols
 @dirrm share/gnome/gossip
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@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
diff --git a/net-im/grouch/Makefile b/net-im/grouch/Makefile
index d6c38bdcecde..ed3c9c520f35 100644
--- a/net-im/grouch/Makefile
+++ b/net-im/grouch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grouch
 PORTVERSION=	20060713
+PORTREVISION=	1
 CATEGORIES=	net-im gnustep
 MASTER_SITES=	http://mail.rochester.edu/~asveikau/grouch/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/net-im/gtkyahoo/Makefile b/net-im/gtkyahoo/Makefile
index 8a42c78fe36b..31f1d2de54c2 100644
--- a/net-im/gtkyahoo/Makefile
+++ b/net-im/gtkyahoo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkyahoo
 PORTVERSION=	0.18.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkyahoo
diff --git a/net-im/gyach/Makefile b/net-im/gyach/Makefile
index 40a6eb90f589..ecd48455e077 100644
--- a/net-im/gyach/Makefile
+++ b/net-im/gyach/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gyach
 PORTVERSION=	0.9.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://www4.infi.net/~cpinkham/gyach/code/
 
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index 26a82c322aa3..efc76439f978 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ickle
 PORTVERSION=	0.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/icqnd/Makefile b/net-im/icqnd/Makefile
index 6405f75678ed..3cbf80b29556 100644
--- a/net-im/icqnd/Makefile
+++ b/net-im/icqnd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icqnd
 PORTVERSION=	0.1.9.6
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
diff --git a/net-im/jabber-pyicq/Makefile b/net-im/jabber-pyicq/Makefile
index 6888a2adc6f3..0b8d4f394b2a 100644
--- a/net-im/jabber-pyicq/Makefile
+++ b/net-im/jabber-pyicq/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	pyicq
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.blathersource.org/download.php/pyicq-t/
 PKGNAMEPREFIX=	jabber-
diff --git a/net-im/jabber-pymsn/Makefile b/net-im/jabber-pymsn/Makefile
index 90fe22cc1ddb..91a14f1b6cd7 100644
--- a/net-im/jabber-pymsn/Makefile
+++ b/net-im/jabber-pymsn/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	pymsn
 DISTVERSION=	0.11.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://delx.cjb.net/pymsnt/tarballs/
diff --git a/net-im/jarl/Makefile b/net-im/jarl/Makefile
index ad79885fc5c2..a8599374919d 100644
--- a/net-im/jarl/Makefile
+++ b/net-im/jarl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jarl
 PORTVERSION=	0.5001
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/jggtrans/Makefile b/net-im/jggtrans/Makefile
index 4788b5b46b2f..ed7ce0d94bee 100644
--- a/net-im/jggtrans/Makefile
+++ b/net-im/jggtrans/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		jggtrans
 PORTVERSION=		2.2.2
+PORTREVISION=		1
 CATEGORIES=		net-im polish
 MASTER_SITES=		http://jggtrans.jajcus.net/downloads/ \
 			http://freebsd.e.pl/distfiles/
diff --git a/net-im/jggtrans/pkg-plist b/net-im/jggtrans/pkg-plist
index 9e0c01d3863f..4aeea40af9a2 100644
--- a/net-im/jggtrans/pkg-plist
+++ b/net-im/jggtrans/pkg-plist
@@ -4,5 +4,3 @@ share/locale/pl/LC_MESSAGES/jggtrans.mo
 @unexec if cmp -s %D/etc/jggtrans.xml.sample %D/etc/jggtrans.xml; then rm -f %D/etc/jggtrans.xml; fi
 etc/jggtrans.xml.sample
 @exec if [ ! -f %D/etc/jggtrans.xml ] ; then cp -p %D/%F %B/jggtrans.xml; fi
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
diff --git a/net-im/kf/Makefile b/net-im/kf/Makefile
index 224b6790cd04..efa832e56ecb 100644
--- a/net-im/kf/Makefile
+++ b/net-im/kf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kf
 PORTVERSION=	0.5.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	http://files.jabberstudio.org/kf/ \
 		http://jabberstudio.rediris.es/kf/ \
diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile
index 108eb76793de..f7114271cc77 100644
--- a/net-im/kmerlin/Makefile
+++ b/net-im/kmerlin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kmerlin
 PORTVERSION=	1.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index 22f8000ee235..4af01457d81c 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kmess
 PORTVERSION=	1.5.p.1
+PORTREVISION=	1
 CATEGORIES=	net-im kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/kmess-kde4/pkg-plist b/net-im/kmess-kde4/pkg-plist
index 6efdd402122e..3d62f3f320c2 100644
--- a/net-im/kmess-kde4/pkg-plist
+++ b/net-im/kmess-kde4/pkg-plist
@@ -185,20 +185,8 @@ share/sounds/kmess_chat.ogg
 share/sounds/kmess_logoff.ogg
 share/sounds/kmess_logon.ogg
 share/sounds/kmess_msg.ogg
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
 @dirrmtry share/locale/zh_CN.GB18030/LC_MESSAGES
 @dirrmtry share/locale/zh_CN.GB18030
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/emoticons/KMess-new
 @dirrmtry share/emoticons
 @dirrm share/doc/HTML/en/kmess
diff --git a/net-im/kmess/Makefile b/net-im/kmess/Makefile
index 22f8000ee235..4af01457d81c 100644
--- a/net-im/kmess/Makefile
+++ b/net-im/kmess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kmess
 PORTVERSION=	1.5.p.1
+PORTREVISION=	1
 CATEGORIES=	net-im kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/kmess/pkg-plist b/net-im/kmess/pkg-plist
index 6efdd402122e..3d62f3f320c2 100644
--- a/net-im/kmess/pkg-plist
+++ b/net-im/kmess/pkg-plist
@@ -185,20 +185,8 @@ share/sounds/kmess_chat.ogg
 share/sounds/kmess_logoff.ogg
 share/sounds/kmess_logon.ogg
 share/sounds/kmess_msg.ogg
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
 @dirrmtry share/locale/zh_CN.GB18030/LC_MESSAGES
 @dirrmtry share/locale/zh_CN.GB18030
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/emoticons/KMess-new
 @dirrmtry share/emoticons
 @dirrm share/doc/HTML/en/kmess
diff --git a/net-im/konverse/Makefile b/net-im/konverse/Makefile
index 698e0efef1a7..1116c90354a2 100644
--- a/net-im/konverse/Makefile
+++ b/net-im/konverse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	konverse
 PORTVERSION=	0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-im kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile
index b6ee98ca1731..f9ea9987843b 100644
--- a/net-im/kopete/Makefile
+++ b/net-im/kopete/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kopete
 PORTVERSION=	0.12.4
+PORTREVISION=	1
 CATEGORIES?=	net-im kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/3.5.6/src
diff --git a/net-im/kpopup/Makefile b/net-im/kpopup/Makefile
index e81e9da99a1f..0f2a0f97a0fe 100644
--- a/net-im/kpopup/Makefile
+++ b/net-im/kpopup/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	kpopup
 PORTVERSION=	0.9.8.2
+PORTREVISION=	1
 CATEGORIES=	net-im kde
 MASTER_SITES=	http://www.henschelsoft.de/kpopup/ \
 		http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 7295b2cd07a9..778f9bb9bc5e 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME?=	libpurple
 PORTVERSION=	2.0.0.b7
-PORTREVISION?=	1
+PORTREVISION?=	3
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pidgin
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 085307933fe1..259fe4d35366 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -241,8 +241,6 @@ share/locale/zh_TW/LC_MESSAGES/pidgin.mo
 @dirrmtry share/locale/gl
 @dirrmtry share/locale/fi/LC_MESSAGES
 @dirrmtry share/locale/fi
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
 @dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/net-im/libtelepathy/Makefile b/net-im/libtelepathy/Makefile
index 91a330ca5e91..93e4604bfd1c 100644
--- a/net-im/libtelepathy/Makefile
+++ b/net-im/libtelepathy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtelepathy
 PORTVERSION=	0.0.53
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im devel
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile
index 71e480c647fa..5b37429e595f 100644
--- a/net-im/licq-osd/Makefile
+++ b/net-im/licq-osd/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	osd
 PORTVERSION=	${OSD_LICQ_VER}
+PORTREVISION=	1
 CATEGORIES=	net-im
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile
index 56743f9161c2..d9f336c52f9a 100644
--- a/net-im/licq-qt-gui/Makefile
+++ b/net-im/licq-qt-gui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt-gui
 PORTVERSION=	${QT_LICQ_VER}
+PORTREVISION=	1
 CATEGORIES=	net-im
 PKGNAMESUFFIX?=	${KDE_SUFFIX}${PKGNAMESUFFIX2}
 
diff --git a/net-im/linpopup/Makefile b/net-im/linpopup/Makefile
index 87b2de57999c..30d7e2be84b9 100644
--- a/net-im/linpopup/Makefile
+++ b/net-im/linpopup/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	linpopup
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.chez.com/littleigloo/files/
 DISTNAME=	LinPopUp-${PORTVERSION}.src
diff --git a/net-im/meanwhile-gaim/Makefile b/net-im/meanwhile-gaim/Makefile
index c0a1bfa61ec2..5c736fe344c2 100644
--- a/net-im/meanwhile-gaim/Makefile
+++ b/net-im/meanwhile-gaim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	meanwhile
 PORTVERSION=	1.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index c5eca4635b96..2f9461630291 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mercury
 DISTVERSION=	1.9RC3
+PORTREVISION=	1
 PORTEPOCH=	6
 CATEGORIES=	net-im java
 MASTER_SITES=	${MASTER_SITE_LOCAL}			\
diff --git a/net-im/ocaml-jabbr/Makefile b/net-im/ocaml-jabbr/Makefile
index 10fb16585985..76e1c188dca6 100644
--- a/net-im/ocaml-jabbr/Makefile
+++ b/net-im/ocaml-jabbr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jabbr
 PORTVERSION=	0.0.${DATE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://mikelin.mit.edu/xmpp/jabbr/
 PKGNAMEPREFIX=	ocaml-
diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index b6a5940aa007..82c240d22378 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wildfire
 PORTVERSION=	3.2.4
+PORTREVISION=	1
 CATEGORIES=	net-im java
 MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=wildfire/
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 43e340f83c3a..8af10531e009 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guifications
 PORTVERSION=	2.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/pidgin-hotkeys/Makefile b/net-im/pidgin-hotkeys/Makefile
index 74ccc269f6d4..43da30f81de8 100644
--- a/net-im/pidgin-hotkeys/Makefile
+++ b/net-im/pidgin-hotkeys/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gaim-hotkeys
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile
index 16c2a6ceb90d..43ec88c0db78 100644
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	latex
 PORTVERSION=	0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 56d90ee92304..971ecdc47e54 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	pidgin
-PORTREVISION=	0
+PORTREVISION=	1
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Pidgin multi-protocol messaging client (GTK+ UI)
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index a6b5726c746a..6dfa9dd44b83 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	psi
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/sim-im-devel/Makefile b/net-im/sim-im-devel/Makefile
index 25a92f32b8c5..ddabadedf7f9 100644
--- a/net-im/sim-im-devel/Makefile
+++ b/net-im/sim-im-devel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	sim-im-devel
 PORTVERSION=	0.9.5.1809
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://sim-im.lehis.ru/dist/ \
 		http://www.sim-im.lehis.ru/dist/
diff --git a/net-im/sim-im-devel/pkg-plist b/net-im/sim-im-devel/pkg-plist
index 5b7232a9fa7f..fa0dd863bb23 100644
--- a/net-im/sim-im-devel/pkg-plist
+++ b/net-im/sim-im-devel/pkg-plist
@@ -204,20 +204,8 @@ share/services/simctrl.desktop
 @dirrmtry share/icons/hicolor/64x64
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/sw/LC_MESSAGES
 @dirrmtry share/locale/sw
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/mimelnk/application
 @dirrmtry share/mimelnk
 @dirrmtry share/services
diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile
index a176f49bfe9c..667a680cf7e1 100644
--- a/net-im/sim-im/Makefile
+++ b/net-im/sim-im/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	sim-im
 PORTVERSION=	0.9.4.3
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_BERLIOS} \
 		http://sim-im.lehis.ru/dist/ \
diff --git a/net-im/sim-im/pkg-plist b/net-im/sim-im/pkg-plist
index 056b6b86eda3..821dba6372a7 100644
--- a/net-im/sim-im/pkg-plist
+++ b/net-im/sim-im/pkg-plist
@@ -187,22 +187,8 @@ share/services/simctrl.desktop
 @dirrmtry share/services
 @dirrmtry share/mimelnk/application
 @dirrmtry share/mimelnk
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/sw/LC_MESSAGES
 @dirrmtry share/locale/sw
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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
 @dirrmtry share/icons/hicolor/64x64/apps
 @dirrmtry share/icons/hicolor/64x64
 @dirrmtry share/icons/hicolor/48x48/apps
diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index a933c8721c3d..75bedce71de9 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	1.3.0.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 PKGNAMESUFFIX=	-devel
diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index 29351687e0aa..d8bc290f93f5 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	1.2.0.18
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 DISTNAME=	skype_staticQT-${PORTVERSION}
diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile
index 29351687e0aa..d8bc290f93f5 100644
--- a/net-im/skype20/Makefile
+++ b/net-im/skype20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	1.2.0.18
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 DISTNAME=	skype_staticQT-${PORTVERSION}
diff --git a/net-im/sulci/Makefile b/net-im/sulci/Makefile
index ffd00430e1ba..911ebfde8e23 100644
--- a/net-im/sulci/Makefile
+++ b/net-im/sulci/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sulci
 PORTVERSION=	0.5.a.20060221
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.jabber.ru/files/sulci/
diff --git a/net-im/telepathy-butterfly/Makefile b/net-im/telepathy-butterfly/Makefile
index 3846dacd945f..f7435b22dcf7 100644
--- a/net-im/telepathy-butterfly/Makefile
+++ b/net-im/telepathy-butterfly/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	telepathy-butterfly
 PORTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index ff698de4b60d..fc97ae8093fb 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	telepathy-gabble
 PORTVERSION=	0.5.11
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index fb8aeb95dfee..dcfaa918a321 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	telepathy-glib
 PORTVERSION=	0.5.11
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 850b78fb216b..546ee7f1e7f2 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	telepathy-idle
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
diff --git a/net-im/telepathy-python/Makefile b/net-im/telepathy-python/Makefile
index 61e63b746f9c..6697c495ea01 100644
--- a/net-im/telepathy-python/Makefile
+++ b/net-im/telepathy-python/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	telepathy-python
 PORTVERSION=	0.13.9
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index 43a266da1c0d..1f6d8944c957 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	telepathy-salut
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
diff --git a/net-im/tik/Makefile b/net-im/tik/Makefile
index 840291a56a17..5f8d112dbbcb 100644
--- a/net-im/tik/Makefile
+++ b/net-im/tik/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tik
 PORTVERSION=	0.90
+PORTREVISION=	1
 CATEGORIES=	net-im tk82
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tik
diff --git a/net-im/tkabber-devel/Makefile b/net-im/tkabber-devel/Makefile
index 9e4e39c2ebf9..9b8c4123f649 100644
--- a/net-im/tkabber-devel/Makefile
+++ b/net-im/tkabber-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkabber
 PORTVERSION=	0.9.9.a.20070325
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://ports.internal.vlink.ru/distfiles/
 PKGNAMESUFFIX=	-devel
diff --git a/net-im/tkabber/Makefile b/net-im/tkabber/Makefile
index ecd10caa4669..b757fd51bc6b 100644
--- a/net-im/tkabber/Makefile
+++ b/net-im/tkabber/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkabber
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.jabber.ru/files/tkabber/
 
diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile
index 13676094e2cc..b37972ca31db 100644
--- a/net-im/vqcc-gtk/Makefile
+++ b/net-im/vqcc-gtk/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	vqcc-gtk
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/wildfire/Makefile b/net-im/wildfire/Makefile
index b6a5940aa007..82c240d22378 100644
--- a/net-im/wildfire/Makefile
+++ b/net-im/wildfire/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wildfire
 PORTVERSION=	3.2.4
+PORTREVISION=	1
 CATEGORIES=	net-im java
 MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=wildfire/
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
diff --git a/net-im/xfce4-messenger-plugin/Makefile b/net-im/xfce4-messenger-plugin/Makefile
index 844bd08498c4..e955e5ef31ff 100644
--- a/net-im/xfce4-messenger-plugin/Makefile
+++ b/net-im/xfce4-messenger-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-messenger-plugin
 PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im xfce
 MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
 DIST_SUBDIR=	xfce4
diff --git a/net-mgmt/TkTopNetFlows/Makefile b/net-mgmt/TkTopNetFlows/Makefile
index 241cb9b73063..97f351c73e0f 100644
--- a/net-mgmt/TkTopNetFlows/Makefile
+++ b/net-mgmt/TkTopNetFlows/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	TkTopNetFlows
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://vfom.narod.ru/download/
 
diff --git a/net-mgmt/airport/Makefile b/net-mgmt/airport/Makefile
index faba0be36f02..aff29433e904 100644
--- a/net-mgmt/airport/Makefile
+++ b/net-mgmt/airport/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	airport
 PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	http://gicl.cs.drexel.edu/people/sevy/airport/
 DISTFILES=	configurator_${PORTVERSION:S/.0.1/01/g}${EXTRACT_SUFX} \
diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile
index 77db6c2395fb..d0f05dab366a 100644
--- a/net-mgmt/ap-utils/Makefile
+++ b/net-mgmt/ap-utils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ap-utils
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/ap-utils/pkg-plist b/net-mgmt/ap-utils/pkg-plist
index 87b04b8dc8c6..3964ed1dc7bc 100644
--- a/net-mgmt/ap-utils/pkg-plist
+++ b/net-mgmt/ap-utils/pkg-plist
@@ -12,9 +12,3 @@ sbin/ap-trapd
 %%PORTDOCS%%%%DOCSDIR%%/HARDWARE-NOTES
 %%PORTDOCS%%%%DOCSDIR%%/README.ap-gl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
diff --git a/net-mgmt/argus-monitor/Makefile b/net-mgmt/argus-monitor/Makefile
index 9cc3257d6489..be81f9233578 100644
--- a/net-mgmt/argus-monitor/Makefile
+++ b/net-mgmt/argus-monitor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	argus-monitor
 PORTVERSION=	20060722
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.tcp4me.com/code/argus-archive/
 DISTNAME=	argus-dev-${PORTVERSION}
diff --git a/net-mgmt/bandwidthd/Makefile b/net-mgmt/bandwidthd/Makefile
index 65aaa9741ff9..7300e12bac3a 100644
--- a/net-mgmt/bandwidthd/Makefile
+++ b/net-mgmt/bandwidthd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bandwidthd
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/bigsister/Makefile b/net-mgmt/bigsister/Makefile
index 1187653e9b16..c1a168c78e7b 100644
--- a/net-mgmt/bigsister/Makefile
+++ b/net-mgmt/bigsister/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bigsister
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/confregdecode/Makefile b/net-mgmt/confregdecode/Makefile
index 7d46578c5acf..2df0dc590ec9 100644
--- a/net-mgmt/confregdecode/Makefile
+++ b/net-mgmt/confregdecode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	confregdecode
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cosi-nms
diff --git a/net-mgmt/driftnet/Makefile b/net-mgmt/driftnet/Makefile
index 81edaafb931a..6b6efda50b6e 100644
--- a/net-mgmt/driftnet/Makefile
+++ b/net-mgmt/driftnet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	driftnet
 PORTVERSION=	0.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.ex-parrot.com/~chris/driftnet/ \
 		http://www.vanheusden.com/mirrors/
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 10d6d9e54afd..1393da8ae233 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etherape
 PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 0ef16fd35125..2f6165c6ac09 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=		ettercap
 PORTVERSION=		0.7.3
 DISTVERSIONPREFIX=	NG-
-PORTREVISION=		4
+PORTREVISION=		5
 PORTEPOCH=		1
 CATEGORIES=		net-mgmt security
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_EXTENDED} \
diff --git a/net-mgmt/flowviewer/Makefile b/net-mgmt/flowviewer/Makefile
index 7ccf46e6c698..f2d12294e757 100644
--- a/net-mgmt/flowviewer/Makefile
+++ b/net-mgmt/flowviewer/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	flowviewer
 PORTVERSION=	3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://ensight.eos.nasa.gov/FlowViewer/
 DISTNAME=	FlowViewer_${DISTVERSION}
diff --git a/net-mgmt/horde-nic/Makefile b/net-mgmt/horde-nic/Makefile
index 33dc5d8e49f4..bac46ddd36b5 100644
--- a/net-mgmt/horde-nic/Makefile
+++ b/net-mgmt/horde-nic/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	nic
 DISTVERSIONPREFIX=
 DISTVERSION=	0.1.beta20070316
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	CENKES http://freebsd.alaskaparadise.com/source/
 PKGNAMEPREFIX=	horde-
diff --git a/net-mgmt/ipacco/Makefile b/net-mgmt/ipacco/Makefile
index b612d01bcbcf..7c5bb7b5ccb4 100644
--- a/net-mgmt/ipacco/Makefile
+++ b/net-mgmt/ipacco/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ipacco
 PORTVERSION=	0.2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ipacco
diff --git a/net-mgmt/jffnms/Makefile b/net-mgmt/jffnms/Makefile
index 62a286faaa7a..9a4dec668791 100644
--- a/net-mgmt/jffnms/Makefile
+++ b/net-mgmt/jffnms/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jffnms
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/net-mgmt/mbrowse/Makefile b/net-mgmt/mbrowse/Makefile
index e1380c4fe4c2..b809b4073b64 100644
--- a/net-mgmt/mbrowse/Makefile
+++ b/net-mgmt/mbrowse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mbrowse
 PORTVERSION=	0.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kill-9.org/mbrowse/
 
diff --git a/net-mgmt/mrtg-ping-probe/Makefile b/net-mgmt/mrtg-ping-probe/Makefile
index 11738858e0b3..76f7beaedb49 100644
--- a/net-mgmt/mrtg-ping-probe/Makefile
+++ b/net-mgmt/mrtg-ping-probe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mrtg-ping-probe
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.pwo.de/pub/pwo/mrtg/${PORTNAME}/
 
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index ccc567a3b657..88af61cd28a7 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mrtg
 PORTVERSION=	2.15.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
diff --git a/net-mgmt/nagios-snmp-plugins/Makefile b/net-mgmt/nagios-snmp-plugins/Makefile
index 81bde41cc5be..2c0e3e35b982 100644
--- a/net-mgmt/nagios-snmp-plugins/Makefile
+++ b/net-mgmt/nagios-snmp-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios-snmp-plugins
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.hometree.net/pub/${PORTNAME}/
 
@@ -17,7 +17,7 @@ COMMENT=	Additional SNMP plugins for Nagios
 LIB_DEPENDS=    netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp
 
 GNU_CONFIGURE=		yes
-USE_AUTOTOOLS=	automake:14 autoheader:213 autoconf:213
+USE_AUTOTOOLS=	automake:14 autoheader:253 autoconf:253
 USE_GETOPT_LONG=	yes
 USE_GMAKE=		yes
 USE_PERL5=		yes
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index dc93bdffaa16..3af17dd34620 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	2.9
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile
index c5cd10e0b62f..2a080f85bc92 100644
--- a/net-mgmt/nagios12/Makefile
+++ b/net-mgmt/nagios12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index dc93bdffaa16..3af17dd34620 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	2.9
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
diff --git a/net-mgmt/nagiosgraph/Makefile b/net-mgmt/nagiosgraph/Makefile
index 387b629947d6..0464a4b5dd17 100644
--- a/net-mgmt/nagiosgraph/Makefile
+++ b/net-mgmt/nagiosgraph/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagiosgraph
 PORTVERSION=	0.8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/nagiostat/Makefile b/net-mgmt/nagiostat/Makefile
index 36379444eb4c..b99f81fbdf66 100644
--- a/net-mgmt/nagiostat/Makefile
+++ b/net-mgmt/nagiostat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nagiostat
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/nav/Makefile b/net-mgmt/nav/Makefile
index 4435c1bbf0bd..39d1878e6329 100644
--- a/net-mgmt/nav/Makefile
+++ b/net-mgmt/nav/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nav
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/net-snmp-tkmib/Makefile b/net-mgmt/net-snmp-tkmib/Makefile
index 8ec2c7c99209..d737c40ed58c 100644
--- a/net-mgmt/net-snmp-tkmib/Makefile
+++ b/net-mgmt/net-snmp-tkmib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ucd-snmp-tkmib
 PORTVERSION=	4.2.3
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile
index 563a9217d5b5..61e067b222e7 100644
--- a/net-mgmt/netdisco/Makefile
+++ b/net-mgmt/netdisco/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netdisco
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/netsaint/Makefile b/net-mgmt/netsaint/Makefile
index 4d858381a6f2..30d5c3cb5864 100644
--- a/net-mgmt/netsaint/Makefile
+++ b/net-mgmt/netsaint/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netsaint
 PORTVERSION=	0.0.7
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
diff --git a/net-mgmt/netwag/Makefile b/net-mgmt/netwag/Makefile
index 4c5680ab13e2..20e995e95eac 100644
--- a/net-mgmt/netwag/Makefile
+++ b/net-mgmt/netwag/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netwag
 PORTVERSION=	5.35.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://www.laurentconstantin.com/common/netw/${PORTNAME}/download/v5/ \
 		http://membres.lycos.fr/lauconstantin/common/netw/${PORTNAME}/download/v5/ \
@@ -18,7 +19,7 @@ COMMENT=	A graphical front end for netwox
 
 BUILD_DEPENDS=	netwox:${PORTSDIR}/net-mgmt/netwox \
 		wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
-		xterm:${X_CLIENTS_PORT}
+		appres:${X_CLIENTS_PORT}
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
diff --git a/net-mgmt/nsca/Makefile b/net-mgmt/nsca/Makefile
index 0fde7e2c8178..3074eb303b46 100644
--- a/net-mgmt/nsca/Makefile
+++ b/net-mgmt/nsca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nsca
 PORTVERSION=	2.7.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
diff --git a/net-mgmt/ourmon/Makefile b/net-mgmt/ourmon/Makefile
index 77d8428fff90..c5ca21d3a9a5 100644
--- a/net-mgmt/ourmon/Makefile
+++ b/net-mgmt/ourmon/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=       ourmon
 PORTVERSION=    2.5
+PORTREVISION=    1
 CATEGORIES=     net-mgmt
 MASTER_SITES=   http://ourmon.cat.pdx.edu/ourmon/
 DISTNAME=       ourmon25
diff --git a/net-mgmt/rancid-devel/Makefile b/net-mgmt/rancid-devel/Makefile
index 85785e8b773b..5a74a103b725 100644
--- a/net-mgmt/rancid-devel/Makefile
+++ b/net-mgmt/rancid-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rancid
 PORTVERSION=	2.3.2a6
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
 PKGNAMESUFFIX=	-devel
diff --git a/net-mgmt/rancid/Makefile b/net-mgmt/rancid/Makefile
index 15b909a4c676..57b45e81fe4c 100644
--- a/net-mgmt/rancid/Makefile
+++ b/net-mgmt/rancid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rancid
 PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
 
diff --git a/net-mgmt/routers2-extensions/Makefile b/net-mgmt/routers2-extensions/Makefile
index e61e174a2c54..04e7f4089a6f 100644
--- a/net-mgmt/routers2-extensions/Makefile
+++ b/net-mgmt/routers2-extensions/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	routers2-extensions
 PORTVERSION=	2.17
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.steveshipway.org/software/rrd/ \
 		ftp://ftp.oav.oav.net/routers2/
diff --git a/net-mgmt/routers2-extras/Makefile b/net-mgmt/routers2-extras/Makefile
index 2ba37d6b15fc..fdd6547090c6 100644
--- a/net-mgmt/routers2-extras/Makefile
+++ b/net-mgmt/routers2-extras/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	routers2-extras
 PORTVERSION=	2.17
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.steveshipway.org/software/rrd/ \
 		ftp://ftp.oav.oav.net/routers2/
diff --git a/net-mgmt/routers2/Makefile b/net-mgmt/routers2/Makefile
index 3ac95eb4840d..1cd33092f5cd 100644
--- a/net-mgmt/routers2/Makefile
+++ b/net-mgmt/routers2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	routers2
 PORTVERSION=	2.17
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.steveshipway.org/software/rrd/ \
 		ftp://ftp.oav.oav.net/routers2/
diff --git a/net-mgmt/scotty3/Makefile b/net-mgmt/scotty3/Makefile
index b2545a96bebd..f0ff6ae5e707 100644
--- a/net-mgmt/scotty3/Makefile
+++ b/net-mgmt/scotty3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scotty
 PORTVERSION=	20000221
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt tcl84 tk84
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/devel/
 DISTNAME=	${PORTNAME}-00-02-21
diff --git a/net-mgmt/spectools/Makefile b/net-mgmt/spectools/Makefile
index 000996285e8a..a8ca91ed1671 100644
--- a/net-mgmt/spectools/Makefile
+++ b/net-mgmt/spectools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wispy-tools
 PORTVERSION=	200609.r1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/
 DISTNAME=	wispy-tools-2006-09-R1
diff --git a/net-mgmt/tknetmon/Makefile b/net-mgmt/tknetmon/Makefile
index e4d3aa5ede8b..8ad73f4fa26e 100644
--- a/net-mgmt/tknetmon/Makefile
+++ b/net-mgmt/tknetmon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tknetmon
 PORTVERSION=	2.0.7a
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		http://vfom.narod.ru/download/
diff --git a/net-mgmt/vidalia/Makefile b/net-mgmt/vidalia/Makefile
index b94ac6bb292c..adb651063749 100644
--- a/net-mgmt/vidalia/Makefile
+++ b/net-mgmt/vidalia/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vidalia
 PORTVERSION=	0.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://vidalia-project.net:8001/\
 		http://tor.eff.org/dist/vidalia-bundles/
diff --git a/net-mgmt/wispy-tools/Makefile b/net-mgmt/wispy-tools/Makefile
index 000996285e8a..a8ca91ed1671 100644
--- a/net-mgmt/wispy-tools/Makefile
+++ b/net-mgmt/wispy-tools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wispy-tools
 PORTVERSION=	200609.r1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/
 DISTNAME=	wispy-tools-2006-09-R1
diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile
index 2be7ea375741..25b4798b0e95 100644
--- a/net-mgmt/zabbix/Makefile
+++ b/net-mgmt/zabbix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zabbix
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile
index 2be7ea375741..25b4798b0e95 100644
--- a/net-mgmt/zabbix2/Makefile
+++ b/net-mgmt/zabbix2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zabbix
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index c2af3f26bbfd..ecb73f969b09 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amule
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index c2af3f26bbfd..ecb73f969b09 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amule
diff --git a/net-p2p/amule1/Makefile b/net-p2p/amule1/Makefile
index 4faa0cee7f19..a110fa34edc3 100644
--- a/net-p2p/amule1/Makefile
+++ b/net-p2p/amule1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	1.2.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-p2p
 #MASTER_SITES=	http://download.berlios.de/amule/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/net-p2p/amule1/pkg-plist b/net-p2p/amule1/pkg-plist
index 2f21e5ba0dbc..5d44b3119cbb 100644
--- a/net-p2p/amule1/pkg-plist
+++ b/net-p2p/amule1/pkg-plist
@@ -77,9 +77,3 @@ share/locale/ru/LC_MESSAGES/amule.mo
 @dirrmtry share/gnome/doc
 @dirrm share/gnome/amuleweb/webserver
 @dirrm share/gnome/amuleweb
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile
index c2af3f26bbfd..ecb73f969b09 100644
--- a/net-p2p/amule2/Makefile
+++ b/net-p2p/amule2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amule
diff --git a/net-p2p/apollon/Makefile b/net-p2p/apollon/Makefile
index 8d2c9228f9b2..8526aebd6f0b 100644
--- a/net-p2p/apollon/Makefile
+++ b/net-p2p/apollon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apollon
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	apollon
diff --git a/net-p2p/apollon/pkg-plist b/net-p2p/apollon/pkg-plist
index cff5d484aa20..ca3bc2e8bbf5 100644
--- a/net-p2p/apollon/pkg-plist
+++ b/net-p2p/apollon/pkg-plist
@@ -54,14 +54,10 @@ share/applnk/Applications/Apollon.desktop
 %%PORTDOCS%%share/doc/HTML/en/apollon/credits.docbook
 %%PORTDOCS%%share/doc/HTML/en/apollon/index.cache.bz2
 %%PORTDOCS%%share/doc/HTML/en/apollon/common
-@dirrmtry share/locale/sr/LC_MESSAGES
 @dirrmtry share/locale/pt_br/LC_MESSAGES
 @dirrmtry share/locale/pt_br
-@dirrmtry share/locale/pl/LC_MESSAGES
 @dirrmtry share/locale/nb_NO/LC_MESSAGES
 @dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/icons/hicolor/32x32/apps
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16/actions
diff --git a/net-p2p/azureus/Makefile b/net-p2p/azureus/Makefile
index 46673976996e..11f6bcb56335 100644
--- a/net-p2p/azureus/Makefile
+++ b/net-p2p/azureus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	azureus
 PORTVERSION=	3.0.1.2
+PORTREVISION=	1
 CATEGORIES=	net-p2p java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/azureus2/Makefile b/net-p2p/azureus2/Makefile
index 46673976996e..11f6bcb56335 100644
--- a/net-p2p/azureus2/Makefile
+++ b/net-p2p/azureus2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	azureus
 PORTVERSION=	3.0.1.2
+PORTREVISION=	1
 CATEGORIES=	net-p2p java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/bittyrant/Makefile b/net-p2p/bittyrant/Makefile
index aa0c5c7467d0..47aed5261e39 100644
--- a/net-p2p/bittyrant/Makefile
+++ b/net-p2p/bittyrant/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bittyrant
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p java
 MASTER_SITES=	http://bittyrant.cs.washington.edu/dist_010807/
 DISTNAME=	BitTyrant-src
diff --git a/net-p2p/dctc-gui-qt/Makefile b/net-p2p/dctc-gui-qt/Makefile
index f72e6a16d614..2140e5bef8f9 100644
--- a/net-p2p/dctc-gui-qt/Makefile
+++ b/net-p2p/dctc-gui-qt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dctc
 PORTVERSION=	0.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dc-qt
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index 9441d712ca2c..a9a588cde699 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dctc
 PORTVERSION=	0.66
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p gnome
 MASTER_SITES=	http://unixpages.org/distfiles/
 PKGNAMESUFFIX=	-gui
diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index 70cdebf63a8c..78a4f51ed761 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	deluge
 PORTVERSION=	0.5.0
+PORTREVISION=	2
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://deluge-torrent.org/downloads/
 
diff --git a/net-p2p/deluge/pkg-plist b/net-p2p/deluge/pkg-plist
index 25dd770305ff..f9908ec9ff1e 100644
--- a/net-p2p/deluge/pkg-plist
+++ b/net-p2p/deluge/pkg-plist
@@ -86,35 +86,8 @@ share/locale/tr/LC_MESSAGES/deluge.mo
 share/locale/zh_CN/LC_MESSAGES/deluge.mo
 share/locale/zh_TW/LC_MESSAGES/deluge.mo
 share/pixmaps/deluge.xpm
-@dirrmtry share/pixmaps
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@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/la/LC_MESSAGES
 @dirrmtry share/locale/la
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/plugins/TorrentSearch
 @dirrm %%DATADIR%%/plugins/NetworkHealth
diff --git a/net-p2p/deluge05/Makefile b/net-p2p/deluge05/Makefile
index 70cdebf63a8c..78a4f51ed761 100644
--- a/net-p2p/deluge05/Makefile
+++ b/net-p2p/deluge05/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	deluge
 PORTVERSION=	0.5.0
+PORTREVISION=	2
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://deluge-torrent.org/downloads/
 
diff --git a/net-p2p/deluge05/pkg-plist b/net-p2p/deluge05/pkg-plist
index 25dd770305ff..f9908ec9ff1e 100644
--- a/net-p2p/deluge05/pkg-plist
+++ b/net-p2p/deluge05/pkg-plist
@@ -86,35 +86,8 @@ share/locale/tr/LC_MESSAGES/deluge.mo
 share/locale/zh_CN/LC_MESSAGES/deluge.mo
 share/locale/zh_TW/LC_MESSAGES/deluge.mo
 share/pixmaps/deluge.xpm
-@dirrmtry share/pixmaps
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@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/la/LC_MESSAGES
 @dirrmtry share/locale/la
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/plugins/TorrentSearch
 @dirrm %%DATADIR%%/plugins/NetworkHealth
diff --git a/net-p2p/edonkey-gui-gtk-urlslave/Makefile b/net-p2p/edonkey-gui-gtk-urlslave/Makefile
index b69ecc885daa..8508ab8c876b 100644
--- a/net-p2p/edonkey-gui-gtk-urlslave/Makefile
+++ b/net-p2p/edonkey-gui-gtk-urlslave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	edonkey
 PORTVERSION=	0.0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://home.ircnet.de/cru/ed2k_urlslave/dist/
 PKGNAMESUFFIX=	-gui-gtk-urlslave
diff --git a/net-p2p/edonkey-gui-gtk/Makefile b/net-p2p/edonkey-gui-gtk/Makefile
index eb60ea1bbdb2..201873c7ee64 100644
--- a/net-p2p/edonkey-gui-gtk/Makefile
+++ b/net-p2p/edonkey-gui-gtk/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	edonkey
 PORTVERSION=	0.6.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ed2k-gtk-gui
diff --git a/net-p2p/edonkey-gui-gtk/pkg-plist b/net-p2p/edonkey-gui-gtk/pkg-plist
index 83756e75f3c1..05b94d784014 100644
--- a/net-p2p/edonkey-gui-gtk/pkg-plist
+++ b/net-p2p/edonkey-gui-gtk/pkg-plist
@@ -473,9 +473,3 @@ share/locale/sk/LC_MESSAGES/ed2k_gui.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/deutsch
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile
index 36d73a3280db..3330cc371c34 100644
--- a/net-p2p/fidelio/Makefile
+++ b/net-p2p/fidelio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fidelio
 PORTVERSION=	1.0.b1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/freenet/Makefile b/net-p2p/freenet/Makefile
index b76a74837336..10a2926dec40 100644
--- a/net-p2p/freenet/Makefile
+++ b/net-p2p/freenet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freenet
 PORTVERSION=	0.5.2.1.5106
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p java security
 MASTER_SITES=	http://freenetproject.org/snapshots/ \
 		http://downloads.freenetproject.org/ \
diff --git a/net-p2p/freenet05/Makefile b/net-p2p/freenet05/Makefile
index b76a74837336..10a2926dec40 100644
--- a/net-p2p/freenet05/Makefile
+++ b/net-p2p/freenet05/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freenet
 PORTVERSION=	0.5.2.1.5106
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p java security
 MASTER_SITES=	http://freenetproject.org/snapshots/ \
 		http://downloads.freenetproject.org/ \
diff --git a/net-p2p/frost/Makefile b/net-p2p/frost/Makefile
index 7897d5ed28c8..d5b0e3c7dd08 100644
--- a/net-p2p/frost/Makefile
+++ b/net-p2p/frost/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	frost
 PORTVERSION=	1.2.0.20051020
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	net-p2p java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/net-p2p/frostwire/Makefile b/net-p2p/frostwire/Makefile
index fadff99de514..0cf9d343403c 100644
--- a/net-p2p/frostwire/Makefile
+++ b/net-p2p/frostwire/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	frostwire
 PORTVERSION=	4.13.1.7
+PORTREVISION=	1
 CATEGORIES=	net-p2p java
 MASTER_SITES=	http://station1.peercommons.com/frostwire/4.13.1/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.noarch
diff --git a/net-p2p/gift-ares/Makefile b/net-p2p/gift-ares/Makefile
index c55a2bd5281e..538d1fc9d6d1 100644
--- a/net-p2p/gift-ares/Makefile
+++ b/net-p2p/gift-ares/Makefile
@@ -19,5 +19,6 @@ LIB_DEPENDS=	gift.0:${PORTSDIR}/net-p2p/gift
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_GNOME2=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gift-ares/pkg-plist b/net-p2p/gift-ares/pkg-plist
index c8f518570940..410fde2d3160 100644
--- a/net-p2p/gift-ares/pkg-plist
+++ b/net-p2p/gift-ares/pkg-plist
@@ -3,3 +3,4 @@ lib/giFT/libAres.so
 share/giFT/Ares/Ares.conf.template
 share/giFT/Ares/nodes
 @dirrm share/giFT/Ares
+@dirrm lib/giFT
\ No newline at end of file
diff --git a/net-p2p/giftoxic/Makefile b/net-p2p/giftoxic/Makefile
index e812108c27bc..57a8bab2962b 100644
--- a/net-p2p/giftoxic/Makefile
+++ b/net-p2p/giftoxic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giFToxic
 PORTVERSION=	0.0.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	giftoxic
diff --git a/net-p2p/giftui/Makefile b/net-p2p/giftui/Makefile
index c63ffa54eded..668eec258fff 100644
--- a/net-p2p/giftui/Makefile
+++ b/net-p2p/giftui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giFTui
 PORTVERSION=	0.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	giftui
diff --git a/net-p2p/gkrellm-gift/Makefile b/net-p2p/gkrellm-gift/Makefile
index 8488fb25066f..3632ab32c6b6 100644
--- a/net-p2p/gkrellm-gift/Makefile
+++ b/net-p2p/gkrellm-gift/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gift
 PORTVERSION=	0.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
 MASTER_SITES=	ftp://ftp.code-monkey.de/pub/gkrellm-gift/ \
 		http://depot.fsck.ch/mirror/distfiles/
diff --git a/net-p2p/gkremldk/Makefile b/net-p2p/gkremldk/Makefile
index c2e995158e1f..1d4772f42254 100644
--- a/net-p2p/gkremldk/Makefile
+++ b/net-p2p/gkremldk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkremldk
 PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://www.tof2k.com/gkremldk/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
diff --git a/net-p2p/gnewtellium/Makefile b/net-p2p/gnewtellium/Makefile
index 5471dd848026..80821022218b 100644
--- a/net-p2p/gnewtellium/Makefile
+++ b/net-p2p/gnewtellium/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gnewtellium
 PORTVERSION=	0.05b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 5bc704e1a177..1863b682e53a 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnunet
 PORTVERSION=	0.6.6b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index b9e6000bee45..8dd24aed9856 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -44,7 +44,7 @@
 
 PORTNAME=	gtk-gnutella
 PORTVERSION=	0.96.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index 23a779f942b2..36ea8f6007e1 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -46,7 +46,6 @@ share/pixmaps/gtk-gnutella.png
 share/pixmaps/gtk-gnutella.svg
 @dirrmtry bin
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/el
 @dirrm %%DATADIR%%/en
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index b7524619c443..484c21ec393f 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkhx
 PORTVERSION=	0.9.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkhx
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index 71bc9dfffc55..3692ee214524 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtorrentviewer
 PORTVERSION=	0.2b
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/i2p/Makefile b/net-p2p/i2p/Makefile
index cfac132504da..2e0a5d3dff3e 100644
--- a/net-p2p/i2p/Makefile
+++ b/net-p2p/i2p/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	i2p
 PORTVERSION=	0.6.1.28
+PORTREVISION=	1
 CATEGORIES=	net-p2p java security
 MASTER_SITES=	http://dev.i2p.net/i2p/:i2p \
 		${MASTER_SITE_SOURCEFORGE:S/$/:jetty/}
diff --git a/net-p2p/javadc/Makefile b/net-p2p/javadc/Makefile
index 83e1a7d7a5b7..26d6c8b48831 100644
--- a/net-p2p/javadc/Makefile
+++ b/net-p2p/javadc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	javadc
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	net-p2p java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile
index 5d7a1fd94ab2..5c90a8c95b30 100644
--- a/net-p2p/kmldonkey/Makefile
+++ b/net-p2p/kmldonkey/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kmldonkey
 PORTVERSION=	0.10.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/kmldonkey/pkg-plist b/net-p2p/kmldonkey/pkg-plist
index 9e4db23e9715..76eb6adfc28e 100644
--- a/net-p2p/kmldonkey/pkg-plist
+++ b/net-p2p/kmldonkey/pkg-plist
@@ -128,16 +128,6 @@ share/servicetypes/kmldonkey_plugin.desktop
 @dirrmtry share/servicetypes
 @dirrmtry share/services/kded
 @dirrmtry share/services
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/icons/hicolor/64x64/apps
 @dirrmtry share/icons/hicolor/64x64
 @dirrmtry share/icons/hicolor/48x48/apps
diff --git a/net-p2p/ktorrent-devel/Makefile b/net-p2p/ktorrent-devel/Makefile
index 7826cd730f61..9fcf4d5f07d8 100644
--- a/net-p2p/ktorrent-devel/Makefile
+++ b/net-p2p/ktorrent-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ktorrent
 PORTVERSION=	20070311
+PORTREVISION=	1
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
 PKGNAMESUFFIX=	-devel
diff --git a/net-p2p/ktorrent-devel/pkg-plist b/net-p2p/ktorrent-devel/pkg-plist
index 49b7ad07160c..8ab5d3efc19d 100644
--- a/net-p2p/ktorrent-devel/pkg-plist
+++ b/net-p2p/ktorrent-devel/pkg-plist
@@ -430,32 +430,10 @@ share/services/ktsearchplugin.desktop
 share/services/ktupnpplugin.desktop
 share/services/ktwebinterfaceplugin.desktop
 share/servicetypes/ktorrentplugin.desktop
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrmtry share/locale/nds/LC_MESSAGES
 @dirrmtry share/locale/nds
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@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/apps/ktorrent/www/mobile
 @dirrm share/apps/ktorrent/www/default
 @dirrm share/apps/ktorrent/www/coldmilk/icons/64x64
diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index 2cd0a6955461..2fe331e54fd3 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ktorrent
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.pwsp.net/downloads/${PORTVERSION}/ \
 		http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
diff --git a/net-p2p/ktorrent/pkg-plist b/net-p2p/ktorrent/pkg-plist
index 21dc074d9f22..a4e5694d5d23 100644
--- a/net-p2p/ktorrent/pkg-plist
+++ b/net-p2p/ktorrent/pkg-plist
@@ -434,36 +434,12 @@ share/services/ktsearchplugin.desktop
 share/services/ktupnpplugin.desktop
 share/services/ktwebinterfaceplugin.desktop
 share/servicetypes/ktorrentplugin.desktop
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrmtry share/locale/nds/LC_MESSAGES
 @dirrmtry share/locale/nds
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/apps/ktorrent/www/mobile
 @dirrm share/apps/ktorrent/www/default
 @dirrm share/apps/ktorrent/www/coldmilk/icons/64x64
diff --git a/net-p2p/ktorrent2/Makefile b/net-p2p/ktorrent2/Makefile
index 2cd0a6955461..2fe331e54fd3 100644
--- a/net-p2p/ktorrent2/Makefile
+++ b/net-p2p/ktorrent2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ktorrent
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.pwsp.net/downloads/${PORTVERSION}/ \
 		http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
diff --git a/net-p2p/ktorrent2/pkg-plist b/net-p2p/ktorrent2/pkg-plist
index 21dc074d9f22..a4e5694d5d23 100644
--- a/net-p2p/ktorrent2/pkg-plist
+++ b/net-p2p/ktorrent2/pkg-plist
@@ -434,36 +434,12 @@ share/services/ktsearchplugin.desktop
 share/services/ktupnpplugin.desktop
 share/services/ktwebinterfaceplugin.desktop
 share/servicetypes/ktorrentplugin.desktop
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrmtry share/locale/nds/LC_MESSAGES
 @dirrmtry share/locale/nds
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/apps/ktorrent/www/mobile
 @dirrm share/apps/ktorrent/www/default
 @dirrm share/apps/ktorrent/www/coldmilk/icons/64x64
diff --git a/net-p2p/liberator/Makefile b/net-p2p/liberator/Makefile
index 00323b880aa2..41d170f1f5dc 100644
--- a/net-p2p/liberator/Makefile
+++ b/net-p2p/liberator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	liberator
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/limewire/Makefile b/net-p2p/limewire/Makefile
index d24db82efed6..8ac89354b7cf 100644
--- a/net-p2p/limewire/Makefile
+++ b/net-p2p/limewire/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	limewire
 PORTVERSION=	4.12.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-p2p java
 MASTER_SITES=	http://www10.limewire.com/download/
diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile
index 4e6dcf1e8ed9..e5dfb61ab102 100644
--- a/net-p2p/linuxdcpp/Makefile
+++ b/net-p2p/linuxdcpp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	linuxdcpp
 PORTVERSION=	0.0.1.20070324	#0.0.1.YYYYMMDD
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~mezz/distfiles/
diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile
index d8716b26797c..6be8ef718f3f 100644
--- a/net-p2p/lopster/Makefile
+++ b/net-p2p/lopster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lopster
 PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://lopster.sourceforge.net/download/
diff --git a/net-p2p/microdc2/Makefile b/net-p2p/microdc2/Makefile
index 3a1e33a71b19..01a1c74e414b 100644
--- a/net-p2p/microdc2/Makefile
+++ b/net-p2p/microdc2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	microdc2
 PORTVERSION=	0.15.6
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://corsair626.no-ip.org/microdc/ \
 		http://corsair626.no-ip.org/microdc/archive/
diff --git a/net-p2p/microdc2/pkg-plist b/net-p2p/microdc2/pkg-plist
index 9c20e5c4e89e..0294f1d3ca2b 100644
--- a/net-p2p/microdc2/pkg-plist
+++ b/net-p2p/microdc2/pkg-plist
@@ -2,5 +2,3 @@ bin/microdc2
 bin/tthsum
 %%NLS%%share/locale/pl/LC_MESSAGES/microdc2.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/microdc2.mo
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index 631bb192968c..77034d96e4c7 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mldonkey
 PORTVERSION=	2.8.5
+PORTREVISION=	1
 CATEGORIES+=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
 		${MASTER_SITE_SAVANNAH}
diff --git a/net-p2p/mldonkey-serverspy/Makefile b/net-p2p/mldonkey-serverspy/Makefile
index 88514bac007d..b98bbc340ea5 100644
--- a/net-p2p/mldonkey-serverspy/Makefile
+++ b/net-p2p/mldonkey-serverspy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mldonkey
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p perl5
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
 PKGNAMESUFFIX=	-serverspy
diff --git a/net-p2p/mldonkey-urlslave/Makefile b/net-p2p/mldonkey-urlslave/Makefile
index e500b047bf6f..03914cc07858 100644
--- a/net-p2p/mldonkey-urlslave/Makefile
+++ b/net-p2p/mldonkey-urlslave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mldonkey
 PORTVERSION=	0.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p perl5
 MASTER_SITES=	http://home.ircnet.de/cru/ed2k_urlslave/dist/
 PKGNAMESUFFIX=	-urlslave
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 8c1cf2f020a2..36a597993bc7 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mldonkey
 PORTVERSION=	2.8.5
+PORTREVISION=	1
 CATEGORIES+=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
 		${MASTER_SITE_SAVANNAH}
diff --git a/net-p2p/museek+/Makefile b/net-p2p/museek+/Makefile
index 4213d9a50aec..6e18b55037d2 100644
--- a/net-p2p/museek+/Makefile
+++ b/net-p2p/museek+/Makefile
@@ -13,6 +13,7 @@
 
 PORTNAME=	museekplus
 PORTVERSION=	0.1.12
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	museek-plus
diff --git a/net-p2p/museekplus/Makefile b/net-p2p/museekplus/Makefile
index 4213d9a50aec..6e18b55037d2 100644
--- a/net-p2p/museekplus/Makefile
+++ b/net-p2p/museekplus/Makefile
@@ -13,6 +13,7 @@
 
 PORTNAME=	museekplus
 PORTVERSION=	0.1.12
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	museek-plus
diff --git a/net-p2p/mute-net/Makefile b/net-p2p/mute-net/Makefile
index 591269073eaf..323da28d4823 100644
--- a/net-p2p/mute-net/Makefile
+++ b/net-p2p/mute-net/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mute
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}-net
diff --git a/net-p2p/napshare/Makefile b/net-p2p/napshare/Makefile
index 43f3aa59c53f..5aa82df39d08 100644
--- a/net-p2p/napshare/Makefile
+++ b/net-p2p/napshare/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	napshare
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	napshare
diff --git a/net-p2p/nicotine-plus/Makefile b/net-p2p/nicotine-plus/Makefile
index d2760bdd5095..302a24f4fc1a 100644
--- a/net-p2p/nicotine-plus/Makefile
+++ b/net-p2p/nicotine-plus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	plus
 PORTVERSION=	1.2.7.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
diff --git a/net-p2p/nicotine-plus/pkg-plist b/net-p2p/nicotine-plus/pkg-plist
index f21745b9dba6..9b1b2dcbf268 100644
--- a/net-p2p/nicotine-plus/pkg-plist
+++ b/net-p2p/nicotine-plus/pkg-plist
@@ -153,4 +153,3 @@ share/pixmaps/nicotine-plus-32px.png
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/net-p2p/nicotine/Makefile b/net-p2p/nicotine/Makefile
index b8ec61cda0b6..456d9d6067d7 100644
--- a/net-p2p/nicotine/Makefile
+++ b/net-p2p/nicotine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nicotine
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://nicotine.thegraveyard.org/
 
diff --git a/net-p2p/phex/Makefile b/net-p2p/phex/Makefile
index 65ca83e26357..1e1adcf26524 100644
--- a/net-p2p/phex/Makefile
+++ b/net-p2p/phex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phex
 PORTVERSION=	2.2.0.83
+PORTREVISION=	1
 CATEGORIES=	net-p2p java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/py-bittornado/Makefile b/net-p2p/py-bittornado/Makefile
index 810d5a1f8a65..b8dc5bd114fc 100644
--- a/net-p2p/py-bittornado/Makefile
+++ b/net-p2p/py-bittornado/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	BitTornado
 PORTVERSION=	0.3.18
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES?=	net-p2p python ipv6
 MASTER_SITES=	http://download.bittornado.com/download/ \
diff --git a/net-p2p/py-bittorrent-devel/Makefile b/net-p2p/py-bittorrent-devel/Makefile
index 1410a3549a53..a505b386e726 100644
--- a/net-p2p/py-bittorrent-devel/Makefile
+++ b/net-p2p/py-bittorrent-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	BitTorrent
 PORTVERSION=	4.20.4
-PORTREVISION=	2
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES?=	net-p2p python
 MASTER_SITES=	http://download.bittorrent.com/dl/
diff --git a/net-p2p/py-bittorrent-devel/pkg-plist b/net-p2p/py-bittorrent-devel/pkg-plist
index ab3518163cc9..e7cd0bc757b2 100644
--- a/net-p2p/py-bittorrent-devel/pkg-plist
+++ b/net-p2p/py-bittorrent-devel/pkg-plist
@@ -369,15 +369,6 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
 %%GUI%%@dirrm share/pixmaps/BitTorrent/logo
 %%GUI%%@dirrm share/pixmaps/BitTorrent/flags
 %%GUI%%@dirrm share/pixmaps/BitTorrent
-%%GUI%%@dirrmtry share/pixmaps
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrm %%PYTHON_SITELIBDIR%%/khashmir
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
diff --git a/net-p2p/py-bittorrent/Makefile b/net-p2p/py-bittorrent/Makefile
index c1d7743cae54..d34e4e6ad467 100644
--- a/net-p2p/py-bittorrent/Makefile
+++ b/net-p2p/py-bittorrent/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	BitTorrent
 PORTVERSION=	4.26.0
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES?=	net-p2p python
 MASTER_SITES=	http://download.bittorrent.com/dl/
diff --git a/net-p2p/py-bittorrent/pkg-plist b/net-p2p/py-bittorrent/pkg-plist
index 8848c3f0660d..0b044ac680aa 100644
--- a/net-p2p/py-bittorrent/pkg-plist
+++ b/net-p2p/py-bittorrent/pkg-plist
@@ -542,31 +542,8 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
 %%GUI%%@dirrm share/pixmaps/BitTorrent/logo
 %%GUI%%@dirrm share/pixmaps/BitTorrent/flags
 %%GUI%%@dirrm share/pixmaps/BitTorrent
-%%GUI%%@dirrmtry share/pixmaps
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/nb_NO/LC_MESSAGES
 @dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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 %%PYTHON_SITELIBDIR%%/khashmir
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
diff --git a/net-p2p/py-kenosis-bittorrent/Makefile b/net-p2p/py-kenosis-bittorrent/Makefile
index 3d9a43846882..16a098ecfa58 100644
--- a/net-p2p/py-kenosis-bittorrent/Makefile
+++ b/net-p2p/py-kenosis-bittorrent/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kenosis
 PORTVERSION=	${KENOSIS_VERSION}.0.3.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES?=	net-p2p python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/net-p2p/pyslsk/Makefile b/net-p2p/pyslsk/Makefile
index ce183c2ce9c7..f0d9d03892e5 100644
--- a/net-p2p/pyslsk/Makefile
+++ b/net-p2p/pyslsk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pyslsk
 PORTVERSION=	1.2.7b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://www.sensi.org/~ak/pyslsk/
 
diff --git a/net-p2p/qbittorrent-22/Makefile b/net-p2p/qbittorrent-22/Makefile
index 5e94cc772054..c69120fef1af 100644
--- a/net-p2p/qbittorrent-22/Makefile
+++ b/net-p2p/qbittorrent-22/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qbittorrent
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 5e94cc772054..c69120fef1af 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qbittorrent
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
diff --git a/net-p2p/qtella/Makefile b/net-p2p/qtella/Makefile
index 12b5c458a5e6..0cfe2ad8207e 100644
--- a/net-p2p/qtella/Makefile
+++ b/net-p2p/qtella/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qtella
 PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/qtorrent/Makefile b/net-p2p/qtorrent/Makefile
index aea50c533379..6febd477e55c 100644
--- a/net-p2p/qtorrent/Makefile
+++ b/net-p2p/qtorrent/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qtorrent
 PORTVERSION=	0.9.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://thegraveyard.org/files/
 
diff --git a/net-p2p/sharktorrent/Makefile b/net-p2p/sharktorrent/Makefile
index 25579a80a975..ea715d9e6901 100644
--- a/net-p2p/sharktorrent/Makefile
+++ b/net-p2p/sharktorrent/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sharktorrent
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
diff --git a/net-p2p/torrent_swapper/Makefile b/net-p2p/torrent_swapper/Makefile
index 4ef27acdde65..a8c803540017 100644
--- a/net-p2p/torrent_swapper/Makefile
+++ b/net-p2p/torrent_swapper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	torrent_swapper
 PORTVERSION=	1.0
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	bit-torrent
diff --git a/net-p2p/torrent_swapper/pkg-plist b/net-p2p/torrent_swapper/pkg-plist
index 354535668f0d..16e92bb7789d 100644
--- a/net-p2p/torrent_swapper/pkg-plist
+++ b/net-p2p/torrent_swapper/pkg-plist
@@ -439,4 +439,3 @@ share/pixmaps/swapper.xpm
 @dirrm %%DATADIR%%/ABC
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/pixmaps
diff --git a/net-p2p/torrentvolve/Makefile b/net-p2p/torrentvolve/Makefile
index 7acc9946f34e..299203c590ab 100644
--- a/net-p2p/torrentvolve/Makefile
+++ b/net-p2p/torrentvolve/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	torrentvolve
 DISTVERSION=	1.4-beta
+PORTREVISION=	1
 CATEGORIES=	net-p2p java
 MASTER_SITES=	SF
 
diff --git a/net-p2p/transmission-gtk2/Makefile b/net-p2p/transmission-gtk2/Makefile
index 4e03a862bdd4..59804f3afd67 100644
--- a/net-p2p/transmission-gtk2/Makefile
+++ b/net-p2p/transmission-gtk2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	2
 PKGNAMESUFFIX=	-gtk2
 
 COMMENT=	A free BitTorrent client written from scratch in C with GTK+2
@@ -14,7 +14,7 @@ MASTERDIR=	${.CURDIR}/../transmission
 PLIST=		${.CURDIR}/pkg-plist
 
 USE_XLIB=	yes
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 desktopfileutils
 SLAVE_TRANS=	yes
 USE_GETTEXT=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
diff --git a/net-p2p/transmission-gtk2/pkg-plist b/net-p2p/transmission-gtk2/pkg-plist
index 64292c9499c9..5f6a936230ca 100644
--- a/net-p2p/transmission-gtk2/pkg-plist
+++ b/net-p2p/transmission-gtk2/pkg-plist
@@ -14,7 +14,6 @@ share/locale/ro/LC_MESSAGES/transmission-gtk.mo
 share/locale/ru/LC_MESSAGES/transmission-gtk.mo
 share/locale/sv/LC_MESSAGES/transmission-gtk.mo
 share/pixmaps/transmission.png
-@dirrmtry share/pixmaps
 @dirrmtry share/locale/ro/LC_MESSAGES
 @dirrmtry share/locale/ro
 @dirrmtry share/locale/pl/LC_MESSAGES
diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index 7e77377edba9..afd67e08dc30 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tribler
 PORTVERSION=	3.6.0
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 DISTNAME=	Tribler_${PORTVERSION}_src
diff --git a/net-p2p/tribler/pkg-plist b/net-p2p/tribler/pkg-plist
index 9ddb55ade5f9..e41c32ab1a55 100644
--- a/net-p2p/tribler/pkg-plist
+++ b/net-p2p/tribler/pkg-plist
@@ -519,4 +519,3 @@ share/pixmaps/tribler.xpm
 @dirrm %%DATADIR%%/ABC
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/pixmaps
diff --git a/net-p2p/tvrss/Makefile b/net-p2p/tvrss/Makefile
index c8816cdaa44c..da4f75e95e78 100644
--- a/net-p2p/tvrss/Makefile
+++ b/net-p2p/tvrss/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tvrss
 DISTVERSION=	1.8beta
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tvtrss
diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile
index 75c3adf4d990..d7d39395fd46 100644
--- a/net-p2p/valknut/Makefile
+++ b/net-p2p/valknut/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	valknut
 PORTVERSION=	0.3.7
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://download.berlios.de/dcgui/ \
 		http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index 46673976996e..11f6bcb56335 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	azureus
 PORTVERSION=	3.0.1.2
+PORTREVISION=	1
 CATEGORIES=	net-p2p java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile
index 5b0df9f3e67a..c54912ac3bb3 100644
--- a/net-p2p/xmule/Makefile
+++ b/net-p2p/xmule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmule
 PORTVERSION=	1.12.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 #MASTER_SITES=	http://download.berlios.de/%SUBDIR%/
diff --git a/net-p2p/xmule/pkg-plist b/net-p2p/xmule/pkg-plist
index adec38f91fad..2a4a5d69d73f 100644
--- a/net-p2p/xmule/pkg-plist
+++ b/net-p2p/xmule/pkg-plist
@@ -12,7 +12,3 @@ share/locale/ko/LC_MESSAGES/xmule.mo
 share/locale/pl/LC_MESSAGES/xmule.mo
 share/locale/tr/LC_MESSAGES/xmule.mo
 @dirrmtry share/gnome/locale
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
diff --git a/net-p2p/xnap/Makefile b/net-p2p/xnap/Makefile
index 17dd93936712..5ce8d7a28c6d 100644
--- a/net-p2p/xnap/Makefile
+++ b/net-p2p/xnap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XNap
 DISTVERSION=	2.5r3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p audio java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/net/adasockets/Makefile b/net/adasockets/Makefile
index fa22c0034af4..45a84d5c1f9f 100644
--- a/net/adasockets/Makefile
+++ b/net/adasockets/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		adasockets
 PORTVERSION=		1.8.4.7
+PORTREVISION=	1
 CATEGORIES=		net
 MASTER_SITES=		http://www.rfc1149.net/download/adasockets/
 
diff --git a/net/apache-soap/Makefile b/net/apache-soap/Makefile
index 6a58b3914c8d..92ca8fb71b43 100644
--- a/net/apache-soap/Makefile
+++ b/net/apache-soap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache-soap
 PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net java devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	ws/soap/version-${PORTVERSION}
diff --git a/net/avahi-qt3/Makefile b/net/avahi-qt3/Makefile
index 45e0bf2904b1..cb2519f328d5 100644
--- a/net/avahi-qt3/Makefile
+++ b/net/avahi-qt3/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-qt3
 
diff --git a/net/avahi-sharp/Makefile b/net/avahi-sharp/Makefile
index 8ac9269ed625..c0e42554a858 100644
--- a/net/avahi-sharp/Makefile
+++ b/net/avahi-sharp/Makefile
@@ -6,7 +6,7 @@
 #   $Id: Makefile,v 1.2 2006/02/15 19:15:40 tmclau02 Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net dns
 PKGNAMESUFFIX=	-sharp
 
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index d48d3461d937..5fadd5dbdb51 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	avahi
 PORTVERSION=	0.6.18
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 
diff --git a/net/bfilter/Makefile b/net/bfilter/Makefile
index e2639ecd9cdf..10290025469c 100644
--- a/net/bfilter/Makefile
+++ b/net/bfilter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bfilter
 PORTVERSION=	1.0.9
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/bfilter/pkg-plist b/net/bfilter/pkg-plist
index d5e249bc9ceb..0b955985c78b 100644
--- a/net/bfilter/pkg-plist
+++ b/net/bfilter/pkg-plist
@@ -8,7 +8,6 @@ etc/bfilter/urls
 etc/bfilter/urls.local
 %%GUI%%share/applications/bfilter.desktop
 %%GUI%%share/pixmaps/bfilter.png
-%%GUI%%@dirrmtry share/pixmaps
 %%GUI%%@dirrmtry share/applications
 @dirrm etc/bfilter/filters
 @dirrm etc/bfilter
diff --git a/net/blam/Makefile b/net/blam/Makefile
index e804e64de365..3693179fafe6 100644
--- a/net/blam/Makefile
+++ b/net/blam/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	blam
 PORTVERSION=	1.8.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.8
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 98f08435a8b4..8aab8ee8174a 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	boinc-client
 PORTVERSION=	5.8.15
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav
diff --git a/net/boinc_curses/Makefile b/net/boinc_curses/Makefile
index 9e4457b4e4eb..a82e55bde0ff 100644
--- a/net/boinc_curses/Makefile
+++ b/net/boinc_curses/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	boinc_curses
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.oook.cz/bsd/boinc_curses/
 
diff --git a/net/clusterit/Makefile b/net/clusterit/Makefile
index 117d29c1b268..d5192b00ead0 100644
--- a/net/clusterit/Makefile
+++ b/net/clusterit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clusterit
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net devel parallel
 MASTER_SITES=	http://www.garbled.net/download/ \
 		ftp://ftp.chg.ru/pub/prog/parallel/clusterit/
diff --git a/net/cnet/Makefile b/net/cnet/Makefile
index c47ccd046640..bef583008209 100644
--- a/net/cnet/Makefile
+++ b/net/cnet/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	cnet
 PORTVERSION=	2.0.10
+PORTREVISION=	1
 CATEGORIES=	net tcl84 tk84
 MASTER_SITES=	http://www.csse.uwa.edu.au/cnet/ \
 		ftp://ftp.giga.net.tw/OS/FreeBSD/distfiles/ \
diff --git a/net/cphone/Makefile b/net/cphone/Makefile
index 09b5f60c734b..fc4a5edac690 100644
--- a/net/cphone/Makefile
+++ b/net/cphone/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cphone
 DISTVERSION=	0.3.2.cvs.20060407
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/
 
diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile
index b33a9645676d..76ba5c3c4794 100644
--- a/net/crescendo/Makefile
+++ b/net/crescendo/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	crescendo
 PORTVERSION=	1.1.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net gnome
 # Master Site broken
 #MASTER_SITES=	http://crescendo.lyrical.net/files/
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index 70c5eaf3abb3..e40c91ac31fa 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvsup
 PORTVERSION?=	16.1h
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 MASTER_SITE_SUBDIR=development/CVSup/snapshots
diff --git a/net/cvsupchk/Makefile b/net/cvsupchk/Makefile
index 43e9fa3c1a17..f9d3484ae288 100644
--- a/net/cvsupchk/Makefile
+++ b/net/cvsupchk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvsupchk
 PORTVERSION=	19990209
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 DISTFILES=
 
diff --git a/net/danamics/Makefile b/net/danamics/Makefile
index a88c2bd49047..b9cda87c4403 100644
--- a/net/danamics/Makefile
+++ b/net/danamics/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	danamics
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net java
 MASTER_SITES=	ftp://ftp.cs.uct.ac.za/pub/FreeBSD/distfiles-local/
 
diff --git a/net/diradmin/Makefile b/net/diradmin/Makefile
index bd738bb268d7..1c59cbb13bcc 100644
--- a/net/diradmin/Makefile
+++ b/net/diradmin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	diradmin
 PORTVERSION=	1.5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://diradmin.open-it.org/releases/ \
 		http://diradmin.open-it.org/releases/old/
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 8ad057e51086..e1d1f12f2328 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ekiga
 PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
diff --git a/net/ekiga/pkg-plist b/net/ekiga/pkg-plist
index 7cc2b099366f..25356d251d72 100644
--- a/net/ekiga/pkg-plist
+++ b/net/ekiga/pkg-plist
@@ -242,51 +242,17 @@ share/locale/zh_TW/LC_MESSAGES/ekiga.mo
 @dirrm share/gnome/help/ekiga/C/figures
 @dirrm share/gnome/help/ekiga/C
 @dirrm share/gnome/help/ekiga
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/net/erlang_xmlrpc/Makefile b/net/erlang_xmlrpc/Makefile
index cbe0469a973c..6e1ef17d8233 100644
--- a/net/erlang_xmlrpc/Makefile
+++ b/net/erlang_xmlrpc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erlang_xmlrpc
 PORTVERSION=	1.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.erlang.org/contrib/
 DISTNAME=	xmlrpc-${PORTVERSION}
diff --git a/net/forg/Makefile b/net/forg/Makefile
index 14804702d0cd..60a38a6fe991 100644
--- a/net/forg/Makefile
+++ b/net/forg/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	forg
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	http://gopher.quux.org:70/give-me-gopher/
 # Old home website doesn't seem to work anymore (19/05/03)
diff --git a/net/freenx/Makefile b/net/freenx/Makefile
index 1b068fef27ea..febfd5f22c9d 100644
--- a/net/freenx/Makefile
+++ b/net/freenx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freenx
 PORTVERSION=	0.4.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.iem.pw.edu.pl/ftp/distfiles/
 
diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index fd79030bbb34..cdd4aea09a44 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	g2ipmsg
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.ipmsg.org/archive/ \
 		${MASTER_SITE_LOCAL} \
diff --git a/net/gacxtool/Makefile b/net/gacxtool/Makefile
index 61ae1bd522b8..04a9cfa1e53f 100644
--- a/net/gacxtool/Makefile
+++ b/net/gacxtool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gacxtool
 PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/gastman/Makefile b/net/gastman/Makefile
index 040db26e10e5..1e0d123098b9 100644
--- a/net/gastman/Makefile
+++ b/net/gastman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gastman
 PORTVERSION=	1.0.r1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/gastman/
 DISTNAME=	${PORTNAME}-1.0-RC1
diff --git a/net/geotrace/Makefile b/net/geotrace/Makefile
index 3f95482600b1..a84091c48d7f 100644
--- a/net/geotrace/Makefile
+++ b/net/geotrace/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	geotrace
 PORTVERSION=	0.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/ggsd/Makefile b/net/ggsd/Makefile
index 77e79b024165..8a6287931cd1 100644
--- a/net/ggsd/Makefile
+++ b/net/ggsd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ggsd
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
 DISTNAME=	ggsd
diff --git a/net/gkrellm_snmp/Makefile b/net/gkrellm_snmp/Makefile
index 226095bcffa5..5aae9645eda7 100644
--- a/net/gkrellm_snmp/Makefile
+++ b/net/gkrellm_snmp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellm_snmp
 PORTVERSION=	0.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://triq.net/gkrellm/
 
diff --git a/net/gkrellmmultiping2/Makefile b/net/gkrellmmultiping2/Makefile
index 6b9a54acf63b..5c9d95e8e264 100644
--- a/net/gkrellmmultiping2/Makefile
+++ b/net/gkrellmmultiping2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gkrellmmultiping
 PORTVERSION=	2.0.11
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/ \
 		http://depot.fsck.ch/mirror/distfiles/
diff --git a/net/gkrellmqst/Makefile b/net/gkrellmqst/Makefile
index 87f80c0597b3..51edf1bea17e 100644
--- a/net/gkrellmqst/Makefile
+++ b/net/gkrellmqst/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gkrellmqst
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net games
 MASTER_SITES=	http://tadpol.org/projects/archives/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/net/gkrellmwireless/Makefile b/net/gkrellmwireless/Makefile
index e332b842224f..66aba88c6558 100644
--- a/net/gkrellmwireless/Makefile
+++ b/net/gkrellmwireless/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmwireless
 PORTVERSION=	0.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
diff --git a/net/gkrellmwireless2/Makefile b/net/gkrellmwireless2/Makefile
index f42a40c20867..6f41c63fc7b0 100644
--- a/net/gkrellmwireless2/Makefile
+++ b/net/gkrellmwireless2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmwireless
 PORTVERSION=	2.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
diff --git a/net/globus4/Makefile b/net/globus4/Makefile
index e4863d5e0bea..5e5a06e0fe69 100644
--- a/net/globus4/Makefile
+++ b/net/globus4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	globus
 PORTVERSION=	4.0.3
-PORTREVISION=	20060825
+PORTREVISION=	20060826
 CATEGORIES=	net java parallel
 MASTER_SITES=	ftp://ftp.globus.org/pub/gt4/4.0/${PORTVERSION}/%SUBDIR%/src/:installers,updates
 MASTER_SITE_SUBDIR=	installers/:installers updates/:updates
diff --git a/net/gnoemoe/Makefile b/net/gnoemoe/Makefile
index 90ebb7378fc7..37383a835917 100644
--- a/net/gnoemoe/Makefile
+++ b/net/gnoemoe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnoemoe
 PORTVERSION=	0.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.icecrew.nl/software/gnoemoe/download/
 
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index 9cb2ba92cfe3..18fcd99193e4 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-mud
 PORTVERSION=	0.10.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 78997b013267..db67a215985b 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-netstatus
 PORTVERSION=	2.12.1
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-netstatus/2.12
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index 7096347702e0..aa2ec728fad4 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -190,53 +190,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
 @dirrm share/gnome/help/gnome-netstatus/C
 @dirrm share/gnome/help/gnome-netstatus
 @dirrm share/gnome/gnome-netstatus
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index c4fcab40ffc4..11546a4107df 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-nettool
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index c9ab10850c78..17424514cc9a 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -87,50 +87,18 @@ share/locale/xh/LC_MESSAGES/gnome-nettool.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-nettool.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrm share/gnome/omf/gnome-nettool
diff --git a/net/gnome-vnc/Makefile b/net/gnome-vnc/Makefile
index fd804778410d..d3f20cb3ab7e 100644
--- a/net/gnome-vnc/Makefile
+++ b/net/gnome-vnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-vnc
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.brettnacher.org/users/dominik/FreeBSD/
 
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index 47df4af49de5..b5e920472335 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnometelnet
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.cyest.org/downloads/
 DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
diff --git a/net/gnosamba/Makefile b/net/gnosamba/Makefile
index 6a929631fad0..409046996fb7 100644
--- a/net/gnosamba/Makefile
+++ b/net/gnosamba/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnosamba
 PORTVERSION=	0.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/g/gnosamba
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index f8f97433bb15..d51419797944 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gnu-radius
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	radius
diff --git a/net/gnu-radius/pkg-plist b/net/gnu-radius/pkg-plist
index 1511f0dfd386..0dddfa8991bf 100644
--- a/net/gnu-radius/pkg-plist
+++ b/net/gnu-radius/pkg-plist
@@ -122,10 +122,6 @@ share/locale/ru/LC_MESSAGES/radius.mo
 @dirrm %%DATADIR%%/%%PORTVERSION%%
 @dirrm %%DATADIR%%
 @dirrmtry lib/security
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @unexec rm -f /var/run/radiusd.pid
 @unexec rm -rf /var/log/radius
 @unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radstat alone."
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 696359bcb7ac..624fa58a8169 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gq
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
diff --git a/net/gq/pkg-plist b/net/gq/pkg-plist
index b3c9a46be66d..d6e7dbd3ed48 100644
--- a/net/gq/pkg-plist
+++ b/net/gq/pkg-plist
@@ -11,7 +11,6 @@ share/pixmaps/gq/gq.xpm
 share/pixmaps/gq/textview.png
 share/pixmaps/gq/warning.xpm
 @dirrm share/pixmaps/gq
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @unexec %%PREFIX%%/bin/update-mime-database %%PREFIX%%/share/mime
diff --git a/net/grdesktop/Makefile b/net/grdesktop/Makefile
index 95a2b55bd399..b686cb551382 100644
--- a/net/grdesktop/Makefile
+++ b/net/grdesktop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grdesktop
 PORTVERSION=	0.23
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile
index a6c35c3090ca..0ef48da71823 100644
--- a/net/gspoof/Makefile
+++ b/net/gspoof/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gspoof
 PORTVERSION=	3.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/gstreamer-plugins-libmms/Makefile b/net/gstreamer-plugins-libmms/Makefile
index 6f4cd9ab0c4c..9f3d61ce6b87 100644
--- a/net/gstreamer-plugins-libmms/Makefile
+++ b/net/gstreamer-plugins-libmms/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 COMMENT=	Gstreamer mms:// and mmsh:// plugin
diff --git a/net/gstreamer-plugins-libmms80/Makefile b/net/gstreamer-plugins-libmms80/Makefile
index 654e770065a5..d6c8a9378a99 100644
--- a/net/gstreamer-plugins-libmms80/Makefile
+++ b/net/gstreamer-plugins-libmms80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/net/gstreamer-plugins-libmms80/Makefile,v 1.2 2006/02/25 00:12:31 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 
 COMMENT=	Gstreamer mms:// and mmsh:// plugin
diff --git a/net/imm/Makefile b/net/imm/Makefile
index 9cf49cf2e12a..dd5ebaddfb53 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imm
 PORTVERSION=	3.5a1
+PORTREVISION=	1
 CATEGORIES=	mbone tk82
 MASTER_SITES=	ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
 DISTNAME=	imm.source
diff --git a/net/ipfw-graph/Makefile b/net/ipfw-graph/Makefile
index 647d1567d9db..f66497b78cf1 100644
--- a/net/ipfw-graph/Makefile
+++ b/net/ipfw-graph/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ipfw-graph
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.mavetju.org/download/
 
diff --git a/net/ipsorc/Makefile b/net/ipsorc/Makefile
index ecb61c871092..d5bbcb28d5ec 100644
--- a/net/ipsorc/Makefile
+++ b/net/ipsorc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ipsorc
 PORTVERSION=	1.7.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net security
 MASTER_SITES=	http://ipv42.net/distfiles/ipsorc/ \
 		http://sorcerer.mirrors.pair.com/sources/ipsorcery/${PORTVERSION}/
diff --git a/net/jags/Makefile b/net/jags/Makefile
index dc4ac4a73073..c1aeaa93a65f 100644
--- a/net/jags/Makefile
+++ b/net/jags/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jags
 PORTVERSION=	0.20.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://sumpan.campus.luth.se/software/jags/download/
diff --git a/net/jakarta-commons-net/Makefile b/net/jakarta-commons-net/Makefile
index 41101f466cd7..739f628cbb93 100644
--- a/net/jakarta-commons-net/Makefile
+++ b/net/jakarta-commons-net/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	commons-net
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	commons/net/source
diff --git a/net/java-beepcore/Makefile b/net/java-beepcore/Makefile
index 9cdd8ed3696c..cf667997be25 100644
--- a/net/java-beepcore/Makefile
+++ b/net/java-beepcore/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	beepcore
 PORTVERSION=	0.9.08
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}-java
diff --git a/net/jcifs/Makefile b/net/jcifs/Makefile
index d7ce9b57f0f5..3a6fa981805f 100644
--- a/net/jcifs/Makefile
+++ b/net/jcifs/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jcifs
 PORTVERSION=	1.2.13
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	http://jcifs.samba.org/src/
 EXTRACT_SUFX=	.tgz
diff --git a/net/jffnms/Makefile b/net/jffnms/Makefile
index 62a286faaa7a..9a4dec668791 100644
--- a/net/jffnms/Makefile
+++ b/net/jffnms/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jffnms
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/net/jrobin/Makefile b/net/jrobin/Makefile
index 713934028841..124a3a63573f 100644
--- a/net/jrobin/Makefile
+++ b/net/jrobin/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jrobin
 PORTVERSION=	1.5.4
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/jsch/Makefile b/net/jsch/Makefile
index bb5436ab8864..1db6a017e8b2 100644
--- a/net/jsch/Makefile
+++ b/net/jsch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jsch
 PORTVERSION=	0.1.28
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 55cc4bfe08dc..50b4d5f76713 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdenetwork
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	net kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 55cc4bfe08dc..50b4d5f76713 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdenetwork
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	net kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/net/kiax/Makefile b/net/kiax/Makefile
index 56e3701a2707..780977a4303e 100644
--- a/net/kiax/Makefile
+++ b/net/kiax/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kiax
 PORTVERSION=	0.8.51
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/kmuddy/Makefile b/net/kmuddy/Makefile
index 5993159b0b6e..d4c17a60dc59 100644
--- a/net/kmuddy/Makefile
+++ b/net/kmuddy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kmuddy
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	net games
 MASTER_SITES=	http://www.kmuddy.com/files/
 
diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile
index 7605a747bb24..6494f1664af3 100644
--- a/net/knemo-kde4/Makefile
+++ b/net/knemo-kde4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	knemo
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	net kde
 MASTER_SITES=	http://www.eris23.de/knemo/
 
diff --git a/net/knemo-kde4/pkg-plist b/net/knemo-kde4/pkg-plist
index 866585aa2771..27dbcca320c4 100644
--- a/net/knemo-kde4/pkg-plist
+++ b/net/knemo-kde4/pkg-plist
@@ -82,17 +82,7 @@ share/locale/tr/LC_MESSAGES/kcm_knemo.mo
 share/locale/tr/LC_MESSAGES/knemod.mo
 share/services/kded/knemod.desktop
 @dirrmtry share/services/kded
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@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
 @dirrm share/apps/knemo
 @dirrmtry share/applications/kde
diff --git a/net/knemo/Makefile b/net/knemo/Makefile
index 7605a747bb24..6494f1664af3 100644
--- a/net/knemo/Makefile
+++ b/net/knemo/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	knemo
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	net kde
 MASTER_SITES=	http://www.eris23.de/knemo/
 
diff --git a/net/knemo/pkg-plist b/net/knemo/pkg-plist
index 866585aa2771..27dbcca320c4 100644
--- a/net/knemo/pkg-plist
+++ b/net/knemo/pkg-plist
@@ -82,17 +82,7 @@ share/locale/tr/LC_MESSAGES/kcm_knemo.mo
 share/locale/tr/LC_MESSAGES/knemod.mo
 share/services/kded/knemod.desktop
 @dirrmtry share/services/kded
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@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
 @dirrm share/apps/knemo
 @dirrmtry share/applications/kde
diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index fc3c0be0a0e2..beabe396cdf5 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kphone
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.wirlab.net/kphone/
 
diff --git a/net/krdesktop/Makefile b/net/krdesktop/Makefile
index a8595f12b039..91c88f8b5d1a 100644
--- a/net/krdesktop/Makefile
+++ b/net/krdesktop/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	krdesktop
 PORTVERSION=	1.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net kde
 MASTER_SITES=	http://www.fruitsalad.org/people/mdouhan/krdesktop/
 DISTNAME=	${PORTNAME:S/kr/KR/}-${PORTVERSION}
diff --git a/net/lanbrowsing/Makefile b/net/lanbrowsing/Makefile
index 30274bf2b332..eca390f4c3d1 100644
--- a/net/lanbrowsing/Makefile
+++ b/net/lanbrowsing/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lanbrowsing
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/net/ldapbrowser/Makefile b/net/ldapbrowser/Makefile
index e438629f4c37..537991022477 100644
--- a/net/ldapbrowser/Makefile
+++ b/net/ldapbrowser/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ldapbrowser
 PORTVERSION=	2.8.2
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	http://www-unix.mcs.anl.gov/~gawor/ldapcommon/bin/
 DISTNAME=	Browser282b2
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index c17dceabb5b7..8d0db3aec5dd 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgnetwork
 PORTVERSION=	0.0.9
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.0
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 2dbc2d8d1d59..bf273779c6c1 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	liferea
 PORTVERSION=	1.2.13
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	liferea
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index b862cab1e9a0..31e2706ef95f 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -142,5 +142,3 @@ share/locale/tr/LC_MESSAGES/liferea.mo
 @dirrm lib/liferea
 %%XPI%%@dirrm lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/chrome
 %%XPI%%@dirrm lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
diff --git a/net/link-monitor-applet/Makefile b/net/link-monitor-applet/Makefile
index a06f42f5a72c..de2eddd92869 100644
--- a/net/link-monitor-applet/Makefile
+++ b/net/link-monitor-applet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	link-monitor-applet
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	link-monitor
diff --git a/net/linneighborhood/Makefile b/net/linneighborhood/Makefile
index 649f0635247d..7c111b1496bf 100644
--- a/net/linneighborhood/Makefile
+++ b/net/linneighborhood/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	LinNeighborhood
 PORTVERSION=	0.6.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	http://www.bnro.de/~schmidjo/download/
 
diff --git a/net/linneighborhood/pkg-plist b/net/linneighborhood/pkg-plist
index da913b869ce9..affe370998a6 100644
--- a/net/linneighborhood/pkg-plist
+++ b/net/linneighborhood/pkg-plist
@@ -12,5 +12,3 @@ share/locale/it/LC_MESSAGES/LinNeighborhood.mo
 share/locale/zh_TW/LC_MESSAGES/LinNeighborhood.mo
 share/icons/LinNeighborhood.xpm
 @dirrm share/icons
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index 26a52ce6cf56..a325b1fab695 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	linphone
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:linphone/} \
diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist
index 93c87cb61330..c70da23afe9a 100644
--- a/net/linphone-base/pkg-plist
+++ b/net/linphone-base/pkg-plist
@@ -56,10 +56,6 @@ share/mediastreamer/images/nowebcamCIF.jpg
 %%NLS%%share/locale/pl/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/linphone.mo
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
 @dirrm share/mediastreamer/images
 @dirrm share/mediastreamer
 @dirrm %%DATADIR%%/sounds/rings
diff --git a/net/lyntin/Makefile b/net/lyntin/Makefile
index 40e1ae66384c..29949bdd7f0d 100644
--- a/net/lyntin/Makefile
+++ b/net/lyntin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyntin
 PORTVERSION=	4.1.1
+PORTREVISION=	1
 CATEGORIES=	net games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/mmucl/Makefile b/net/mmucl/Makefile
index 6dd45c4e24f8..7d6247dc4dcb 100644
--- a/net/mmucl/Makefile
+++ b/net/mmucl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mmucl
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index e4d81bfd558c..c9bdf672bd72 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpich
 DISTVERSION=	1.2.7p1
+PORTREVISION=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/
 DIST_SUBDIR=	mpich
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 41471a8cb250..1a7e93650fa5 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpich2
 PORTVERSION=	1.0.5p4
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	net parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/	\
diff --git a/net/mrtg-ping-probe/Makefile b/net/mrtg-ping-probe/Makefile
index 11738858e0b3..76f7beaedb49 100644
--- a/net/mrtg-ping-probe/Makefile
+++ b/net/mrtg-ping-probe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mrtg-ping-probe
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.pwo.de/pub/pwo/mrtg/${PORTNAME}/
 
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 0618f328f442..06bb302f0b25 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mtr
 PORTVERSION=	0.72
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		http://www.mirrors.wiretapped.net/security/network-mapping/mtr/ \
diff --git a/net/mugshot/Makefile b/net/mugshot/Makefile
index 0d02f0b12f78..cd80caf59b2b 100644
--- a/net/mugshot/Makefile
+++ b/net/mugshot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mugshot
 PORTVERSION=	1.1.42
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.mugshot.org/client/sources/linux/
 
diff --git a/net/nam/Makefile b/net/nam/Makefile
index c39bba16d5cd..5486812ef51e 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nam
 PORTVERSION=	1.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
 DISTNAME=	nam-src-${PORTVERSION}
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 8723308f81f6..5a8368aacf75 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	netdude
 PORTVERSION=	0.4.7
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/netmap/Makefile b/net/netmap/Makefile
index e067bdcd25ed..d057d412bfcf 100644
--- a/net/netmap/Makefile
+++ b/net/netmap/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	netmap
 PORTVERSION=	0.1.2b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 565434f7c595..6e527ed6a921 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netspeed_applet
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/
 
diff --git a/net/nos-ttb/Makefile b/net/nos-ttb/Makefile
index 29e87fbd6547..0b30a1e13a96 100644
--- a/net/nos-ttb/Makefile
+++ b/net/nos-ttb/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nos-ttb
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.djcbsoftware.nl/code/ttb/
 DISTNAME=	ttb-${PORTVERSION}
diff --git a/net/ns/Makefile b/net/ns/Makefile
index c15390459084..395ddcd7332c 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ns
 PORTVERSION=	2.29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
 DISTNAME=	ns-src-${PORTVERSION}
diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index c15390459084..395ddcd7332c 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ns
 PORTVERSION=	2.29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
 DISTNAME=	ns-src-${PORTVERSION}
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 5305a9c6bbbf..28ec562a44da 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ntop
 PORTVERSION=	3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/nxserver/Makefile b/net/nxserver/Makefile
index 25a8f48cffd9..ebc19f994125 100644
--- a/net/nxserver/Makefile
+++ b/net/nxserver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nxserver
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${URL}/:X11 \
 		${URL}/:agent \
diff --git a/net/ocaml-netclient/Makefile b/net/ocaml-netclient/Makefile
index 46df6bc25c81..167d10bced79 100644
--- a/net/ocaml-netclient/Makefile
+++ b/net/ocaml-netclient/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netclient
 PORTVERSION=	0.92.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 PKGNAMEPREFIX=	ocaml-
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile
index ab13be172fbb..5a3278dbfcbe 100644
--- a/net/ohphone/Makefile
+++ b/net/ohphone/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ohphone
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/
 
diff --git a/net/onion-fec/Makefile b/net/onion-fec/Makefile
index 98a4fa5335c6..4ba8e1de82f1 100644
--- a/net/onion-fec/Makefile
+++ b/net/onion-fec/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fec
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	http://onionnetworks.com/downloads/
 PKGNAMEPREFIX=	onion-
diff --git a/net/openverse/Makefile b/net/openverse/Makefile
index e4ca1727b3f6..2ab0619728e4 100644
--- a/net/openverse/Makefile
+++ b/net/openverse/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	OpenVerse
 PORTVERSION=	0.8.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net tcl84 tk84
 MASTER_SITES=	http://www.openverse.com/files/OpenVerse/
 DISTNAME=	${PORTNAME}-0.8-7
diff --git a/net/p5-Net-FS-Flickr/Makefile b/net/p5-Net-FS-Flickr/Makefile
index 54126c993f70..a95f60a53510 100644
--- a/net/p5-Net-FS-Flickr/Makefile
+++ b/net/p5-Net-FS-Flickr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net-FS-Flickr
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
diff --git a/net/p5-Net-VNC/Makefile b/net/p5-Net-VNC/Makefile
index 488d8f65a3c7..b8322dea6c3d 100644
--- a/net/p5-Net-VNC/Makefile
+++ b/net/p5-Net-VNC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net-VNC
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
diff --git a/net/p5-Parallel-MPI/Makefile b/net/p5-Parallel-MPI/Makefile
index 49479722b585..726845cc3fc8 100644
--- a/net/p5-Parallel-MPI/Makefile
+++ b/net/p5-Parallel-MPI/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Parallel-MPI
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Parallel
diff --git a/net/p5-Parallel-Pvm/Makefile b/net/p5-Parallel-Pvm/Makefile
index fee705a40b13..dff84f5da07a 100644
--- a/net/p5-Parallel-Pvm/Makefile
+++ b/net/p5-Parallel-Pvm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Parallel-Pvm
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Parallel
diff --git a/net/penguintv-devel/Makefile b/net/penguintv-devel/Makefile
index bbb48a989496..19a1c044f914 100644
--- a/net/penguintv-devel/Makefile
+++ b/net/penguintv-devel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	PenguinTV
 PORTVERSION=	2.91
+PORTREVISION=	1
 CATEGORIES=	net audio multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	penguintv
diff --git a/net/penguintv-devel/pkg-plist b/net/penguintv-devel/pkg-plist
index 692cf6d083d6..da1ccecfda62 100644
--- a/net/penguintv-devel/pkg-plist
+++ b/net/penguintv-devel/pkg-plist
@@ -161,7 +161,6 @@ share/locale/pt/LC_MESSAGES/penguintv.mo
 share/locale/pt_BR/LC_MESSAGES/penguintv.mo
 share/locale/sv/LC_MESSAGES/penguintv.mo
 
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
 @dirrm share/penguintv
 @dirrm %%PYTHON_SITELIBDIR%%/penguintv/trayicon
diff --git a/net/penguintv/Makefile b/net/penguintv/Makefile
index b8ea519aaf99..c513544a86f8 100644
--- a/net/penguintv/Makefile
+++ b/net/penguintv/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	PenguinTV
 PORTVERSION=	2.0.3
+PORTREVISION=	2
 CATEGORIES=	net audio multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	penguintv
diff --git a/net/penguintv/pkg-plist b/net/penguintv/pkg-plist
index 5f6ffd532031..acde6643113f 100644
--- a/net/penguintv/pkg-plist
+++ b/net/penguintv/pkg-plist
@@ -120,11 +120,8 @@ share/penguintv/defaultsubs.opml
 share/penguintv/penguintv.glade
 share/penguintv/penguintvicon.png
 share/pixmaps/penguintvicon.png
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
 @dirrm share/penguintv
 @dirrm %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent
 %%WITH_MOZILLA%%@dirrm %%PYTHON_SITELIBDIR%%/penguintv/democracy_moz
 @dirrm %%PYTHON_SITELIBDIR%%/penguintv
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
diff --git a/net/pfinger/Makefile b/net/pfinger/Makefile
index ea36b49afa59..b5f8d661e980 100644
--- a/net/pfinger/Makefile
+++ b/net/pfinger/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pfinger
 PORTVERSION=	0.7.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.xelia.ch/unix/pfinger/
 
diff --git a/net/pload/Makefile b/net/pload/Makefile
index 520fdf40fdd3..98dd3602d5c1 100644
--- a/net/pload/Makefile
+++ b/net/pload/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pload
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	net sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://opal.com/freebsd/ports/net/pload/
diff --git a/net/pppload/Makefile b/net/pppload/Makefile
index 4e283c829b2c..e4fd672f7d33 100644
--- a/net/pppload/Makefile
+++ b/net/pppload/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pppload
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net sysutils
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=		system/network/serial/ppp
diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile
index 249196c0a64f..57d859f48aee 100644
--- a/net/pvm++/Makefile
+++ b/net/pvm++/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pvm++
 PORTVERSION=	0.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net parallel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S:+:-plus:g}
diff --git a/net/pvm/Makefile b/net/pvm/Makefile
index 4fecf1b30c53..b73e0b9a19e5 100644
--- a/net/pvm/Makefile
+++ b/net/pvm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pvm
 PORTVERSION=	3.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.netlib.org/pvm3/	\
 		ftp://ftp.chg.ru/pub/prog/parallel/pvm3/
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 460027e3fc0a..ded9333edb1b 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/net/py-mp-random/Makefile b/net/py-mp-random/Makefile
index 4b1290dc630e..cdfeb20cab31 100644
--- a/net/py-mp-random/Makefile
+++ b/net/py-mp-random/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=mp-random
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net python
 MASTER_SITES=	http://mirrorproject.com/widget/
 PKGNAMEPREFIX=	py-
diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile
index 0f6ec22625c9..1c2e9d5bf482 100644
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	network
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	net devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/net/pypvm/Makefile b/net/pypvm/Makefile
index 227329a6a5db..08f172ee6206 100644
--- a/net/pypvm/Makefile
+++ b/net/pypvm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pypvm
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index 088763c9e4e7..daf150d1a40c 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rdesktop
 PORTVERSION=	1.5.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	net comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/remotedesk/Makefile b/net/remotedesk/Makefile
index 82dc7cf1d849..ac5cc43212cd 100644
--- a/net/remotedesk/Makefile
+++ b/net/remotedesk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	remotedesk
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	net gnustep
 MASTER_SITES=	http://download.savannah.gnu.org/releases/gap/
 DISTNAME=	RemoteDesk-${PORTVERSION}
diff --git a/net/rqm/Makefile b/net/rqm/Makefile
index c651b7f9defb..a78d7fc6fab7 100644
--- a/net/rqm/Makefile
+++ b/net/rqm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rqm
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	mbone
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/
 
diff --git a/net/ruby-mpi/Makefile b/net/ruby-mpi/Makefile
index cfd9b277a761..e468e57cdb43 100644
--- a/net/ruby-mpi/Makefile
+++ b/net/ruby-mpi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpi
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	net ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}ruby
diff --git a/net/rude/Makefile b/net/rude/Makefile
index beaf698495c7..2341b605cc4f 100644
--- a/net/rude/Makefile
+++ b/net/rude/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rude
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/sambasentinel/Makefile b/net/sambasentinel/Makefile
index 1a2e8e7752b4..9472fdd03156 100644
--- a/net/sambasentinel/Makefile
+++ b/net/sambasentinel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sambasentinel
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.fasta.fh-dortmund.de/pub/linux/gentoo/distfiles/ \
 		http://voodoo.bawue.com/download/
diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile
index 92326c4c81fb..e1e7e99141a7 100644
--- a/net/sdl_net/Makefile
+++ b/net/sdl_net/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_net
 PORTVERSION=	1.2.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_net/release/
 DISTNAME=	SDL_net-${PORTVERSION}
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index a4003f4bb28c..a05f351b6f64 100644
--- a/net/sdr/Makefile
+++ b/net/sdr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdr
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	mbone tk84
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/
 
diff --git a/net/seda/Makefile b/net/seda/Makefile
index 81498e87ea3c..aa5f4d3a1f7a 100644
--- a/net/seda/Makefile
+++ b/net/seda/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	seda
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/service-discovery-applet/Makefile b/net/service-discovery-applet/Makefile
index c64157694c3f..6c12db81ea95 100644
--- a/net/service-discovery-applet/Makefile
+++ b/net/service-discovery-applet/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	service-discovery-applet
 PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net dns gnome
 MASTER_SITES=	http://0pointer.de/~sebest/
 
diff --git a/net/service-discovery-applet/pkg-plist b/net/service-discovery-applet/pkg-plist
index 0f040570e11d..9f426d622478 100644
--- a/net/service-discovery-applet/pkg-plist
+++ b/net/service-discovery-applet/pkg-plist
@@ -45,5 +45,3 @@ share/locale/fr/LC_MESSAGES/service-discovery-applet.mo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/sdapplet
 @dirrmtry lib/%%PYTHON_VERSION%%/site-packages
 @dirrmtry lib/%%PYTHON_VERSION%%
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/net/silky/Makefile b/net/silky/Makefile
index a3fa955d4f83..7d4da7391063 100644
--- a/net/silky/Makefile
+++ b/net/silky/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	silky
 PORTVERSION=	0.5.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
diff --git a/net/silky/pkg-plist b/net/silky/pkg-plist
index 571d6e23706a..160d5da0079e 100644
--- a/net/silky/pkg-plist
+++ b/net/silky/pkg-plist
@@ -33,11 +33,3 @@ share/locale/zh_CN/LC_MESSAGES/silky.mo
 share/gnome/apps/Applications/silky.desktop
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
diff --git a/net/sipxcalllib/Makefile b/net/sipxcalllib/Makefile
index 1fa899229fd3..50ed373e48d7 100644
--- a/net/sipxcalllib/Makefile
+++ b/net/sipxcalllib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sipxcalllib
 PORTVERSION=	3.6.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
diff --git a/net/sipxcommserverlib/Makefile b/net/sipxcommserverlib/Makefile
index f3ef4f9f70db..e09a00cfeb5a 100644
--- a/net/sipxcommserverlib/Makefile
+++ b/net/sipxcommserverlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxcommserverlib
 PORTVERSION=	3.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
diff --git a/net/sipxconfig/Makefile b/net/sipxconfig/Makefile
index f8af21ddf8c9..f637d63b54ad 100644
--- a/net/sipxconfig/Makefile
+++ b/net/sipxconfig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxconfig
 PORTVERSION=	3.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
diff --git a/net/sipxmediaadapterlib/Makefile b/net/sipxmediaadapterlib/Makefile
index e8645877701e..5aec1d41af59 100644
--- a/net/sipxmediaadapterlib/Makefile
+++ b/net/sipxmediaadapterlib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sipxmediaadapterlib
 PORTVERSION=	3.6.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
diff --git a/net/sipxmedialib/Makefile b/net/sipxmedialib/Makefile
index 643aff9ac213..1560354656a7 100644
--- a/net/sipxmedialib/Makefile
+++ b/net/sipxmedialib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sipxmedialib
 PORTVERSION=	3.6.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
diff --git a/net/sipxpbx/Makefile b/net/sipxpbx/Makefile
index f01d01f278a6..2c2d031cc8c3 100644
--- a/net/sipxpbx/Makefile
+++ b/net/sipxpbx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxpbx
 PORTVERSION=	3.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
diff --git a/net/sipxproxy/Makefile b/net/sipxproxy/Makefile
index babefbce5322..50bc5514089e 100644
--- a/net/sipxproxy/Makefile
+++ b/net/sipxproxy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxproxy
 PORTVERSION=	3.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
diff --git a/net/sipxpublisher/Makefile b/net/sipxpublisher/Makefile
index e10297473321..4a1af133c582 100644
--- a/net/sipxpublisher/Makefile
+++ b/net/sipxpublisher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxpublisher
 PORTVERSION=	3.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
diff --git a/net/sipxregistry/Makefile b/net/sipxregistry/Makefile
index b89506040378..cbedd008e65d 100644
--- a/net/sipxregistry/Makefile
+++ b/net/sipxregistry/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxregistry
 PORTVERSION=	3.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
diff --git a/net/sipxtacklib/Makefile b/net/sipxtacklib/Makefile
index 633cdff271e0..20eff5699552 100644
--- a/net/sipxtacklib/Makefile
+++ b/net/sipxtacklib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sipxtacklib
 PORTVERSION=	3.6.0
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
diff --git a/net/sipxvxml/Makefile b/net/sipxvxml/Makefile
index e2a4e2795482..9bb31b0818aa 100644
--- a/net/sipxvxml/Makefile
+++ b/net/sipxvxml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxvxml
 PORTVERSION=	3.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
diff --git a/net/skype-devel/Makefile b/net/skype-devel/Makefile
index a933c8721c3d..75bedce71de9 100644
--- a/net/skype-devel/Makefile
+++ b/net/skype-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	1.3.0.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 PKGNAMESUFFIX=	-devel
diff --git a/net/skype/Makefile b/net/skype/Makefile
index 29351687e0aa..d8bc290f93f5 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	1.2.0.18
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 DISTNAME=	skype_staticQT-${PORTVERSION}
diff --git a/net/smb4k/Makefile b/net/smb4k/Makefile
index 5aedce7d6dd7..d0cf8413b897 100644
--- a/net/smb4k/Makefile
+++ b/net/smb4k/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		smb4k
 PORTVERSION=		0.8.1
+PORTREVISION=	1
 CATEGORIES=		net kde
 MASTER_SITES=		${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	smb4k
diff --git a/net/smm++/Makefile b/net/smm++/Makefile
index 2f879a7498ac..6d9a6236f67d 100644
--- a/net/smm++/Makefile
+++ b/net/smm++/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	smm++
 PORTVERSION=	6.1.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	smm
diff --git a/net/sobby/Makefile b/net/sobby/Makefile
index 413a8bcde64d..3757becbdbdb 100644
--- a/net/sobby/Makefile
+++ b/net/sobby/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sobby
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://releases.0x539.de/sobby/
 
diff --git a/net/spread-j/Makefile b/net/spread-j/Makefile
index d36228140b85..d7aa62c81b41 100644
--- a/net/spread-j/Makefile
+++ b/net/spread-j/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spread
 PORTVERSION=	3.17.2
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
 PKGNAMESUFFIX=	-j
diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile
index d723af91913b..c2a1edbb3a1b 100644
--- a/net/ssvnc/Makefile
+++ b/net/ssvnc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ssvnc
 PORTVERSION=	1.0.15
+PORTREVISION=	1
 CATEGORIES=	net security
 MASTER_SITES=	http://www.karlrunge.com/x11vnc/etv/
 
diff --git a/net/straw/Makefile b/net/straw/Makefile
index 0a7dfe08d77d..877957d812f5 100644
--- a/net/straw/Makefile
+++ b/net/straw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	straw
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION}
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index f31d3d9d32bd..aeea3caba592 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tapidbus
 PORTVERSION=	0.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tapioca-voip
diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile
index 074faead15ad..766c3766ebd5 100644
--- a/net/tcpillust/Makefile
+++ b/net/tcpillust/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcpillust
 PORTVERSION=	1.0a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net tk84 tcl84
 MASTER_SITES=	ftp://ftp.csl.sony.co.jp/CSL/nishida/
 
diff --git a/net/tcpview/Makefile b/net/tcpview/Makefile
index 5c231b1bc04f..d0f726361f86 100644
--- a/net/tcpview/Makefile
+++ b/net/tcpview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcpview
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pub/noc-tools/tcpview/
 EXTRACT_SUFX=	.tar.Z
diff --git a/net/tcpwatch/Makefile b/net/tcpwatch/Makefile
index f911066e42d3..fec80f280741 100644
--- a/net/tcpwatch/Makefile
+++ b/net/tcpwatch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tcpwatch
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	http://hathawaymix.org/Software/TCPWatch/
 
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 610ab0ac5966..8b0486698a48 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	tightvnc
 PORTVERSION=	1.3.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vnc-tight
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index f9db1940bfc2..53b4b5fdfca4 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tramp
 PORTVERSION=	2.1.7
+PORTREVISION=	1
 CATEGORIES=	net elisp
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile
index 8e94735471ca..ad1d973d9e55 100644
--- a/net/tridiavnc/Makefile
+++ b/net/tridiavnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tridiavnc
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=dwcjr
diff --git a/net/tryst-examples/Makefile b/net/tryst-examples/Makefile
index 2323a7ff5500..bf622cc06923 100644
--- a/net/tryst-examples/Makefile
+++ b/net/tryst-examples/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tryst
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/net/tryst/Makefile b/net/tryst/Makefile
index 9bec31ad95dc..d860d65885ca 100644
--- a/net/tryst/Makefile
+++ b/net/tryst/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tryst
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 93483f9221e3..f84cf4c081a9 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tsclient
 PORTVERSION=	0.148
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.gnomepro.com/tsclient/
 
diff --git a/net/ttt/Makefile b/net/ttt/Makefile
index e468702c4d35..f5e349a5df7f 100644
--- a/net/ttt/Makefile
+++ b/net/ttt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ttt
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	net tk84 ipv6
 MASTER_SITES=	ftp://ftp.csl.sony.co.jp/pub/kjc/
 
diff --git a/net/tvark/Makefile b/net/tvark/Makefile
index 40c4dc340391..bd7cab3e01ab 100644
--- a/net/tvark/Makefile
+++ b/net/tvark/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tvark
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://voodoo.bawue.com/download/ \
 		http://www.tvark.com/
diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
index 46f39198dcd4..f2e486b04d50 100644
--- a/net/twinkle/Makefile
+++ b/net/twinkle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	twinkle
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.xs4all.nl/~mfnboer/twinkle/download/
 
diff --git a/net/vino/Makefile b/net/vino/Makefile
index a39554ceb73c..a2e61fa054bd 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	vino
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 9070a7112028..16bb51793ffb 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -74,51 +74,17 @@ share/locale/zh_CN/LC_MESSAGES/vino.mo
 share/locale/zh_HK/LC_MESSAGES/vino.mo
 share/locale/zh_TW/LC_MESSAGES/vino.mo
 @dirrm share/gnome/vino
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 808e570f7bbf..3b54f565a689 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vnc
 PORTVERSION=	4.1.2
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.realvnc.com/:vnc
 DISTNAME=	vnc-4_1_2-unixsrc
diff --git a/net/vnc2swf/Makefile b/net/vnc2swf/Makefile
index 4f824549379c..b3402b8865bc 100644
--- a/net/vnc2swf/Makefile
+++ b/net/vnc2swf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vnc2swf
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.unixuser.org/~euske/${PORTNAME}/ \
 		ftp://ftp.rewt.org.uk/pub/distfiles/
diff --git a/net/vyqchat/Makefile b/net/vyqchat/Makefile
index f6f773c34128..3066fe10144a 100644
--- a/net/vyqchat/Makefile
+++ b/net/vyqchat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vyqchat
 PORTVERSION=	0.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://linux.bydg.org/~yogin/
 
diff --git a/net/warppipe/Makefile b/net/warppipe/Makefile
index 7cec00e6caea..1c1fd74a9174 100644
--- a/net/warppipe/Makefile
+++ b/net/warppipe/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	warppipe
 PORTVERSION=	0.3.5b
+PORTREVISION=	1
 CATEGORIES=	net games
 MASTER_SITES=	http://cubeonline.warppipe.com/download/
 DISTNAME=	WarpPipe-0.3.5-bsd
diff --git a/net/wb/Makefile b/net/wb/Makefile
index 83a0ce98bbd0..a1b4cf4ee682 100644
--- a/net/wb/Makefile
+++ b/net/wb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wb
 PORTVERSION=	1.59
+PORTREVISION=	1
 CATEGORIES=	mbone
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/wb/
 DISTFILES=	i386-wb-1.59.tar.Z
diff --git a/net/wireshark-lite/Makefile b/net/wireshark-lite/Makefile
index 5c82bf152fea..bc645e095f58 100644
--- a/net/wireshark-lite/Makefile
+++ b/net/wireshark-lite/Makefile
@@ -6,7 +6,7 @@
 #
 
 LITE=		yes
-PORTREVISION?=	0
+PORTREVISION?=	1
 PKGNAMESUFFIX=	-lite
 
 MASTERDIR=	${.CURDIR}/../wireshark
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 0796ac31c196..48c6e01ebb1e 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	wireshark
 PORTVERSION=	0.99.5
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/
 DISTNAME=	${DATADIR_NAME}-${PORTVERSION}
diff --git a/net/wistumbler2/Makefile b/net/wistumbler2/Makefile
index ba0dbe8f96ba..d9231275093b 100644
--- a/net/wistumbler2/Makefile
+++ b/net/wistumbler2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wistumbler2
 PORTVERSION=	2.00
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.nopcode.org/prj/wistumbler2/
 DISTNAME=	wistumbler${PORTVERSION}-pre7
diff --git a/net/wmlj/Makefile b/net/wmlj/Makefile
index 8f0dd08f152b..1a0dbbb71ee1 100644
--- a/net/wmlj/Makefile
+++ b/net/wmlj/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmlj
 PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/wmnd/Makefile b/net/wmnd/Makefile
index f82416ca38bc..54b2777e9cbe 100644
--- a/net/wmnd/Makefile
+++ b/net/wmnd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmnd
 PORTVERSION=	0.4.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.yuv.info/wmnd/releases/
 
diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile
index 3c9c5ac55ac5..f9cfe3dd0bc6 100644
--- a/net/wmnet/Makefile
+++ b/net/wmnet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmnet
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net windowmaker
 MASTER_SITES=	ftp://ftp.enteract.com/users/rneswold/ \
 		${MASTER_SITE_LOCAL}
diff --git a/net/wmnet2/Makefile b/net/wmnet2/Makefile
index 6d1517692464..c0f801542c00 100644
--- a/net/wmnet2/Makefile
+++ b/net/wmnet2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmnet2
 PORTVERSION=	1.06
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://mirror2.unixfreunde.de/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/net/wmnetload/Makefile b/net/wmnetload/Makefile
index a3bae5943df8..a7fae00b5c0c 100644
--- a/net/wmnetload/Makefile
+++ b/net/wmnetload/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmnetload
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net windowmaker afterstep
 MASTER_SITES=	ftp://truffula.com/pub/ \
 				http://dl.fkb.wormulon.net/wmnetload/ \
diff --git a/net/wmnetmon/Makefile b/net/wmnetmon/Makefile
index 4f63517832e9..019a920797bc 100644
--- a/net/wmnetmon/Makefile
+++ b/net/wmnetmon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmnetmon
 PORTVERSION=	0.2p5
+PORTREVISION=	1
 CATEGORIES=	net windowmaker
 MASTER_SITES=	http://www.linuks.mine.nu/dockapps/
 
diff --git a/net/wmpiki/Makefile b/net/wmpiki/Makefile
index 46d5f6dfca1e..a8b69c49dd59 100644
--- a/net/wmpiki/Makefile
+++ b/net/wmpiki/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmpiki
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net windowmaker
 MASTER_SITES=	http://mirror2.unixfreunde.de/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/net/wmping/Makefile b/net/wmping/Makefile
index b58655d3404b..978a0c2ce84d 100644
--- a/net/wmping/Makefile
+++ b/net/wmping/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmping
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	net windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/wmq3/Makefile b/net/wmq3/Makefile
index a1e4a9489e48..e1ba196c2458 100644
--- a/net/wmq3/Makefile
+++ b/net/wmq3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmq3
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net windowmaker games
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		http://mirror2.unixfreunde.de/
diff --git a/net/wmwave/Makefile b/net/wmwave/Makefile
index d797f22106b0..0c196c4f0c01 100644
--- a/net/wmwave/Makefile
+++ b/net/wmwave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmwave
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/wmwifi/Makefile b/net/wmwifi/Makefile
index f5dec2b0f7c3..b29891c30e80 100644
--- a/net/wmwifi/Makefile
+++ b/net/wmwifi/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	wmwifi
 PORTVERSION=	0.4
 DISTVERSIONSUFFIX=-bsd
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://digitalssg.net/debian/
 
diff --git a/net/wmwlmon/Makefile b/net/wmwlmon/Makefile
index e326c1493a35..2d355a90ce3f 100644
--- a/net/wmwlmon/Makefile
+++ b/net/wmwlmon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmwlmon
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net windowmaker
 MASTER_SITES=	http://www.nazgul.ch/dev/ \
 		http://dougbarton.us/Downloads/
diff --git a/net/wping/Makefile b/net/wping/Makefile
index 9475e6815bf1..5266d29bb9a2 100644
--- a/net/wping/Makefile
+++ b/net/wping/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wping
 PORTVERSION=	0.1a
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://freebsdcluster.org/~mich/software/
 
diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index b93b83e46425..7c86ec725978 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	x11vnc
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=libvncserver
diff --git a/net/xarchie/Makefile b/net/xarchie/Makefile
index 818e79d4996e..969bfa15eac6 100644
--- a/net/xarchie/Makefile
+++ b/net/xarchie/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xarchie
 PORTVERSION=	2.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
@@ -17,6 +17,7 @@ COMMENT=	X11 front-end program for the archie network search service
 
 USE_IMAKE=	yes
 USE_GMAKE=	yes
+USE_XORG=	xbitmaps
 MAN1=		xarchie.1
 
 .include <bsd.port.mk>
diff --git a/net/xbone-gui/Makefile b/net/xbone-gui/Makefile
index 4563933f3125..35af60a36971 100644
--- a/net/xbone-gui/Makefile
+++ b/net/xbone-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XBone-GUI
 PORTVERSION=	3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	http://www.isi.edu/xbone/software/xbone/
 DISTNAME=	XBone-${PORTVERSION}
diff --git a/net/xbone/Makefile b/net/xbone/Makefile
index fd18225607b2..78accba4084e 100644
--- a/net/xbone/Makefile
+++ b/net/xbone/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XBone
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	http://www.isi.edu/xbone/software/xbone/
 
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 057eb15bf772..91f250a4a34f 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xipdump
 PORTVERSION=	1.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.lse.epita.fr/twiki/pub/Projects/XipDump/
 EXTRACT_SUFX=	.tgz
diff --git a/net/xipmsg/Makefile b/net/xipmsg/Makefile
index 3dec872799e1..84931539d14e 100644
--- a/net/xipmsg/Makefile
+++ b/net/xipmsg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xipmsg
 PORTVERSION=	0.8088
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.bsddiary.net/xipmsg/
 DISTNAME=	xipmsg-${PORTVERSION:E}
diff --git a/net/xisp/Makefile b/net/xisp/Makefile
index 7a91f803c571..3e60ed77a34e 100644
--- a/net/xisp/Makefile
+++ b/net/xisp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xisp
 PORTVERSION=	2.7p4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://xisp.hellug.gr/release/
 
diff --git a/net/xpvm/Makefile b/net/xpvm/Makefile
index 35337d25677c..56008725d7d5 100644
--- a/net/xpvm/Makefile
+++ b/net/xpvm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpvm
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.netlib.org/pvm3/xpvm/
 DISTNAME=	XPVM.src.${PORTVERSION}
diff --git a/net/xrdesktop/Makefile b/net/xrdesktop/Makefile
index 0f90188b12c0..8b8b8b698084 100644
--- a/net/xrdesktop/Makefile
+++ b/net/xrdesktop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xrdesktop
 PORTVERSION=	1.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://luggage.linux0wnsyou.com/xrdesktop/
 
diff --git a/net/xsmbrowser/Makefile b/net/xsmbrowser/Makefile
index 764375dbb833..86f48e75add3 100644
--- a/net/xsmbrowser/Makefile
+++ b/net/xsmbrowser/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xsmbrowser
 PORTVERSION=	3.4.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://nuxo1.free.fr/logiciel_reseau/visu_reso/ \
 		http://mirror.uni-c.dk/gentoo/distfiles/
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index be13fef3e548..1592b5b58917 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtraceroute
 PORTVERSION=	0.9.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.dtek.chalmers.se/~d3august/xt/dl/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile
index c7d5de67ddad..0ad1b369c760 100644
--- a/net/xwhois/Makefile
+++ b/net/xwhois/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xwhois
 PORTVERSION=	0.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://c64.org/~nr/xwhois/dist/
 
diff --git a/net/zillion/Makefile b/net/zillion/Makefile
index f31fb233a0ac..938b4ea1c078 100644
--- a/net/zillion/Makefile
+++ b/net/zillion/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zillion
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	net gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/news/PicMonger/Makefile b/news/PicMonger/Makefile
index e4f11cec5efa..d94cf262fbea 100644
--- a/news/PicMonger/Makefile
+++ b/news/PicMonger/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	PicMonger
 PORTVERSION=	0.9.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	news graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=picmonger
diff --git a/news/gnus-emacs20/Makefile b/news/gnus-emacs20/Makefile
index 4ebf08d7e7fc..c00396ee9e6d 100644
--- a/news/gnus-emacs20/Makefile
+++ b/news/gnus-emacs20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnus
 PORTVERSION=	5.8.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	news mail elisp
 MASTER_SITES=	ftp://ftp.monash.edu.au/pub/gnus/ \
 		ftp://ftp.kreonet.re.kr/pub/tools/emacs/gnus/ \
diff --git a/news/grn/Makefile b/news/grn/Makefile
index 1af3f369be97..17fcdadf9752 100644
--- a/news/grn/Makefile
+++ b/news/grn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grn
 PORTVERSION=	0.0.28
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	news gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/news/klibido/Makefile b/news/klibido/Makefile
index 6d832891019e..6561747fea3e 100644
--- a/news/klibido/Makefile
+++ b/news/klibido/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		klibido
 PORTVERSION=		0.2.5
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		news
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 2e35e56681c8..a5e40d7b0ee0 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	knews
 PORTVERSION=	1.0b.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	news
 MASTER_SITES=	http://www.matematik.su.se/~kjj/
 
diff --git a/news/lusernet/Makefile b/news/lusernet/Makefile
index dfd318c187eb..47b5a7c3eaa8 100644
--- a/news/lusernet/Makefile
+++ b/news/lusernet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lusernet
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	news gnustep
 MASTER_SITES=	http://web.telia.com/~u42308495/alex/LuserNET/
 DISTNAME=	LuserNET-${PORTVERSION}
diff --git a/news/openftd/Makefile b/news/openftd/Makefile
index c257dfd2e1b6..e661fe199887 100644
--- a/news/openftd/Makefile
+++ b/news/openftd/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	openftd
 PORTVERSION=	0.98.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news
 MASTER_SITES=	http://www.icheb.nl/mirrors/openftd/
 
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 984b23d5afe3..81086cb31404 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pan
 PORTVERSION=	0.128
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news gnome
 MASTER_SITES=	http://pan.rebelbase.com/download/releases/${PORTVERSION}/source/
 DIST_SUBDIR=	gnome2
diff --git a/news/pan/pkg-plist b/news/pan/pkg-plist
index f4e0f1d0b777..170b30a422fc 100644
--- a/news/pan/pkg-plist
+++ b/news/pan/pkg-plist
@@ -45,37 +45,4 @@ share/locale/vi/LC_MESSAGES/pan.mo
 share/locale/zh_CN/LC_MESSAGES/pan.mo
 share/locale/zh_TW/LC_MESSAGES/pan.mo
 share/pixmaps/pan.png
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/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/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/news/pyne/Makefile b/news/pyne/Makefile
index edb6057561c3..cf6aa88e1db7 100644
--- a/news/pyne/Makefile
+++ b/news/pyne/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pyne
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news python mail
 MASTER_SITES=	http://www.soul-less.pwp.blueyonder.co.uk/pyne/
 
diff --git a/news/slrnconf/Makefile b/news/slrnconf/Makefile
index 4e068403dca1..007ef9384bf4 100644
--- a/news/slrnconf/Makefile
+++ b/news/slrnconf/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	slrnconf
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	http://home.arcor.de/kaffeetisch/downloads/
 
diff --git a/news/slrnface/Makefile b/news/slrnface/Makefile
index 979c55dddb84..c0c465966945 100644
--- a/news/slrnface/Makefile
+++ b/news/slrnface/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slrnface
 PORTVERSION=	2.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	news
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/s/${PORTNAME}
diff --git a/news/xpn/Makefile b/news/xpn/Makefile
index 8f28498be8e1..62daf460e499 100644
--- a/news/xpn/Makefile
+++ b/news/xpn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpn
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	news python
 MASTER_SITES=	http://xpn.altervista.org/codice/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/news/xrn/Makefile b/news/xrn/Makefile
index 87346223a192..699e5bdaf4ca 100644
--- a/news/xrn/Makefile
+++ b/news/xrn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xrn
 PORTVERSION=	9.02
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	ftp://sipb.mit.edu/pub/xrn/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
index 84d6854e5be3..be945aff58a9 100644
--- a/palm/coldsync/Makefile
+++ b/palm/coldsync/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	coldsync
 PORTVERSION=	2.2.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	palm comms
 MASTER_SITES=	http://www.coldsync.org/download/
 
diff --git a/palm/coldsync/pkg-plist b/palm/coldsync/pkg-plist
index b9c5d2fa981c..8505f57be0b2 100644
--- a/palm/coldsync/pkg-plist
+++ b/palm/coldsync/pkg-plist
@@ -26,5 +26,3 @@ include/pconn/netsync.h
 include/pconn/PConnection.h
 include/pconn/spc_client.h
 @dirrm include/pconn
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index ce2141a8cb4a..c53419d79217 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-pilot-conduits
 PORTVERSION=	2.0.15
+PORTREVISION=	1
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 05f935166a5d..746954d55b17 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-pilot
 PORTVERSION=	2.0.15
+PORTREVISION=	1
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
diff --git a/palm/jpilot-db/Makefile b/palm/jpilot-db/Makefile
index 9fcc669508bf..2b1834ea0173 100644
--- a/palm/jpilot-db/Makefile
+++ b/palm/jpilot-db/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jpilot-db
 PORTVERSION=	1.3.20
+PORTREVISION=	1
 CATEGORIES=	palm java
 MASTER_SITES=	http://chickenshick.com/jpilot-db/download/
 EXTRACT_SUFX=	-ej.jar
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index e745a6c99735..2958d11cb4e8 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	jpilot
 PORTVERSION=	0.99.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	palm comms
 MASTER_SITES=	http://www.mirrorservice.org/sites/master.us.finkmirrors.net/distfiles/ \
 		http://jpilot.org/
diff --git a/palm/pilrc/Makefile b/palm/pilrc/Makefile
index e89391a5639e..af32d0839944 100644
--- a/palm/pilrc/Makefile
+++ b/palm/pilrc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pilrc
 PORTVERSION=	3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/palm/plucker/Makefile b/palm/plucker/Makefile
index 73eaab5f1364..b962e6fcdba7 100644
--- a/palm/plucker/Makefile
+++ b/palm/plucker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	plucker
 PORTVERSION=	1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	palm www
 MASTER_SITES=	http://downloads.plkr.org/${PORTVERSION}/ \
 		http://downloads.hideho.org/${PORTNAME}/${PORTVERSION}/
diff --git a/palm/pose/Makefile b/palm/pose/Makefile
index e5309de43b61..12c2802e4eac 100644
--- a/palm/pose/Makefile
+++ b/palm/pose/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pose
 PORTVERSION=	3.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	palm emulators
 MASTER_SITES=	http://www.palmos.com/dev/tools/emulator/sources/ \
 		http://www.palmos.com/dev/tools/emulator/:skins
diff --git a/palm/synce-gnomevfs/Makefile b/palm/synce-gnomevfs/Makefile
index 475695760689..6a9465c14ab8 100644
--- a/palm/synce-gnomevfs/Makefile
+++ b/palm/synce-gnomevfs/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	synce-gnomevfs
 PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index 475695760689..6a9465c14ab8 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	synce-gnomevfs
 PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
diff --git a/palm/synce-kde/Makefile b/palm/synce-kde/Makefile
index b01b8efb337f..59db48cbcd03 100644
--- a/palm/synce-kde/Makefile
+++ b/palm/synce-kde/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	synce-kde
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
diff --git a/palm/synce-multisync/Makefile b/palm/synce-multisync/Makefile
index 3eefdb6a3324..f836578f1f61 100644
--- a/palm/synce-multisync/Makefile
+++ b/palm/synce-multisync/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	synce-multisync_plugin
 PORTVERSION=	0.9.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	palm deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile
index 42d7a1485ed4..d2b8a152fccf 100644
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	synce-trayicon
 PORTVERSION=	0.9.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
diff --git a/palm/synce-trayicon/pkg-plist b/palm/synce-trayicon/pkg-plist
index 4597fbf66577..165fb37ed135 100644
--- a/palm/synce-trayicon/pkg-plist
+++ b/palm/synce-trayicon/pkg-plist
@@ -5,5 +5,4 @@ share/pixmaps/synce/synce-color-small.png
 share/pixmaps/synce/synce-gray-small.png
 share/synce/synce_trayicon_properties.glade
 @dirrm share/pixmaps/synce
-@dirrmtry share/pixmaps
 @dirrmtry share/synce
diff --git a/polish/calligra-l10n/Makefile b/polish/calligra-l10n/Makefile
index 439aaee50bb2..9259e226eb6d 100644
--- a/polish/calligra-l10n/Makefile
+++ b/polish/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	polish kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index f264867d1921..a0b223dc5b0d 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ekg2
 PORTVERSION=	20070303
+PORTREVISION=	1
 CATEGORIES=	polish net-im
 MASTER_SITES=	http://www.ekg2.org/archive/
 
diff --git a/polish/ekg2/pkg-plist b/polish/ekg2/pkg-plist
index f6cf8003a68e..f000804d59e8 100644
--- a/polish/ekg2/pkg-plist
+++ b/polish/ekg2/pkg-plist
@@ -133,8 +133,6 @@ libexec/ioctld
 %%DATADIR%%/themes/blue_sea_dragon.theme
 %%DATADIR%%/themes/irc-irssi.theme
 share/locale/pl/LC_MESSAGES/ekg2.mo
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%/plugins/logs
 @dirrm %%DATADIR%%/plugins/mail
diff --git a/polish/gnugadu/Makefile b/polish/gnugadu/Makefile
index 511b49cf52a7..1ccde6585cc8 100644
--- a/polish/gnugadu/Makefile
+++ b/polish/gnugadu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnugadu
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	polish net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggadu
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index b6fdf20110b2..5e5d8f644fd5 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnugadu2
 PORTVERSION=	2.2.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	polish net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggadu
diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 34800a373c78..0a076a873422 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		kadu
 PORTVERSION=		0.5.0
+PORTREVISION=	1
 PORTEPOCH=		1
 CATEGORIES=		polish net-im
 MASTER_SITES=		http://www.kadu.net/download/stable/:kadu \
diff --git a/polish/kde3-i18n/Makefile b/polish/kde3-i18n/Makefile
index 772a0b18233a..463e62645bde 100644
--- a/polish/kde3-i18n/Makefile
+++ b/polish/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	polish kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/polish/kde4-l10n/Makefile b/polish/kde4-l10n/Makefile
index 772a0b18233a..463e62645bde 100644
--- a/polish/kde4-l10n/Makefile
+++ b/polish/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	polish kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/polish/koffice-i18n/Makefile b/polish/koffice-i18n/Makefile
index 439aaee50bb2..9259e226eb6d 100644
--- a/polish/koffice-i18n/Makefile
+++ b/polish/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	polish kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/polish/koffice-kde4-l10n/Makefile b/polish/koffice-kde4-l10n/Makefile
index 439aaee50bb2..9259e226eb6d 100644
--- a/polish/koffice-kde4-l10n/Makefile
+++ b/polish/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	polish kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/polish/tleenx2/Makefile b/polish/tleenx2/Makefile
index fbce5f6da2ac..96797c679dc8 100644
--- a/polish/tleenx2/Makefile
+++ b/polish/tleenx2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tleenx2
 PORTVERSION=	20040214
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	polish net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tleenx
diff --git a/ports-mgmt/barry/Makefile b/ports-mgmt/barry/Makefile
index 359709b90f36..4570fc74280d 100644
--- a/ports-mgmt/barry/Makefile
+++ b/ports-mgmt/barry/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	barry
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt kde
 MASTER_SITES=	http://www.student.uni-oldenburg.de/frerich.raabe/barry/ \
 		http://freebsd.so14k.com/barry/
diff --git a/ports-mgmt/barry/pkg-plist b/ports-mgmt/barry/pkg-plist
index 46dd9b7601c9..6671c8f4f68e 100644
--- a/ports-mgmt/barry/pkg-plist
+++ b/ports-mgmt/barry/pkg-plist
@@ -30,7 +30,3 @@ share/locale/sv/LC_MESSAGES/barry.mo
 @dirrm share/icons/crystalsvg/16x16/apps
 @dirrm share/icons/crystalsvg/32x32/apps
 @dirrm share/icons/crystalsvg/48x48/apps
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
diff --git a/ports-mgmt/bpm/Makefile b/ports-mgmt/bpm/Makefile
index 0ff21bbd1638..74b86dd39212 100644
--- a/ports-mgmt/bpm/Makefile
+++ b/ports-mgmt/bpm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bpm
 PORTVERSION=	0.4.1b
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://www.meowfishies.com/code/bpm/
 EXTRACT_SUFX=	.tgz
diff --git a/ports-mgmt/instant-tinderbox/Makefile b/ports-mgmt/instant-tinderbox/Makefile
index 7b13fde2b24e..e65122372618 100644
--- a/ports-mgmt/instant-tinderbox/Makefile
+++ b/ports-mgmt/instant-tinderbox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	instant-tinderbox
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt
 DISTFILES=
 
diff --git a/ports-mgmt/kports-qt4/Makefile b/ports-mgmt/kports-qt4/Makefile
index cbe981c26528..cf93ff08ffdb 100644
--- a/ports-mgmt/kports-qt4/Makefile
+++ b/ports-mgmt/kports-qt4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kports
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/ports-mgmt/kports/Makefile b/ports-mgmt/kports/Makefile
index cbe981c26528..cf93ff08ffdb 100644
--- a/ports-mgmt/kports/Makefile
+++ b/ports-mgmt/kports/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kports
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/ports-mgmt/pib/Makefile b/ports-mgmt/pib/Makefile
index 8915359c8130..e39348810d14 100644
--- a/ports-mgmt/pib/Makefile
+++ b/ports-mgmt/pib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pib
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt tk84
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	msmith
diff --git a/ports-mgmt/portbrowser/Makefile b/ports-mgmt/portbrowser/Makefile
index 747759463b15..fe07c4e4d38c 100644
--- a/ports-mgmt/portbrowser/Makefile
+++ b/ports-mgmt/portbrowser/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	portbrowser
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://www.bytelabs.org/
 DISTNAME=	pb-browser-${PORTVERSION}
diff --git a/ports-mgmt/qtpkg/Makefile b/ports-mgmt/qtpkg/Makefile
index 1246bac7b4bd..1ef3b8bdd627 100644
--- a/ports-mgmt/qtpkg/Makefile
+++ b/ports-mgmt/qtpkg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qtpkg
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 # mastersite disappeared around July 6 2003
 MASTER_SITES=	# http://gauss.cord.edu/homepages/twschulz/demo/
diff --git a/portuguese/acroread/Makefile b/portuguese/acroread/Makefile
index 9a9011c09754..5db165cadf79 100644
--- a/portuguese/acroread/Makefile
+++ b/portuguese/acroread/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	portuguese print linux
 PKGNAMEPREFIX=	pt_BR-
 
diff --git a/portuguese/calligra-l10n-pt_BR/Makefile b/portuguese/calligra-l10n-pt_BR/Makefile
index e1f5a3e8f430..8556fa2e3358 100644
--- a/portuguese/calligra-l10n-pt_BR/Makefile
+++ b/portuguese/calligra-l10n-pt_BR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/portuguese/calligra-l10n/Makefile b/portuguese/calligra-l10n/Makefile
index b587c0ac109a..d6edd65fef46 100644
--- a/portuguese/calligra-l10n/Makefile
+++ b/portuguese/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/portuguese/irpf-pt_BR/Makefile b/portuguese/irpf-pt_BR/Makefile
index 8c8ed7d9ce17..273602a1c7fb 100644
--- a/portuguese/irpf-pt_BR/Makefile
+++ b/portuguese/irpf-pt_BR/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	irpf
 PORTVERSION=	2007.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	portuguese finance java
 MASTER_SITES=	http://www.receita.fazenda.gov.br/publico/programas/irpf/2007/PGDIrpf2007/Java/ZIP/
 PKGNAMEPREFIX?=	pt_BR-
diff --git a/portuguese/kde3-i18n-pt_BR/Makefile b/portuguese/kde3-i18n-pt_BR/Makefile
index c9bd9fe68b45..0ffd6525aad4 100644
--- a/portuguese/kde3-i18n-pt_BR/Makefile
+++ b/portuguese/kde3-i18n-pt_BR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/portuguese/kde3-i18n/Makefile b/portuguese/kde3-i18n/Makefile
index e2bbe3c41021..5dd6fde21d86 100644
--- a/portuguese/kde3-i18n/Makefile
+++ b/portuguese/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/portuguese/kde4-l10n-pt_BR/Makefile b/portuguese/kde4-l10n-pt_BR/Makefile
index c9bd9fe68b45..0ffd6525aad4 100644
--- a/portuguese/kde4-l10n-pt_BR/Makefile
+++ b/portuguese/kde4-l10n-pt_BR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/portuguese/kde4-l10n/Makefile b/portuguese/kde4-l10n/Makefile
index e2bbe3c41021..5dd6fde21d86 100644
--- a/portuguese/kde4-l10n/Makefile
+++ b/portuguese/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/portuguese/koffice-i18n-pt_BR/Makefile b/portuguese/koffice-i18n-pt_BR/Makefile
index e1f5a3e8f430..8556fa2e3358 100644
--- a/portuguese/koffice-i18n-pt_BR/Makefile
+++ b/portuguese/koffice-i18n-pt_BR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/portuguese/koffice-i18n/Makefile b/portuguese/koffice-i18n/Makefile
index b587c0ac109a..d6edd65fef46 100644
--- a/portuguese/koffice-i18n/Makefile
+++ b/portuguese/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/portuguese/koffice-kde4-l10n-pt_BR/Makefile b/portuguese/koffice-kde4-l10n-pt_BR/Makefile
index e1f5a3e8f430..8556fa2e3358 100644
--- a/portuguese/koffice-kde4-l10n-pt_BR/Makefile
+++ b/portuguese/koffice-kde4-l10n-pt_BR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/portuguese/koffice-kde4-l10n/Makefile b/portuguese/koffice-kde4-l10n/Makefile
index b587c0ac109a..d6edd65fef46 100644
--- a/portuguese/koffice-kde4-l10n/Makefile
+++ b/portuguese/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index 8d38d7a44c74..641addbf8ff5 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	a2ps
 PORTVERSION=	4.13b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.enst.fr/pub/unix/a2ps/ \
 		${MASTER_SITE_GNU}
diff --git a/print/a2ps-letter/pkg-plist b/print/a2ps-letter/pkg-plist
index 009cf0cd100d..7438ad0f71bc 100644
--- a/print/a2ps-letter/pkg-plist
+++ b/print/a2ps-letter/pkg-plist
@@ -292,17 +292,3 @@ share/locale/tr/LC_MESSAGES/a2ps.mo
 @dirrm %%DATADIR%%
 %%WITHEMACS%%@dirrm lib/xemacs/site-lisp
 %%WITHEMACS%%@dirrm lib/xemacs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
diff --git a/print/abntex/Makefile b/print/abntex/Makefile
index e4b66f2bd195..28bbe7834b7f 100644
--- a/print/abntex/Makefile
+++ b/print/abntex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	abntex
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://mirror.isp.net.au/ftp/pub/freebsd/distfiles/ \
 		http://download.codigolivre.org.br/abntex/
diff --git a/print/acrobatviewer/Makefile b/print/acrobatviewer/Makefile
index baa2a317c9e1..0d0234534720 100644
--- a/print/acrobatviewer/Makefile
+++ b/print/acrobatviewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	acrobatviewer
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	print java
 MASTER_SITES=	ftp://ftp.adobe.com/pub/adobe/magic/acrobatviewer/unix/1.x/
 DISTNAME=	viewer.bin
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index 8164bbb55f05..5cb29e6b371a 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	acroread7
 PORTVERSION?=	7.0.9
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES?=	print linux
 MASTER_SITES?=	http://ardownload.adobe.com/pub/adobe/reader/unix/7x/${VERSIONDIR}/${ADOBE_LANG:L}/ \
diff --git a/print/acroreadwrapper/Makefile b/print/acroreadwrapper/Makefile
index 73cb9d4b4b30..a34df0e046f6 100644
--- a/print/acroreadwrapper/Makefile
+++ b/print/acroreadwrapper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	acroreadwrapper
 PORTVERSION=	0.0.20060221
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/print/advi/Makefile b/print/advi/Makefile
index fbac4b379c33..7de1eb57bbeb 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	advi
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/${PORTNAME}/
 EXTRACT_SUFX=	.tgz
diff --git a/print/amspsfnt/Makefile b/print/amspsfnt/Makefile
index 96a4f59f5831..a4944f0bbc99 100644
--- a/print/amspsfnt/Makefile
+++ b/print/amspsfnt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amspsfnt
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/ams/
 DISTNAME=	amsps
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 994a7489a66d..57a344c230a5 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apsfilter
 PORTVERSION=	7.2.8
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 
diff --git a/print/asprint/Makefile b/print/asprint/Makefile
index 0d1dabd450f6..ea5beb7f35c7 100644
--- a/print/asprint/Makefile
+++ b/print/asprint/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asprint
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
 MASTER_SITE_SUBDIR=	apps/asprint
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index cd7e6b8fa9ac..56b8b484e15d 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		auctex
 PORTVERSION=		11.84
-PORTREVISION=		0
+PORTREVISION=		1
 CATEGORIES=		print elisp
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/bibview/Makefile b/print/bibview/Makefile
index 0e49ae9a1680..8e738dace9ca 100644
--- a/print/bibview/Makefile
+++ b/print/bibview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bibview
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	print databases
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR= biblio/bibtex/utils/bibview-2.0
diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile
index b14a47207634..e4f90961767a 100644
--- a/print/bjfiltercom/Makefile
+++ b/print/bjfiltercom/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	bjfiltercom
 PORTVERSION?=	1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print linux
 MASTER_SITES=	ftp://download.canon.jp/pub/driver/bj/linux/
 DISTFILES=	${RPMFILE}
diff --git a/print/bjfiltercom/pkg-plist b/print/bjfiltercom/pkg-plist
index aa7127bee842..387fbe900732 100644
--- a/print/bjfiltercom/pkg-plist
+++ b/print/bjfiltercom/pkg-plist
@@ -86,8 +86,6 @@ usr/local/share/stsmon/pixmaps/Inkg_ye.xpm
 @dirrm usr/local/share/stsmon/pixmaps
 @dirrm usr/local/share/stsmon
 @dirrmtry usr/local/share/printui
-@dirrmtry usr/local/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/local/share/locale/ja
 @dirrmtry usr/local/share/locale
 @dirrmtry usr/local/share
 @dirrmtry usr/local
diff --git a/print/catdvi/Makefile b/print/catdvi/Makefile
index f3a8b7ddf1da..b51aa229a737 100644
--- a/print/catdvi/Makefile
+++ b/print/catdvi/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	catdvi
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index be7c8ecef5cc..5d37ecdeb495 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	print chinese japanese korean
 MASTER_SITES=	ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/ \
 		ftp://ftp.u-aizu.ac.jp/pub/tex/cjk-lyx/qt/ \
diff --git a/print/cm-super/Makefile b/print/cm-super/Makefile
index a0142c640fad..ee7ab7de24a9 100644
--- a/print/cm-super/Makefile
+++ b/print/cm-super/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cm-super
 PORTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	fonts/ps-type1
diff --git a/print/cmpsfont/Makefile b/print/cmpsfont/Makefile
index c030dbe0bcbe..f45ffe054292 100644
--- a/print/cmpsfont/Makefile
+++ b/print/cmpsfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cmpsfont
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/cm/
 DISTNAME=	cmps
diff --git a/print/cups-magicolor/Makefile b/print/cups-magicolor/Makefile
index 28bd6b6760a4..1b83bd51b975 100644
--- a/print/cups-magicolor/Makefile
+++ b/print/cups-magicolor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cups-magicolor
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://printer.konicaminolta.net/drivers/linux/
 DISTNAME=	2430DL_sc_linux
diff --git a/print/cups-pdf/Makefile b/print/cups-pdf/Makefile
index 5568aab67e24..4d8a203ffd3d 100644
--- a/print/cups-pdf/Makefile
+++ b/print/cups-pdf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cups-pdf
 PORTVERSION=	2.4.5
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/ \
 		http://olofsson.de/mirror/distfiles/
diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile
index d229866d8a62..d17d26e0cd87 100644
--- a/print/cups-pstoraster/Makefile
+++ b/print/cups-pstoraster/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cups-pstoraster
 PORTVERSION=	8.15.4
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_EASYSW}
 MASTER_SITE_SUBDIR=	ghostscript/${PORTVERSION}
diff --git a/print/cups/Makefile b/print/cups/Makefile
index cf971c66436e..e02d7f815e63 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	cups
 PORTVERSION=	1.2.10
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/print/dk-acroread/Makefile b/print/dk-acroread/Makefile
index 2a4962e5dc23..faa0c6499518 100644
--- a/print/dk-acroread/Makefile
+++ b/print/dk-acroread/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	dk-
 
 MASTERDIR=	${.CURDIR}/../../print/acroread7
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index ba77afc1118a..747cd295ed25 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dvipdfmx
 PORTVERSION=	20061211
+PORTREVISION=	1
 #PORTREVISION=	0
 CATEGORIES=	print
 MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/release/
diff --git a/print/dvipsk-tetex/Makefile b/print/dvipsk-tetex/Makefile
index ee27736f6387..cbc554b67a82 100644
--- a/print/dvipsk-tetex/Makefile
+++ b/print/dvipsk-tetex/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	dvipsk-tetex
 PORTVERSION=	5.95a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
diff --git a/print/dvisvg/Makefile b/print/dvisvg/Makefile
index f6e0c455f02b..555fba819ced 100644
--- a/print/dvisvg/Makefile
+++ b/print/dvisvg/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	dvisvg
 DISTVERSION=	0.7.1d
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://dvisvg.sourceforge.net/files/
 
diff --git a/print/easylatex/Makefile b/print/easylatex/Makefile
index 7af19c777524..ae54e9c3ea29 100644
--- a/print/easylatex/Makefile
+++ b/print/easylatex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	easylatex
 PORTVERSION=	0.062
+PORTREVISION=	1
 CATEGORIES=	print textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/epsonepl/Makefile b/print/epsonepl/Makefile
index cc9850f0db5e..6b85d0000ba8 100644
--- a/print/epsonepl/Makefile
+++ b/print/epsonepl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	epsonepl
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/es-acroread/Makefile b/print/es-acroread/Makefile
index 34436f04587b..473e0adb7958 100644
--- a/print/es-acroread/Makefile
+++ b/print/es-acroread/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	es-
 
 MASTERDIR=	${.CURDIR}/../../print/acroread7
diff --git a/print/fi-acroread/Makefile b/print/fi-acroread/Makefile
index af40df37bbdb..e9d4d492fc82 100644
--- a/print/fi-acroread/Makefile
+++ b/print/fi-acroread/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	fi-
 
 MASTERDIR=	${.CURDIR}/../../print/acroread7
diff --git a/print/flpsed/Makefile b/print/flpsed/Makefile
index 7c8b3017d9c2..d2b480714fa6 100644
--- a/print/flpsed/Makefile
+++ b/print/flpsed/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flpsed
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.ecademix.com/JohannesHofmann/
 
diff --git a/print/font2svg/Makefile b/print/font2svg/Makefile
index 0527833df5fb..5eb331be4296 100644
--- a/print/font2svg/Makefile
+++ b/print/font2svg/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	font2svg
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.gdv.uni-hannover.de/~peinecke/font2svg/
 
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index fd8a1e0396c2..b4c5b86f6834 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fontforge
 PORTVERSION=	20060822
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fontforge
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index e710c7473335..b4b6902a9593 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	foo2zjs
 PORTVERSION=	20070120
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://foo2zjs.rkkda.com/ \
 		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile
index 60931d52c0e6..48a46771bd15 100644
--- a/print/freetype-tools/Makefile
+++ b/print/freetype-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freetype-tools
 PORTVERSION=	1.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index 7a1906230225..f297e9d42059 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ft2demos
 PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
diff --git a/print/gfontview/Makefile b/print/gfontview/Makefile
index fd2a3920167c..71d3218c24fd 100644
--- a/print/gfontview/Makefile
+++ b/print/gfontview/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gfontview
 PORTVERSION=	0.5.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 225dc4e1bbc2..88a783093439 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ggv
 PORTVERSION=	2.12.0
+PORTREVISION=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.12
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 05e3b7729fd1..c52ff1b228c7 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
+PORTREVISION=	1
 PORTREVISION=	${GS_REVISION}
 PORTEPOCH=	${GS_EPOCH}
 CATEGORIES=	print
diff --git a/print/ghostscript-gnu-commfont/Makefile b/print/ghostscript-gnu-commfont/Makefile
index b9e73b7191e4..f8655526dab2 100644
--- a/print/ghostscript-gnu-commfont/Makefile
+++ b/print/ghostscript-gnu-commfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript-gnu-commfont
 PORTVERSION=	7.07
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 73b461e9d6b8..c1b3773ec3a5 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
+PORTREVISION=	1
 PORTREVISION=	${GS_REVISION}
 PORTEPOCH=	${GS_EPOCH}
 CATEGORIES=	print
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 520815961fce..f04c23f6298e 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
+PORTREVISION=	1
 PORTREVISION=	${GS_REVISION}
 PORTEPOCH=	${GS_EPOCH}
 CATEGORIES=	print
diff --git a/print/ghostscript7-commfont/Makefile b/print/ghostscript7-commfont/Makefile
index b9e73b7191e4..f8655526dab2 100644
--- a/print/ghostscript7-commfont/Makefile
+++ b/print/ghostscript7-commfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript-gnu-commfont
 PORTVERSION=	7.07
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/print/ghostscript7-jpnfont/Makefile b/print/ghostscript7-jpnfont/Makefile
index f5cd18821567..cb17a3efab99 100644
--- a/print/ghostscript7-jpnfont/Makefile
+++ b/print/ghostscript7-jpnfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript-gnu-jpnfont
 PORTVERSION=	7.07
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/print/ghostscript7-korfont/Makefile b/print/ghostscript7-korfont/Makefile
index c9883a21d718..06eca1b4794a 100644
--- a/print/ghostscript7-korfont/Makefile
+++ b/print/ghostscript7-korfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript-gnu-korfont
 PORTVERSION=	7.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 73b461e9d6b8..c1b3773ec3a5 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
+PORTREVISION=	1
 PORTREVISION=	${GS_REVISION}
 PORTEPOCH=	${GS_EPOCH}
 CATEGORIES=	print
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 520815961fce..f04c23f6298e 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
+PORTREVISION=	1
 PORTREVISION=	${GS_REVISION}
 PORTEPOCH=	${GS_EPOCH}
 CATEGORIES=	print
diff --git a/print/ghostview/Makefile b/print/ghostview/Makefile
index 0517b3a0c115..443d88d9702e 100644
--- a/print/ghostview/Makefile
+++ b/print/ghostview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostview
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	ghostview
@@ -15,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An X11 front-end for ghostscript, the GNU postscript previewer
 
 USE_IMAKE=	yes
+USE_XORG=	xbitmaps
 MAN1=		ghostview.1
 
 post-install:
diff --git a/print/gimp-devel-gutenprint/Makefile b/print/gimp-devel-gutenprint/Makefile
index 1f3caba12491..e649303794a6 100644
--- a/print/gimp-devel-gutenprint/Makefile
+++ b/print/gimp-devel-gutenprint/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/print/gimp-gutenprint/Makefile,v 1.2 2007/03/30 16:42:46 ahze Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	0
 PKGNAMEPREFIX=	gimp-devel-
 PKGNAMESUFFIX=	# empty
diff --git a/print/gimp-gutenprint/Makefile b/print/gimp-gutenprint/Makefile
index 109e99f4ee79..d080d23a78fd 100644
--- a/print/gimp-gutenprint/Makefile
+++ b/print/gimp-gutenprint/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/print/gimp-gutenprint/Makefile,v 1.2 2007/03/30 16:42:46 ahze Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	0
 PKGNAMEPREFIX=	gimp-
 PKGNAMESUFFIX=	# empty
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index a322480c942d..87ca50db698c 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gimp-print
 PORTVERSION=	4.2.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/gimp-print/pkg-plist b/print/gimp-print/pkg-plist
index 94cfea77c1a9..e7bd24eccf55 100644
--- a/print/gimp-print/pkg-plist
+++ b/print/gimp-print/pkg-plist
@@ -4380,17 +4380,3 @@ share/locale/uk/LC_MESSAGES/gimp-print.mo
 %%CUPS%%@dirrmtry share/cups/model/cs
 %%CUPS%%@dirrmtry share/cups/model/C
 @dirrm include/gimp-print
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
diff --git a/print/gl2ps/Makefile b/print/gl2ps/Makefile
index e6db126b2d73..0d8b18d69203 100644
--- a/print/gl2ps/Makefile
+++ b/print/gl2ps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gl2ps
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	print graphics
 MASTER_SITES=	http://www.geuz.org/gl2ps/src/
 EXTRACT_SUFX=	.tgz
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index bc97c1cff4ff..66163b21bcfa 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-cups-manager
 PORTVERSION=	0.31
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/print/gnome-cups-manager/pkg-plist b/print/gnome-cups-manager/pkg-plist
index 21bf6a8fef4b..43ea9b7a402b 100644
--- a/print/gnome-cups-manager/pkg-plist
+++ b/print/gnome-cups-manager/pkg-plist
@@ -71,33 +71,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-cups-manager.mo
 @unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true
 @dirrmtry include/libgnomecups-1/libgnomecups
 @dirrmtry include/libgnomecups-1
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 188bd4be43af..5ace94c2e034 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-print
 PORTVERSION=	0.37
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-print/0.37
diff --git a/print/gnome-print/pkg-plist b/print/gnome-print/pkg-plist
index f1ffc683a34e..0ebdefdb5faa 100644
--- a/print/gnome-print/pkg-plist
+++ b/print/gnome-print/pkg-plist
@@ -119,33 +119,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-print.mo
 @dirrm share/gnome/fonts/afms
 @dirrm include/gnome-1.0/libgnomeprint
 @dirrm etc/gnome/fonts
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/print/gnomephotoprinter/Makefile b/print/gnomephotoprinter/Makefile
index c66a339e7d40..ffd0056a6bb8 100644
--- a/print/gnomephotoprinter/Makefile
+++ b/print/gnomephotoprinter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomephotoprinter
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	http://www.fogman.de/gpp/
 DISTNAME=	gpp-${PORTVERSION}
diff --git a/print/gribouy/Makefile b/print/gribouy/Makefile
index 43013fdc428c..cbecf9f9f140 100644
--- a/print/gribouy/Makefile
+++ b/print/gribouy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gribouy
 PORTVERSION=	0.0.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print gnome
 #MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 #MASTER_SITE_SUBDIR=	gribouy/unstable.pkg/${PORTVERSION:R}
diff --git a/print/gspdf/Makefile b/print/gspdf/Makefile
index 9a1e922b59cb..f71554f17076 100644
--- a/print/gspdf/Makefile
+++ b/print/gspdf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gspdf
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	print gnustep
 MASTER_SITES=	http://www.gnustep.it/enrico/gspdf/
 
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index 55a710b99bd3..5cd9b49f83ce 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtklp
 PORTVERSION=	1.2.3
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
diff --git a/print/guitartex/Makefile b/print/guitartex/Makefile
index 55307745ecc8..2ffd29d94aae 100644
--- a/print/guitartex/Makefile
+++ b/print/guitartex/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	guitartex
 PORTVERSION=	2.8.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index 447d3334c46f..1f19d1730786 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME?=	gutenprint
 PORTVERSION=	5.1.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gimp-print
diff --git a/print/gutenprint-cups/Makefile b/print/gutenprint-cups/Makefile
index 4271c54185ab..84b966054ece 100644
--- a/print/gutenprint-cups/Makefile
+++ b/print/gutenprint-cups/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/print/gutenprint-cups/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
 
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	0
 PKGNAMESUFFIX=	-cups
 
diff --git a/print/gutenprint-foomatic/Makefile b/print/gutenprint-foomatic/Makefile
index 5e1ea3f79110..6c7eb258e0ca 100644
--- a/print/gutenprint-foomatic/Makefile
+++ b/print/gutenprint-foomatic/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/print/gutenprint-foomatic/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	0
 PKGNAMESUFFIX=	-foomatic
 
diff --git a/print/gutenprint-ijs/Makefile b/print/gutenprint-ijs/Makefile
index d5614c93e2e6..e26d69438f81 100644
--- a/print/gutenprint-ijs/Makefile
+++ b/print/gutenprint-ijs/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/print/gutenprint-ijs/Makefile,v 1.1 2007/03/30 16:42:47 ahze Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	0
 PKGNAMESUFFIX=	-ijs
 
diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile
index 43190702d270..a5b23b32b504 100644
--- a/print/gutenprint/Makefile
+++ b/print/gutenprint/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gutenprint
 PORTVERSION=	5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 3b967d9a0e66..7348d6d1e0b5 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gv
 PORTVERSION=	3.6.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index 9c880002bf01..60178bd34dc3 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hp2xx
 PORTVERSION=	3.4.4
+PORTREVISION=	1
 CATEGORIES=	print x11
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index a9c2a59af406..b4a81405f5d9 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hpijs
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hpinkjet
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 1188cb77ed6f..921e7d1ca2fc 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hplip
 PORTVERSION=	1.7.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hplip
diff --git a/print/hplip3/Makefile b/print/hplip3/Makefile
index 1188cb77ed6f..921e7d1ca2fc 100644
--- a/print/hplip3/Makefile
+++ b/print/hplip3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hplip
 PORTVERSION=	1.7.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hplip
diff --git a/print/html2ps-letter/Makefile b/print/html2ps-letter/Makefile
index 634004d1b7b3..e9376138bc3c 100644
--- a/print/html2ps-letter/Makefile
+++ b/print/html2ps-letter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	html2ps
 DISTVERSION=	1.0b5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	print www perl5
 MASTER_SITES=	http://user.it.uu.se/~jan/
diff --git a/print/hugelatex/Makefile b/print/hugelatex/Makefile
index 53cbf87ecb1f..eeaf3e43f3c2 100644
--- a/print/hugelatex/Makefile
+++ b/print/hugelatex/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=		hugelatex
 PORTVERSION=		1.0
+PORTREVISION=	1
 CATEGORIES=		print
 MASTER_SITES=		# none
 DISTFILES=		# none
diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index 3ac87db1d73d..a3a9c2fad306 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Hyperlatex
 DISTVERSION=	2.8b
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=hyperlatex
diff --git a/print/ifhp/Makefile b/print/ifhp/Makefile
index 03ff9998a598..5143ca7e0d2d 100644
--- a/print/ifhp/Makefile
+++ b/print/ifhp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ifhp
 PORTVERSION=	3.5.20
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lprng.com/pub/%SUBDIR%/ \
 		ftp://ftp.cise.ufl.edu/pub/mirrors/%SUBDIR%/ \
diff --git a/print/it-acroread/Makefile b/print/it-acroread/Makefile
index 8b67d56c8d77..58fc18e22e53 100644
--- a/print/it-acroread/Makefile
+++ b/print/it-acroread/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	it-
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/print/jabref/Makefile b/print/jabref/Makefile
index 748252d209ae..9c5606f8c384 100644
--- a/print/jabref/Makefile
+++ b/print/jabref/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	jabref
 PORTVERSION=	2.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	print java editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index 218418c3996c..50dbc78dc706 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		jadetex
 PORTVERSION=		3.13
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jadetex
diff --git a/print/kaspaliste/Makefile b/print/kaspaliste/Makefile
index c06fbee77274..6d0cc158d2ce 100644
--- a/print/kaspaliste/Makefile
+++ b/print/kaspaliste/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		kaspaliste
 PORTVERSION=		0.96
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		print kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kaspaliste
diff --git a/print/kcdlabel/Makefile b/print/kcdlabel/Makefile
index a1851eff3ff0..f5ca75c5efc6 100644
--- a/print/kcdlabel/Makefile
+++ b/print/kcdlabel/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kcdlabel
 PORTVERSION=		2.12
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=		print kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/kcdlabel/pkg-plist b/print/kcdlabel/pkg-plist
index af5fac156753..8c36424bf66d 100644
--- a/print/kcdlabel/pkg-plist
+++ b/print/kcdlabel/pkg-plist
@@ -15,8 +15,6 @@ share/locale/de/LC_MESSAGES/kcdlabel.mo
 share/locale/fr/LC_MESSAGES/kcdlabel.mo
 share/locale/hu/LC_MESSAGES/kcdlabel.mo
 share/locale/it/LC_MESSAGES/kcdlabel.mo
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrmtry share/icons/small/locolor/apps
 @dirrmtry share/icons/small/locolor
 @dirrmtry share/icons/small
diff --git a/print/kover/Makefile b/print/kover/Makefile
index f8b717e204c3..e3eabe8c6f6e 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kover
 PORTVERSION=		2.9.5
-PORTREVISION=		4
+PORTREVISION=		5
 CATEGORIES=		print kde
 MASTER_SITES=		http://lisas.de/kover/
 
diff --git a/print/kpdftool/Makefile b/print/kpdftool/Makefile
index 0cd5b05435c1..aa69afd302db 100644
--- a/print/kpdftool/Makefile
+++ b/print/kpdftool/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kpdftool
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	print kde
 MASTER_SITES=	http://www.yuanjue.net/download/
 
diff --git a/print/latex-arydshln/Makefile b/print/latex-arydshln/Makefile
index d29e69828925..5c1573918ed1 100644
--- a/print/latex-arydshln/Makefile
+++ b/print/latex-arydshln/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-arydshln
 PORTVERSION=	1.71.20040831
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
 		${MASTER_SITE_TEX_CTAN}
diff --git a/print/latex-auto-greek/Makefile b/print/latex-auto-greek/Makefile
index f007ab680d3a..a7da69ce6146 100644
--- a/print/latex-auto-greek/Makefile
+++ b/print/latex-auto-greek/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	latex-auto-greek
 PORTVERSION=	1.0b
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://a.physics.upatras.gr/~mplekos/files/
 
diff --git a/print/latex-beamer/Makefile b/print/latex-beamer/Makefile
index 00a0093bcb48..a714a3f41ce1 100644
--- a/print/latex-beamer/Makefile
+++ b/print/latex-beamer/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	latex-beamer
 PORTVERSION=	3.07
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/latex-biblist/Makefile b/print/latex-biblist/Makefile
index ac95d58bc2a8..56eec29022d3 100644
--- a/print/latex-biblist/Makefile
+++ b/print/latex-biblist/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-biblist
 PORTVERSION=	1.4.19920113
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	macros/latex209/contrib/biblist
diff --git a/print/latex-bytefield/Makefile b/print/latex-bytefield/Makefile
index 55faf028af5a..69e3a27bfff2 100644
--- a/print/latex-bytefield/Makefile
+++ b/print/latex-bytefield/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-bytefield
 PORTVERSION=	1.2.20050731
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	macros/latex/contrib/bytefield
diff --git a/print/latex-caption/Makefile b/print/latex-caption/Makefile
index a6fb478505eb..413ccdcb905f 100644
--- a/print/latex-caption/Makefile
+++ b/print/latex-caption/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-caption
 PORTVERSION=	3.0.20060112
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
 		${MASTER_SITE_TEX_CTAN}
diff --git a/print/latex-circ/Makefile b/print/latex-circ/Makefile
index 1ad0fe03d481..2eb1f11c710d 100644
--- a/print/latex-circ/Makefile
+++ b/print/latex-circ/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	circ
 PORTVERSION=	1.0f
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://cam.ctan.org/tex-archive/macros/generic/diagrams/ \
 		http://theory.uwinnipeg.ca/scripts/CTAN/macros/generic/diagrams/
diff --git a/print/latex-cjk/Makefile b/print/latex-cjk/Makefile
index d1cb57c21497..2dcc5a666ff0 100644
--- a/print/latex-cjk/Makefile
+++ b/print/latex-cjk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CJK
 PORTVERSION=	4.7.0
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	http://cjk.ffii.org/ \
 		ftp://freebsd.csie.ntu.edu.tw/users/rafan/
diff --git a/print/latex-feynmf/Makefile b/print/latex-feynmf/Makefile
index 7b38095eaf84..015e38e75e97 100644
--- a/print/latex-feynmf/Makefile
+++ b/print/latex-feynmf/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-feynmf
 PORTVERSION=	1.08.19961202
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	macros/latex/contrib/feynmf
diff --git a/print/latex-keystroke/Makefile b/print/latex-keystroke/Makefile
index 0c4b36959050..042303ac1dcf 100644
--- a/print/latex-keystroke/Makefile
+++ b/print/latex-keystroke/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-keystroke
 PORTVERSION=	1.0.20001109
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	macros/latex/contrib/keystroke
diff --git a/print/latex-logpap/Makefile b/print/latex-logpap/Makefile
index dd9263ded972..f546c877426c 100644
--- a/print/latex-logpap/Makefile
+++ b/print/latex-logpap/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-logpap
 PORTVERSION=	0.6.20040201
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
 		${MASTER_SITE_TEX_CTAN}
diff --git a/print/latex-mathabx/Makefile b/print/latex-mathabx/Makefile
index 28ce0a07a121..94516ed4d732 100644
--- a/print/latex-mathabx/Makefile
+++ b/print/latex-mathabx/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-mathabx
 PORTVERSION=	1.0.20050518
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://auemath.aichi-edu.ac.jp/~khotta/ghost/abx/
 DISTFILES=	mathabx${EXTRACT_SUFX} abxtype1${EXTRACT_SUFX}
diff --git a/print/latex-msc/Makefile b/print/latex-msc/Makefile
index 648153aa01d5..0280ff480c12 100644
--- a/print/latex-msc/Makefile
+++ b/print/latex-msc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-msc
 PORTVERSION=	1.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
 		${MASTER_SITE_TEX_CTAN}
diff --git a/print/latex-pgf/Makefile b/print/latex-pgf/Makefile
index b67a2a719f25..587cf242fd04 100644
--- a/print/latex-pgf/Makefile
+++ b/print/latex-pgf/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	latex-pgf
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pgf
diff --git a/print/latex-subfloat/Makefile b/print/latex-subfloat/Makefile
index f06784f0492d..a771e3ffa4d1 100644
--- a/print/latex-subfloat/Makefile
+++ b/print/latex-subfloat/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-subfloat
 PORTVERSION=	2.14.20030821
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	macros/latex/contrib/subfloat
diff --git a/print/latex-svninfo/Makefile b/print/latex-svninfo/Makefile
index 8bfb41e82c99..619753da55fe 100644
--- a/print/latex-svninfo/Makefile
+++ b/print/latex-svninfo/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	svninfo
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.brucker.ch/projects/svninfo/download/ \
 		${MASTER_SITE_LOCAL}
diff --git a/print/latex-timing/Makefile b/print/latex-timing/Makefile
index 410c4f01a474..a7c31ce1a5bc 100644
--- a/print/latex-timing/Makefile
+++ b/print/latex-timing/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-timing
 PORTVERSION=	1.0.19940515
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	macros/latex/contrib/timing
diff --git a/print/latex-tipa/Makefile b/print/latex-tipa/Makefile
index 7aba14642f9b..17069b32d2cb 100644
--- a/print/latex-tipa/Makefile
+++ b/print/latex-tipa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	latex-tipa
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.braml.org/
 DISTNAME=	tipa-${PORTVERSION}
diff --git a/print/latex-ucs/Makefile b/print/latex-ucs/Makefile
index f9a5800c6bc0..d1bce0ded6c2 100644
--- a/print/latex-ucs/Makefile
+++ b/print/latex-ucs/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-ucs
 PORTVERSION=	20041017
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.unruh.de/DniQ/latex/unicode/
 DISTNAME=	unicode
diff --git a/print/latex2slides/Makefile b/print/latex2slides/Makefile
index e47e498f8837..a96630438131 100644
--- a/print/latex2slides/Makefile
+++ b/print/latex2slides/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	latex2slides
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/latexmk/Makefile b/print/latexmk/Makefile
index e7bfc2de223a..2b58487ba8df 100644
--- a/print/latexmk/Makefile
+++ b/print/latexmk/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	latexmk
 PORTVERSION=	307a
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.phys.psu.edu/~collins/software/latexmk/
 
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index 6d9a683f7387..bcf2fed8b83b 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lgrind
 PORTVERSION=	3.67
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 #MASTER_SITES=	ftp://ftp.dante.de/tex-archive/support/ \
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 7861e2abee05..8905db35af4e 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomecups
 PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/print/libgnomecups/pkg-plist b/print/libgnomecups/pkg-plist
index 707caa19865c..51a176d33211 100644
--- a/print/libgnomecups/pkg-plist
+++ b/print/libgnomecups/pkg-plist
@@ -47,29 +47,5 @@ share/locale/zh_CN/LC_MESSAGES/libgnomecups.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomecups.mo
 @dirrmtry include/libgnomecups-1/libgnomecups
 @dirrmtry include/libgnomecups-1
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 41270b8d3016..52588b35ab4a 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgnomeprint
 PORTVERSION=	2.18.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 6b4b5a758bc9..0216d7e71fe8 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -181,55 +181,19 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 @dirrm include/libgnomeprint-%%LIBVERSION%%
 @dirrm etc/gnome/libgnomeprint-2.0/fonts
 @dirrm etc/gnome/libgnomeprint-2.0
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile
index afe2d6f2761d..40b204c50379 100644
--- a/print/libgnomeprintmm/Makefile
+++ b/print/libgnomeprintmm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomeprintmm
 PORTVERSION=	2.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
diff --git a/print/libotf/Makefile b/print/libotf/Makefile
index d2649f69c487..69881ecff7f2 100644
--- a/print/libotf/Makefile
+++ b/print/libotf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libotf
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	print devel
 MASTER_SITES=	http://www.m17n.org/libotf/
 
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index f0c3335842d7..976e0325169b 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	lilypond
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print audio
 MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/:src \
 		http://distfiles.master.finkmirrors.net/:rpm
diff --git a/print/lilypond/pkg-plist b/print/lilypond/pkg-plist
index 52a8476047b5..5910bccaf35c 100644
--- a/print/lilypond/pkg-plist
+++ b/print/lilypond/pkg-plist
@@ -989,10 +989,6 @@ share/locale/sv/LC_MESSAGES/lilypond.mo
 @dirrm %%DATADIR%%/%%PORTVERSION%%/make
 @dirrm %%DATADIR%%/%%PORTVERSION%%
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @exec scrollkeeper-install -q %D/%%CONDITIONAL%%share/omf/lilypond/%%PORTVERSION%%/lilypond-internals.html.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/%%CONDITIONAL%%share/omf/lilypond/%%PORTVERSION%%/lilypond-internals.html.omf 2>/dev/null || /usr/bin/true
 @exec scrollkeeper-install -q %D/%%CONDITIONAL%%share/omf/lilypond/%%PORTVERSION%%/lilypond.html.omf 2>/dev/null || /usr/bin/true
diff --git a/print/lpr-wrapper/Makefile b/print/lpr-wrapper/Makefile
index b8e0ca51af2e..76253f7e5878 100644
--- a/print/lpr-wrapper/Makefile
+++ b/print/lpr-wrapper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lpr-wrapper
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.mathstat.dal.ca/~selinger/lpr-wrapper/download/
 
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 401c7a021676..331f51a45efe 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.planetmirror.com/pub/lyx/stable/ \
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 401c7a021676..331f51a45efe 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.planetmirror.com/pub/lyx/stable/ \
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 401c7a021676..331f51a45efe 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.planetmirror.com/pub/lyx/stable/ \
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 401c7a021676..331f51a45efe 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.planetmirror.com/pub/lyx/stable/ \
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 401c7a021676..331f51a45efe 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.planetmirror.com/pub/lyx/stable/ \
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 64ff7171bcec..f81d535a032d 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	magicfilter
 PORTVERSION=	2.3.h
+PORTREVISION=	1
 PORREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.pell.portland.or.us/~orc/Code/magicfilter/
diff --git a/print/mapagi/Makefile b/print/mapagi/Makefile
index bcb49e94c9fc..cd8ef40b04bf 100644
--- a/print/mapagi/Makefile
+++ b/print/mapagi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mapagi
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://members.ferrara.linux.it/calicant/mapagi/
 
diff --git a/print/mftrace/Makefile b/print/mftrace/Makefile
index ad44fecd7a41..3db1a76f10d4 100644
--- a/print/mftrace/Makefile
+++ b/print/mftrace/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mftrace
 PORTVERSION=	1.2.14
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	LOCAL/chinsan \
 		http://lilypond.org/download/sources/mftrace/
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 71e16e975270..9cd2067a40dd 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mgv
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.netsw.org/graphic/postscript/interpreter/mgv/ \
 		http://mirror2.unixfreunde.de/ \
diff --git a/print/mup/Makefile b/print/mup/Makefile
index d882a3db7fd1..90ccbc93d3eb 100644
--- a/print/mup/Makefile
+++ b/print/mup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mup
 PORTVERSION=	5.3
+PORTREVISION=	1
 CATEGORIES=	print audio
 MASTER_SITES=	ftp://ftp.arkkra.com/pub/unix/
 DISTFILES=	mup${PORTVERSION:S/.//}src.tar.gz
diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index dce7baaac751..803d0a90e01e 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	muttprint
 PORTVERSION=	0.72d
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	print mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	muttprint
diff --git a/print/nl-acroread/Makefile b/print/nl-acroread/Makefile
index f3817b6b0c24..519196f30325 100644
--- a/print/nl-acroread/Makefile
+++ b/print/nl-acroread/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	nl-
 
 MASTERDIR=	${.CURDIR}/../../print/acroread7
diff --git a/print/no-acroread/Makefile b/print/no-acroread/Makefile
index 16ab0e254325..1c3ae5fc8ee9 100644
--- a/print/no-acroread/Makefile
+++ b/print/no-acroread/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	no-
 
 MASTERDIR=	${.CURDIR}/../../print/acroread7
diff --git a/print/p5-XML-ApacheFOP/Makefile b/print/p5-XML-ApacheFOP/Makefile
index 4fb93cd12ffc..afdbc498d644 100644
--- a/print/p5-XML-ApacheFOP/Makefile
+++ b/print/p5-XML-ApacheFOP/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XML-ApacheFOP
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
diff --git a/print/passivetex/Makefile b/print/passivetex/Makefile
index 8e6147aa1202..89e4c01d8d9b 100644
--- a/print/passivetex/Makefile
+++ b/print/passivetex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	passivetex
 PORTVERSION=	1.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.tei-c.org/Software/passivetex/
 DISTNAME=	${PORTNAME}
diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile
index 6163c59f3be4..9bbe00b8adac 100644
--- a/print/pdfcube/Makefile
+++ b/print/pdfcube/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pdfcube
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	# http://code.100allora.it/pdfcube/attachment/wiki/WikiStart/${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/print/pdfjam/Makefile b/print/pdfjam/Makefile
index d1ca9924d346..14622947ff82 100644
--- a/print/pdfjam/Makefile
+++ b/print/pdfjam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pdfjam
 PORTVERSION=	1.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam/ \
 		http://www.it.ca/~paul/src/
diff --git a/print/pdfmerge/Makefile b/print/pdfmerge/Makefile
index 2dfcbf5ab530..192ddf2f9a15 100644
--- a/print/pdfmerge/Makefile
+++ b/print/pdfmerge/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pdfmerge
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/ \
 		http://web.hku.hk/cgi-bin/cgiwrap/kangsg/freeware/
diff --git a/print/pdq/Makefile b/print/pdq/Makefile
index 865119a35016..afd3fcd0ab65 100644
--- a/print/pdq/Makefile
+++ b/print/pdq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pdq
 PORTVERSION=	2.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	http://pdq.sourceforge.net/ftp/
 EXTRACT_SUFX=	.tgz
diff --git a/print/pecl-pdflib/Makefile b/print/pecl-pdflib/Makefile
index 3798049688a2..e9cd7df527cd 100644
--- a/print/pecl-pdflib/Makefile
+++ b/print/pecl-pdflib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pdflib
 PORTVERSION=	2.1.3
+PORTREVISION=	1
 CATEGORIES=	print pear
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/print/pips-sc60s/Makefile b/print/pips-sc60s/Makefile
index 094cf9289aa4..d6141d35cd7f 100644
--- a/print/pips-sc60s/Makefile
+++ b/print/pips-sc60s/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus C60 Series
 
diff --git a/print/pips-sc65_66s/Makefile b/print/pips-sc65_66s/Makefile
index ceb3fe408a64..14304610f847 100644
--- a/print/pips-sc65_66s/Makefile
+++ b/print/pips-sc65_66s/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus C65/C66 Series
 
diff --git a/print/pips-sc80s/Makefile b/print/pips-sc80s/Makefile
index bf41954608cd..3543fafcc45a 100644
--- a/print/pips-sc80s/Makefile
+++ b/print/pips-sc80s/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus C80 Series
 
diff --git a/print/pips-sc84_83s/Makefile b/print/pips-sc84_83s/Makefile
index 09202b6aeed3..5c9340ecd799 100644
--- a/print/pips-sc84_83s/Makefile
+++ b/print/pips-sc84_83s/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus C84/C83 Series
 
diff --git a/print/pips-sc85_86s/Makefile b/print/pips-sc85_86s/Makefile
index 72eba479470d..0cc105ce7aae 100644
--- a/print/pips-sc85_86s/Makefile
+++ b/print/pips-sc85_86s/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus C85/C86 Series
 
diff --git a/print/pips-scx3500_3600s/Makefile b/print/pips-scx3500_3600s/Makefile
index 20ec77de3a57..d08031de97ae 100644
--- a/print/pips-scx3500_3600s/Makefile
+++ b/print/pips-scx3500_3600s/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus CX3500/CX3600 Series
 
diff --git a/print/pips-sp2100_2200/Makefile b/print/pips-sp2100_2200/Makefile
index 4d4981786dda..935ec575e5e8 100644
--- a/print/pips-sp2100_2200/Makefile
+++ b/print/pips-sp2100_2200/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus Photo 2100/2200
 
diff --git a/print/pips-spr200_210/Makefile b/print/pips-spr200_210/Makefile
index 6b91c8bc5e4e..07c01f7b2e18 100644
--- a/print/pips-spr200_210/Makefile
+++ b/print/pips-spr200_210/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus Photo R200/R210
 
diff --git a/print/pips-spr300_310/Makefile b/print/pips-spr300_310/Makefile
index 5a50a3482339..d27d4db486ca 100644
--- a/print/pips-spr300_310/Makefile
+++ b/print/pips-spr300_310/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus Photo R300/R310
 
diff --git a/print/pips-spr800/Makefile b/print/pips-spr800/Makefile
index e1c3243d1e8e..a287ce6cd4be 100644
--- a/print/pips-spr800/Makefile
+++ b/print/pips-spr800/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus Photo R800
 
diff --git a/print/pips2200/Makefile b/print/pips2200/Makefile
index 5572d048c4ad..2a7c457cf481 100644
--- a/print/pips2200/Makefile
+++ b/print/pips2200/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-2200C
 
diff --git a/print/pips3000/Makefile b/print/pips3000/Makefile
index 3d1f1478bcc7..1ce86e85fded 100644
--- a/print/pips3000/Makefile
+++ b/print/pips3000/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-3000C
 
diff --git a/print/pips3300/Makefile b/print/pips3300/Makefile
index cc6b3248eb79..a9313de03d46 100644
--- a/print/pips3300/Makefile
+++ b/print/pips3300/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-3300C
 
diff --git a/print/pips3500/Makefile b/print/pips3500/Makefile
index 1fe512b74ac1..2b77acec5297 100644
--- a/print/pips3500/Makefile
+++ b/print/pips3500/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-3500C
 
diff --git a/print/pips4000/Makefile b/print/pips4000/Makefile
index ebe3d7688bdf..1bdb5dcc3b7e 100644
--- a/print/pips4000/Makefile
+++ b/print/pips4000/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-4000PX
 
diff --git a/print/pips670/Makefile b/print/pips670/Makefile
index 8033ca1d4a4d..b0662fba0be0 100644
--- a/print/pips670/Makefile
+++ b/print/pips670/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-670C
 
diff --git a/print/pips730/Makefile b/print/pips730/Makefile
index 601e83ed7e09..baea3240d294 100644
--- a/print/pips730/Makefile
+++ b/print/pips730/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-730C
 
diff --git a/print/pips740-cups/Makefile b/print/pips740-cups/Makefile
index 77f980b285ee..d7b764fa8760 100644
--- a/print/pips740-cups/Makefile
+++ b/print/pips740-cups/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-740C (for CUPS)
 
diff --git a/print/pips740/Makefile b/print/pips740/Makefile
index c6a115bdfc63..7579fe1aa5ad 100644
--- a/print/pips740/Makefile
+++ b/print/pips740/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-740C (for LPR)
 
diff --git a/print/pips750_2000/Makefile b/print/pips750_2000/Makefile
index 0ca69c8ee988..918045c5b2c1 100644
--- a/print/pips750_2000/Makefile
+++ b/print/pips750_2000/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-750C PM-2000C
 
diff --git a/print/pips760/Makefile b/print/pips760/Makefile
index d0117ea13576..415db2db8db0 100644
--- a/print/pips760/Makefile
+++ b/print/pips760/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-760C
 
diff --git a/print/pips770/Makefile b/print/pips770/Makefile
index 94050e202b46..ddda40ba4c5e 100644
--- a/print/pips770/Makefile
+++ b/print/pips770/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-770C
 
diff --git a/print/pips780/Makefile b/print/pips780/Makefile
index 7da5835d16de..777593b2668a 100644
--- a/print/pips780/Makefile
+++ b/print/pips780/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-780C
 
diff --git a/print/pips800/Makefile b/print/pips800/Makefile
index 41fdef038f30..58bcf404deb0 100644
--- a/print/pips800/Makefile
+++ b/print/pips800/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-800C
 
diff --git a/print/pips820/Makefile b/print/pips820/Makefile
index c771e7a87c2b..453e2639b595 100644
--- a/print/pips820/Makefile
+++ b/print/pips820/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-820C
 
diff --git a/print/pips870-cups/Makefile b/print/pips870-cups/Makefile
index 6b0273ee8e93..74ae98e16643 100644
--- a/print/pips870-cups/Makefile
+++ b/print/pips870-cups/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-870C (for CUPS)
 
diff --git a/print/pips870/Makefile b/print/pips870/Makefile
index 23df67f131cc..0bc68ba5dd6c 100644
--- a/print/pips870/Makefile
+++ b/print/pips870/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-870C (for LPR)
 
diff --git a/print/pips880/Makefile b/print/pips880/Makefile
index a72587964730..8283aba1a8f3 100644
--- a/print/pips880/Makefile
+++ b/print/pips880/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-880C
 
diff --git a/print/pips900/Makefile b/print/pips900/Makefile
index 713d4b5b4153..dd52e4470e0c 100644
--- a/print/pips900/Makefile
+++ b/print/pips900/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-900C
 
diff --git a/print/pips930/Makefile b/print/pips930/Makefile
index 4d6bd744458d..8e0a4dc753d2 100644
--- a/print/pips930/Makefile
+++ b/print/pips930/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-930C (for LPR)
 
diff --git a/print/pips940/Makefile b/print/pips940/Makefile
index d5993ea36fd7..2d745b6b4aeb 100644
--- a/print/pips940/Makefile
+++ b/print/pips940/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-940C
 
diff --git a/print/pips970-cups/Makefile b/print/pips970-cups/Makefile
index fdc83797bf3f..dc58f8cbd5c4 100644
--- a/print/pips970-cups/Makefile
+++ b/print/pips970-cups/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-970C (for CUPS)
 
diff --git a/print/pips970/Makefile b/print/pips970/Makefile
index e83c0b5ae1e3..e2987bae3f47 100644
--- a/print/pips970/Makefile
+++ b/print/pips970/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-970C (for LPR)
 
diff --git a/print/pips980/Makefile b/print/pips980/Makefile
index 28f7a6099d70..8592b277d85c 100644
--- a/print/pips980/Makefile
+++ b/print/pips980/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-980C
 
diff --git a/print/pipsg700/Makefile b/print/pipsg700/Makefile
index dce669930a81..175462b17bcb 100644
--- a/print/pipsg700/Makefile
+++ b/print/pipsg700/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-G700
 
diff --git a/print/pipsg800/Makefile b/print/pipsg800/Makefile
index b060b2b3359d..2d08e2e167d6 100644
--- a/print/pipsg800/Makefile
+++ b/print/pipsg800/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-G800
 
diff --git a/print/pipsg900/Makefile b/print/pipsg900/Makefile
index ae0b838ac0a9..1bdf37daeb6b 100644
--- a/print/pipsg900/Makefile
+++ b/print/pipsg900/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PX-G900
 
diff --git a/print/pipsv500/Makefile b/print/pipsv500/Makefile
index 7cb90488038d..5f27a67a54d4 100644
--- a/print/pipsv500/Makefile
+++ b/print/pipsv500/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PX-V500
 
diff --git a/print/pipsv600/Makefile b/print/pipsv600/Makefile
index 52d4f3420b8a..1ec5274a59bc 100644
--- a/print/pipsv600/Makefile
+++ b/print/pipsv600/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PX-V600
 
diff --git a/print/pipsv700-cups/Makefile b/print/pipsv700-cups/Makefile
index 61274ad53b94..f76eeeb5a48f 100644
--- a/print/pipsv700-cups/Makefile
+++ b/print/pipsv700-cups/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PX-V700 (for CUPS)
 
diff --git a/print/pipsv700/Makefile b/print/pipsv700/Makefile
index cce0b150264f..60c7e7028171 100644
--- a/print/pipsv700/Makefile
+++ b/print/pipsv700/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PX-V700 (for LPR)
 
diff --git a/print/pkpgcounter/Makefile b/print/pkpgcounter/Makefile
index 24f970ae7e08..3165253db7c2 100644
--- a/print/pkpgcounter/Makefile
+++ b/print/pkpgcounter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pkpgcounter
 PORTVERSION=	2.16
+PORTREVISION=	1
 CATEGORIES=	print python
 MASTER_SITES=	http://www.pykota.com/software/pkpgcounter/download/tarballs/
 
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 1fb264d76ab5..17b8e0a13c19 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pnm2ppa
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/ps2eps/Makefile b/print/ps2eps/Makefile
index 415c5c3eb6b4..12b2fe6472aa 100644
--- a/print/ps2eps/Makefile
+++ b/print/ps2eps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ps2eps
 PORTVERSION=	1.58
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.tm.uka.de/~bless/ \
 		http://www.ipv6.tm.uka.de/~bless/
diff --git a/print/psdim/Makefile b/print/psdim/Makefile
index 8ed5ede5a364..075250d20632 100644
--- a/print/psdim/Makefile
+++ b/print/psdim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	psdim
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.mathstat.dal.ca/~selinger/psdim/download/
 
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index 8b72a93a4dcc..fc9508a316e3 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pslib
 PORTVERSION=	0.2.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/pstotext/Makefile b/print/pstotext/Makefile
index 5290d8801bcc..f4c9fe807e15 100644
--- a/print/pstotext/Makefile
+++ b/print/pstotext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pstotext
 PORTVERSION=	1.8g
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.breuninger.org/files/distfiles/
 DISTNAME=	${PORTNAME}
diff --git a/print/pup/Makefile b/print/pup/Makefile
index 1751ab06fa88..8a1ecaed95c2 100644
--- a/print/pup/Makefile
+++ b/print/pup/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pup
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 #MASTER_SITES=	http://download.sourceforge.net/pup/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/print/py-pyscript/Makefile b/print/py-pyscript/Makefile
index 6c4c6c3b4cf4..db088b5857d1 100644
--- a/print/py-pyscript/Makefile
+++ b/print/py-pyscript/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pyscript
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	print graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/ruby-gnomeprint/Makefile b/print/ruby-gnomeprint/Makefile
index 588a460e2cc1..d15b704705d7 100644
--- a/print/ruby-gnomeprint/Makefile
+++ b/print/ruby-gnomeprint/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnomeprint
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	print ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 08d0b11381b3..076741cf3bc9 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	scribus
 PORTVERSION=	1.3.3.4
+PORTREVISION=	1
 CATEGORIES=	print editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scribus.net/downloads/${PORTVERSION}/
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 08d0b11381b3..076741cf3bc9 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	scribus
 PORTVERSION=	1.3.3.4
+PORTREVISION=	1
 CATEGORIES=	print editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scribus.net/downloads/${PORTVERSION}/
diff --git a/print/sgf2tex/Makefile b/print/sgf2tex/Makefile
index bb9aadedb70c..45c2e20673c4 100644
--- a/print/sgf2tex/Makefile
+++ b/print/sgf2tex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sgf2tex
 PORTVERSION=	3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://sporadic.stanford.edu/bump/
 
diff --git a/print/sv-acroread/Makefile b/print/sv-acroread/Makefile
index b78c9ca3035d..fa2f1d898a8f 100644
--- a/print/sv-acroread/Makefile
+++ b/print/sv-acroread/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTVERSION=	7.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	sv-
 
 MASTERDIR=	${.CURDIR}/../../print/acroread7
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index c1b55e5fb6db..d4644c6f9af4 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	teTeX-base
 PORTVERSION=	3.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 3202fc56c4c5..8aebb6fbe611 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	teTeX
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/print/tex-omegaware-old/Makefile b/print/tex-omegaware-old/Makefile
index ad0238eaee0c..00bdea394b63 100644
--- a/print/tex-omegaware-old/Makefile
+++ b/print/tex-omegaware-old/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	tex-omegaware-old
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=     hrs/teTeX
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index ce4b75a02ce3..d81d240b3724 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	texinfo
 PORTVERSION=	4.8
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/texinfo/pkg-plist b/print/texinfo/pkg-plist
index 741f7a76e03e..f56e4f32d5e8 100644
--- a/print/texinfo/pkg-plist
+++ b/print/texinfo/pkg-plist
@@ -50,17 +50,3 @@ share/locale/zh_TW/LC_MESSAGES/texinfo.mo
 @dirrmtry %%TEXMFLOCAL%%/pdftex
 @dirrmtry %%TEXMFLOCAL%%
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/de_AT/LC_MESSAGES
-@dirrmtry share/locale/de_AT
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/print/texpower/Makefile b/print/texpower/Makefile
index b40526ed0c75..54ef74dd71db 100644
--- a/print/texpower/Makefile
+++ b/print/texpower/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	texpower
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/tipograf/Makefile b/print/tipograf/Makefile
index c5161bc3655f..cfd862d90215 100644
--- a/print/tipograf/Makefile
+++ b/print/tipograf/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	tipograf
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.falk-henrich.de/download/
 
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 74ff8c7cf51b..61396ab1f802 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transfig
 PORTVERSION=	3.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.xfig.org/xfigdist/ \
 		ftp://www-epb.lbl.gov/xfig/%SUBDIR%/
diff --git a/print/typetools/Makefile b/print/typetools/Makefile
index 535cc41ab5f2..e8f5529fd6e6 100644
--- a/print/typetools/Makefile
+++ b/print/typetools/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	typetools
 PORTVERSION=	2.60
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.lcdf.org/type/
 DISTNAME=	lcdf-${PORTNAME}-${PORTVERSION}
diff --git a/print/virtualpaper/Makefile b/print/virtualpaper/Makefile
index 0e031593f711..4c1cc922cb16 100644
--- a/print/virtualpaper/Makefile
+++ b/print/virtualpaper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	virtualpaper
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 DISTFILES=
 
diff --git a/print/wmlpq/Makefile b/print/wmlpq/Makefile
index cf34ead2724d..26e22453ce8a 100644
--- a/print/wmlpq/Makefile
+++ b/print/wmlpq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmlpq
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print windowmaker
 MASTER_SITES=	http://www.ur.uklinux.net/wmlpq/dl/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/print/xdvi/Makefile b/print/xdvi/Makefile
index e623e0824cc2..599b1d1fe68b 100644
--- a/print/xdvi/Makefile
+++ b/print/xdvi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvi
 PORTVERSION=	pl20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 8ca8e69a3f5a..68c620bb8e22 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvik
 PORTVERSION=	22.84.10
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdvi
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index c85ca7402151..06b8d1046087 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-print
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	print xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DISTNAME=	xfprint-${PORTVERSION}
diff --git a/print/xmbibtex/Makefile b/print/xmbibtex/Makefile
index 35495e4900a5..76f9fada1de0 100644
--- a/print/xmbibtex/Makefile
+++ b/print/xmbibtex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmbibtex
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	print databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/tex
diff --git a/print/xmltex/Makefile b/print/xmltex/Makefile
index 82da00a15755..92faea8c93ac 100644
--- a/print/xmltex/Makefile
+++ b/print/xmltex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		xmltex
 PORTVERSION=		1.9
-PORTREVISION=		4
+PORTREVISION=		5
 CATEGORIES=		print
 MASTER_SITES=		ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
 			${MASTER_SITE_TEX_CTAN}
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 873d3a4d420a..c4f8bcbdac58 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpp
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cups
diff --git a/print/xtexsh/Makefile b/print/xtexsh/Makefile
index 4667d1ab66e8..15a7d663c8fe 100644
--- a/print/xtexsh/Makefile
+++ b/print/xtexsh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtexsh
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.mat.univie.ac.at/pub/teschl/xtexsh/
 DISTNAME=	${PORTNAME}-1.4-2
diff --git a/russian/artwiz-ru/Makefile b/russian/artwiz-ru/Makefile
index 488ce83dd3d7..866d46c405da 100644
--- a/russian/artwiz-ru/Makefile
+++ b/russian/artwiz-ru/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	artwiz-ru
 PORTVERSION=	20041031
+PORTREVISION=	1
 CATEGORIES=	russian x11-fonts
 MASTER_SITES=	http://dev.gentoo.org/~sergey/ \
 		${MASTER_SITE_LOCAL}
diff --git a/russian/calligra-l10n/Makefile b/russian/calligra-l10n/Makefile
index 8ecc4ff95f87..e02bcbae183b 100644
--- a/russian/calligra-l10n/Makefile
+++ b/russian/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	russian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/russian/kde3-i18n/Makefile b/russian/kde3-i18n/Makefile
index 158fe7d250d9..ec7c488c193a 100644
--- a/russian/kde3-i18n/Makefile
+++ b/russian/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	russian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/russian/kde4-l10n/Makefile b/russian/kde4-l10n/Makefile
index 158fe7d250d9..ec7c488c193a 100644
--- a/russian/kde4-l10n/Makefile
+++ b/russian/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	russian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/russian/koffice-i18n/Makefile b/russian/koffice-i18n/Makefile
index 8ecc4ff95f87..e02bcbae183b 100644
--- a/russian/koffice-i18n/Makefile
+++ b/russian/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	russian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/russian/koffice-kde4-l10n/Makefile b/russian/koffice-kde4-l10n/Makefile
index 8ecc4ff95f87..e02bcbae183b 100644
--- a/russian/koffice-kde4-l10n/Makefile
+++ b/russian/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	russian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/russian/ksocrat/Makefile b/russian/ksocrat/Makefile
index 9fedf3d4b318..997a33e5bc5f 100644
--- a/russian/ksocrat/Makefile
+++ b/russian/ksocrat/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ksocrat
 PORTVERSION=	3.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	russian kde
 MASTER_SITES=	http://ksocrat.linux.kiev.ua/download/
 
diff --git a/russian/muttprint/Makefile b/russian/muttprint/Makefile
index 5139110cc73f..48a0c4a68e69 100644
--- a/russian/muttprint/Makefile
+++ b/russian/muttprint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	muttprint
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	russian print
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/russian/prawda/Makefile b/russian/prawda/Makefile
index 4b22fa79e59d..ed72acc15f9f 100644
--- a/russian/prawda/Makefile
+++ b/russian/prawda/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	prawda
 PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	russian
 MASTER_SITES=	http://www.prawda.newmail.ru/
 
diff --git a/russian/pscyr/Makefile b/russian/pscyr/Makefile
index 270a760591c9..a454fdd9e2be 100644
--- a/russian/pscyr/Makefile
+++ b/russian/pscyr/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	PSCyr
 PATCH_LEVEL=	2
 PORTVERSION=	0.4c${PATCH_LEVEL}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	russian print
 MASTER_SITES=	ftp://scon155.phys.msu.su/pub/russian/psfonts/ \
 		ftp://ftp.vsu.ru/pub/tex/font-packs/pscyr/
diff --git a/russian/wmcyrx/Makefile b/russian/wmcyrx/Makefile
index 60310096dcee..3dd77873a1eb 100644
--- a/russian/wmcyrx/Makefile
+++ b/russian/wmcyrx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmcyrx
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	russian windowmaker
 MASTER_SITES=	http://ozz.pp.ru/distfiles/ \
 		ftp://ftp.vistdon.ru/pub/unix/X/wmanagers/windowmaker/
diff --git a/russian/xcyrBGR/Makefile b/russian/xcyrBGR/Makefile
index 3cf4cb44045a..f0455284948c 100644
--- a/russian/xcyrBGR/Makefile
+++ b/russian/xcyrBGR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcyrBGR
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	russian
 MASTER_SITES=	ftp://ftp.slavof.net/pub/FreeBSD/X11/cyrillic/ \
 		ftp://mail.partners-bg.org/pub/FreeBSD/X11/cyrillic/ \
diff --git a/russian/xneur/Makefile b/russian/xneur/Makefile
index f2da1cd70665..fc03f5ec88ef 100644
--- a/russian/xneur/Makefile
+++ b/russian/xneur/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xneur
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	russian
 MASTER_SITES=	http://dists.xneur.ru/release-0.5.0/tgz/ CENKES
 
diff --git a/russian/xruskb/Makefile b/russian/xruskb/Makefile
index 63c0e56da83f..94bd21b19fa6 100644
--- a/russian/xruskb/Makefile
+++ b/russian/xruskb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xruskb
 PORTVERSION=	1.15.4
+PORTREVISION=	1
 CATEGORIES=	russian x11
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/source/xruskb/
 
diff --git a/science/afni/Makefile b/science/afni/Makefile
index 8a918e89ba4e..4e7a539cc82f 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -17,6 +17,7 @@
 
 PORTNAME=	afni
 PORTVERSION=	2007.04.18.1830
+PORTREVISION=	1
 CATEGORIES=	science biology graphics
 MASTER_SITES=	http://www.neuro.mcw.edu/~bacon/Ports/distfiles/AFNI/${PORTVERSION}/ \
 		http://afni.nimh.nih.gov/pub/dist/tgz/
@@ -40,6 +41,7 @@ RUN_DEPENDS=	cjpeg:${PORTSDIR}/graphics/jpeg \
 BROKEN=	Does not compile on sparc64: "undefined reference to '_mcount'"
 .endif
 
+USE_GL=		glw
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
diff --git a/science/bblimage/Makefile b/science/bblimage/Makefile
index 47917f152c24..5962695151fd 100644
--- a/science/bblimage/Makefile
+++ b/science/bblimage/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bblimage
 PORTVERSION=	0.66
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	miwi
diff --git a/science/cdcl/Makefile b/science/cdcl/Makefile
index 997fbd4fe026..f6c0d21944bf 100644
--- a/science/cdcl/Makefile
+++ b/science/cdcl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cdcl
 PORTVERSION=	5.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.gfd-dennou.org/arch/dcl/
 DISTNAME=	dcl-5.3-C
diff --git a/science/chemtool-devel/Makefile b/science/chemtool-devel/Makefile
index 4f93bca7699d..f0f0781ed707 100644
--- a/science/chemtool-devel/Makefile
+++ b/science/chemtool-devel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	chemtool
 PORTVERSION=	1.7.20050716
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
 
diff --git a/science/chemtool-devel/pkg-plist b/science/chemtool-devel/pkg-plist
index 5d9c69788757..25c82ffa82a2 100644
--- a/science/chemtool-devel/pkg-plist
+++ b/science/chemtool-devel/pkg-plist
@@ -47,7 +47,3 @@ share/locale/nl/LC_MESSAGES/chemtool.mo
 share/locale/pl/LC_MESSAGES/chemtool.mo
 share/locale/pt_BR/LC_MESSAGES/chemtool.mo
 share/locale/ru/LC_MESSAGES/chemtool.mo
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile
index 328c55005ec8..b94261ae118e 100644
--- a/science/chemtool/Makefile
+++ b/science/chemtool/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	chemtool
 PORTVERSION=	1.6.10
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
 
diff --git a/science/chemtool/pkg-plist b/science/chemtool/pkg-plist
index 0060de2780c0..9987f9f7a663 100644
--- a/science/chemtool/pkg-plist
+++ b/science/chemtool/pkg-plist
@@ -42,8 +42,4 @@ share/locale/fr/LC_MESSAGES/chemtool.mo
 share/locale/pl/LC_MESSAGES/chemtool.mo
 share/locale/pt_BR/LC_MESSAGES/chemtool.mo
 share/locale/ru/LC_MESSAGES/chemtool.mo
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrm %%EXAMPLESDIR%%
diff --git a/science/dcl/Makefile b/science/dcl/Makefile
index 1df732e9045a..a53ee5c94f3e 100644
--- a/science/dcl/Makefile
+++ b/science/dcl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dcl
 PORTVERSION=	5.3.2
+PORTREVISION=	1
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.gfd-dennou.org/arch/dcl/
 
diff --git a/science/devisor/Makefile b/science/devisor/Makefile
index 6ea2b7156327..33a3946e452a 100644
--- a/science/devisor/Makefile
+++ b/science/devisor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	devisor
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	science java
 MASTER_SITES=	http://www.featflow.de/download/
 DISTNAME=	devisor${PORTVERSION}
diff --git a/science/elmerfront/Makefile b/science/elmerfront/Makefile
index b0c26573633e..1cf91d11ff8d 100644
--- a/science/elmerfront/Makefile
+++ b/science/elmerfront/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	front
 PORTVERSION=	5.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/
 PKGNAMEPREFIX=	elmer
diff --git a/science/elmerpost/Makefile b/science/elmerpost/Makefile
index 0606b8c3bd18..11f8e366cfe5 100644
--- a/science/elmerpost/Makefile
+++ b/science/elmerpost/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	elmerpost
 PORTVERSION=	5.3.0
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/
 
diff --git a/science/euler/Makefile b/science/euler/Makefile
index aa4dedd40601..68dbbf54d978 100644
--- a/science/euler/Makefile
+++ b/science/euler/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	euler
 PORTVERSION=	1.61.0
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/science/felt/Makefile b/science/felt/Makefile
index e8e88a19a04c..a027024a9987 100644
--- a/science/felt/Makefile
+++ b/science/felt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	felt
 PORTVERSION=	3.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	felt
diff --git a/science/felt/files/patch-src-Velvet-analysis.c b/science/felt/files/patch-src-Velvet-analysis.c
new file mode 100644
index 000000000000..8bc3be4977cb
--- /dev/null
+++ b/science/felt/files/patch-src-Velvet-analysis.c
@@ -0,0 +1,11 @@
+--- src/Velvet/analysis.c.orig	Tue Mar 13 19:14:27 2007
++++ src/Velvet/analysis.c	Tue Mar 13 19:14:35 2007
+@@ -964,7 +964,7 @@
+  ************************************************************************/
+ 
+ # if defined(__STDC__)
+-void AnalysisDialogUpdate (AnalysisDialog analysisd, int force)
++void AnalysisDialogUpdate (AnalysisDialog analysisd, Boolean force)
+ # else
+ void AnalysisDialogUpdate (analysisd,force)
+     AnalysisDialog	analysisd;
diff --git a/science/flounder/Makefile b/science/flounder/Makefile
index 9ec6a57ac75a..4c7d453f403c 100644
--- a/science/flounder/Makefile
+++ b/science/flounder/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	flounder
 PORTVERSION=	0.40
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 MASTER_SITES=	http://www2.enel.ucalgary.ca/~vigmond/flounder/
 EXTRACT_SUFX=	.tgz
diff --git a/science/g3data/Makefile b/science/g3data/Makefile
index c6f84e98c48d..4bad7939bc16 100644
--- a/science/g3data/Makefile
+++ b/science/g3data/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	g3data
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://www.frantz.fi/software/
 
diff --git a/science/gave/Makefile b/science/gave/Makefile
index f8eaf3f44d07..d9fa7ccbf05d 100644
--- a/science/gave/Makefile
+++ b/science/gave/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gave
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	science graphics ruby
 MASTER_SITES=	http://ruby.gfd-dennou.org/products/gave/
 DIST_SUBDIR=	ruby
diff --git a/science/gchempaint/Makefile b/science/gchempaint/Makefile
index 816a7fe6af94..013534d11c16 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gchempaint
 PORTVERSION=	0.6.9
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/0.6
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 9947cf7c67fb..dbf061961820 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gchemutils
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/0.6
diff --git a/science/gdis/Makefile b/science/gdis/Makefile
index 3087a8e81d9a..3e31c60dc200 100644
--- a/science/gdis/Makefile
+++ b/science/gdis/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gdis
 PORTVERSION=	0.89
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/science/gerris/Makefile b/science/gerris/Makefile
index 7c4a25b560c0..5007152355d7 100644
--- a/science/gerris/Makefile
+++ b/science/gerris/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=		gerris
 PORTVERSION=		0.6.0
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		science math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gfs
diff --git a/science/getdp/Makefile b/science/getdp/Makefile
index 929625d98364..74cfc097b9b6 100644
--- a/science/getdp/Makefile
+++ b/science/getdp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	getdp
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://www.geuz.org/getdp/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index 4e7dc7178aad..9a0005668370 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ghemical
 PORTVERSION=	2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://www.uku.fi/~thassine/projects/download/ \
 		http://bioinformatics.org/ghemical/download/
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index da9bc8892234..127d011bbd75 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnudatalanguage
 PORTVERSION=	0.8.11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index d3f68b1f54e2..bfb3ce6192ce 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gramps
 PORTVERSION=	2.2.7
+PORTREVISION=	1
 CATEGORIES=	science gnome python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gramps
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index d0fdd944a3eb..4019c4511a4f 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gromacs
 PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.gromacs.org/pub/gromacs/
 
diff --git a/science/gsmc/Makefile b/science/gsmc/Makefile
index c0c1f90af254..7c0cb37308c7 100644
--- a/science/gsmc/Makefile
+++ b/science/gsmc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gsmc
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	science hamradio
 MASTER_SITES=	http://www.qsl.net/ik5nax/
 
diff --git a/science/gsystem/Makefile b/science/gsystem/Makefile
index 52fd605064bf..8e548e4296d2 100644
--- a/science/gsystem/Makefile
+++ b/science/gsystem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gsystem
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science devel games
 MASTER_SITES=	ftp://ftp.g-system.at/pub/gsystem/releases/development/${PORTVERSION}/
 DISTNAME=	G-System-${PORTVERSION}
diff --git a/science/gtamsanalyzer/Makefile b/science/gtamsanalyzer/Makefile
index 48013c7c09f1..682755aa82e2 100644
--- a/science/gtamsanalyzer/Makefile
+++ b/science/gtamsanalyzer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtamsanalyzer
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	science gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tamsys
diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index 2c1a83e437b1..15f3bf6322a4 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gwyddion
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	science graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/science/kmovisto/Makefile b/science/kmovisto/Makefile
index ffe727c3ca0e..72403d0da832 100644
--- a/science/kmovisto/Makefile
+++ b/science/kmovisto/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kmovisto
 PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://mitglied.lycos.de/pageofmh/download/
 
diff --git a/science/kst/Makefile b/science/kst/Makefile
index f4fe7174ce0d..9f646b26768d 100644
--- a/science/kst/Makefile
+++ b/science/kst/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kst
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	science kde
 MASTER_SITES=	${MASTER_SITE_KDE} \
 		http://omega.astro.utoronto.ca/${PORTNAME}/
diff --git a/science/kst/pkg-plist b/science/kst/pkg-plist
index 0f08f3673392..cf7aa0fcc9d6 100644
--- a/science/kst/pkg-plist
+++ b/science/kst/pkg-plist
@@ -879,26 +879,8 @@ share/config/colors/IDL 39 Rainbow-White
 share/config/colors/IDL 40 Rainbow-Black
 @dirrm share/servicetypes/kst
 @dirrm share/services/kst
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@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/sv/kst
 @dirrm share/doc/HTML/pt/kst
 @dirrm share/doc/HTML/nl/kst
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index f4fe7174ce0d..9f646b26768d 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kst
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	science kde
 MASTER_SITES=	${MASTER_SITE_KDE} \
 		http://omega.astro.utoronto.ca/${PORTNAME}/
diff --git a/science/kst2/pkg-plist b/science/kst2/pkg-plist
index 0f08f3673392..cf7aa0fcc9d6 100644
--- a/science/kst2/pkg-plist
+++ b/science/kst2/pkg-plist
@@ -879,26 +879,8 @@ share/config/colors/IDL 39 Rainbow-White
 share/config/colors/IDL 40 Rainbow-Black
 @dirrm share/servicetypes/kst
 @dirrm share/services/kst
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@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/sv/kst
 @dirrm share/doc/HTML/pt/kst
 @dirrm share/doc/HTML/nl/kst
diff --git a/science/linsmith/Makefile b/science/linsmith/Makefile
index 5d5fee9bb73c..146f6660a05d 100644
--- a/science/linsmith/Makefile
+++ b/science/linsmith/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	linsmith
 PORTVERSION=	0.99.3
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	SF
 
diff --git a/science/linsmith/pkg-plist b/science/linsmith/pkg-plist
index 00b0b448746b..a6a89d191dae 100644
--- a/science/linsmith/pkg-plist
+++ b/science/linsmith/pkg-plist
@@ -9,7 +9,6 @@ share/pixmaps/linsmith/Makefile.am~
 share/pixmaps/linsmith/smith4.png
 share/pixmaps/linsmith/smithent.png
 @dirrm share/pixmaps/linsmith
-@dirrmtry share/pixmaps
 %%DATADIR%%/6-1.circ
 %%DATADIR%%/6-1.load
 %%DATADIR%%/6-4.circ
diff --git a/science/mayavi/Makefile b/science/mayavi/Makefile
index 42daab2ea8e0..ef7042303513 100644
--- a/science/mayavi/Makefile
+++ b/science/mayavi/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mayavi
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/science/mcstas/Makefile b/science/mcstas/Makefile
index 0d630bfe6367..ffc8d18a5f8b 100644
--- a/science/mcstas/Makefile
+++ b/science/mcstas/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	mcstas
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://www.mcstas.org/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/science/medit/Makefile b/science/medit/Makefile
index 026ad817f34d..0e27b931b642 100644
--- a/science/medit/Makefile
+++ b/science/medit/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	medit
 PORTVERSION=	2006.09.24
+PORTREVISION=	1
 CATEGORIES=	science graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}	\
 		http://www.ann.jussieu.fr/~frey/logiciels/:author
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index 27763b6c8390..6c42c0611f74 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpqc
 PORTVERSION=	2.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science parallel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mpqc
diff --git a/science/oases/Makefile b/science/oases/Makefile
index a443b8a13fa6..52996df759c6 100644
--- a/science/oases/Makefile
+++ b/science/oases/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	oases
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	ftp://keel.mit.edu/pub/Oases/
 DISTNAME=	oases_Mar-28-2002
diff --git a/science/omnetpp/Makefile b/science/omnetpp/Makefile
index 5b346742dbf2..4fa42496dfdf 100644
--- a/science/omnetpp/Makefile
+++ b/science/omnetpp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	omnetpp
 PORTVERSION=	2.3p1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://www.omnetpp.org/download/release/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/science/oof/Makefile b/science/oof/Makefile
index 931c80f51167..be5925e84a3f 100644
--- a/science/oof/Makefile
+++ b/science/oof/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oof
 PORTVERSION=	1.037
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://www.ctcms.nist.gov/~langer/OOFdownload/SRC/
 DISTNAME=	${PORTNAME}-dist${PORTVERSION}
diff --git a/science/openfoam/Makefile b/science/openfoam/Makefile
index d3f83fe89a49..0922af38a5c8 100644
--- a/science/openfoam/Makefile
+++ b/science/openfoam/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${REALNAME:L}
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	science math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	foam
diff --git a/science/ovt/Makefile b/science/ovt/Makefile
index e25fd9163422..e0f99c69c46e 100644
--- a/science/ovt/Makefile
+++ b/science/ovt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ovt
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science astro java
 MASTER_SITES=	# http://ovt.irfu.se/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_${OVTBUILD}-src
diff --git a/science/paje/Makefile b/science/paje/Makefile
index ce564ae2363c..a0e56845014b 100644
--- a/science/paje/Makefile
+++ b/science/paje/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	paje
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	science gnustep
 MASTER_SITES=	http://download.fr2.forge.objectweb.org/ \
 		http://download.forge.objectweb.org/paje/ \
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index f62fd677ffcc..52e63ade55c0 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	paraview
 PORTVERSION=	2.4.4
+PORTREVISION=	1
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.paraview.org/files/v2.4/
 
diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile
index 995d4d61fb21..6dccfdbb1ffa 100644
--- a/science/pnetcdf/Makefile
+++ b/science/pnetcdf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pnetcdf
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	science parallel
 MASTER_SITES=	http://www-unix.mcs.anl.gov/parallel-netcdf/
 DISTNAME=	parallel-netcdf-${PORTVERSION}
diff --git a/science/py-paida/Makefile b/science/py-paida/Makefile
index 8d515dad8760..64f23b7d950e 100644
--- a/science/py-paida/Makefile
+++ b/science/py-paida/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	paida
 PORTVERSION=	3.2.1.2.8
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	paida
diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile
index 05a933f39eb1..543b388cc1b9 100644
--- a/science/py-scipy/Makefile
+++ b/science/py-scipy/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	scipy
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scipy
diff --git a/science/pyvox/Makefile b/science/pyvox/Makefile
index 47917f152c24..5962695151fd 100644
--- a/science/pyvox/Makefile
+++ b/science/pyvox/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bblimage
 PORTVERSION=	0.66
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	miwi
diff --git a/science/ruby-dcl/Makefile b/science/ruby-dcl/Makefile
index 128d6206eaa7..3e8785e6a9c5 100644
--- a/science/ruby-dcl/Makefile
+++ b/science/ruby-dcl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dcl
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	science graphics ruby
 MASTER_SITES=	http://www.gfd-dennou.org/arch/ruby/products/ruby-dcl/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/science/ruby-gphys/Makefile b/science/ruby-gphys/Makefile
index 4861ad10b4b7..2c6e7b0897c8 100644
--- a/science/ruby-gphys/Makefile
+++ b/science/ruby-gphys/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gphys
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	science ruby
 MASTER_SITES=	http://ruby.gfd-dennou.org/products/gphys/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile
index 0641eb6d4658..08edef58d0d1 100644
--- a/science/v_sim/Makefile
+++ b/science/v_sim/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	v_sim
 PORTVERSION=	3.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://www-drfmc.cea.fr/sp2m/L_Sim/V_Sim/download/
 
diff --git a/science/v_sim/pkg-plist b/science/v_sim/pkg-plist
index 2b2a995b18ef..3fa14a95135f 100644
--- a/science/v_sim/pkg-plist
+++ b/science/v_sim/pkg-plist
@@ -190,7 +190,6 @@ share/pixmaps/v_sim.xpm
 %%DATADIR%%/v_sim.res
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/APIreference/v_sim
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/APIreference
diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile
index 960687c0fb49..81e14fae1c74 100644
--- a/science/vis5d+/Makefile
+++ b/science/vis5d+/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	vis5d+
 PORTVERSION=	1.2.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vis5d
diff --git a/science/vmd/Makefile b/science/vmd/Makefile
index 74d00c6fcc34..7501d47c24ad 100644
--- a/science/vmd/Makefile
+++ b/science/vmd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		vmd
 PORTVERSION=		1.8.3
-PORTREVISION=		0
+PORTREVISION=		1
 CATEGORIES=		science graphics python tcl84 tk84
 MASTER_SITES=		http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/:tachyon \
 			ftp://ftp.ebi.ac.uk/pub/software/unix/stride/src/:stride
diff --git a/science/x11iraf/Makefile b/science/x11iraf/Makefile
index 5018922aace4..64685008852d 100644
--- a/science/x11iraf/Makefile
+++ b/science/x11iraf/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	x11iraf
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	science astro
 MASTER_SITES=	ftp://iraf.noao.edu/iraf/x11iraf/
 DISTNAME=	x11iraf-v${PORTVERSION}-bin.freebsd
diff --git a/science/xmakemol/Makefile b/science/xmakemol/Makefile
index b50dc5b80b47..186cd1a0e092 100644
--- a/science/xmakemol/Makefile
+++ b/science/xmakemol/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xmakemol
 PORTVERSION=	5.15
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/aafid2/Makefile b/security/aafid2/Makefile
index e0092a8937d8..675ca56bf303 100644
--- a/security/aafid2/Makefile
+++ b/security/aafid2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aafid2
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cerias.purdue.edu/pub/tools/unix/ids/AAFID/
 EXTRACT_ONLY=
diff --git a/security/base/Makefile b/security/base/Makefile
index 80477d6a5282..e096353d0e62 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	base
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	secureideas
diff --git a/security/bsp_upektfmess/Makefile b/security/bsp_upektfmess/Makefile
index 430ad99995de..37b0c1cc2e45 100644
--- a/security/bsp_upektfmess/Makefile
+++ b/security/bsp_upektfmess/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bsp_upektfmess
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.upek.com/support/download/ \
 		http://shapeshifter.se/pub/bsp_upektfmess/
diff --git a/security/clusterssh/Makefile b/security/clusterssh/Makefile
index 6774ac179ba8..10620bf9f85f 100644
--- a/security/clusterssh/Makefile
+++ b/security/clusterssh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clusterssh
 PORTVERSION=	3.19.1
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/crank/Makefile b/security/crank/Makefile
index c780710e362d..5c755d915dcd 100644
--- a/security/crank/Makefile
+++ b/security/crank/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	crank
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/cutlass/Makefile b/security/cutlass/Makefile
index b5ad47f0b518..d9aa7ba72893 100644
--- a/security/cutlass/Makefile
+++ b/security/cutlass/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cutlass
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.synacklabs.net/projects/cutlass/
 
diff --git a/security/drupal4-ldap_integration/Makefile b/security/drupal4-ldap_integration/Makefile
index 2a69a58f1bcc..6bd726d2a5e3 100644
--- a/security/drupal4-ldap_integration/Makefile
+++ b/security/drupal4-ldap_integration/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ldap_integration
 DISTVERSION=	${DRUPAL_VERSION}
-PORTREVISION=	20060117
+PORTREVISION=	20060118
 CATEGORIES=	security www
 
 MAINTAINER=	brooks@FreeBSD.org
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 7d19a38ce086..f0a82c8ec362 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dsniff
 PORTVERSION=	2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://naughty.monkey.org/~dugsong/dsniff/
 
diff --git a/security/fpm/Makefile b/security/fpm/Makefile
index d6a95f0d5ab3..bf0ad5b10378 100644
--- a/security/fpm/Makefile
+++ b/security/fpm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fpm
 PORTVERSION=	0.60
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/fwanalog/Makefile b/security/fwanalog/Makefile
index 2bf124af7083..29a8f1ea0a42 100644
--- a/security/fwanalog/Makefile
+++ b/security/fwanalog/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fwanalog
 PORTVERSION=	0.6.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://tud.at/programm/fwanalog/
 
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index c21cda6c3d4c..daaf1f4494a3 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fwbuilder
 PORTVERSION=	2.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index c21cda6c3d4c..daaf1f4494a3 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fwbuilder
 PORTVERSION=	2.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index c21cda6c3d4c..daaf1f4494a3 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fwbuilder
 PORTVERSION=	2.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/fwtk/Makefile b/security/fwtk/Makefile
index 291eb04f07c5..617358e8683e 100644
--- a/security/fwtk/Makefile
+++ b/security/fwtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fwtk
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 DISTNAME=	${PORTNAME}${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
diff --git a/security/gaim-encryption/Makefile b/security/gaim-encryption/Makefile
index 60ec2c932c91..b438bec3dfd6 100644
--- a/security/gaim-encryption/Makefile
+++ b/security/gaim-encryption/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	encryption
 PORTVERSION=	2.39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
diff --git a/security/gaim-otr/Makefile b/security/gaim-otr/Makefile
index a9e9a952059c..8042f20a0234 100644
--- a/security/gaim-otr/Makefile
+++ b/security/gaim-otr/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	otr
 PORTVERSION=	3.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/ \
 		http://www.xelerance.com/mirror/otr/
diff --git a/security/gcipher/Makefile b/security/gcipher/Makefile
index 0f962c91e9e6..6825fb54f901 100644
--- a/security/gcipher/Makefile
+++ b/security/gcipher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcipher
 PORTVERSION=	1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/gnome-gpg/Makefile b/security/gnome-gpg/Makefile
index 58f824b52a1a..fe5e02f417c0 100644
--- a/security/gnome-gpg/Makefile
+++ b/security/gnome-gpg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-gpg
 PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 8455df9454e0..42346cf6b2ca 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-keyring-manager
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist
index ea050475fefa..aae072ad233e 100644
--- a/security/gnome-keyring-manager/pkg-plist
+++ b/security/gnome-keyring-manager/pkg-plist
@@ -83,54 +83,18 @@ share/locale/vi/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
-@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/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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrm share/gnome/omf/gnome-keyring-manager
 @dirrm share/gnome/help/gnome-keyring-manager/uk
 @dirrm share/gnome/help/gnome-keyring-manager/sv
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index dc16b8a0ed78..4656b6c54206 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index ce9beab66841..65d9dffbcaef 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -85,51 +85,17 @@ share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrm %%DOCSDIR%%
 @dirrm include/gnome-keyring-1
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/security/gnome-password-generator/Makefile b/security/gnome-password-generator/Makefile
index 5ce004b8a110..bf3bbeabeccf 100644
--- a/security/gnome-password-generator/Makefile
+++ b/security/gnome-password-generator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-password-generator
 PORTVERSION=	1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security gnome python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnome-password
diff --git a/security/gnome-ssh-askpass/Makefile b/security/gnome-ssh-askpass/Makefile
index f322e65a81aa..b03e14d599da 100644
--- a/security/gnome-ssh-askpass/Makefile
+++ b/security/gnome-ssh-askpass/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gnome-ssh-askpass
 PORTVERSION=	3.6p1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security gnome
 MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 		ftp://carroll.cac.psu.edu/pub/OpenBSD/OpenSSH/portable/
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index e42ad4451880..ec300cf98b0e 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	1.4.7
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index 910435100676..a8878f94030b 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -37,26 +37,4 @@ libexec/gnupg/gpgkeys_hkp
 %%NLS%%share/locale/tr/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
 @unexec [ -r %D/bin/gpg2 ] && ln -s gpg2 %D/bin/gpg || true
diff --git a/security/gorilla/Makefile b/security/gorilla/Makefile
index 8159b1db72e6..65a413bf20bb 100644
--- a/security/gorilla/Makefile
+++ b/security/gorilla/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gorilla
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.fpx.de/fp/Software/Gorilla/download/
 
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 546d4f913c12..97502c229d38 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpa
 PORTVERSION=	0.7.5
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://wald.intevation.org/frs/download.php/324/
 
diff --git a/security/gpa/pkg-plist b/security/gpa/pkg-plist
index 7ecb212caacc..91b75b650409 100644
--- a/security/gpa/pkg-plist
+++ b/security/gpa/pkg-plist
@@ -17,4 +17,3 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gpa.mo
 share/pixmaps/gpa.png
 @dirrmtry share/applications
 @dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
diff --git a/security/gpasman/Makefile b/security/gpasman/Makefile
index 619bd70e4523..2f5e8b022953 100644
--- a/security/gpasman/Makefile
+++ b/security/gpasman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpasman
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://gpasman.sourceforge.net/files/
 
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index cb718b672354..2f94e387f7c0 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpass
 PORTVERSION=	0.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security gnome
 MASTER_SITES=	http://projects.netlab.jp/gpass/release/
 
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index 8f52e0efe301..a7f0c047e3a3 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gringotts
 PORTVERSION=	1.2.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://devel.pluto.linux.it/projects/Gringotts/current/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
diff --git a/security/gsfv/Makefile b/security/gsfv/Makefile
index c96ad01d00d5..91d48921442c 100644
--- a/security/gsfv/Makefile
+++ b/security/gsfv/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gsfv
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ijliao
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 9087681b531d..1e37c4d4110f 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gss
 PORTVERSION=	0.0.20
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://josefsson.org/${PORTNAME}/releases/ \
 		${MASTER_SITE_GNU_ALPHA}
diff --git a/security/gss/pkg-plist b/security/gss/pkg-plist
index 8bd9ebc0a7a4..4aaea8a93283 100644
--- a/security/gss/pkg-plist
+++ b/security/gss/pkg-plist
@@ -17,10 +17,6 @@ share/locale/sv/LC_MESSAGES/gss.mo
 share/locale/vi/LC_MESSAGES/gss.mo
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrmtry share/locale/en@quot/LC_MESSAGES
 @dirrmtry share/locale/en@quot
 @dirrmtry share/locale/en@boldquot/LC_MESSAGES
diff --git a/security/gtk-knocker/Makefile b/security/gtk-knocker/Makefile
index 697da8fd7be2..cf7023a178f6 100644
--- a/security/gtk-knocker/Makefile
+++ b/security/gtk-knocker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	knocker
 PORTVERSION=	0.6.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security net x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index 795f9bc84cdd..47006e735bbb 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkpasman
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/gtkportscan/Makefile b/security/gtkportscan/Makefile
index 5edfe6a8ae8c..fb12358a5a54 100644
--- a/security/gtkportscan/Makefile
+++ b/security/gtkportscan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkportscan
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	cpiazza
diff --git a/security/hashish/Makefile b/security/hashish/Makefile
index eb88e0a4d04c..a4a892a856d1 100644
--- a/security/hashish/Makefile
+++ b/security/hashish/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	hashish
 PORTVERSION=	1.1a
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/horde-jeta/Makefile b/security/horde-jeta/Makefile
index ca764eb12513..0939c0e56666 100644
--- a/security/horde-jeta/Makefile
+++ b/security/horde-jeta/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jeta
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	security www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 390efb6ed4d7..b0b06635bae5 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	hydra
 PORTVERSION=	5.4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.thc.org/releases/ \
 		${MASTER_SITE_PACKETSTORM}
diff --git a/security/iaikpkcs11wrapper/Makefile b/security/iaikpkcs11wrapper/Makefile
index c32b129e50bd..3ab52d6f1137 100644
--- a/security/iaikpkcs11wrapper/Makefile
+++ b/security/iaikpkcs11wrapper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	iaikPkcs11Wrapper
 PORTVERSION=	1.2.16
+PORTREVISION=	1
 CATEGORIES=	security java devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ale
diff --git a/security/jce_policy14/Makefile b/security/jce_policy14/Makefile
index 290f967e006c..07d2be310150 100644
--- a/security/jce_policy14/Makefile
+++ b/security/jce_policy14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jce_policy
 PORTVERSION=	1.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security java
 MASTER_SITES=	#http://java.sun.com/products/jce/index-14.html
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\./_/g}
diff --git a/security/jeta/Makefile b/security/jeta/Makefile
index ca764eb12513..0939c0e56666 100644
--- a/security/jeta/Makefile
+++ b/security/jeta/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jeta
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	security www
 
 MAINTAINER=	beech@alaskaparadise.com
diff --git a/security/kedpm/Makefile b/security/kedpm/Makefile
index 50b637238079..9c5ae1f10ab2 100644
--- a/security/kedpm/Makefile
+++ b/security/kedpm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kedpm
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kedpm
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index 1b5c4664f490..fd4e747717e8 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	KeePassX
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index d2a8b1c1613f..349568482863 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/security/kgpg/Makefile b/security/kgpg/Makefile
index fbd978c88521..e8771f7d0ca7 100644
--- a/security/kgpg/Makefile
+++ b/security/kgpg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		kgpg
 PORTVERSION=		1.0.0
-PORTREVISION=		6
+PORTREVISION=		7
 CATEGORIES=		security kde
 MASTER_SITES=		http://developer.kde.org/~kgpg/src/
 
diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index 0d0932908e60..67531fd2c3a1 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	klamav
 PORTVERSION=	0.41
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	klamav
diff --git a/security/kovpn/Makefile b/security/kovpn/Makefile
index 8f9ad13cbe3d..6dbb57f3d071 100644
--- a/security/kovpn/Makefile
+++ b/security/kovpn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kovpn
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	security kde
 MASTER_SITES=	http://home.bawue.de/~lighter/www.enlighter.de/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_pre6
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index 5dd2de586d95..50cc753df637 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.6.1
+PORTREVISION=	1
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index 5dd2de586d95..50cc753df637 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.6.1
+PORTREVISION=	1
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index 5dd2de586d95..50cc753df637 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.6.1
+PORTREVISION=	1
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 5dd2de586d95..50cc753df637 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.6.1
+PORTREVISION=	1
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index e8d216d01223..be3b23b9060b 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kssh
 PORTVERSION=	0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index d2a8b1c1613f..349568482863 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index f078f1591893..8a52fdffbe24 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	libfwbuilder
 PORTVERSION=	2.1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index f078f1591893..8a52fdffbe24 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	libfwbuilder
 PORTVERSION=	2.1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/libfwbuilder2/Makefile b/security/libfwbuilder2/Makefile
index f078f1591893..8a52fdffbe24 100644
--- a/security/libfwbuilder2/Makefile
+++ b/security/libfwbuilder2/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	libfwbuilder
 PORTVERSION=	2.1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile
index ac150a7dc314..a6cf086befa0 100644
--- a/security/libgnomesu/Makefile
+++ b/security/libgnomesu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomesu
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security gnome
 MASTER_SITES=	http://members.chello.nl/~h.lai/libgnomesu/
 
diff --git a/security/mypasswordsafe/Makefile b/security/mypasswordsafe/Makefile
index bf53b52f5f5a..083894b12604 100644
--- a/security/mypasswordsafe/Makefile
+++ b/security/mypasswordsafe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	MyPasswordSafe
 PORTVERSION=	20061216
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.semanticgap.com/myps/release/
 EXTRACT_SUFX=	.src.tgz
diff --git a/security/newpki-client/Makefile b/security/newpki-client/Makefile
index a93c3b9a235b..8be6cc361677 100644
--- a/security/newpki-client/Makefile
+++ b/security/newpki-client/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	newpki-client
 DISTVERSION=	2.0.0-beta4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	newpki
diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 0f002335dccd..0bcfc4650b49 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	nmap
 PORTVERSION=	${DISTVERSION:L:C/([a-z])[a-z]+/\1/g:C/[^a-z0-9+]+/./g}
+PORTREVISION=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://download.insecure.org/nmap/dist/ \
 		http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \
diff --git a/security/nofgpg/Makefile b/security/nofgpg/Makefile
index 8df2ec7846a8..a3f0b7d7432d 100644
--- a/security/nofgpg/Makefile
+++ b/security/nofgpg/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	nofgpg
 PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security python
 MASTER_SITES=	http://www.cgabriel.org/download/nofgpg/
 
diff --git a/security/ocaml-cryptgps/Makefile b/security/ocaml-cryptgps/Makefile
index 94a501565267..0d0686af4539 100644
--- a/security/ocaml-cryptgps/Makefile
+++ b/security/ocaml-cryptgps/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cryptgps
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 PKGNAMEPREFIX=	ocaml-
diff --git a/security/ocaml-cryptokit/Makefile b/security/ocaml-cryptokit/Makefile
index bddf64ee98f5..80dbaf561faf 100644
--- a/security/ocaml-cryptokit/Makefile
+++ b/security/ocaml-cryptokit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cryptokit
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
 PKGNAMEPREFIX=	ocaml-
diff --git a/security/ocaml-ssl/Makefile b/security/ocaml-ssl/Makefile
index a42a33123029..76ec6975df75 100644
--- a/security/ocaml-ssl/Makefile
+++ b/security/ocaml-ssl/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ssl
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	savonet
diff --git a/security/openssh-askpass/Makefile b/security/openssh-askpass/Makefile
index 74a416f974d8..7239732ccad6 100644
--- a/security/openssh-askpass/Makefile
+++ b/security/openssh-askpass/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	OpenSSH-askpass
 PORTVERSION=	1.2.2.2001.02.24
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kris
diff --git a/security/openvpn-admin/Makefile b/security/openvpn-admin/Makefile
index e029bf4df205..4a46bb18ee30 100644
--- a/security/openvpn-admin/Makefile
+++ b/security/openvpn-admin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openvpn-admin
 PORTVERSION=	1.9.3b
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/p5-Authen-Captcha/Makefile b/security/p5-Authen-Captcha/Makefile
index da3e4a1577d1..c36826ea7a2c 100644
--- a/security/p5-Authen-Captcha/Makefile
+++ b/security/p5-Authen-Captcha/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Authen-Captcha
 PORTVERSION=	1.023
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Authen
diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile
index 8db19517d39e..9f1d724bca5f 100644
--- a/security/p5-GD-SecurityImage/Makefile
+++ b/security/p5-GD-SecurityImage/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	GD-SecurityImage
 PORTVERSION=	1.64
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
diff --git a/security/pam_authsrv/Makefile b/security/pam_authsrv/Makefile
index bd5a858ba62e..a0d9babef6a0 100644
--- a/security/pam_authsrv/Makefile
+++ b/security/pam_authsrv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pam_authsrv
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.feep.net/pub/software/PAM/pam_authsrv/
 
diff --git a/security/parano/Makefile b/security/parano/Makefile
index 1b7991091342..3cf7f5244baa 100644
--- a/security/parano/Makefile
+++ b/security/parano/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	parano
 PORTVERSION=	0.3.4
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	CENKES BERLIOS
 
diff --git a/security/parano/pkg-plist b/security/parano/pkg-plist
index 734d3e91278d..d7cda87fc27d 100644
--- a/security/parano/pkg-plist
+++ b/security/parano/pkg-plist
@@ -13,6 +13,5 @@ share/pixmaps/parano-icon.png
 @dirrmtry share/applications
 @dirrmtry share/application-registry
 @dirrmtry share/mime-info
-@dirrmtry share/pixmaps
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 60ec2c932c91..b438bec3dfd6 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	encryption
 PORTVERSION=	2.39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index a9e9a952059c..8042f20a0234 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	otr
 PORTVERSION=	3.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/ \
 		http://www.xelerance.com/mirror/otr/
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 24a1220199d2..80e7bc032a54 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pinentry
 PORTVERSION=	0.7.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	pinentry
diff --git a/security/putty/Makefile b/security/putty/Makefile
index e63d04e2dd62..fbd9dab367ac 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	putty
 PORTVERSION=	0.59
+PORTREVISION=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://the.earth.li/~sgtatham/putty/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index eb5d17d41733..d3f32fbefd06 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qca-tls
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://delta.affinix.com/download/qca/ \
 		http://psi.affinix.com/beta/
diff --git a/security/qtfw/Makefile b/security/qtfw/Makefile
index 76ad3c9ad7fe..fe65182948d6 100644
--- a/security/qtfw/Makefile
+++ b/security/qtfw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qtfw
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/quintuple-agent/Makefile b/security/quintuple-agent/Makefile
index 63a06f83d3ed..0337ea5a9fe3 100644
--- a/security/quintuple-agent/Makefile
+++ b/security/quintuple-agent/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quintuple-agent
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index 2f07a52648a2..14384867c563 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	revelation
 PORTVERSION=	0.4.11
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	ftp://oss.codepoet.no/revelation/
 
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index c509d05e0521..aa115cf5ac27 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	seahorse
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 46a2d2432ddc..b06be456a0a2 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -295,43 +295,11 @@ share/locale/zh_TW/LC_MESSAGES/seahorse.mo
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/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/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/et/LC_MESSAGES
-@dirrmtry share/locale/et
-@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
diff --git a/security/secpanel/Makefile b/security/secpanel/Makefile
index e9a5fb4f099e..a4feb81ee118 100644
--- a/security/secpanel/Makefile
+++ b/security/secpanel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	secpanel
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security tcl84 tk84
 MASTER_SITES=	CENKES
diff --git a/security/sguil-client/Makefile b/security/sguil-client/Makefile
index 680685525395..cb8f4be4d46d 100644
--- a/security/sguil-client/Makefile
+++ b/security/sguil-client/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sguil-client
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sguil
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index 056296108485..d5bb3175da9b 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	shishi
 PORTVERSION=	0.0.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://josefsson.org/${PORTNAME}/releases/ \
 		${MASTER_SITE_GNU_ALPHA}
diff --git a/security/shishi/pkg-plist b/security/shishi/pkg-plist
index c1e9c225eae7..93ad8a0babdf 100644
--- a/security/shishi/pkg-plist
+++ b/security/shishi/pkg-plist
@@ -25,5 +25,3 @@ sbin/shishid
 %%NLS%%@dirrmtry share/locale/en@boldquot
 %%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/en@quot
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
diff --git a/security/snortreport/Makefile b/security/snortreport/Makefile
index 0b139e8b2306..12feb1d4b6ac 100644
--- a/security/snortreport/Makefile
+++ b/security/snortreport/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snortreport
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	security www
 MASTER_SITES=	http://www.symmetrixtech.com/ids/
 
diff --git a/security/ssh-gui/Makefile b/security/ssh-gui/Makefile
index 3af5c415d227..cbc6f81e220d 100644
--- a/security/ssh-gui/Makefile
+++ b/security/ssh-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ssh-gui
 PORTVERSION=	0.7.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 211710250226..0e01901805a4 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ssh2
 PORTVERSION=	3.2.9.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security ipv6
 # The list of official mirror sites is at:
 # http://www.ssh.com/support/downloads/secureshellserver/non-commercial.html
diff --git a/security/ssh_askpass_gtk2/Makefile b/security/ssh_askpass_gtk2/Makefile
index 93558f861405..93f416f2cca7 100644
--- a/security/ssh_askpass_gtk2/Makefile
+++ b/security/ssh_askpass_gtk2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ssh_askpass_gtk2
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.cgabriel.org/download/ssh-askpass-fullscreen/
 DISTNAME=	ssh-askpass-fullscreen-${PORTVERSION}
diff --git a/security/starttls/Makefile b/security/starttls/Makefile
index 985d9b3a73c4..c0252683e400 100644
--- a/security/starttls/Makefile
+++ b/security/starttls/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	starttls
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.opaopa.org/pub/elisp/
 
diff --git a/security/stegdetect/Makefile b/security/stegdetect/Makefile
index 099a290d898f..21bbafefff53 100644
--- a/security/stegdetect/Makefile
+++ b/security/stegdetect/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	stegdetect
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://www.outguess.org/ \
 		http://distfiles.master.finkmirrors.net/
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index cd1256bedb4b..aeaad9cd1b41 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tinyca
 PORTVERSION=	0.7.5
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	http://tinyca.sm-zone.net/ \
 		http://tinyca.sm-zone.net/old/
diff --git a/security/umit/Makefile b/security/umit/Makefile
index 201738a5ba7f..a721bf1f75b9 100644
--- a/security/umit/Makefile
+++ b/security/umit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	umit
 PORTVERSION=	0.9.3
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 				http://bio3k.softboard.ru/uploads/arch/
diff --git a/security/umit/pkg-plist b/security/umit/pkg-plist
index 93ade50f01a5..1ffb4b8e3c2b 100644
--- a/security/umit/pkg-plist
+++ b/security/umit/pkg-plist
@@ -198,4 +198,3 @@ share/pixmaps/umit/win_32.png
 share/pixmaps/umit/win_75.png
 share/pixmaps/umit/wizard_logo.png
 @dirrmtry share/pixmaps/umit
-@dirrmtry share/pixmaps
diff --git a/security/vinetto/Makefile b/security/vinetto/Makefile
index 916c3ab56384..561c2ab3e1d0 100644
--- a/security/vinetto/Makefile
+++ b/security/vinetto/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vinetto
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/xca/Makefile b/security/xca/Makefile
index 4871be386a61..c7bbcd5b63f9 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xca
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/xca/pkg-plist b/security/xca/pkg-plist
index f72fbb211388..85c2ff7d9332 100644
--- a/security/xca/pkg-plist
+++ b/security/xca/pkg-plist
@@ -36,5 +36,4 @@ share/xca/xca-8.html
 share/xca/xca-9.html
 share/xca/xca.html
 @dirrm share/xca
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
diff --git a/security/xspy/Makefile b/security/xspy/Makefile
index b69ba39b1a54..8bcc5d6f8397 100644
--- a/security/xspy/Makefile
+++ b/security/xspy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xspy
 PORTVERSION=	1.0c
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.acm.vt.edu/~jmaxwell/programs/xspy/
 
diff --git a/shells/bush/Makefile b/shells/bush/Makefile
index da6b0a286d8e..e3325eed9769 100644
--- a/shells/bush/Makefile
+++ b/shells/bush/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		bush
 PORTVERSION=		1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		shells
 MASTER_SITES=		http://www.pegasoft.ca/downloads/	\
 			http://66.11.182.223/downloads/
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index d885ae6b6644..b0131f64a066 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fish
 PORTVERSION=	1.22.3
+PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	http://www.fishshell.org/files/1.22.3/ \
 		http://roo.no-ip.org/fish/files/1.22.3/ \
diff --git a/shells/gscommander/Makefile b/shells/gscommander/Makefile
index 76429d89741b..006d67ef4058 100644
--- a/shells/gscommander/Makefile
+++ b/shells/gscommander/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gscommander
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	shells gnustep
 MASTER_SITES=	http://www.nice.ch/~phip/
 DISTNAME=	GSCommander-${PORTVERSION}
diff --git a/shells/viewglob/Makefile b/shells/viewglob/Makefile
index aad4fd5107a8..02f4a928e73f 100644
--- a/shells/viewglob/Makefile
+++ b/shells/viewglob/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	viewglob
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/LPRngTool/Makefile b/sysutils/LPRngTool/Makefile
index c99f0d8e0d12..a5f93f6252ec 100644
--- a/sysutils/LPRngTool/Makefile
+++ b/sysutils/LPRngTool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	LPRngTool
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	 sysutils print
 MASTER_SITES=	ftp://ftp.lprng.com/pub/%SUBDIR%/ \
 		ftp://ftp.cise.ufl.edu/pub/mirrors/%SUBDIR%/ \
diff --git a/sysutils/acidlaunch/Makefile b/sysutils/acidlaunch/Makefile
index b5ab23040867..d41bf3306c37 100644
--- a/sysutils/acidlaunch/Makefile
+++ b/sysutils/acidlaunch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	acidlaunch
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://linuxgamers.net/download/
 
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 21f2506dd55b..3e68b2c563d6 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asapm
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asapm/
 
diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile
index 5bbd022899b0..6a2ec027f334 100644
--- a/sysutils/ascpu/Makefile
+++ b/sysutils/ascpu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ascpu
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	sysutils afterstep
 MASTER_SITES=	http://www.tigr.net/afterstep/download/ascpu/
 
diff --git a/sysutils/asfsm/Makefile b/sysutils/asfsm/Makefile
index 8e446e8ca60d..29e9e6377dc0 100644
--- a/sysutils/asfsm/Makefile
+++ b/sysutils/asfsm/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	asfsm
 PORTVERSION=	1.0.p15
+PORTREVISION=	1
 CATEGORIES=	sysutils afterstep
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asfsm/
 DISTNAME=	asfsm-1.0pre15
diff --git a/sysutils/asmem/Makefile b/sysutils/asmem/Makefile
index dc987498ff9a..4fa57ae01304 100644
--- a/sysutils/asmem/Makefile
+++ b/sysutils/asmem/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asmem
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	sysutils afterstep
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asmem/
 
diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile
index e230c7779f62..d677295de11f 100644
--- a/sysutils/asmon/Makefile
+++ b/sysutils/asmon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asmon
 PORTVERSION=	0.60
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils afterstep
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
 MASTER_SITE_SUBDIR=	apps/asmon
diff --git a/sysutils/asr-utils/Makefile b/sysutils/asr-utils/Makefile
index eeebf9cb79fa..dbf377cdc66b 100644
--- a/sysutils/asr-utils/Makefile
+++ b/sysutils/asr-utils/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	asr-utils
 PORTVERSION=	3.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.adaptec.com/raid/u160raid/unix/ \
 		ftp://ftp.adaptec.com/raid/u160raid/unix/
diff --git a/sysutils/batmon/Makefile b/sysutils/batmon/Makefile
index bb0c31b8bdc9..02ca5dea6e63 100644
--- a/sysutils/batmon/Makefile
+++ b/sysutils/batmon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	batmon
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	http://download.savannah.gnu.org/releases/gap/
 
diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile
index d337dcd26659..833ffa3e396a 100644
--- a/sysutils/battfink/Makefile
+++ b/sysutils/battfink/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	battfink
 PORTVERSION=	0.6.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
diff --git a/sysutils/bbapm/Makefile b/sysutils/bbapm/Makefile
index 69b0b586d93c..7b16bee5cb04 100644
--- a/sysutils/bbapm/Makefile
+++ b/sysutils/bbapm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bbapm
 PORTVERSION=	0.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bbtools
diff --git a/sysutils/bbsmount/Makefile b/sysutils/bbsmount/Makefile
index 2f8d94d0b240..6b0c9357ac8d 100644
--- a/sysutils/bbsmount/Makefile
+++ b/sysutils/bbsmount/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bbsmount
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://phoenix.inf.upol.cz/~jezberam/bbsmount/files/
 
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index dd5f670eecd1..e3f9ad6d43c1 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	brasero
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils audio multimedia gnome
 MASTER_SITES=	SOURCEFORGE
 MASTER_SITE_SUBDIR=	bonfire
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index 235bdc29ebf5..124b98cc8b06 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -46,7 +46,3 @@ share/mime/packages/brasero.xml
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/sysutils/bubblemon-dockapp/Makefile b/sysutils/bubblemon-dockapp/Makefile
index 8fc8fde2c2f6..8ea603ed69d2 100644
--- a/sysutils/bubblemon-dockapp/Makefile
+++ b/sysutils/bubblemon-dockapp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bubblemon-dockapp
 PORTVERSION=	1.46
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.ne.jp/asahi/linux/timecop/software/ \
 		http://critical.ch/distfiles/ \
diff --git a/sysutils/bubblemon2/Makefile b/sysutils/bubblemon2/Makefile
index b28b65ea87fb..d53fe60a7ecf 100644
--- a/sysutils/bubblemon2/Makefile
+++ b/sysutils/bubblemon2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bubblemon2
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	bubblemon
diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index c54d91866583..40356b4a3c37 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	burn
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gsburn
diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index a1883de5fe9b..081f9534207e 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cd-write
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jmz
diff --git a/sysutils/cdbakeoven/Makefile b/sysutils/cdbakeoven/Makefile
index 0555b7de73d9..c4cade67a37e 100644
--- a/sysutils/cdbakeoven/Makefile
+++ b/sysutils/cdbakeoven/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cdbakeoven
 PORTVERSION=	1.8.9
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/cog/Makefile b/sysutils/cog/Makefile
index d7e3be3d6699..41079a0d1d48 100644
--- a/sysutils/cog/Makefile
+++ b/sysutils/cog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cog
 PORTVERSION=	0.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.krakoa.dk/progs/cog/
 
diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index dd38a08deb78..692ba1aec391 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	conky
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index dd38a08deb78..692ba1aec391 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	conky
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/contool/Makefile b/sysutils/contool/Makefile
index b5a541b1a97e..d09953d640ed 100644
--- a/sysutils/contool/Makefile
+++ b/sysutils/contool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	contool
 PORTVERSION=	3.3a
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nsayer
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index bd79bc07a250..42220f35d444 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	coreutils
 PORTVERSION=	6.7
+PORTREVISION=	1
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/coreutils/pkg-plist b/sysutils/coreutils/pkg-plist
index 5a77d59c3630..ceee63b7b287 100644
--- a/sysutils/coreutils/pkg-plist
+++ b/sysutils/coreutils/pkg-plist
@@ -167,22 +167,12 @@ bin/gbase64
 %%NLS%%@dirrmtry share/locale/tr/LC_TIME
 %%NLS%%@dirrmtry share/locale/sv/LC_TIME
 %%NLS%%@dirrmtry share/locale/sl/LC_TIME
-%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sl
 %%NLS%%@dirrmtry share/locale/sk/LC_TIME
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
 %%NLS%%@dirrmtry share/locale/ru/LC_TIME
 %%NLS%%@dirrmtry share/locale/pt_BR/LC_TIME
 %%NLS%%@dirrmtry share/locale/pt/LC_TIME
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
 %%NLS%%@dirrmtry share/locale/pl/LC_TIME
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
 %%NLS%%@dirrmtry share/locale/no/LC_TIME
-%%NLS%%@dirrmtry share/locale/no/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/no
 %%NLS%%@dirrmtry share/locale/nl/LC_TIME
 %%NLS%%@dirrmtry share/locale/nb/LC_TIME
 %%NLS%%@dirrmtry share/locale/ms/LC_TIME
@@ -190,35 +180,21 @@ bin/gbase64
 %%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/lg
 %%NLS%%@dirrmtry share/locale/ko/LC_TIME
-%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko
 %%NLS%%@dirrmtry share/locale/ja/LC_TIME
 %%NLS%%@dirrmtry share/locale/it/LC_TIME
 %%NLS%%@dirrmtry share/locale/hu/LC_TIME
 %%NLS%%@dirrmtry share/locale/gl/LC_TIME
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
 %%NLS%%@dirrmtry share/locale/ga/LC_TIME
 %%NLS%%@dirrmtry share/locale/fr/LC_TIME
 %%NLS%%@dirrmtry share/locale/fi/LC_TIME
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 %%NLS%%@dirrmtry share/locale/et/LC_TIME
 %%NLS%%@dirrmtry share/locale/es/LC_TIME
 %%NLS%%@dirrmtry share/locale/el/LC_TIME
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
 %%NLS%%@dirrmtry share/locale/de/LC_TIME
 %%NLS%%@dirrmtry share/locale/da/LC_TIME
 %%NLS%%@dirrmtry share/locale/cs/LC_TIME
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
 %%NLS%%@dirrmtry share/locale/ca/LC_TIME
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
 %%NLS%%@dirrmtry share/locale/be/LC_TIME
-%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/be
 %%NLS%%@dirrmtry share/locale/af/LC_TIME
 %%NLS%%@dirrmtry share/locale/bg/LC_TIME
 %%NLS%%@dirrmtry share/locale/eu/LC_TIME
diff --git a/sysutils/desktopbsd-tools/Makefile b/sysutils/desktopbsd-tools/Makefile
index dd00e9bfa3ea..d28f8a4c3279 100644
--- a/sysutils/desktopbsd-tools/Makefile
+++ b/sysutils/desktopbsd-tools/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	desktopbsd-tools
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.desktopbsd.net/
 
diff --git a/sysutils/dircomp/Makefile b/sysutils/dircomp/Makefile
index 97846e8712df..7131f0df48ac 100644
--- a/sysutils/dircomp/Makefile
+++ b/sysutils/dircomp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	DirComp
 PORTVERSION=	1.3.03
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
diff --git a/sysutils/dirdiff/Makefile b/sysutils/dirdiff/Makefile
index bb90267196b7..ae4af9c7fea1 100644
--- a/sysutils/dirdiff/Makefile
+++ b/sysutils/dirdiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dirdiff
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils tcl84 tk84
 MASTER_SITES=	ftp://ftp.samba.org/pub/paulus/
 
diff --git a/sysutils/disktool/Makefile b/sysutils/disktool/Makefile
index 57651f15c119..b7d708d62041 100644
--- a/sysutils/disktool/Makefile
+++ b/sysutils/disktool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	disktool
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ftp.auxio.org/pub/mirrors/step.polymtl.ca/pub/Xview/apps/disktool/
 DISTNAME=	disktool-2.0c
diff --git a/sysutils/downtime/Makefile b/sysutils/downtime/Makefile
index 99cff340fd89..02ca147bbfa3 100644
--- a/sysutils/downtime/Makefile
+++ b/sysutils/downtime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	downtime
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.nickwithers.com/downtime/
 
diff --git a/sysutils/dtc-toaster/Makefile b/sysutils/dtc-toaster/Makefile
index f73cfba41804..20cdddf39b7b 100644
--- a/sysutils/dtc-toaster/Makefile
+++ b/sysutils/dtc-toaster/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=       dtc
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=     sysutils
 PKGNAMESUFFIX=  -toaster
 
diff --git a/sysutils/dtc/Makefile b/sysutils/dtc/Makefile
index b4d6ff945083..9d687c6c21a4 100644
--- a/sysutils/dtc/Makefile
+++ b/sysutils/dtc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dtc
 PORTVERSION=	0.24.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.gplhost.com/pub/dtc/bsd/
 
diff --git a/sysutils/dvdisaster/Makefile b/sysutils/dvdisaster/Makefile
index b84856aaf35a..9ffd1cf3ad16 100644
--- a/sysutils/dvdisaster/Makefile
+++ b/sysutils/dvdisaster/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dvdisaster
 PORTVERSION=	0.70.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dvdisaster
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
index d84689866648..0c6a246cf0e8 100644
--- a/sysutils/eiciel/Makefile
+++ b/sysutils/eiciel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eiciel
 PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils security
 MASTER_SITES=	http://rofi.pinchito.com/eiciel/download/
 
diff --git a/sysutils/empower/Makefile b/sysutils/empower/Makefile
index eab715fb7cc2..6366643a5b51 100644
--- a/sysutils/empower/Makefile
+++ b/sysutils/empower/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	empower
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/sysutils/eroaster/Makefile b/sysutils/eroaster/Makefile
index 1f77cd9f7bfe..ee828cefd44f 100644
--- a/sysutils/eroaster/Makefile
+++ b/sysutils/eroaster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eroaster
 PORTVERSION=	2.2.0.0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	eroaster
diff --git a/sysutils/eroaster/pkg-plist b/sysutils/eroaster/pkg-plist
index 895bbf433903..a9a77d0ba203 100644
--- a/sysutils/eroaster/pkg-plist
+++ b/sysutils/eroaster/pkg-plist
@@ -91,6 +91,5 @@ share/locale/es/LC_MESSAGES/es.mo
 @dirrm lib/eroaster/glade
 @dirrm lib/eroaster/xml
 @dirrm lib/eroaster
-@dirrmtry share/pixmaps
 @dirrm share/eroaster/pixmaps
 @dirrm share/eroaster
diff --git a/sysutils/etoile-behavior/Makefile b/sysutils/etoile-behavior/Makefile
index a5fa0715ed80..f69239414184 100644
--- a/sysutils/etoile-behavior/Makefile
+++ b/sysutils/etoile-behavior/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	behavior
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/sysutils/etoile-installer/Makefile b/sysutils/etoile-installer/Makefile
index 02ba70573768..642b611857ac 100644
--- a/sysutils/etoile-installer/Makefile
+++ b/sysutils/etoile-installer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	installer
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/sysutils/etoile-system/Makefile b/sysutils/etoile-system/Makefile
index d8981f4279a8..db00f82ae61b 100644
--- a/sysutils/etoile-system/Makefile
+++ b/sysutils/etoile-system/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	system
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/sysutils/eventwatcher/Makefile b/sysutils/eventwatcher/Makefile
index e3d809d4253a..2d7ff660ff9f 100644
--- a/sysutils/eventwatcher/Makefile
+++ b/sysutils/eventwatcher/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eventwatcher
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	eventwatcher
diff --git a/sysutils/extrackt/Makefile b/sysutils/extrackt/Makefile
index a4595fba38fc..84f84d58cd2f 100644
--- a/sysutils/extrackt/Makefile
+++ b/sysutils/extrackt/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	extrackt
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile
index e397e628781c..ccfbd84f2f09 100644
--- a/sysutils/filelight-kde4/Makefile
+++ b/sysutils/filelight-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	filelight
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://www.methylblue.com/filelight/packages/
 
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index e397e628781c..ccfbd84f2f09 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	filelight
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://www.methylblue.com/filelight/packages/
 
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index 63d9ccbc4732..29904169e7ef 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	encfs
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://arg0.net/users/vgough/download/
 PKGNAMEPREFIX=	fusefs-
diff --git a/sysutils/fusefs-encfs/pkg-plist b/sysutils/fusefs-encfs/pkg-plist
index 0ae4a7101c94..e204e7f28a57 100644
--- a/sysutils/fusefs-encfs/pkg-plist
+++ b/sysutils/fusefs-encfs/pkg-plist
@@ -43,8 +43,6 @@ share/locale/es_PE/LC_MESSAGES/encfs.mo
 @dirrmtry share/locale/de_CH
 @dirrmtry share/locale/de_DE/LC_MESSAGES
 @dirrmtry share/locale/de_DE
-@dirrmtry share/locale/fr_FR/LC_MESSAGES
-@dirrmtry share/locale/fr_FR
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/es_PE/LC_MESSAGES
diff --git a/sysutils/fusefs-gnome-vfs/Makefile b/sysutils/fusefs-gnome-vfs/Makefile
index ff925d124681..fea9b6d2e1bc 100644
--- a/sysutils/fusefs-gnome-vfs/Makefile
+++ b/sysutils/fusefs-gnome-vfs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fusefs-gnome-vfs
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.evolware.org/chri/
 DISTNAME=	${RPORTNAME}-${PORTVERSION}
diff --git a/sysutils/ganglia-webfrontend/Makefile b/sysutils/ganglia-webfrontend/Makefile
index 62af92265c22..4b83a0dfb9bb 100644
--- a/sysutils/ganglia-webfrontend/Makefile
+++ b/sysutils/ganglia-webfrontend/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	webfrontend
 PORTVERSION=	3.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils net parallel www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ganglia
diff --git a/sysutils/gapcmon/Makefile b/sysutils/gapcmon/Makefile
index 5a64fdcf1a96..52a458f2c450 100644
--- a/sysutils/gapcmon/Makefile
+++ b/sysutils/gapcmon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gapcmon
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/gapcmon/pkg-plist b/sysutils/gapcmon/pkg-plist
index 9c8805d329f2..a645105f34a1 100644
--- a/sysutils/gapcmon/pkg-plist
+++ b/sysutils/gapcmon/pkg-plist
@@ -7,4 +7,3 @@ share/pixmaps/onbatt.png
 share/pixmaps/online.png
 share/pixmaps/unplugged.png
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index cfd05499582f..df4380341f8a 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcdmaster
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	GNOME frontend for cdrdao
 
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 14d4cbe02ca4..57a22aee983b 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcombust
 PORTVERSION=	0.1.55
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.abo.fi/~jmunsin/gcombust/
 
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 1f224eb2380d..f461cd8ba943 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gconf-editor
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 641ccff6f777..a879a223d6e7 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -109,61 +109,25 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
 @dirrm share/gnome/help/gconf-editor/C/figures
 @dirrm share/gnome/help/gconf-editor/C
 @dirrm share/gnome/help/gconf-editor
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @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/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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/sysutils/gdmap/Makefile b/sysutils/gdmap/Makefile
index a19b93472c92..cac665153d37 100644
--- a/sysutils/gdmap/Makefile
+++ b/sysutils/gdmap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdmap
 PORTVERSION=	0.7.5
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gdmap
diff --git a/sysutils/geomgui/Makefile b/sysutils/geomgui/Makefile
index 9ee0551ce15f..282dd29dd06b 100644
--- a/sysutils/geomgui/Makefile
+++ b/sysutils/geomgui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	geomgui
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://geomgui.xride.dk/files/ \
 		${MASTER_SITE_LOCAL}
diff --git a/sysutils/gfslicer/Makefile b/sysutils/gfslicer/Makefile
index 81cb65781ee7..5393ada32554 100644
--- a/sysutils/gfslicer/Makefile
+++ b/sysutils/gfslicer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gfslicer
 PORTVERSION=	1.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/sysutils/ghasher/Makefile b/sysutils/ghasher/Makefile
index 397c2fbe8b07..216b122ef57b 100644
--- a/sysutils/ghasher/Makefile
+++ b/sysutils/ghasher/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghasher
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://asgaard.homelinux.org/code/ghasher/
 
diff --git a/sysutils/gkfreq/Makefile b/sysutils/gkfreq/Makefile
index ed7af84defcd..6a929bbdd821 100644
--- a/sysutils/gkfreq/Makefile
+++ b/sysutils/gkfreq/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gkfreq
 PORTVERSION=	1.0
+PORTREVISION=	1
 #PORTREVISION=	0
 CATEGORIES=	sysutils
 DISTNAME=	gkrellm-gkfreq-${PORTVERSION}
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index 90cd7b92ea38..f5be829a5350 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gkleds2
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://heim.ifi.uio.no/~oyvinha/files/files/
 DISTNAME=	gkleds-${PORTVERSION}
diff --git a/sysutils/gkrellfire/Makefile b/sysutils/gkrellfire/Makefile
index 0a927d12739c..7707c7b40e21 100644
--- a/sysutils/gkrellfire/Makefile
+++ b/sysutils/gkrellfire/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellfire
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.freenet.de/thomas-steinke/ \
 		${MASTER_SITE_LOCAL}
diff --git a/sysutils/gkrellflynn/Makefile b/sysutils/gkrellflynn/Makefile
index 139ca8777dd3..b6dc3db09c7a 100644
--- a/sysutils/gkrellflynn/Makefile
+++ b/sysutils/gkrellflynn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellflynn
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://horus.comlab.uni-rostock.de/flynn/
 
diff --git a/sysutils/gkrellm-trayicons/Makefile b/sysutils/gkrellm-trayicons/Makefile
index b287bc9be60d..320a1c8335d7 100644
--- a/sysutils/gkrellm-trayicons/Makefile
+++ b/sysutils/gkrellm-trayicons/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	trayicons
 PORTVERSION=	1.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://depot.fsck.ch/mirror/distfiles/ \
 		http://sweb.cz/tripie/gkrellm/trayicons/dist/
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 3f80ce9adf7b..d10f83a7c581 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellm
 PORTVERSION=	1.2.13
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 1a7619abcaf8..55e3200b3089 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellm
 PORTVERSION=	2.2.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
diff --git a/sysutils/gkrellmouse/Makefile b/sysutils/gkrellmouse/Makefile
index a1bcb7e6ecf1..262a82335bcf 100644
--- a/sysutils/gkrellmouse/Makefile
+++ b/sysutils/gkrellmouse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmouse
 PORTVERSION=	0.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.nafpik.com/paul/gkrellmouse/ \
 		http://mirror2.unixfreunde.de/ \
diff --git a/sysutils/gkrellmwho/Makefile b/sysutils/gkrellmwho/Makefile
index 992ca8bf745d..f4b4e83d5367 100644
--- a/sysutils/gkrellmwho/Makefile
+++ b/sysutils/gkrellmwho/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmwho
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://mirror2.unixfreunde.de/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/sysutils/gkrellmwho2/Makefile b/sysutils/gkrellmwho2/Makefile
index d5a7f18b05ef..4af912cd641a 100644
--- a/sysutils/gkrellmwho2/Makefile
+++ b/sysutils/gkrellmwho2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellmwho2
 PORTVERSION=	0.2.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://shisha.spb.ru/ \
 		http://users.podolsk.ru/c104598/
diff --git a/sysutils/gkrelltop/Makefile b/sysutils/gkrelltop/Makefile
index 3f066765c138..5008dc69c68e 100644
--- a/sysutils/gkrelltop/Makefile
+++ b/sysutils/gkrelltop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrelltop
 PORTVERSION=	2.2.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://psychology.rutgers.edu/~zaimi/html/gkrelltop/
 DISTNAME=	${PORTNAME}_2.2-6
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index 7b05600f1069..3eaddd603412 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gksu
 PORTVERSION=	1.3.7
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.debian.org/~kov/gksu/old_stuff/gksu/
 
diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile
index 4f9ef5d7fc04..96a8312abb39 100644
--- a/sysutils/glload/Makefile
+++ b/sysutils/glload/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glload
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://reality.exsgi.org/eile/misc/
 
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index c634136f35cd..c52529193b27 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 608cafc69e0b..45b72866f165 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -250,62 +250,26 @@ share/mime/application/x-gnome-theme-package.xml
 share/mime/packages/gnome-theme-package.xml
 @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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrm share/gnome/omf/control-center
 @dirrm share/gnome/help/control-center/zh_CN
 @dirrm share/gnome/help/control-center/uk
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index f611d3b6b129..74c2b5687627 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	1.4.0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/1.4
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index cb6be48dd8a4..f0daa09acd1a 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-mount
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://people.freedesktop.org/~david/dist/
 
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index c3312f9948d8..11e61cb4ac61 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-pkgview
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.greatnorthern.demon.co.uk/packages/gnome-pkgview/
 
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index ed8bdbafd01e..efd9d66e2d3a 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-power-manager
 PORTVERSION=	2.18.2
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
index a219aaa33290..89d70a45f6f1 100644
--- a/sysutils/gnome-power-manager/pkg-plist
+++ b/sysutils/gnome-power-manager/pkg-plist
@@ -357,41 +357,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-power-manager.mo
 @dirrm share/gnome/help/gnome-power-manager
 @dirrm share/gnome/gnome-power-manager
 @dirrmtry share/gnome/autostart
-@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/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/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile
index b06ed466b5c3..5ec219beeacd 100644
--- a/sysutils/gnome-schedule/Makefile
+++ b/sysutils/gnome-schedule/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-schedule
 PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 9e87b69b5eda..083be484d17f 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-system-monitor
 PORTVERSION=	2.18.1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index b251815c687b..f6895ea2169d 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -149,60 +149,22 @@ share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @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/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
 @dirrm share/gnome/pixmaps/gnome-system-monitor
 @dirrm share/gnome/omf/gnome-system-monitor
 @dirrm share/gnome/help/gnome-system-monitor/sv/figures
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 53b0ed251c49..e048f695e1da 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-system-tools
 PORTVERSION=	2.18.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 65ec9bf4dbde..43de72f87103 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -187,54 +187,20 @@ share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
-@dirrm share/locale/zh_TW/LC_MESSAGES
-@dirrm share/locale/zh_TW
 @dirrm share/locale/zh_HK/LC_MESSAGES
 @dirrm share/locale/zh_HK
-@dirrm share/locale/zh_CN/LC_MESSAGES
-@dirrm share/locale/zh_CN
 @dirrm share/locale/xh/LC_MESSAGES
 @dirrm share/locale/xh
-@dirrm share/locale/uk/LC_MESSAGES
-@dirrm share/locale/uk
-@dirrm share/locale/sr/LC_MESSAGES
-@dirrm share/locale/sr
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
 @dirrm share/locale/rw/LC_MESSAGES
 @dirrm share/locale/rw
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/nn/LC_MESSAGES
-@dirrm share/locale/nn
-@dirrm share/locale/ne/LC_MESSAGES
-@dirrm share/locale/ne
 @dirrm share/locale/mg/LC_MESSAGES
 @dirrm share/locale/mg
 @dirrm share/locale/ku/LC_MESSAGES
 @dirrm share/locale/ku
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko
-@dirrm share/locale/gl/LC_MESSAGES
-@dirrm share/locale/gl
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
 @dirrm share/locale/dz/LC_MESSAGES
 @dirrm share/locale/dz
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
 @dirrm share/locale/bn_IN/LC_MESSAGES
 @dirrm share/locale/bn_IN
-@dirrm share/locale/be/LC_MESSAGES
-@dirrm share/locale/be
 @dirrm share/gnome/omf/users-admin
 @dirrm share/gnome/omf/time-admin
 @dirrm share/gnome/omf/shares-admin
@@ -295,51 +261,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
 @dirrm share/gnome/gnome-system-tools/pixmaps
 @dirrm share/gnome/gnome-system-tools/interfaces
 @dirrm share/gnome/gnome-system-tools
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
index a78e6438b437..bf5a2e7e98fc 100644
--- a/sysutils/gnome-volume-manager/Makefile
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-volume-manager
 PORTVERSION=	2.17.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist
index 03aa400ce488..035e5037d15f 100644
--- a/sysutils/gnome-volume-manager/pkg-plist
+++ b/sysutils/gnome-volume-manager/pkg-plist
@@ -76,52 +76,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
 @dirrmtry share/gnome/autostart
 @dirrm share/gnome/gnome-volume-manager/icons
 @dirrm share/gnome/gnome-volume-manager
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/ang/LC_MESSAGES
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 33ffa505e359..8944bc3edc95 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		gnomebaker
 PORTVERSION=		0.6.1
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnomebaker
diff --git a/sysutils/gnomebaker/pkg-plist b/sysutils/gnomebaker/pkg-plist
index 41ea1cbf5aac..a3d27ec3597e 100644
--- a/sysutils/gnomebaker/pkg-plist
+++ b/sysutils/gnomebaker/pkg-plist
@@ -119,54 +119,26 @@ share/locale/zh/LC_MESSAGES/gnomebaker.mo
 share/locale/zh_CN/LC_MESSAGES/gnomebaker.mo
 share/locale/zh_HK/LC_MESSAGES/gnomebaker.mo
 share/locale/zh_TW/LC_MESSAGES/gnomebaker.mo
-@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/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/tl/LC_MESSAGES
 @dirrmtry share/locale/tl
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/st/LC_MESSAGES
 @dirrmtry share/locale/st
-@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/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/no/LC_MESSAGES
-@dirrmtry share/locale/no
 @dirrmtry share/locale/nl_NL/LC_MESSAGES
 @dirrmtry share/locale/nl_NL
 @dirrmtry share/locale/nl_BE/LC_MESSAGES
 @dirrmtry share/locale/nl_BE
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrmtry share/locale/it_IT/LC_MESSAGES
 @dirrmtry share/locale/it_IT
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fr_FR/LC_MESSAGES
-@dirrmtry share/locale/fr_FR
 @dirrmtry share/locale/fr_CH/LC_MESSAGES
 @dirrmtry share/locale/fr_CH
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrmtry share/locale/eu_ES/LC_MESSAGES
 @dirrmtry share/locale/eu_ES
 @dirrmtry share/locale/es_CR/LC_MESSAGES
@@ -177,20 +149,10 @@ share/locale/zh_TW/LC_MESSAGES/gnomebaker.mo
 @dirrmtry share/locale/es_AR
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
-@dirrmtry share/locale/en_AU/LC_MESSAGES
-@dirrmtry share/locale/en_AU
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
 @dirrmtry share/locale/de_DE/LC_MESSAGES
 @dirrmtry share/locale/de_DE
 @dirrmtry share/locale/de_CH/LC_MESSAGES
 @dirrmtry share/locale/de_CH
-@dirrmtry share/locale/de_AT/LC_MESSAGES
-@dirrmtry share/locale/de_AT
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/locale/bo/LC_MESSAGES
 @dirrmtry share/locale/bo
 @dirrmtry share/icons/hicolor/48x48/apps
diff --git a/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile
index 0550fa8b000f..a145fcae6a1a 100644
--- a/sysutils/gnomefind/Makefile
+++ b/sysutils/gnomefind/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomefind
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnome-find
diff --git a/sysutils/gpkgdep/Makefile b/sysutils/gpkgdep/Makefile
index d5c3b0e9952d..e70985c07b25 100644
--- a/sysutils/gpkgdep/Makefile
+++ b/sysutils/gpkgdep/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gpkgdep
 PORTVERSION=	0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gpkgdep
diff --git a/sysutils/graphicboot/Makefile b/sysutils/graphicboot/Makefile
index 228613a1c791..535e63f2cbda 100644
--- a/sysutils/graphicboot/Makefile
+++ b/sysutils/graphicboot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	graphicboot
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://matt.sixxgate.com/files/
 
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index 89fa704aaf41..eb797e9e57db 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	graveman
 PORTVERSION=	0.3.12.5
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://graveman.tuxfamily.org/sources/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}
diff --git a/sysutils/gstreamer-plugins-cdio80/Makefile b/sysutils/gstreamer-plugins-cdio80/Makefile
index 4f77fae21c96..2ec8d1051233 100644
--- a/sysutils/gstreamer-plugins-cdio80/Makefile
+++ b/sysutils/gstreamer-plugins-cdio80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/sysutils/gstreamer-plugins-cdio80/Makefile,v 1.2 2006/02/25 00:19:56 marcus Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 COMMENT=	Gstreamer compact disc input and control library
diff --git a/sysutils/gstreamer-plugins-hal/Makefile b/sysutils/gstreamer-plugins-hal/Makefile
index 35f6293372b0..c83708436bd9 100644
--- a/sysutils/gstreamer-plugins-hal/Makefile
+++ b/sysutils/gstreamer-plugins-hal/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/sysutils/gstreamer-plugins-hal/Makefile,v 1.1 2006/05/17 12:29:05 ahze Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 COMMENT=	Gstreamer hal plugin
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index 9bfa6a5ca209..d46b2166ebc4 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-imonc
 PORTVERSION=	0.6.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://userpage.fu-berlin.de/~zeank/gtk-imonc/download/
 
diff --git a/sysutils/gtk-imonc/pkg-plist b/sysutils/gtk-imonc/pkg-plist
index 31192335ed37..844509e1a2cc 100644
--- a/sysutils/gtk-imonc/pkg-plist
+++ b/sysutils/gtk-imonc/pkg-plist
@@ -12,6 +12,5 @@ share/gtk-imonc/pixmaps/reboot.png
 share/gtk-imonc/pixmaps/shutdown.png
 share/locale/de/LC_MESSAGES/gtk-imonc.mo
 share/pixmaps/gtk-imonc.png
-@dirrmtry share/pixmaps
 @dirrm share/gtk-imonc/pixmaps
 @dirrm share/gtk-imonc
diff --git a/sysutils/gtk-send-pr/Makefile b/sysutils/gtk-send-pr/Makefile
index 44ed609923ed..7bef143ab38b 100644
--- a/sysutils/gtk-send-pr/Makefile
+++ b/sysutils/gtk-send-pr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-send-pr
 PORTVERSION=	0.4.8
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/${PORTNAME}/
 
diff --git a/sysutils/gtoaster/Makefile b/sysutils/gtoaster/Makefile
index fed7570b68c4..a60b82d32809 100644
--- a/sysutils/gtoaster/Makefile
+++ b/sysutils/gtoaster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtoaster
 PORTVERSION=	1.0.b6
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://gnometoaster.rulez.org/archive/
diff --git a/sysutils/gupsc/Makefile b/sysutils/gupsc/Makefile
index 8ba6536a065c..4a95d18442f8 100644
--- a/sysutils/gupsc/Makefile
+++ b/sysutils/gupsc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gupsc
 PORTVERSION=	0.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://heim.ifi.uio.no/~hennikul/gupsc/download/
 
diff --git a/sysutils/gupsc/pkg-plist b/sysutils/gupsc/pkg-plist
index b78d831db818..213dcb215695 100644
--- a/sysutils/gupsc/pkg-plist
+++ b/sysutils/gupsc/pkg-plist
@@ -3,5 +3,3 @@ share/locale/no/LC_MESSAGES/gupsc.mo
 share/gnome/pixmaps/gupsc/ups.png
 share/gnome/apps/System/gupsc.desktop
 @dirrm share/gnome/pixmaps/gupsc
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
diff --git a/sysutils/hachoir-wx/Makefile b/sysutils/hachoir-wx/Makefile
index 2d79791804c9..b937a48f8021 100644
--- a/sysutils/hachoir-wx/Makefile
+++ b/sysutils/hachoir-wx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hachoir-wx
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	http://cheeseshop.python.org/packages/source/h/${PORTNAME}/ CENKES
 
diff --git a/sysutils/hal-device-manager/Makefile b/sysutils/hal-device-manager/Makefile
index f51395471c67..eaf3a019a88f 100644
--- a/sysutils/hal-device-manager/Makefile
+++ b/sysutils/hal-device-manager/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/sysutils/hal-device-manager/Makefile,v 1.3 2006/05/18 22:15:41 ahze Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 PKGNAMESUFFIX=	-device-manager
 
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 0a88856606f9..fa48fbb35e31 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	hal
 PORTVERSION=	${HALVERSION}.${SNAPVERSION}
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	sysutils
 MASTER_SITES=	http://www.marcuscom.com/downloads/
 
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
index 219eea45256a..6b0d1e7589aa 100644
--- a/sysutils/hal/pkg-plist
+++ b/sysutils/hal/pkg-plist
@@ -136,26 +136,8 @@ share/locale/zh_TW/LC_MESSAGES/hal.mo
 @unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true
 @unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true
 @unexec rmdir /var/run/hald 2>/dev/null || true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sl_SI/LC_MESSAGES
 @dirrmtry share/locale/sl_SI
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 %%MEDIA%%@unexec rmdir /media 2>/dev/null || true
diff --git a/sysutils/hoz/Makefile b/sysutils/hoz/Makefile
index ed84d2e9efd1..710c0811ff50 100644
--- a/sysutils/hoz/Makefile
+++ b/sysutils/hoz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hoz
 PORTVERSION=	1.65
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/isomaster/Makefile b/sysutils/isomaster/Makefile
index 8eae98a371e2..4d56d58f9fca 100644
--- a/sysutils/isomaster/Makefile
+++ b/sysutils/isomaster/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	isomaster
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://littlesvr.ca/isomaster/releases/
 
diff --git a/sysutils/jdiskreport/Makefile b/sysutils/jdiskreport/Makefile
index f5cd21f4747f..6bf10cd1ed8e 100644
--- a/sysutils/jdiskreport/Makefile
+++ b/sysutils/jdiskreport/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jdiskreport
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	http://www.jGoodies.com/download/${PORTNAME}/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S,.,_,g}
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 3e603572dc85..c35c3e68cf2b 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 3e603572dc85..c35c3e68cf2b 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/kcpuload/Makefile b/sysutils/kcpuload/Makefile
index 7b5ed577c0b9..ffbb23501717 100644
--- a/sysutils/kcpuload/Makefile
+++ b/sysutils/kcpuload/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kcpuload
 PORTVERSION=	1.99
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://www.brueffer.de/distfiles/
 
diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile
index 36f3d617c6e1..4ce1098624ee 100644
--- a/sysutils/kcube/Makefile
+++ b/sysutils/kcube/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kcube
 PORTVERSION=	0.61
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://www.tuxed.de/kcube/download/
 
diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index 32c981541e86..b5f068dc2be6 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdeadmin
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index 32c981541e86..b5f068dc2be6 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdeadmin
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index d2a8b1c1613f..349568482863 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index a22eeada2749..72d1865bfa71 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdirstat
 PORTVERSION=	2.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://kdirstat.sourceforge.net/download/
 
diff --git a/sysutils/keep/Makefile b/sysutils/keep/Makefile
index 4b0b867c3eb4..1268e0035d8c 100644
--- a/sysutils/keep/Makefile
+++ b/sysutils/keep/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	keep
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://jr.falleri.free.fr/files/devel/keep/
 
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index d2a8b1c1613f..349568482863 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/sysutils/kkbswitch/Makefile b/sysutils/kkbswitch/Makefile
index 1e016a0f6e65..16ebcabd7500 100644
--- a/sysutils/kkbswitch/Makefile
+++ b/sysutils/kkbswitch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		kkbswitch
 PORTVERSION=		1.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=		sysutils kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kkbswitch
diff --git a/sysutils/kkeyled/Makefile b/sysutils/kkeyled/Makefile
index 91bda54af7f5..9f06c99c3df3 100644
--- a/sysutils/kkeyled/Makefile
+++ b/sysutils/kkeyled/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kkeyled
 PORTVERSION=	0.8.11
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
 
diff --git a/sysutils/klaptopdaemon/Makefile b/sysutils/klaptopdaemon/Makefile
index 29be5f29ab75..79603d373d95 100644
--- a/sysutils/klaptopdaemon/Makefile
+++ b/sysutils/klaptopdaemon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	klaptopdaemon
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/sysutils/klineakconfig/Makefile b/sysutils/klineakconfig/Makefile
index 35b4e807d434..7b9a1637ca84 100644
--- a/sysutils/klineakconfig/Makefile
+++ b/sysutils/klineakconfig/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	klineakconfig
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lineak
diff --git a/sysutils/kmilo/Makefile b/sysutils/kmilo/Makefile
index 264771810d32..ebb6bb9b0514 100644
--- a/sysutils/kmilo/Makefile
+++ b/sysutils/kmilo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kmilo
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile
index f3cde1745da7..306ac9170d6f 100644
--- a/sysutils/knutclient-kde4/Makefile
+++ b/sysutils/knutclient-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	knutclient
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/
 
diff --git a/sysutils/knutclient-kde4/pkg-plist b/sysutils/knutclient-kde4/pkg-plist
index b2e432e13b52..329847fb2546 100644
--- a/sysutils/knutclient-kde4/pkg-plist
+++ b/sysutils/knutclient-kde4/pkg-plist
@@ -43,8 +43,6 @@ share/locale/it/LC_MESSAGES/knutclient.mo
 share/locale/pt_BR/LC_MESSAGES/knutclient.mo
 share/locale/ru/LC_MESSAGES/knutclient.mo
 share/locale/uk/LC_MESSAGES/knutclient.mo
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/icons/locolor/32x32/apps
 @dirrmtry share/icons/locolor/32x32
 @dirrmtry share/icons/locolor/16x16/apps
diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile
index f3cde1745da7..306ac9170d6f 100644
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	knutclient
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/
 
diff --git a/sysutils/knutclient/pkg-plist b/sysutils/knutclient/pkg-plist
index b2e432e13b52..329847fb2546 100644
--- a/sysutils/knutclient/pkg-plist
+++ b/sysutils/knutclient/pkg-plist
@@ -43,8 +43,6 @@ share/locale/it/LC_MESSAGES/knutclient.mo
 share/locale/pt_BR/LC_MESSAGES/knutclient.mo
 share/locale/ru/LC_MESSAGES/knutclient.mo
 share/locale/uk/LC_MESSAGES/knutclient.mo
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/icons/locolor/32x32/apps
 @dirrmtry share/icons/locolor/32x32
 @dirrmtry share/icons/locolor/16x16/apps
diff --git a/sysutils/komparator/Makefile b/sysutils/komparator/Makefile
index 065e8ee456bc..e3c5d298bda8 100644
--- a/sysutils/komparator/Makefile
+++ b/sysutils/komparator/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	komparator
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/krename-kde4/Makefile b/sysutils/krename-kde4/Makefile
index 29cb572b6454..e38e865ac7b0 100644
--- a/sysutils/krename-kde4/Makefile
+++ b/sysutils/krename-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	krename
 PORTVERSION=	3.0.14
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/krename-kde4/pkg-plist b/sysutils/krename-kde4/pkg-plist
index a3e6e3c253b8..fb5200018443 100644
--- a/sysutils/krename-kde4/pkg-plist
+++ b/sysutils/krename-kde4/pkg-plist
@@ -26,10 +26,6 @@ share/locale/sv/LC_MESSAGES/krename.mo
 share/locale/tr/LC_MESSAGES/krename.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/krename.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/krename.mo
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrm share/doc/HTML/en/krename
 @dirrm share/apps/krename
 @dirrmtry share/applications/kde
diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
index 29cb572b6454..e38e865ac7b0 100644
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	krename
 PORTVERSION=	3.0.14
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/krename/pkg-plist b/sysutils/krename/pkg-plist
index a3e6e3c253b8..fb5200018443 100644
--- a/sysutils/krename/pkg-plist
+++ b/sysutils/krename/pkg-plist
@@ -26,10 +26,6 @@ share/locale/sv/LC_MESSAGES/krename.mo
 share/locale/tr/LC_MESSAGES/krename.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/krename.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/krename.mo
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 @dirrm share/doc/HTML/en/krename
 @dirrm share/apps/krename
 @dirrmtry share/applications/kde
diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index 3fc53a2a8d6d..853e4870bd05 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kshutdown
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/kshutdown-kde4/pkg-plist b/sysutils/kshutdown-kde4/pkg-plist
index 8a16d44ba064..384b7abce61f 100644
--- a/sysutils/kshutdown-kde4/pkg-plist
+++ b/sysutils/kshutdown-kde4/pkg-plist
@@ -52,14 +52,6 @@ share/locale/sk/LC_MESSAGES/kshutdown.mo
 share/locale/sv/LC_MESSAGES/kshutdown.mo
 share/locale/tr/LC_MESSAGES/kshutdown.mo
 share/locale/zh_CN/LC_MESSAGES/kshutdown.mo
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrm share/doc/HTML/en/kshutdown
 @dirrm share/doc/HTML/de/kshutdown
 @dirrm share/apps/kshutdown/sounds
diff --git a/sysutils/kshutdown/Makefile b/sysutils/kshutdown/Makefile
index 3fc53a2a8d6d..853e4870bd05 100644
--- a/sysutils/kshutdown/Makefile
+++ b/sysutils/kshutdown/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kshutdown
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/kshutdown/pkg-plist b/sysutils/kshutdown/pkg-plist
index 8a16d44ba064..384b7abce61f 100644
--- a/sysutils/kshutdown/pkg-plist
+++ b/sysutils/kshutdown/pkg-plist
@@ -52,14 +52,6 @@ share/locale/sk/LC_MESSAGES/kshutdown.mo
 share/locale/sv/LC_MESSAGES/kshutdown.mo
 share/locale/tr/LC_MESSAGES/kshutdown.mo
 share/locale/zh_CN/LC_MESSAGES/kshutdown.mo
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrm share/doc/HTML/en/kshutdown
 @dirrm share/doc/HTML/de/kshutdown
 @dirrm share/apps/kshutdown/sounds
diff --git a/sysutils/ksynaptics/Makefile b/sysutils/ksynaptics/Makefile
index 177a6e85e5ed..161347aecf4c 100644
--- a/sysutils/ksynaptics/Makefile
+++ b/sysutils/ksynaptics/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ksynaptics
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://qsynaptics.sourceforge.net/
 
diff --git a/sysutils/ksynaptics/pkg-plist b/sysutils/ksynaptics/pkg-plist
index 1e0d4747dd33..3260bccde00b 100644
--- a/sysutils/ksynaptics/pkg-plist
+++ b/sysutils/ksynaptics/pkg-plist
@@ -45,15 +45,7 @@ share/locale/sv/LC_MESSAGES/ksynaptics.mo
 share/locale/ta/LC_MESSAGES/ksynaptics.mo
 share/locale/th/LC_MESSAGES/ksynaptics.mo
 share/locale/tr/LC_MESSAGES/ksynaptics.mo
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@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/autostart
 @dirrmtry share/applications/kde
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index a02b89169df2..8da9224a764b 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lavaps
 PORTVERSION=	2.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 14dea7f50be6..d3f01c8f9125 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgksu
 PORTVERSION=	1.3.8
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.debian.org/~kov/gksu/old_stuff/libgksu1.2/
 DISTNAME=	${PORTNAME}1.2-${PORTVERSION}
diff --git a/sysutils/libgksuui/Makefile b/sysutils/libgksuui/Makefile
index 0096d3914d65..c2b9fbe50ff4 100644
--- a/sysutils/libgksuui/Makefile
+++ b/sysutils/libgksuui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgksuui
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.debian.org/~kov/gksu/old_stuff/libgksuui1.0/
 DISTNAME=	${PORTNAME}1.0-${PORTVERSION}
diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index 4604f9980f46..6d8d1c5e21a9 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lineak-defaultplugin
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	sysutils deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lineak
diff --git a/sysutils/lineak-kdeplugins/Makefile b/sysutils/lineak-kdeplugins/Makefile
index a362c3bdcc93..873389fa2df4 100644
--- a/sysutils/lineak-kdeplugins/Makefile
+++ b/sysutils/lineak-kdeplugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lineak-kdeplugins
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	sysutils deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lineak
diff --git a/sysutils/lineak-xosdplugin/Makefile b/sysutils/lineak-xosdplugin/Makefile
index acd5ca6517ee..0ab8404786af 100644
--- a/sysutils/lineak-xosdplugin/Makefile
+++ b/sysutils/lineak-xosdplugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lineak-xosdplugin
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	sysutils deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=lineak
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index ef584bfbb9c7..4c006501de28 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lineakd
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=lineak
diff --git a/sysutils/lire/Makefile b/sysutils/lire/Makefile
index 5d90aa7dfd96..f9cba3379b00 100644
--- a/sysutils/lire/Makefile
+++ b/sysutils/lire/Makefile
@@ -13,7 +13,7 @@
 
 PORTNAME=	lire
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.logreport.org/pub/
 
diff --git a/sysutils/luma/Makefile b/sysutils/luma/Makefile
index a58cb28708c4..357aa3c73440 100644
--- a/sysutils/luma/Makefile
+++ b/sysutils/luma/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	luma
 PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	sysutils net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 # MASTER_SITES=	http://home.tu-clausthal.de/~ifwd/luma/
diff --git a/sysutils/maint/Makefile b/sysutils/maint/Makefile
index 7d8b021fdbf5..762c388e0efa 100644
--- a/sysutils/maint/Makefile
+++ b/sysutils/maint/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	maint
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	http://people.FreeBSD.org/~foxfair/distfiles/
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/mmore/Makefile b/sysutils/mmore/Makefile
index 1f2b9af0261a..ca5a454339df 100644
--- a/sysutils/mmore/Makefile
+++ b/sysutils/mmore/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mmore
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://matt.sixxgate.com/files/
 
diff --git a/sysutils/mount.app/Makefile b/sysutils/mount.app/Makefile
index 82fcbf0f7da3..fe125813f6e9 100644
--- a/sysutils/mount.app/Makefile
+++ b/sysutils/mount.app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mountapp
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mountapp
diff --git a/sysutils/namefix/Makefile b/sysutils/namefix/Makefile
index f60a6ef6007e..d29cc17508e2 100644
--- a/sysutils/namefix/Makefile
+++ b/sysutils/namefix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	namefix
 DISTVERSION=	4.0_RC4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}.pl_${DISTVERSION}
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 5d8c64594dea..4168f780a618 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nautilus-cd-burner
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 47a18e696bd0..e2d8c0f735df 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -112,59 +112,23 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
 @dirrm include/libnautilus-burn
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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/sysutils/nbosd/Makefile b/sysutils/nbosd/Makefile
index d7c918113926..4edb8e3e8fba 100644
--- a/sysutils/nbosd/Makefile
+++ b/sysutils/nbosd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nbosd
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index ef4f6040237a..5b2523da417d 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ntfsprogs
 PORTVERSION=	1.13.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	linux-ntfs
diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile
index 14bb9ecc422e..97001e61b9b3 100644
--- a/sysutils/nvclock/Makefile
+++ b/sysutils/nvclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nvclock
 PORTVERSION=	0.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.linuxhardware.org/nvclock/ \
 		http://www.kerneled.com/freebsd/ports/
diff --git a/sysutils/nvtv/Makefile b/sysutils/nvtv/Makefile
index 508088d74fe6..719125bba7c1 100644
--- a/sysutils/nvtv/Makefile
+++ b/sysutils/nvtv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nvtv
 PORTVERSION=	0.4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nv-tv-out
diff --git a/sysutils/perf/Makefile b/sysutils/perf/Makefile
index 810ec4d74382..f95a9565e141 100644
--- a/sysutils/perf/Makefile
+++ b/sysutils/perf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	perf
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.spyz.org/perf/
 
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index 631c18c94336..27f32445d864 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pessulus
 PORTVERSION=	2.16.2
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
index daa675cff9ef..2648287f579a 100644
--- a/sysutils/pessulus/pkg-plist
+++ b/sysutils/pessulus/pkg-plist
@@ -111,41 +111,11 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo
 @dirrm %%PYTHON_SITELIBDIR%%/Pessulus
 @dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry %%PYTHON_LIBDIR%%
-@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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index 5111081a61fb..2f133d327b08 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pfstat
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.benzedrine.cx/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/sysutils/plod/Makefile b/sysutils/plod/Makefile
index 0aad77fc8076..c4e5857a4f9b 100644
--- a/sysutils/plod/Makefile
+++ b/sysutils/plod/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	plod
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.far2wise.net/plod/
 
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index 9f004b498faf..32cf6b06d1bf 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	policykit
 PORTVERSION=	0.1.20060514
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.marcuscom.com/downloads/
 DISTNAME=	PolicyKit-${PORTVERSION}
diff --git a/sysutils/pwg/Makefile b/sysutils/pwg/Makefile
index 18d3e7fc6021..fb486d534bab 100644
--- a/sysutils/pwg/Makefile
+++ b/sysutils/pwg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pwg
 PORTVERSION=	0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/qpxtool/Makefile b/sysutils/qpxtool/Makefile
index 578738981b8e..56e7f69cfafc 100644
--- a/sysutils/qpxtool/Makefile
+++ b/sysutils/qpxtool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qpxtool
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/relaxconf/Makefile b/sysutils/relaxconf/Makefile
index b6bcc7db98a0..1faeadae4822 100644
--- a/sysutils/relaxconf/Makefile
+++ b/sysutils/relaxconf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	relaxconf
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	relaxbsd
diff --git a/sysutils/relaxconf/pkg-plist b/sysutils/relaxconf/pkg-plist
index 307204cb631a..c78bdeb1d003 100644
--- a/sysutils/relaxconf/pkg-plist
+++ b/sysutils/relaxconf/pkg-plist
@@ -14,10 +14,6 @@ bin/relaxwebinstaller
 bin/relaxxconf
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/relaxconf.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/relaxconf.mo
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_TW
 %%DATADIR%%/COPYRIGHT
 %%DATADIR%%/COPYRIGHT.RelaxBSD
 %%DATADIR%%/README
diff --git a/sysutils/roottail/Makefile b/sysutils/roottail/Makefile
index b3f57e1a96db..551ea0b9de77 100644
--- a/sysutils/roottail/Makefile
+++ b/sysutils/roottail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	roottail
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.goof.com/pcg/marc/data/
 DISTNAME=	root-tail-${PORTVERSION}
diff --git a/sysutils/searchmonkey/Makefile b/sysutils/searchmonkey/Makefile
index 187ab906b338..f4b9c1d332a8 100644
--- a/sysutils/searchmonkey/Makefile
+++ b/sysutils/searchmonkey/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	searchmonkey
 PORTVERSION=	0.7.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
@@ -20,7 +21,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 PLIST_FILES=	bin/${PORTNAME} share/pixmaps/${PORTNAME}-32x32.png
-PLIST_DIRS=	share/pixmaps
 CFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=-L${LOCALBASE}/lib
 
diff --git a/sysutils/sensors-applet/Makefile b/sysutils/sensors-applet/Makefile
index a2d9d426bccf..0142a398946b 100644
--- a/sysutils/sensors-applet/Makefile
+++ b/sysutils/sensors-applet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sensors-applet
 PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/serpentine/Makefile b/sysutils/serpentine/Makefile
index 530aa003995a..a915557b8ae0 100644
--- a/sysutils/serpentine/Makefile
+++ b/sysutils/serpentine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	serpentine
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/sge/Makefile b/sysutils/sge/Makefile
index 5f42b14c9557..84dd64829791 100644
--- a/sysutils/sge/Makefile
+++ b/sysutils/sge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/122/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile
index 5f42b14c9557..84dd64829791 100644
--- a/sysutils/sge60/Makefile
+++ b/sysutils/sge60/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/122/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile
index 5f42b14c9557..84dd64829791 100644
--- a/sysutils/sge61/Makefile
+++ b/sysutils/sge61/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/122/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile
index 5f42b14c9557..84dd64829791 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/122/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
diff --git a/sysutils/sjog/Makefile b/sysutils/sjog/Makefile
index 2eb6a0cfeab0..ccd3bd2e05e1 100644
--- a/sysutils/sjog/Makefile
+++ b/sysutils/sjog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sjog
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/spassgen/Makefile b/sysutils/spassgen/Makefile
index 535aaac804cf..cb28915d42d9 100644
--- a/sysutils/spassgen/Makefile
+++ b/sysutils/spassgen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spassgen
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	spassgen
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index d2a8b1c1613f..349568482863 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index 0d05cce9d7c7..f6dc45c72335 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	synergy
 PORTVERSION= 	1.3.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}2
diff --git a/sysutils/syscp/Makefile b/sysutils/syscp/Makefile
index 1dd5cb95cdf3..3eda7f190e30 100644
--- a/sysutils/syscp/Makefile
+++ b/sysutils/syscp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	syscp
 PORTVERSION=	1.2.16
+PORTREVISION=	1
 CATEGORIES=	sysutils www
 MASTER_SITES=	http://canada.syscp.org/releases/tgz/ \
 		http://france.syscp.org/releases/tgz/ \
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index a735308960ee..fed2dcfab5a0 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	system-tools-backends
 PORTVERSION=	2.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile
index 65683a085190..e6eef0d9a306 100644
--- a/sysutils/thefish/Makefile
+++ b/sysutils/thefish/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	thefish
 PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.energyhq.es.eu.org/files/
 
diff --git a/sysutils/thunar-volman-plugin/Makefile b/sysutils/thunar-volman-plugin/Makefile
index 0f8d0dcc3040..082fb8814c06 100644
--- a/sysutils/thunar-volman-plugin/Makefile
+++ b/sysutils/thunar-volman-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	thunar-volman
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/thunar-volman-plugin/pkg-plist b/sysutils/thunar-volman-plugin/pkg-plist
index f37f02aaa728..d313d04d0e30 100644
--- a/sysutils/thunar-volman-plugin/pkg-plist
+++ b/sysutils/thunar-volman-plugin/pkg-plist
@@ -9,12 +9,6 @@ share/locale/fr/LC_MESSAGES/thunar-volman.mo
 share/locale/hu/LC_MESSAGES/thunar-volman.mo
 share/locale/pl/LC_MESSAGES/thunar-volman.mo
 share/locale/zh_TW/LC_MESSAGES/thunar-volman.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrm share/icons/hicolor/scalable/apps
 @dirrm share/icons/hicolor/scalable
 @dirrm share/icons/hicolor/48x48/apps
diff --git a/sysutils/ticker.app/Makefile b/sysutils/ticker.app/Makefile
index 3d37c603eaab..1adff1ba8ec6 100644
--- a/sysutils/ticker.app/Makefile
+++ b/sysutils/ticker.app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ticker.app
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://seiichisato.jp/dockapps/src/
 
diff --git a/sysutils/timemon/Makefile b/sysutils/timemon/Makefile
index 03d7ada4d0d4..915a55e62079 100644
--- a/sysutils/timemon/Makefile
+++ b/sysutils/timemon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	timemon
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	gap
diff --git a/sysutils/torsmo/Makefile b/sysutils/torsmo/Makefile
index 882f4fa3c5b8..c94053758abb 100644
--- a/sysutils/torsmo/Makefile
+++ b/sysutils/torsmo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	torsmo
 PORTVERSION=	0.18
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index b521b48dbccc..dd4e0be0c7ae 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	tracker
 PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.gnome.org/~jamiemcc/tracker/
 
diff --git a/sysutils/tracker-client/pkg-plist b/sysutils/tracker-client/pkg-plist
index a2d5e9e7a4eb..a96b9ba29110 100644
--- a/sysutils/tracker-client/pkg-plist
+++ b/sysutils/tracker-client/pkg-plist
@@ -76,12 +76,6 @@ share/locale/it/LC_MESSAGES/tracker.mo
 share/locale/nb/LC_MESSAGES/tracker.mo
 share/locale/sl/LC_MESSAGES/tracker.mo
 share/locale/sv/LC_MESSAGES/tracker.mo
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrm share/gnome/tracker/languages
 @dirrm share/gnome/tracker
 @dirrm share/gnome/pixmaps/tracker
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index b521b48dbccc..dd4e0be0c7ae 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	tracker
 PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.gnome.org/~jamiemcc/tracker/
 
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index a2d5e9e7a4eb..a96b9ba29110 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -76,12 +76,6 @@ share/locale/it/LC_MESSAGES/tracker.mo
 share/locale/nb/LC_MESSAGES/tracker.mo
 share/locale/sl/LC_MESSAGES/tracker.mo
 share/locale/sv/LC_MESSAGES/tracker.mo
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrm share/gnome/tracker/languages
 @dirrm share/gnome/tracker
 @dirrm share/gnome/pixmaps/tracker
diff --git a/sysutils/wmapm/Makefile b/sysutils/wmapm/Makefile
index 622b2e82666f..71e47e51d82c 100644
--- a/sysutils/wmapm/Makefile
+++ b/sysutils/wmapm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmapm
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://dockapps.org/files/18/25/
 
diff --git a/sysutils/wmapmload/Makefile b/sysutils/wmapmload/Makefile
index d0ecfdbf7b93..3bf69f48dc3b 100644
--- a/sysutils/wmapmload/Makefile
+++ b/sysutils/wmapmload/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmapmload
 PORTVERSION=	0.3.4
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 
diff --git a/sysutils/wmavgload/Makefile b/sysutils/wmavgload/Makefile
index f3158246aede..3dafd88890e5 100644
--- a/sysutils/wmavgload/Makefile
+++ b/sysutils/wmavgload/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmavgload
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
 MASTER_SITE_SUBDIR=	contrib/old/srcs/utils
diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile
index df7634657570..afa244c7acca 100644
--- a/sysutils/wmbattery/Makefile
+++ b/sysutils/wmbattery/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmbattery
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://www.kitenet.net/programs/wmbattery/old/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/sysutils/wmbluecpu/Makefile b/sysutils/wmbluecpu/Makefile
index a9780a5e26f8..46a1ac3463b9 100644
--- a/sysutils/wmbluecpu/Makefile
+++ b/sysutils/wmbluecpu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmbluecpu
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/xutils
diff --git a/sysutils/wmbsdbatt/Makefile b/sysutils/wmbsdbatt/Makefile
index 638bc54c6303..7d9c27eb571b 100644
--- a/sysutils/wmbsdbatt/Makefile
+++ b/sysutils/wmbsdbatt/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	wmbsdbatt
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://homepage.univie.ac.at/l.ertl/wmbsdbatt/files/
 
diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile
index ebcb677fb87a..ec798b744e85 100644
--- a/sysutils/wmcpuload/Makefile
+++ b/sysutils/wmcpuload/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmcpuload
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://seiichisato.jp/dockapps/src/
 
diff --git a/sysutils/wmcube-gdk/Makefile b/sysutils/wmcube-gdk/Makefile
index 897f4095c370..4c35f6a70aab 100644
--- a/sysutils/wmcube-gdk/Makefile
+++ b/sysutils/wmcube-gdk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmcube
 PORTVERSION=	0.98p2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://www.ne.jp/asahi/linux/timecop/software/
 PKGNAMESUFFIX=	-gdk
diff --git a/sysutils/wmcube/Makefile b/sysutils/wmcube/Makefile
index fae0ba254857..efb1ab515dfc 100644
--- a/sysutils/wmcube/Makefile
+++ b/sysutils/wmcube/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmcube
 PORTVERSION=	0.98
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	${MASTER_SITE_TUCOWS} \
 		http://dockapps.org/download.php/id/222/ \
diff --git a/sysutils/wmdiskmon/Makefile b/sysutils/wmdiskmon/Makefile
index cf89612ba978..750c737dd75a 100644
--- a/sysutils/wmdiskmon/Makefile
+++ b/sysutils/wmdiskmon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmdiskmon
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 2e079e928203..04aaa83714b2 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmfire
 PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.swanson.ukfsn.org/wmfire/
 
diff --git a/sysutils/wmflame/Makefile b/sysutils/wmflame/Makefile
index 8025b2d16c31..976ae0c3d285 100644
--- a/sysutils/wmflame/Makefile
+++ b/sysutils/wmflame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmflame
 PORTVERSION=	0.60
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://web.novalis.org/programs/
 
diff --git a/sysutils/wmfsm/Makefile b/sysutils/wmfsm/Makefile
index 02798363fdea..6fcec7af9679 100644
--- a/sysutils/wmfsm/Makefile
+++ b/sysutils/wmfsm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmfsm
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://www.cs.ubc.ca/~cmg/
 
diff --git a/sysutils/wmhm/Makefile b/sysutils/wmhm/Makefile
index 56b91bc7afab..f181a9de9b8e 100644
--- a/sysutils/wmhm/Makefile
+++ b/sysutils/wmhm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmhm
 PORTVERSION=	1.46
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fenner
diff --git a/sysutils/wminet/Makefile b/sysutils/wminet/Makefile
index ac19c702c1de..b94866036ca3 100644
--- a/sysutils/wminet/Makefile
+++ b/sysutils/wminet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wminet
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		http://mirror2.unixfreunde.de/
diff --git a/sysutils/wmlmmon/Makefile b/sysutils/wmlmmon/Makefile
index e81d7a1d6294..7c23832dbfa3 100644
--- a/sysutils/wmlmmon/Makefile
+++ b/sysutils/wmlmmon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmlmmon
 PORTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://www.fxp.org/~jedgar/wmlmmon/
 
diff --git a/sysutils/wmlongrun/Makefile b/sysutils/wmlongrun/Makefile
index 57344e4fb499..78f8646d2009 100644
--- a/sysutils/wmlongrun/Makefile
+++ b/sysutils/wmlongrun/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmlongrun
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://seiichisato.jp/dockapps/src/
 
diff --git a/sysutils/wmmemfree/Makefile b/sysutils/wmmemfree/Makefile
index a45f7f79a65f..e5874e9de8a9 100644
--- a/sysutils/wmmemfree/Makefile
+++ b/sysutils/wmmemfree/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmmemfree
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/xutils
diff --git a/sysutils/wmmemload/Makefile b/sysutils/wmmemload/Makefile
index d4bae78d1c7a..f947f2a16f38 100644
--- a/sysutils/wmmemload/Makefile
+++ b/sysutils/wmmemload/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmmemload
 PORTVERSION=	0.1.6
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://www.markstaggs.net/wmmemload/
 
diff --git a/sysutils/wmmemmon/Makefile b/sysutils/wmmemmon/Makefile
index e4ccd6695106..27addb9b95e7 100644
--- a/sysutils/wmmemmon/Makefile
+++ b/sysutils/wmmemmon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmmemmon
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://seiichisato.jp/dockapps/src/
 
diff --git a/sysutils/wmmount/Makefile b/sysutils/wmmount/Makefile
index 386f840887c5..d493fe294601 100644
--- a/sysutils/wmmount/Makefile
+++ b/sysutils/wmmount/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmmount
 PORTVERSION=	1.0b2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker afterstep
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Vista/2471/files/
 DISTNAME=	${PORTNAME}-1.0-beta2
diff --git a/sysutils/wmpccard/Makefile b/sysutils/wmpccard/Makefile
index ddf46f3526ce..a25860eadb00 100644
--- a/sysutils/wmpccard/Makefile
+++ b/sysutils/wmpccard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmpccard
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://www.sra.co.jp/people/m-kasahr/wmpccard/src/
 
diff --git a/sysutils/wmshutdown/Makefile b/sysutils/wmshutdown/Makefile
index cece4fd1d0e1..ec6bfbdc5d7f 100644
--- a/sysutils/wmshutdown/Makefile
+++ b/sysutils/wmshutdown/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmShutdown
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		http://mirror2.unixfreunde.de/
diff --git a/sysutils/wmtop/Makefile b/sysutils/wmtop/Makefile
index d33b198a5786..29d359312324 100644
--- a/sysutils/wmtop/Makefile
+++ b/sysutils/wmtop/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	wmtop
 PORTVERSION=	0.84
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://ftp1.sourceforge.net/wmtop/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/sysutils/wmupmon/Makefile b/sysutils/wmupmon/Makefile
index 9d0fa48491ea..958926ffc5a0 100644
--- a/sysutils/wmupmon/Makefile
+++ b/sysutils/wmupmon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmupmon
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://j-z-s.com/projects/downloads/
 
diff --git a/sysutils/wmzazof/Makefile b/sysutils/wmzazof/Makefile
index 5105f796c0b4..b6edce0ac116 100644
--- a/sysutils/wmzazof/Makefile
+++ b/sysutils/wmzazof/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmzazof
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://members.chello.be/cr49940/wmzazof/
 
diff --git a/sysutils/xacpim/Makefile b/sysutils/xacpim/Makefile
index aa4bacebc8b2..127936eb8f39 100644
--- a/sysutils/xacpim/Makefile
+++ b/sysutils/xacpim/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xacpim
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://shapeshifter.se/pub/xacpim/
 
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index df13d321a65f..e598135d01cf 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbatt
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.clave.gr.jp/~eto/xbatt/
 
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index 1b1ad059b204..2e4621041978 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbattbar
 PORTVERSION=	1.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://iplab.aist-nara.ac.jp/member/suguru/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 4ba24892af82..022d818c606d 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcdroast
 PORTVERSION=	0.98.a.15
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.xcdroast.org/download/:src \
diff --git a/sysutils/xcpustate/Makefile b/sysutils/xcpustate/Makefile
index 085a9cdb07f8..d15ace312e75 100644
--- a/sysutils/xcpustate/Makefile
+++ b/sysutils/xcpustate/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xcpustate
 PORTVERSION=	2.9
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/jdd/xcpustate/  \
 		${MASTER_SITE_XCONTRIB}
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index acbe1d108c0b..e2261ffaff07 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdu
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://sd.wareonearth.com/~phil/xdu/
 EXTRACT_SUFX=	.tar.Z
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index dc908b266322..be8ff237a931 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-battery-plugin
 PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index be60be77f718..a2eed1443a0c 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-cpugraph-plugin
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index e603ada1da66..927aae753a72 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-fsguard-plugin
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index da2d382a309e..7f00378cd2c7 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-genmon-plugin
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-genmon-plugin/pkg-plist b/sysutils/xfce4-genmon-plugin/pkg-plist
index d7a5a2195058..c7dc882cd147 100644
--- a/sysutils/xfce4-genmon-plugin/pkg-plist
+++ b/sysutils/xfce4-genmon-plugin/pkg-plist
@@ -5,9 +5,5 @@ share/locale/pl/LC_MESSAGES/xfce4-genmon-plugin.mo
 share/xfce4/panel-plugins/genmon.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/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile
index 03ea2d78f77b..3edf26350341 100644
--- a/sysutils/xfce4-mcs-manager/Makefile
+++ b/sysutils/xfce4-mcs-manager/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-mcs-manager
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DISTNAME=	xfce-mcs-manager-${PORTVERSION}
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index 64c85273b30a..2cb6e0284b3d 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xfce4-mcs-plugins
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DISTNAME=	xfce-mcs-plugins-${PORTVERSION}
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index c1a3335b465b..6c02a7e6a527 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-minicmd-plugin
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 18945f2d7521..4bb2befc64fb 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-netload-plugin
 PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-places-plugin/Makefile b/sysutils/xfce4-places-plugin/Makefile
index f8c01db8ad56..b2b0dc3b7e27 100644
--- a/sysutils/xfce4-places-plugin/Makefile
+++ b/sysutils/xfce4-places-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-places-plugin
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index dbacedb69b49..75bfad59266b 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-systemload-plugin
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index fcf2ebda0434..e24adb09d957 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-utils
 PORTVERSION=	4.4.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DISTNAME=	xfce-utils-${PORTVERSION}
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 4bc08d3acf02..82236b9e01de 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-wavelan-plugin
 PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/xfsm/Makefile b/sysutils/xfsm/Makefile
index fd958a886540..e831df1eda99 100644
--- a/sysutils/xfsm/Makefile
+++ b/sysutils/xfsm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfsm
 PORTVERSION=	1.99
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/status/xstatus
@@ -16,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X File System Monitor
 
 USE_IMAKE=	yes
+USE_XORG=	xbitmaps
 MAKE_ARGS=	CC="${CC}" CCOPTIONS="-DFreeBSD"
 MAN1=		xfsm.1
 PLIST_FILES=	bin/xfsm
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 75fdbdff5cc5..7c24b8fb3b26 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfsprogs
 PORTVERSION=	2.8.10
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://oss.sgi.com/projects/xfs/cmd_tars/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/sysutils/xfsprogs/pkg-plist b/sysutils/xfsprogs/pkg-plist
index 015273a71a50..9b6bd52c25a5 100644
--- a/sysutils/xfsprogs/pkg-plist
+++ b/sysutils/xfsprogs/pkg-plist
@@ -15,7 +15,6 @@ sbin/fsck.xfs
 sbin/mkfs.xfs
 sbin/xfs_repair
 share/locale/pl/LC_MESSAGES/xfsprogs.mo
-@dirrmtry share/locale/pl/LC_MESSAGES
 %%PORTDOCS%%%%DOCSDIR%%/PORTING
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.gz
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
diff --git a/sysutils/xloadface/Makefile b/sysutils/xloadface/Makefile
index 8ec205467fd1..012d58856852 100644
--- a/sysutils/xloadface/Makefile
+++ b/sysutils/xloadface/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xloadface
 PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.kazu.kz/freebsd/
 
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index d1f239359811..826e8eb1151c 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xlogmaster
 PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/xmbmon/Makefile b/sysutils/xmbmon/Makefile
index 110b0e8f63d8..2371d4dddbe4 100644
--- a/sysutils/xmbmon/Makefile
+++ b/sysutils/xmbmon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmbmon
-PORTREVISION=	7
+PORTREVISION=	8
 
 COMMENT=	A X motherboard monitor for LM78/79, W8378x, AS99127F, VT82C686 and ADM9240
 
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index f0ff6504e7b3..4d610a2cd306 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xosview
 PORTVERSION=	1.8.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/xperfmon/Makefile b/sysutils/xperfmon/Makefile
index edeacd736210..7d2b5bd2d0bd 100644
--- a/sysutils/xperfmon/Makefile
+++ b/sysutils/xperfmon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xperfmon++
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://wwwhomes.uni-bielefeld.de/lkoeller/
 
diff --git a/sysutils/xsu/Makefile b/sysutils/xsu/Makefile
index 962978c70983..d76a18179e07 100644
--- a/sysutils/xsu/Makefile
+++ b/sysutils/xsu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xsu
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xsu
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index f1958eb19de8..1c1d0f7baec8 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xsysstats
 PORTVERSION=	1.51
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 782c8096f580..58dff2ca78bf 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		xvidcap
 DISTVERSION=		1.1.4p1
+PORTREVISION=		1
 PORTEPOCH=		1
 CATEGORIES=		sysutils multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
diff --git a/sysutils/xvidcap/pkg-plist b/sysutils/xvidcap/pkg-plist
index d8c0b9485d24..e7d22a00c82e 100644
--- a/sysutils/xvidcap/pkg-plist
+++ b/sysutils/xvidcap/pkg-plist
@@ -141,7 +141,6 @@ share/pixmaps/xvidcap.png
 %%DATADIR%%/xvidcap.png
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
-@dirrm share/pixmaps
 @dirrm share/omf/xvidcap
 @dirrm share/omf
 @dirrm share/gnome/help/xvidcap/it/figures
diff --git a/sysutils/xwipower/Makefile b/sysutils/xwipower/Makefile
index a080c2225cba..ad7f7bc796e1 100644
--- a/sysutils/xwipower/Makefile
+++ b/sysutils/xwipower/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xwipower
 PORTVERSION=	20000623
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fumi.org/pub/xwipower/
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/xwlans/Makefile b/sysutils/xwlans/Makefile
index 0cc543553fd5..c38940a9c0ca 100644
--- a/sysutils/xwlans/Makefile
+++ b/sysutils/xwlans/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xwlans
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://shapeshifter.se/code/xwlans/release/ \
 		http://mirror.shapeshifter.se/code/xwlans/release/
diff --git a/textproc/Ebnf2ps/Makefile b/textproc/Ebnf2ps/Makefile
index 01c22ec2a08d..0a1621e91901 100644
--- a/textproc/Ebnf2ps/Makefile
+++ b/textproc/Ebnf2ps/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Ebnf2ps
 PORTVERSION=	1.05
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/
 DISTNAME=	ebnf2ps-${PORTVERSION}
diff --git a/textproc/aiksaurus-gtk/Makefile b/textproc/aiksaurus-gtk/Makefile
index 8909c44ee15c..047fb80d482a 100644
--- a/textproc/aiksaurus-gtk/Makefile
+++ b/textproc/aiksaurus-gtk/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc deskutils
 PKGNAMESUFFIX=	-gtk
 
diff --git a/textproc/ant-xinclude-task/Makefile b/textproc/ant-xinclude-task/Makefile
index 4c9b1b111394..89e157b8250c 100644
--- a/textproc/ant-xinclude-task/Makefile
+++ b/textproc/ant-xinclude-task/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xinclude-task
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://people.freebsd.org/~znerd/xinclude-task/
 PKGNAMEPREFIX=	ant-
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index fef8433d1d53..ddcc84371ce2 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aspell
 PORTVERSION=	0.60.5
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	aspell
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index 5fbf6a1b66ac..97df058d1ca1 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -112,23 +112,5 @@ lib/libpspell.so.16
 %%NLS%%share/locale/vi/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/wa/LC_MESSAGES/aspell.mo
 @dirrm include/pspell
-%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/be
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
 %%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/rw
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sl
-%%NLS%%@dirrmtry share/locale/sr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sr
-%%NLS%%@dirrmtry share/locale/tg/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tg
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
diff --git a/textproc/bibtex2html/Makefile b/textproc/bibtex2html/Makefile
index 2d4ad9534f1b..f91de77d14b3 100644
--- a/textproc/bibtex2html/Makefile
+++ b/textproc/bibtex2html/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bibtex2html
 PORTVERSION=	1.85
+PORTREVISION=	1
 CATEGORIES=	textproc print
 MASTER_SITES=	http://www.lri.fr/~filliatr/ftp/bibtex2html/
 
diff --git a/textproc/bibtool/Makefile b/textproc/bibtool/Makefile
index 172024c6f277..951a7b7c937c 100644
--- a/textproc/bibtool/Makefile
+++ b/textproc/bibtool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bibtool
 PORTVERSION=	2.48
+PORTREVISION=	1
 CATEGORIES=	textproc print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	biblio/bibtex/utils/${PORTNAME}
diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile
index 4a6372caff9c..6f9ec9ea5ac1 100644
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dblatex
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/denature/Makefile b/textproc/denature/Makefile
index c09273537754..10cb3140a258 100644
--- a/textproc/denature/Makefile
+++ b/textproc/denature/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	denature
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile
index 441d2e416580..68fd0eafe3ef 100644
--- a/textproc/dictem/Makefile
+++ b/textproc/dictem/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	dictem
 PORTVERSION=	0.81
+PORTREVISION=	1
 CATEGORIES=	textproc net elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/dictionary/Makefile b/textproc/dictionary/Makefile
index 982d6c506222..ad504af85105 100644
--- a/textproc/dictionary/Makefile
+++ b/textproc/dictionary/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dictionary
 PORTVERSION=	1.8.7
+PORTREVISION=	1
 CATEGORIES=	textproc net elisp
 MASTER_SITES=	http://me.in-berlin.de/~myrkr/dictionary/ \
 		http://bsdchat.com/dist/dryice/
diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile
index 9cca1aef5ec3..ef0b174d6090 100644
--- a/textproc/dixit/Makefile
+++ b/textproc/dixit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dixit
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc # this should/will be romanian ;)
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	dixit
diff --git a/textproc/docbook-to-man/Makefile b/textproc/docbook-to-man/Makefile
index 437ad5a8b696..146c87d0ae03 100644
--- a/textproc/docbook-to-man/Makefile
+++ b/textproc/docbook-to-man/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	docbook-to-man
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/tools/dtm/
 DISTNAME=	${PORTNAME}
diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile
index dd82182a96b9..4efdb512077f 100644
--- a/textproc/docbook-utils/Makefile
+++ b/textproc/docbook-utils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	docbook-utils
 PORTVERSION=	0.6.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	docbook-tools/new-trials/SOURCES
diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile
index 79252d19b403..d984a9209c6c 100644
--- a/textproc/docproj/Makefile
+++ b/textproc/docproj/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	docproj
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/textproc/dom4j/Makefile b/textproc/dom4j/Makefile
index 45ab19cc252a..d4207b4e85d1 100644
--- a/textproc/dom4j/Makefile
+++ b/textproc/dom4j/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dom4j
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dom4j
diff --git a/textproc/dtd2relax/Makefile b/textproc/dtd2relax/Makefile
index 26fb80d48047..f7d7b8d785e1 100644
--- a/textproc/dtd2relax/Makefile
+++ b/textproc/dtd2relax/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dtd2relax
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://www.horobi.com/Projects/RELAX/Archive/
 DISTNAME=	${PORTNAME:U}_${PORTVERSION:S/./_/g}
diff --git a/textproc/dtdinst/Makefile b/textproc/dtdinst/Makefile
index a3f52d9ad5bc..e0e71fbe5b9e 100644
--- a/textproc/dtdinst/Makefile
+++ b/textproc/dtdinst/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dtdinst
 PORTVERSION=	2003.06.19
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://www.thaiopensource.com/download/
 DISTNAME=	${PORTNAME}-20030619
diff --git a/textproc/duncan/Makefile b/textproc/duncan/Makefile
index b432601cf31b..e850f8e42ec2 100644
--- a/textproc/duncan/Makefile
+++ b/textproc/duncan/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	duncan
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	textproc gnustep
 MASTER_SITES=	http://www.eskimo.com/~pburns/Dictionaries/files/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/textproc/dwdiff/Makefile b/textproc/dwdiff/Makefile
index 0c1905becb5d..d45f348d9726 100644
--- a/textproc/dwdiff/Makefile
+++ b/textproc/dwdiff/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	dwdiff
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://os.ghalkes.nl/dist/
 EXTRACT_SUFX=	.tgz
diff --git a/textproc/dwdiff/pkg-plist b/textproc/dwdiff/pkg-plist
index b1d1d059f74d..ca401ab54238 100644
--- a/textproc/dwdiff/pkg-plist
+++ b/textproc/dwdiff/pkg-plist
@@ -1,9 +1,5 @@
 bin/dwdiff
 %%NLS%%share/locale/de/LC_MESSAGES/dwdiff.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/dwdiff.mo
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl
 %%NLS%%@dirrmtry man/nl/man1
 %%NLS%%@dirrmtry man/nl
diff --git a/textproc/easydiff/Makefile b/textproc/easydiff/Makefile
index 391fb076826a..cc2a915be29a 100644
--- a/textproc/easydiff/Makefile
+++ b/textproc/easydiff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	easydiff
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	textproc gnustep
 # outdated:	http://www.rivaille.net/EasyDiff/
 # outdated:	http://debian.uni-essen.de/misc/GNUstep/Apps/EasyDiff/
diff --git a/textproc/ecromedos/Makefile b/textproc/ecromedos/Makefile
index 935950b9219a..a37f848d761f 100644
--- a/textproc/ecromedos/Makefile
+++ b/textproc/ecromedos/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ecromedos
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc print www
 MASTER_SITES=	http://www.ecromedos.net/files/${PORTVERSION}/
 
diff --git a/textproc/emacs-wiki/Makefile b/textproc/emacs-wiki/Makefile
index 5f43a46ae221..636a2337e11d 100644
--- a/textproc/emacs-wiki/Makefile
+++ b/textproc/emacs-wiki/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emacs-wiki
 PORTVERSION=	2.72
+PORTREVISION=	1
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://www.mwolson.org/static/dist/emacs-wiki/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/textproc/eqe/Makefile b/textproc/eqe/Makefile
index 8a226962c267..715a621a5ab7 100644
--- a/textproc/eqe/Makefile
+++ b/textproc/eqe/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	eqe
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://rlehy.free.fr/
 
diff --git a/textproc/etoile-lucenekit/Makefile b/textproc/etoile-lucenekit/Makefile
index 901bb2db3465..6f16eac7764f 100644
--- a/textproc/etoile-lucenekit/Makefile
+++ b/textproc/etoile-lucenekit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lucenekit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	textproc gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/textproc/etoile-ogrekit/Makefile b/textproc/etoile-ogrekit/Makefile
index 7ce58c5b977b..6d656dd01e97 100644
--- a/textproc/etoile-ogrekit/Makefile
+++ b/textproc/etoile-ogrekit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogrekit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	textproc gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/textproc/exml/Makefile b/textproc/exml/Makefile
index 7fa8eb741dee..e3585b1dc568 100644
--- a/textproc/exml/Makefile
+++ b/textproc/exml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	exml
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/textproc/fldiff/Makefile b/textproc/fldiff/Makefile
index 6d5547bb4efb..812bbde3d405 100644
--- a/textproc/fldiff/Makefile
+++ b/textproc/fldiff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fldiff
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://critical.ch/distfiles/ \
 		http://energy.critical.ch/distfiles/ \
diff --git a/textproc/foiltex/Makefile b/textproc/foiltex/Makefile
index 5a123d1ccc3a..3f1018b7ddeb 100644
--- a/textproc/foiltex/Makefile
+++ b/textproc/foiltex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	foiltex
 PORTVERSION=	2.1.4a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	nonfree/macros/latex/contrib/${PORTNAME}
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 4f3ce1e29dfc..faa1e5a49783 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fop
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:fop/} \
 	${MASTER_SITE_SOURCEFORGE:S/$/:hyph/}
diff --git a/textproc/galax/Makefile b/textproc/galax/Makefile
index beea2f78ac7c..fe1efc7bea4b 100644
--- a/textproc/galax/Makefile
+++ b/textproc/galax/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	galax
 PORTVERSION=	0.3.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://db.bell-labs.com/galax/Downloads/
 
diff --git a/textproc/gastex/Makefile b/textproc/gastex/Makefile
index 859356c34bd6..68862caa7af0 100644
--- a/textproc/gastex/Makefile
+++ b/textproc/gastex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gastex
 PORTVERSION=	2.7
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.lsv.ens-cachan.fr/~gastin/gastex/
 DISTFILES=	gastex.sty gastex.pro ex-gastex.tex
diff --git a/textproc/gdict/Makefile b/textproc/gdict/Makefile
index bfcec2d56877..8c4fd152c3d0 100644
--- a/textproc/gdict/Makefile
+++ b/textproc/gdict/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdict
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.brettnacher.org/users/dominik/FreeBSD/
 
diff --git a/textproc/gladtex/Makefile b/textproc/gladtex/Makefile
index d5c5196ab346..4e42a8c97dd6 100644
--- a/textproc/gladtex/Makefile
+++ b/textproc/gladtex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gladtex
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	textproc math www
 MASTER_SITES=	http://www.math.uio.no/~martingu/gladtex/dl/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/textproc/gmat/Makefile b/textproc/gmat/Makefile
index 0ab2f4d5959e..e8c48a64830b 100644
--- a/textproc/gmat/Makefile
+++ b/textproc/gmat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmat
 PORTVERSION=	0.2.4c
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.ora.com/pub/gmat/
 
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index a8026aa39fa7..76498989cf98 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-doc-utils
 PORTVERSION=	0.10.3
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist
index 7ed23ca2d134..86bb06a79f10 100644
--- a/textproc/gnome-doc-utils/pkg-plist
+++ b/textproc/gnome-doc-utils/pkg-plist
@@ -173,49 +173,17 @@ share/xml2po/xhtml.pyc
 @dirrm share/gnome/help/gnome-doc-make/C
 @dirrm share/gnome/help/gnome-doc-make
 @dirrm %%DATADIR%%
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index b9cb3c0d1de8..1ecf4b617681 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-spell
 PORTVERSION=	1.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-spell/1.0
diff --git a/textproc/gnome-spell/pkg-plist b/textproc/gnome-spell/pkg-plist
index 2f03a7e498da..a078dddab685 100644
--- a/textproc/gnome-spell/pkg-plist
+++ b/textproc/gnome-spell/pkg-plist
@@ -57,37 +57,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
 @dirrmtry share/gnome/control-center-2.0
 @dirrm share/gnome/gnome-spell-%%VERSION%%
 @dirrm lib/gnome-spell
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
index 4626b1e27068..a71f44072271 100644
--- a/textproc/gnome-translate/Makefile
+++ b/textproc/gnome-translate/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		gnome-translate
 PORTVERSION=		0.99
-PORTREVISION=		6
+PORTREVISION=		7
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	libtranslate
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index e74ef1e49725..dac864889713 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-doc
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/textproc/gtkdiff/Makefile b/textproc/gtkdiff/Makefile
index 96d47df2a090..b29042b32169 100644
--- a/textproc/gtkdiff/Makefile
+++ b/textproc/gtkdiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkdiff
 PORTVERSION=	1.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http:www.alaskaparadise.com/freebsd/
 
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 15d10f6f7cc1..0d93de509a07 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtkspell
 PORTVERSION=	2.0.11
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://gtkspell.sourceforge.net/download/
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
diff --git a/textproc/gtkspell/pkg-plist b/textproc/gtkspell/pkg-plist
index a04d2eb94863..ee19f482e7ce 100644
--- a/textproc/gtkspell/pkg-plist
+++ b/textproc/gtkspell/pkg-plist
@@ -30,23 +30,7 @@ share/locale/zh_CN/LC_MESSAGES/gtkspell.mo
 share/locale/zh_TW/LC_MESSAGES/gtkspell.mo
 @dirrm include/gtkspell-2.0/gtkspell
 @dirrm include/gtkspell-2.0
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/rm/LC_MESSAGES
 @dirrmtry share/locale/rm
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/textproc/gxditview/Makefile b/textproc/gxditview/Makefile
index cf0a4b93a33a..367e3760c8ec 100644
--- a/textproc/gxditview/Makefile
+++ b/textproc/gxditview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gxditview
 PORTVERSION=	${GXDVVERSION}${GXDVREVISION}
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTFILES=	# none
 
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index 65336caa31b8..a64f2e730424 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gxmlviewer
 PORTVERSION=	1.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index ede83f7ee998..f599c32e13ef 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hevea
 PORTVERSION=	1.09
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://para.inria.fr/~maranget/hevea/distri/ \
 		ftp://ftp.inria.fr/INRIA/moscova/hevea/
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index 8c9c56073d01..91d56caa5361 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	haxml
 PORTVERSION=	1.13.2
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 MASTER_SITES=	http://www.haskell.org/HaXml/ \
 		ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/
diff --git a/textproc/hs-haxml/Makefile b/textproc/hs-haxml/Makefile
index 8c9c56073d01..91d56caa5361 100644
--- a/textproc/hs-haxml/Makefile
+++ b/textproc/hs-haxml/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	haxml
 PORTVERSION=	1.13.2
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 MASTER_SITES=	http://www.haskell.org/HaXml/ \
 		ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index aa810f27be74..086e28c61303 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	lhs2tex
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.informatik.uni-bonn.de/~loeh/${PORTNAME}/
 
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 9cc9d9d96a52..3922030518b2 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pandoc
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 MASTER_SITES=	http://pandoc.googlecode.com/files/
 DISTNAME=	pandoc-${PORTVERSION}
diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile
index b62b1759761d..c136f9549112 100644
--- a/textproc/htmldoc/Makefile
+++ b/textproc/htmldoc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	htmldoc
 PORTVERSION=	1.8.27
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_EASYSW}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
diff --git a/textproc/htmlize.el/Makefile b/textproc/htmlize.el/Makefile
index 1514752f98a6..50fe49f67f88 100644
--- a/textproc/htmlize.el/Makefile
+++ b/textproc/htmlize.el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	htmlize.el
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://fly.srk.fer.hr/~hniksic/emacs/
 DISTNAME=	${PORTNAME}
diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index 0804227737d1..b4d919a3fc3c 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	htmltolatex
 PORTVERSION=	1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	textproc
 MASTER_SITES=	http://people.FreeBSD.org/~foxfair/distfiles/
 DISTNAME=	${PORTNAME}
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index 682022ebd4f8..a1384c5bfc8a 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-im-switcher
 PORTVERSION=	12.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
diff --git a/textproc/iiimf-gnome-im-switcher/pkg-plist b/textproc/iiimf-gnome-im-switcher/pkg-plist
index 73fe96d5a5d0..65d33b87369a 100644
--- a/textproc/iiimf-gnome-im-switcher/pkg-plist
+++ b/textproc/iiimf-gnome-im-switcher/pkg-plist
@@ -40,15 +40,5 @@ share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
 @dirrm share/gnome/help/imswitcher/C
 @dirrm share/gnome/help/imswitcher
 @dirrmtry share/gnome/control-center-2.0/interfaces
-@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/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index e9e897d87e56..493861e39f6e 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	12.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
diff --git a/textproc/iiimf-gtk/pkg-plist b/textproc/iiimf-gtk/pkg-plist
index 76f956b133db..1d954b58294e 100644
--- a/textproc/iiimf-gtk/pkg-plist
+++ b/textproc/iiimf-gtk/pkg-plist
@@ -8,11 +8,5 @@ share/locale/ko/LC_MESSAGES/iiimgcf.mo
 share/locale/zh_CN/LC_MESSAGES/iiimgcf.mo
 share/locale/zh_TW/LC_MESSAGES/iiimgcf.mo
 share/locale/zh_HK/LC_MESSAGES/iiimgcf.mo
-@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/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index f5b5b482303b..dd182635708a 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-unit
 PORTVERSION=	12.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile
index 78078fbe5112..a076472c09c3 100644
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	x-lib
 PORTVERSION=	12.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile
index d0f52aa02ce6..da34ff069664 100644
--- a/textproc/iiimf-x/Makefile
+++ b/textproc/iiimf-x/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	x
 PORTVERSION=	12.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
diff --git a/textproc/jakarta-commons-digester/Makefile b/textproc/jakarta-commons-digester/Makefile
index 1a35431d01c7..409aaeead91d 100644
--- a/textproc/jakarta-commons-digester/Makefile
+++ b/textproc/jakarta-commons-digester/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-digester
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/source
diff --git a/textproc/jakarta-poi/Makefile b/textproc/jakarta-poi/Makefile
index 0bfa53d083a8..1cdcb39f76a1 100644
--- a/textproc/jakarta-poi/Makefile
+++ b/textproc/jakarta-poi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	poi
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	textproc devel java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/release/src
diff --git a/textproc/jalingo/Makefile b/textproc/jalingo/Makefile
index d9f71a46c886..25b3517a08b4 100644
--- a/textproc/jalingo/Makefile
+++ b/textproc/jalingo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jalingo
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 #PORTREVISION=	0
 CATEGORIES=	textproc java
 MASTER_SITES=	SFE
diff --git a/textproc/javacc/Makefile b/textproc/javacc/Makefile
index a9962b94622b..c62774523734 100644
--- a/textproc/javacc/Makefile
+++ b/textproc/javacc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	javacc
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://javacc.dev.java.net/files/documents/17/26783/
 DISTNAME=	${PORTNAME}-${PORTVERSION}src
diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile
index 7b3ee85805b2..3b4e79421eea 100644
--- a/textproc/jaxup/Makefile
+++ b/textproc/jaxup/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	jaxup
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc java
 MASTER_SITES=	http://klomp.org/jaxup/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/textproc/jdictionary-int-eng/Makefile b/textproc/jdictionary-int-eng/Makefile
index 0d5a70097875..407fcb6a93da 100644
--- a/textproc/jdictionary-int-eng/Makefile
+++ b/textproc/jdictionary-int-eng/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdictionary-int-eng
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 DISTNAME=	Smart_Interlingua_English-1_0.jar
 
diff --git a/textproc/jdictionary/Makefile b/textproc/jdictionary/Makefile
index f38390f75d4b..d1f72ebe3cf8 100644
--- a/textproc/jdictionary/Makefile
+++ b/textproc/jdictionary/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdictionary
 PORTVERSION=	1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/textproc/jing/Makefile b/textproc/jing/Makefile
index 928f72aa265b..44e382fa3677 100644
--- a/textproc/jing/Makefile
+++ b/textproc/jing/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jing
 PORTVERSION=	2003.06.19
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://www.thaiopensource.com/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile
index 1379a34f3e5f..1331842e2a7a 100644
--- a/textproc/kbedic/Makefile
+++ b/textproc/kbedic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kbedic
 PORTVERSION=	4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index e775390652df..30330df993f6 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdiff3
 PORTVERSION=	0.9.91
+PORTREVISION=	1
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/latex-service/Makefile b/textproc/latex-service/Makefile
index 8acd8ebca444..6a31ffdf64ca 100644
--- a/textproc/latex-service/Makefile
+++ b/textproc/latex-service/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	latex
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	textproc gnustep
 MASTER_SITES=	http://www.roard.com/latexservice/download/
 PKGNAMESUFFIX=	-service${PKGNAMESUFFIX2}
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 3f3326173ef4..142360d7a233 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	latex2html
 PORTVERSION=	2002.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	support/${PORTNAME}
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 7382150e580f..14269f14d7cd 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libextractor
 PORTVERSION=	0.5.18
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://gnunet.org/libextractor/download/ \
 		${MASTER_SITE_GNU}
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 9a0d88429d02..13292aab9d50 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libtre
 PORTVERSION=	0.7.4
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://laurikari.net/tre/ \
 		${MASTER_SITE_LOCAL}
diff --git a/textproc/libtre/pkg-plist b/textproc/libtre/pkg-plist
index 9f835731cc9b..f06b1e71c42a 100644
--- a/textproc/libtre/pkg-plist
+++ b/textproc/libtre/pkg-plist
@@ -12,5 +12,3 @@ libdata/pkgconfig/tre.pc
 %%PORTDOCS%%%%DOCSDIR%%/tre-syntax.html
 @dirrm include/tre
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index 6c1801b991f6..c160b01acdde 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libwpd
 PORTVERSION=	0.8.9
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libwpd
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index 6c1801b991f6..c160b01acdde 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libwpd
 PORTVERSION=	0.8.9
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libwpd
diff --git a/textproc/localize/Makefile b/textproc/localize/Makefile
index 5b590ee496d5..bcbd1ce73876 100644
--- a/textproc/localize/Makefile
+++ b/textproc/localize/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	localize
 PORTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc gnustep
 MASTER_SITES=	http://www.eskimo.com/~pburns/Localize/files/
 DISTNAME=	Localize-20040424
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index cfec6c0850c6..426a6572033b 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	meld
 PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc devel python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index e1883fa0baed..e43e0158af67 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -136,26 +136,8 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo
 @dirrm %%DATADIR%%/glade2/pixmaps
 @dirrm %%DATADIR%%/glade2
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrm share/gnome/omf/meld
 @dirrm share/gnome/help/meld/C/figures
 @dirrm share/gnome/help/meld/C
diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile
index 70666040bca2..ae38c0b5cf88 100644
--- a/textproc/mgdiff/Makefile
+++ b/textproc/mgdiff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mgdiff
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index 6d90bd9bec18..4817f87897e7 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	modlogan
 PORTVERSION=	0.8.13
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc www
 MASTER_SITES=	http://jan.kneschke.de/projects/modlogan/download/ \
 		http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/
diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile
index 136e9608b795..27db658de1d5 100644
--- a/textproc/msort/Makefile
+++ b/textproc/msort/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	msort
 PORTVERSION=	8.38
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/
 
diff --git a/textproc/muse/Makefile b/textproc/muse/Makefile
index 87fb2db17884..723e0ac25ab0 100644
--- a/textproc/muse/Makefile
+++ b/textproc/muse/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	muse
 PORTVERSION=	3.02.93
+PORTREVISION=	1
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://download.gna.org/muse-el/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/textproc/nux/Makefile b/textproc/nux/Makefile
index 625ae7495a98..a0271141c7da 100644
--- a/textproc/nux/Makefile
+++ b/textproc/nux/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nux
 PORTVERSION=	1.6
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://dsd.lbl.gov/nux-download/releases/
diff --git a/textproc/ocaml-expat/Makefile b/textproc/ocaml-expat/Makefile
index 25ef9a62f035..93e79d4eca84 100644
--- a/textproc/ocaml-expat/Makefile
+++ b/textproc/ocaml-expat/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ocaml-expat
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.xs4all.nl/~mmzeeman/ocaml/
 
diff --git a/textproc/ocaml-pxp/Makefile b/textproc/ocaml-pxp/Makefile
index a56a921e2333..65e5f20aeaf8 100644
--- a/textproc/ocaml-pxp/Makefile
+++ b/textproc/ocaml-pxp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pxp
 PORTVERSION=	1.1.96
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 PKGNAMEPREFIX=	ocaml-
diff --git a/textproc/ocaml-yaxpo/Makefile b/textproc/ocaml-yaxpo/Makefile
index 353d20f086d3..1d93a592083b 100644
--- a/textproc/ocaml-yaxpo/Makefile
+++ b/textproc/ocaml-yaxpo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yaxpo
 PORTVERSION=	0.0.${DATE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://compbio.mit.edu/mikelin/yaxpo/
 PKGNAMEPREFIX=	ocaml-
diff --git a/textproc/opensched/Makefile b/textproc/opensched/Makefile
index d93bc405df3a..a632306eea9c 100644
--- a/textproc/opensched/Makefile
+++ b/textproc/opensched/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	opensched
 PORTVERSION=	0.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://mtechit.com/dlsoftware/opensched/
 
diff --git a/textproc/openvanilla-framework/Makefile b/textproc/openvanilla-framework/Makefile
index 809d60e569c8..cb1f0000f160 100644
--- a/textproc/openvanilla-framework/Makefile
+++ b/textproc/openvanilla-framework/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openvanilla-framework
 PORTVERSION=	0.7.2.b20060214
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.csie.org/~llwang/	\
 		http://www.infor.org/~llwang/
diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile
index 46d655752df1..88df8076a20d 100644
--- a/textproc/openvanilla-modules/Makefile
+++ b/textproc/openvanilla-modules/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openvanilla-modules
 PORTVERSION=	0.7.2.b20060214
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.csie.org/~llwang/	\
 		http://www.infor.org/~llwang/
diff --git a/textproc/p5-Search-VectorSpace/Makefile b/textproc/p5-Search-VectorSpace/Makefile
index edf853b57612..1295c66b5d2e 100644
--- a/textproc/p5-Search-VectorSpace/Makefile
+++ b/textproc/p5-Search-VectorSpace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Search-VectorSpace
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Search
diff --git a/textproc/p5-Tk-XMLViewer/Makefile b/textproc/p5-Tk-XMLViewer/Makefile
index 0e1e481e445a..87891e881cdc 100644
--- a/textproc/p5-Tk-XMLViewer/Makefile
+++ b/textproc/p5-Tk-XMLViewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-XMLViewer
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/textproc/p5-UML-Class-Simple/Makefile b/textproc/p5-UML-Class-Simple/Makefile
index 03207bac34c9..f837867b4065 100644
--- a/textproc/p5-UML-Class-Simple/Makefile
+++ b/textproc/p5-UML-Class-Simple/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	UML-Class-Simple
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	UML
diff --git a/textproc/p5-UML-Sequence/Makefile b/textproc/p5-UML-Sequence/Makefile
index 2aa22c39bc1d..87d98d919601 100644
--- a/textproc/p5-UML-Sequence/Makefile
+++ b/textproc/p5-UML-Sequence/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	UML-Sequence
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	UML
diff --git a/textproc/p5-WordNet-QueryData/Makefile b/textproc/p5-WordNet-QueryData/Makefile
index 1c0a70d80863..d8fb9c1dfeca 100644
--- a/textproc/p5-WordNet-QueryData/Makefile
+++ b/textproc/p5-WordNet-QueryData/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	WordNet-QueryData
 PORTVERSION=	1.45
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	WordNet
diff --git a/textproc/p5-WordNet-Similarity/Makefile b/textproc/p5-WordNet-Similarity/Makefile
index 22bf637d3841..3967f1d87b4c 100644
--- a/textproc/p5-WordNet-Similarity/Makefile
+++ b/textproc/p5-WordNet-Similarity/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	WordNet-Similarity
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	WordNet
diff --git a/textproc/p5-XML-LibRSVG/Makefile b/textproc/p5-XML-LibRSVG/Makefile
index 5542ccadcd2a..364ac88950f5 100644
--- a/textproc/p5-XML-LibRSVG/Makefile
+++ b/textproc/p5-XML-LibRSVG/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XML-LibRSVG
 PORTVERSION=	0.01
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index ad62eb9f1171..ce37572a8af3 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmltv
 PORTVERSION=	0.5.45
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmltv
diff --git a/textproc/pandoc/Makefile b/textproc/pandoc/Makefile
index 9cc9d9d96a52..3922030518b2 100644
--- a/textproc/pandoc/Makefile
+++ b/textproc/pandoc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pandoc
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 MASTER_SITES=	http://pandoc.googlecode.com/files/
 DISTNAME=	pandoc-${PORTVERSION}
diff --git a/textproc/pdftohtml/Makefile b/textproc/pdftohtml/Makefile
index 9e142fb76e01..599dc233c17f 100644
--- a/textproc/pdftohtml/Makefile
+++ b/textproc/pdftohtml/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pdftohtml
 PORTVERSION=	0.39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/popup/Makefile b/textproc/popup/Makefile
index 6fbd20037158..414ad31d2e01 100644
--- a/textproc/popup/Makefile
+++ b/textproc/popup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	popup
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	textproc gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile
index 90cead0ebe63..bee628542997 100644
--- a/textproc/ppower4/Makefile
+++ b/textproc/ppower4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ppower4
 PORTVERSION=	0.9.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	support/${PORTNAME}
diff --git a/textproc/prosper/Makefile b/textproc/prosper/Makefile
index 18f6695f7771..48b21350588e 100644
--- a/textproc/prosper/Makefile
+++ b/textproc/prosper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	prosper
 PORTVERSION=	1.00.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index 8c7fe646a522..d56fa488dcd6 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enchant
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	textproc devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	py${PORTNAME}
diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile
index a2803990efdb..a874575aa20b 100644
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xml
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	textproc devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/textproc/py-xmltools/Makefile b/textproc/py-xmltools/Makefile
index 8c7be781ca3a..86cfcaacaee0 100644
--- a/textproc/py-xmltools/Makefile
+++ b/textproc/py-xmltools/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xmltools
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	ftp://ftp.logilab.org/pub/xmltools/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/queequeg/Makefile b/textproc/queequeg/Makefile
index 58f585df46ba..08c5e6f55531 100644
--- a/textproc/queequeg/Makefile
+++ b/textproc/queequeg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	queequeg
 PORTVERSION=	0.91
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/re_graph/Makefile b/textproc/re_graph/Makefile
index 2a43249aabe0..2e96f714f8c8 100644
--- a/textproc/re_graph/Makefile
+++ b/textproc/re_graph/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	re_graph
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oualline.com/sw/re/
 DISTNAME=	${PORTNAME:S/_/-/}_${PORTVERSION:S/.//}
diff --git a/textproc/redet/Makefile b/textproc/redet/Makefile
index e561e8d33812..429c9a21a72f 100644
--- a/textproc/redet/Makefile
+++ b/textproc/redet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	redet
 PORTVERSION=	8.21
+PORTREVISION=	1
 CATEGORIES=	textproc tk84
 MASTER_SITES=	http://www.billposer.org/Software/Downloads/ CENKES
 
diff --git a/textproc/resume-extensions/Makefile b/textproc/resume-extensions/Makefile
index 490260ed6ca6..ba937d855b4f 100644
--- a/textproc/resume-extensions/Makefile
+++ b/textproc/resume-extensions/Makefile
@@ -5,6 +5,7 @@
 
 PORTNAME=	resume-extensions
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://aaronland.info/xsl/xmlresume/
 DISTNAME=	xml${PORTNAME}-${PORTVERSION}
diff --git a/textproc/resume/Makefile b/textproc/resume/Makefile
index 42ca34996493..9b7ba0eaee73 100644
--- a/textproc/resume/Makefile
+++ b/textproc/resume/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	resume
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmlresume
diff --git a/textproc/rst.el/Makefile b/textproc/rst.el/Makefile
index a16ec9be49c6..86bece0167a0 100644
--- a/textproc/rst.el/Makefile
+++ b/textproc/rst.el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rst.el
 PORTVERSION=	4747
+PORTREVISION=	1
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://svn.berlios.de/viewcvs/*checkout*/docutils/trunk/docutils/tools/editors/emacs/
 PKGNAMESUFFIX=	-${EMACS_NAME}
diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index 0caa03591ffd..cc6330164764 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	rubber
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ebeffara.free.fr/pub/
 
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index 9477391eecf1..60a2f774dba9 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	sagasu
 PORTVERSION=	2.0.8
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
 
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index 9fb1c1555050..63cffacc82a4 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	saxon
 PORTVERSION=	8.9.0.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/textproc/saxon-he/Makefile b/textproc/saxon-he/Makefile
index 9fb1c1555050..63cffacc82a4 100644
--- a/textproc/saxon-he/Makefile
+++ b/textproc/saxon-he/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	saxon
 PORTVERSION=	8.9.0.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index 733de201b49a..8bfbf1181903 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	saxon
 PORTVERSION=	6.5.4
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	saxon
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index 98b78de5e98f..358601a6d668 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-input-pad
 PORTVERSION=	0.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index 4171f3809aa0..f028004294f5 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-openvanilla
 PORTVERSION=	0.7.2.b20060214
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.csie.org/~llwang/	\
 		http://www.infor.org/~llwang/
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 862d959af98e..a2733e093102 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-table-imengine
 PORTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
diff --git a/textproc/scim-table-imengine/pkg-plist b/textproc/scim-table-imengine/pkg-plist
index 722d84328513..77d39a610dfd 100644
--- a/textproc/scim-table-imengine/pkg-plist
+++ b/textproc/scim-table-imengine/pkg-plist
@@ -33,12 +33,6 @@ share/locale/pa/LC_MESSAGES/scim-tables.mo
 %%SKIM%%@dirrmtry share/apps/skim
 %%SKIM%%@dirrmtry share/config.kcfg
 %%SKIM%%@dirrmtry share/services/skimconfiguredialog
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrmtry lib/scim-1.0/1.4.0/SetupUI
 @dirrmtry lib/scim-1.0/1.4.0/IMEngine
 @dirrmtry lib/scim-1.0/1.4.0
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index bba14e3d7100..45db62c97d5a 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim
 PORTVERSION=	1.4.6
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index 7a9990299b19..3da4b75ba7ca 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -153,11 +153,3 @@ share/locale/zh_TW/LC_MESSAGES/scim.mo
 @dirrm %%DATADIR%%
 @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 73496808b538..600d28737596 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scrollkeeper
 PORTVERSION=	0.3.14
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/textproc/scrollkeeper/pkg-plist b/textproc/scrollkeeper/pkg-plist
index dafc0c8fe4f1..49289b7ded61 100644
--- a/textproc/scrollkeeper/pkg-plist
+++ b/textproc/scrollkeeper/pkg-plist
@@ -135,31 +135,3 @@ share/locale/zh_TW/LC_MESSAGES/scrollkeeper.mo
 @unexec %%LOCALBASE%%/bin/xmlcatalog --noout --del %D/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd %%LOCALBASE%%/share/xml/catalog.ports || true
 @exec touch -f /var/log/scrollkeeper.log
 @exec mkdir -p /var/db/scrollkeeper
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/textproc/sgmltools-lite/Makefile b/textproc/sgmltools-lite/Makefile
index 6122280b53da..3981e83d76fc 100644
--- a/textproc/sgmltools-lite/Makefile
+++ b/textproc/sgmltools-lite/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sgmltools-lite
 PORTVERSION=	3.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sgmltools-lite
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index f588434a9daf..0e3694e50193 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skim
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scim
diff --git a/textproc/skim/pkg-plist b/textproc/skim/pkg-plist
index 016d28e80342..17c46c66a703 100644
--- a/textproc/skim/pkg-plist
+++ b/textproc/skim/pkg-plist
@@ -148,9 +148,3 @@ lib/scim-1.0/1.4.0/Config/kconfig.so
 @dirrm share/doc/HTML/de/skim
 @dirrm share/apps/skim/pics
 @dirrm share/apps/skim
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
diff --git a/textproc/skribe/Makefile b/textproc/skribe/Makefile
index 55fecff3d44a..0796a243388e 100644
--- a/textproc/skribe/Makefile
+++ b/textproc/skribe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skribe
 PORTVERSION=	1.0a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp-sop.inria.fr/mimosa/fp/Skribe/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/textproc/smartdoc-devel/Makefile b/textproc/smartdoc-devel/Makefile
index a046b6077ee5..dd08d5b67007 100644
--- a/textproc/smartdoc-devel/Makefile
+++ b/textproc/smartdoc-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smartdoc
 PORTVERSION=	1.0.0.20031106
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kiri/smartdoc
diff --git a/textproc/smartdoc/Makefile b/textproc/smartdoc/Makefile
index 1fb0a308663f..717c8f369d70 100644
--- a/textproc/smartdoc/Makefile
+++ b/textproc/smartdoc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	smartdoc
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://www.asahi-net.or.jp/~dp8t-asm/java/tools/SmartDoc/
 DISTNAME=	setup${PORTVERSION:S/.//g}
diff --git a/textproc/sowing/Makefile b/textproc/sowing/Makefile
index d480809a95bb..9a297388e097 100644
--- a/textproc/sowing/Makefile
+++ b/textproc/sowing/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sowing
 PORTVERSION=	1.1.11
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://info.mcs.anl.gov/pub/sowing/
 
diff --git a/textproc/stardict2-dictd_mova/Makefile b/textproc/stardict2-dictd_mova/Makefile
index f5bec3499e45..3f4ef3c4186f 100644
--- a/textproc/stardict2-dictd_mova/Makefile
+++ b/textproc/stardict2-dictd_mova/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict
 PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
diff --git a/textproc/stardict2-quick/Makefile b/textproc/stardict2-quick/Makefile
index a6e98023a794..2c56619b5958 100644
--- a/textproc/stardict2-quick/Makefile
+++ b/textproc/stardict2-quick/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict
 PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index 3445a8a1c352..d91c60073f07 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	stardict
 PORTVERSION=	2.4.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index 3445a8a1c352..d91c60073f07 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	stardict
 PORTVERSION=	2.4.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/tex2im/Makefile b/textproc/tex2im/Makefile
index c284713270d7..217ddd029a59 100644
--- a/textproc/tex2im/Makefile
+++ b/textproc/tex2im/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	tex2im
 PORTVERSION=	1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.nought.de/
 
diff --git a/textproc/textogif/Makefile b/textproc/textogif/Makefile
index 2fc6457d6f5d..fa58820c4f3c 100644
--- a/textproc/textogif/Makefile
+++ b/textproc/textogif/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	textogif
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	textproc math www
 MASTER_SITES=	http://www.fourmilab.ch/webtools/textogif/download/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/textproc/tkdiff/Makefile b/textproc/tkdiff/Makefile
index 814de29d5f71..ffd8e65ca949 100644
--- a/textproc/tkdiff/Makefile
+++ b/textproc/tkdiff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkdiff
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	textproc tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/tkxmlive/Makefile b/textproc/tkxmlive/Makefile
index 736029263dcc..ec95b222066e 100644
--- a/textproc/tkxmlive/Makefile
+++ b/textproc/tkxmlive/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		tkxmlive
 PORTVERSION=		0.1.5
+PORTREVISION=	1
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/trang/Makefile b/textproc/trang/Makefile
index fa0b6306ec50..a1ea7b43a34a 100644
--- a/textproc/trang/Makefile
+++ b/textproc/trang/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	trang
 PORTVERSION=	2003.06.19
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://www.thaiopensource.com/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile
index b0fd3fb88cc1..4af40a5832bf 100644
--- a/textproc/tth/Makefile
+++ b/textproc/tth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tth
 PORTVERSION=	3.76
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://hutchinson.belmont.ma.us/tth/tth-noncom/
 DISTNAME=	tth_C
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index b20b3e8e79c3..e192f35fcc24 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	uim-el
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://uim.freedesktop.org/releases/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 7eb95c816a1f..12c2855b00f6 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	uim
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES?=	textproc
 MASTER_SITES=	http://uim.freedesktop.org/releases/
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index 844bc2892a57..962308061cca 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	unroff
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www-rn.informatik.uni-bremen.de/software/unroff/%SUBDIR%/
 MASTER_SITE_SUBDIR=	dist
diff --git a/textproc/weka/Makefile b/textproc/weka/Makefile
index ca36ac48327b..e0cdf30a6906 100644
--- a/textproc/weka/Makefile
+++ b/textproc/weka/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	weka
 DISTVERSION=	3-4-10
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/wordnet/Makefile b/textproc/wordnet/Makefile
index e9781c9f23c4..541856e72e27 100644
--- a/textproc/wordnet/Makefile
+++ b/textproc/wordnet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	WordNet
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PORTVERSION}/ \
 		http://wordnet.princeton.edu/${PORTVERSION}/
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index aa6007b847e6..39540e16e2e8 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wv
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index bb1599e78d63..9f795f65fc6a 100644
--- a/textproc/wv2/Makefile
+++ b/textproc/wv2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wv2
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index e345159a0df5..a404a36ebeec 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xalan-j
 PORTVERSION=	2.7.0
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_APACHE_XML}
 MASTER_SITE_SUBDIR=	${PORTNAME}/source
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index d25d4cd07b20..fba3a467bcaf 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xerces-j
 PORTVERSION=	2.9.0
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_APACHE_XML}
 MASTER_SITE_SUBDIR=	xerces-j/source
diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile
index b57e46c02764..de1970526c41 100644
--- a/textproc/xfce4-dict-plugin/Makefile
+++ b/textproc/xfce4-dict-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-dict-plugin
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile
index 9cac06a5ea15..2397c43815c0 100644
--- a/textproc/xincluder/Makefile
+++ b/textproc/xincluder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xincluder
 PORTVERSION=	1.0.d11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc java
 MASTER_SITES=	ftp://ftp.ibiblio.org/pub/languages/java/javafaq/
 DISTNAME=	${PORTNAME}-1.0d11
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index a7e5b836fa98..2085af006328 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xlhtml
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -18,7 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert Excel and PowerPoint files to HTML and text
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213
+USE_AUTOTOOLS=	automake:14 autoconf:253
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		ppthtml.1 xlhtml.1
diff --git a/textproc/xml-lite.el/Makefile b/textproc/xml-lite.el/Makefile
index 0a07d88494d4..6d3eceb9ceaa 100644
--- a/textproc/xml-lite.el/Makefile
+++ b/textproc/xml-lite.el/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xml-lite.el
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://dogbiscuit.org/mdub/software/
diff --git a/textproc/xml-parse.el/Makefile b/textproc/xml-parse.el/Makefile
index 55a8a6d56b89..80796319d412 100644
--- a/textproc/xml-parse.el/Makefile
+++ b/textproc/xml-parse.el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xml-parse.el
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://dryice.name/computer/FreeBSD/distfiles/ \
 		http://sacha.free.net.ph/notebook/emacs/
diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index 832b8534ad56..03c68116ad15 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xml2rfc
 PORTVERSION=	1.32
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://xml.resource.org/authoring/
 EXTRACT_SUFX=	.tgz
diff --git a/textproc/xmlada-gcc/Makefile b/textproc/xmlada-gcc/Makefile
index 07b0560ac647..a769d448cf16 100644
--- a/textproc/xmlada-gcc/Makefile
+++ b/textproc/xmlada-gcc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmlada
 PORTVERSION=	5.0.4
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnuada
diff --git a/textproc/xmlenc/Makefile b/textproc/xmlenc/Makefile
index 1613ee895c07..a366bd83988c 100644
--- a/textproc/xmlenc/Makefile
+++ b/textproc/xmlenc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmlenc
 PORTVERSION=	0.52
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmlenc
diff --git a/textproc/xmlpull/Makefile b/textproc/xmlpull/Makefile
index f3c7ae3fa66f..936c9fd78d4c 100644
--- a/textproc/xmlpull/Makefile
+++ b/textproc/xmlpull/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmlpull
 PORTVERSION=	1.1.3.4a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc java
 MASTER_SITES=	http://voodoo.bawue.com/download/ \
 		http://www.xmlpull.org/v1/download/
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index a7e625dffec4..d1c802411597 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmlroff
 PORTVERSION=	0.3.9
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/xmlroff/pkg-plist b/textproc/xmlroff/pkg-plist
index 9406ecffac24..73bd5c7259ab 100644
--- a/textproc/xmlroff/pkg-plist
+++ b/textproc/xmlroff/pkg-plist
@@ -365,7 +365,6 @@ share/xml/libfo-0.3.9/catalog.xml
 share/xml/libfo-0.3.9/libfo-compat.xsl
 share/xml/libfo-0.3.9/xmlroff.fo
 @dirrm share/xml/libfo-0.3.9
-@dirrmtry share/xml
 @dirrm %%DOCSDIR%%
 @dirrm include/libfo-0.3/util
 @dirrm include/libfo-0.3/property
diff --git a/textproc/xom/Makefile b/textproc/xom/Makefile
index 4eebd2bf7297..7567d7c2d135 100644
--- a/textproc/xom/Makefile
+++ b/textproc/xom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xom
 PORTVERSION=	1.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://www.cafeconleche.org/XOM/
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
index 21a2ca68dc29..35e1650472b7 100644
--- a/textproc/xp/Makefile
+++ b/textproc/xp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xp
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc java
 MASTER_SITES=	ftp://ftp.jclark.com/pub/xml/
 DISTNAME=	${PORTNAME}
diff --git a/textproc/xpp3/Makefile b/textproc/xpp3/Makefile
index d1944373ca73..908a613a2f27 100644
--- a/textproc/xpp3/Makefile
+++ b/textproc/xpp3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpp3
 DISTVERSION=	1.1.4c
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/
diff --git a/textproc/xstream/Makefile b/textproc/xstream/Makefile
index edc06fabc352..b00937154372 100644
--- a/textproc/xstream/Makefile
+++ b/textproc/xstream/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xstream
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://dist.codehaus.org/xstream/distributions/
 
diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile
index 305be60a8ca8..4e1f97de32b5 100644
--- a/textproc/xt/Makefile
+++ b/textproc/xt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xt
 PORTVERSION=	20020426a
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://www.blnz.com/xt/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/textproc/xxdiff-scripts/Makefile b/textproc/xxdiff-scripts/Makefile
index 5384d8ca8762..96abb6e2a3af 100644
--- a/textproc/xxdiff-scripts/Makefile
+++ b/textproc/xxdiff-scripts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xxdiff
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-scripts
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index 58fbab90be94..f5643ca1ab29 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xxdiff
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
diff --git a/ukrainian/calligra-l10n/Makefile b/ukrainian/calligra-l10n/Makefile
index 3c86be82de8b..9523da4a029f 100644
--- a/ukrainian/calligra-l10n/Makefile
+++ b/ukrainian/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/ukrainian/kde3-i18n/Makefile b/ukrainian/kde3-i18n/Makefile
index 7fc9e293884e..f6ddd0b81252 100644
--- a/ukrainian/kde3-i18n/Makefile
+++ b/ukrainian/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/ukrainian/kde4-l10n/Makefile b/ukrainian/kde4-l10n/Makefile
index 7fc9e293884e..f6ddd0b81252 100644
--- a/ukrainian/kde4-l10n/Makefile
+++ b/ukrainian/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/ukrainian/koffice-i18n/Makefile b/ukrainian/koffice-i18n/Makefile
index 3c86be82de8b..9523da4a029f 100644
--- a/ukrainian/koffice-i18n/Makefile
+++ b/ukrainian/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/ukrainian/koffice-kde4-l10n/Makefile b/ukrainian/koffice-kde4-l10n/Makefile
index 3c86be82de8b..9523da4a029f 100644
--- a/ukrainian/koffice-kde4-l10n/Makefile
+++ b/ukrainian/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
diff --git a/ukrainian/monacofonts/Makefile b/ukrainian/monacofonts/Makefile
index 7a265ed2c855..c635fefaddda 100644
--- a/ukrainian/monacofonts/Makefile
+++ b/ukrainian/monacofonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	monaco
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	ukrainian x11-fonts
 MASTER_SITES=	http://www.brama.com/compute/unix/
 PKGNAMEPREFIX=	koi8-u-
diff --git a/vietnamese/gtk-im-vi/Makefile b/vietnamese/gtk-im-vi/Makefile
index 6f0668fc462a..87f136d04b39 100644
--- a/vietnamese/gtk-im-vi/Makefile
+++ b/vietnamese/gtk-im-vi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-im-vi
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	vietnamese textproc gnome
 MASTER_SITES=	http://dev.gentoo.org/~pclouds/files/
 
diff --git a/vietnamese/kde3-i18n/Makefile b/vietnamese/kde3-i18n/Makefile
index 645a098d7bd7..3ebd418c809c 100644
--- a/vietnamese/kde3-i18n/Makefile
+++ b/vietnamese/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	vietnamese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile
index 9495923dddc6..e6d6fb5ce26f 100644
--- a/vietnamese/unicode-uhoai/Makefile
+++ b/vietnamese/unicode-uhoai/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	unicode-uhoai
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	vietnamese x11-fonts
 MASTER_SITES=	http://www.geocities.com/~starkville/mozilla/
 DISTNAME=	uhoaiw21
diff --git a/vietnamese/urwvn/Makefile b/vietnamese/urwvn/Makefile
index 7bbe16c1c641..4f91dc911aa3 100644
--- a/vietnamese/urwvn/Makefile
+++ b/vietnamese/urwvn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	urwvn
 PORTVERSION=	3.04
+PORTREVISION=	1
 CATEGORIES=	vietnamese x11-fonts
 MASTER_SITES=	http://vntex.org/urwvn/download/
 DISTNAME=	urwvn-${PORTVERSION}-ttf
diff --git a/vietnamese/vietunicode-hannom/Makefile b/vietnamese/vietunicode-hannom/Makefile
index 17e0deb94931..d828acf18fe9 100644
--- a/vietnamese/vietunicode-hannom/Makefile
+++ b/vietnamese/vietunicode-hannom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vietunicode-hannom
 PORTVERSION=	2005.02.06
+PORTREVISION=	1
 CATEGORIES=	vietnamese x11-fonts
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	vietunicode
diff --git a/vietnamese/vietunicode-trichlor/Makefile b/vietnamese/vietunicode-trichlor/Makefile
index 5a418506122c..3aa34b86db04 100644
--- a/vietnamese/vietunicode-trichlor/Makefile
+++ b/vietnamese/vietunicode-trichlor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vietunicode-trichlor
 PORTVERSION=	2004.04.30
+PORTREVISION=	1
 CATEGORIES=	vietnamese x11-fonts
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	vietunicode
diff --git a/vietnamese/vietunicode-web1/Makefile b/vietnamese/vietunicode-web1/Makefile
index b585e3943b18..6fe78bed88fb 100644
--- a/vietnamese/vietunicode-web1/Makefile
+++ b/vietnamese/vietunicode-web1/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vietunicode-web1
 PORTVERSION=	2004.04.30
+PORTREVISION=	1
 CATEGORIES=	vietnamese x11-fonts
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	vietunicode
diff --git a/vietnamese/vnterm/Makefile b/vietnamese/vnterm/Makefile
index b6d09b53191e..2e71cb47c8a9 100644
--- a/vietnamese/vnterm/Makefile
+++ b/vietnamese/vnterm/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	vnterm
 PORTVERSION=	3.4	#11.6.6[.0]
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	vietnamese x11
 MASTER_SITES=	ftp://ftp.x.org/pub/R6.6/tars/
 DISTNAME=	xorg-1
diff --git a/vietnamese/vntex/Makefile b/vietnamese/vntex/Makefile
index 21baaecef94b..f4c3dbbf2df6 100644
--- a/vietnamese/vntex/Makefile
+++ b/vietnamese/vntex/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	vntex
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	vietnamese print
 MASTER_SITES=	http://www.fi.muni.cz/~thanh/download/
 DISTNAME=	vntex
diff --git a/vietnamese/vnxfonts/Makefile b/vietnamese/vnxfonts/Makefile
index 0233919f55b6..e21c8a4d6651 100644
--- a/vietnamese/vnxfonts/Makefile
+++ b/vietnamese/vnxfonts/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	vnxfonts
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	vietnamese x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	obrien
diff --git a/vietnamese/xvnkb/Makefile b/vietnamese/xvnkb/Makefile
index 027fbce2a36b..d6f5537d292c 100644
--- a/vietnamese/xvnkb/Makefile
+++ b/vietnamese/xvnkb/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xvnkb
 PORTVERSION=	0.2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	vietnamese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/MT/Makefile b/www/MT/Makefile
index 0f386be19693..ec9f9f59ae2b 100644
--- a/www/MT/Makefile
+++ b/www/MT/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	MT
 PORTVERSION=	3.34
+PORTREVISION=	1
 CATEGORIES=	www
 DISTNAME=	MT-${PORTVERSION}-en
 
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index b5bfb3e90ff0..5dd979dca2f6 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p3
-PORTREVISION=	25
+PORTREVISION=	26
 PORTEPOCH=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/www/adblock/Makefile b/www/adblock/Makefile
index 1403cc14f5b5..841910a6c8eb 100644
--- a/www/adblock/Makefile
+++ b/www/adblock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	adblock
 DISTVERSION=	0.5-dev
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index dd6d372cb362..a24890ba99e5 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	amaya
 PORTVERSION=	9.51
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
diff --git a/www/analog/Makefile b/www/analog/Makefile
index a872411bf1cd..289d1f5a69c8 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	analog
 PORTVERSION=	6.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.analog.cx/ \
diff --git a/www/apache-forrest/Makefile b/www/apache-forrest/Makefile
index 5fb2241e60a0..557120e2d119 100644
--- a/www/apache-forrest/Makefile
+++ b/www/apache-forrest/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		apache-forrest
 PORTVERSION=		0.8
+PORTREVISION=	1
 CATEGORIES=		www java
 MASTER_SITES=		${MASTER_SITE_APACHE} \
 			http://mirror.tomato.it/apache/forrest/ \
diff --git a/www/apache-jserv/Makefile b/www/apache-jserv/Makefile
index d62520087684..8057552959ac 100644
--- a/www/apache-jserv/Makefile
+++ b/www/apache-jserv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache-jserv
 PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www java
 MASTER_SITES=	http://archive.apache.org/dist/java/jserv/
 DISTNAME=	ApacheJServ-${PORTVERSION}
diff --git a/www/aria/Makefile b/www/aria/Makefile
index 103ea9eed3e3..550e9f4bad03 100644
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aria
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://aria.rednoah.com/storage/sources/
 
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index 1fe7ed7e3275..0d917af27809 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ashe
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.3/%SUBDIR%/
 MASTER_SITE_SUBDIR=	src libcci libhtmlw-2.7
diff --git a/www/asterisk-fop/Makefile b/www/asterisk-fop/Makefile
index e685480c7cac..c8c6b7360d13 100644
--- a/www/asterisk-fop/Makefile
+++ b/www/asterisk-fop/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	op_panel
 PORTVERSION=	0.26
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.asternic.org/files/
 
diff --git a/www/august/Makefile b/www/august/Makefile
index 9c6bae841d81..4047bc25b405 100644
--- a/www/august/Makefile
+++ b/www/august/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	august
 PORTVERSION=	0.63b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www editors
 MASTER_SITES=	http://www.bostream.nu/johanb/august/
 DISTNAME=	${PORTNAME}${PORTVERSION}.src
diff --git a/www/axis/Makefile b/www/axis/Makefile
index f78439858773..2f0e8f111cff 100644
--- a/www/axis/Makefile
+++ b/www/axis/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		axis
 PORTVERSION=		1.4
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		www java
 MASTER_SITES=		${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	ws/axis/${PORTVERSION:S,.,_,g}
diff --git a/www/bblog/Makefile b/www/bblog/Makefile
index 1b8843dfd754..913db792ad47 100644
--- a/www/bblog/Makefile
+++ b/www/bblog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bBlog
 PORTVERSION=	0.7.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/www/bins/Makefile b/www/bins/Makefile
index ee1c99059273..4eb109bc6c65 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bins
 PORTVERSION=	1.1.29
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.gna.org/bins/
 
diff --git a/www/bins/pkg-plist b/www/bins/pkg-plist
index ee718a6b596f..023153b0d6a5 100644
--- a/www/bins/pkg-plist
+++ b/www/bins/pkg-plist
@@ -414,8 +414,6 @@ share/locale/nl/LC_MESSAGES/bins.mo
 share/locale/pl/LC_MESSAGES/bins.mo
 share/locale/ru/LC_MESSAGES/bins.mo
 share/locale/zh_TW/LC_MESSAGES/bins.mo
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/templates.swigs
 @dirrm %%DATADIR%%/templates.satyap/static
diff --git a/www/bk_edit/Makefile b/www/bk_edit/Makefile
index fcb0e566ae94..17971b3c9d5a 100644
--- a/www/bk_edit/Makefile
+++ b/www/bk_edit/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bk_edit
 PORTVERSION=	0.6.23
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.allesdurcheinander.de/nettools/bk_edit/
 
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index f2a8e65a1190..31c679e75595 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bluefish
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist
index 60e67e817c43..8a7b525d9692 100644
--- a/www/bluefish/pkg-plist
+++ b/www/bluefish/pkg-plist
@@ -54,21 +54,3 @@ share/mime/packages/bluefish.xml
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 2c78f29c3806..0ca400d8fd72 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bookmarkbridge
 PORTVERSION=	0.72
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bookmarkbridge
diff --git a/www/bugmenot/Makefile b/www/bugmenot/Makefile
index 97cde4c64093..a68d0cacd2ea 100644
--- a/www/bugmenot/Makefile
+++ b/www/bugmenot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bugmenot
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://extensions.roachfiend.com/
 DISTNAME=	${PORTNAME}
diff --git a/www/bugmenot/distinfo b/www/bugmenot/distinfo
index b5874e6ad0a2..71c5ab8be3ff 100644
--- a/www/bugmenot/distinfo
+++ b/www/bugmenot/distinfo
@@ -1,3 +1,3 @@
-MD5 (bugmenot-1.3_1/bugmenot.xpi) = f446463062b623004db61563eab815c2
-SHA256 (bugmenot-1.3_1/bugmenot.xpi) = 278cb953299e5423ed90c342c228aaa411eaa00fd6518bd73235212084703c18
-SIZE (bugmenot-1.3_1/bugmenot.xpi) = 19249
+MD5 (bugmenot-1.3_2/bugmenot.xpi) = f446463062b623004db61563eab815c2
+SHA256 (bugmenot-1.3_2/bugmenot.xpi) = 278cb953299e5423ed90c342c228aaa411eaa00fd6518bd73235212084703c18
+SIZE (bugmenot-1.3_2/bugmenot.xpi) = 19249
diff --git a/www/campsite/Makefile b/www/campsite/Makefile
index e58316ebd390..af6ca50ae078 100644
--- a/www/campsite/Makefile
+++ b/www/campsite/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	campsite
 PORTVERSION=	2.6.7
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/cheetah/Makefile b/www/cheetah/Makefile
index 2cf3f2af6020..63ed807c2c2b 100644
--- a/www/cheetah/Makefile
+++ b/www/cheetah/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cheetah
 PORTVERSION=	0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index 351464634384..649d1c7fc122 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chimera
 PORTVERSION=	1.70p0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.rocklinux.net/people/ripclaw/projects/software/chimera/devel/
 
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 23aa3307afe0..3fca901bd784 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cocoon
 PORTVERSION=	2.1.10
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/conkeror/Makefile b/www/conkeror/Makefile
index c1459fbbb270..7a846cda1f46 100644
--- a/www/conkeror/Makefile
+++ b/www/conkeror/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	conkeror
 PORTVERSION=	0.42
+PORTREVISION=	1
 DISTVERSIONPREFIX=	firefox-
 CATEGORIES=	www
 MASTER_SITES=	MOZDEV
diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile
index 0ac0996b966b..e30e2e59cd2f 100644
--- a/www/coppermine/Makefile
+++ b/www/coppermine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	coppermine
 PORTVERSION=	1.4.10
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/cssed/Makefile b/www/cssed/Makefile
index 3b59366fb273..ac145eec9997 100644
--- a/www/cssed/Makefile
+++ b/www/cssed/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cssed
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/dalbum/Makefile b/www/dalbum/Makefile
index 143a0ba00782..119b165123c5 100644
--- a/www/dalbum/Makefile
+++ b/www/dalbum/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dalbum
 PORTVERSION=	140.152
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.dalbum.org/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/}
diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile
index e667325feafe..b8c5f6c9c0ed 100644
--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@@ -19,6 +19,7 @@
 
 PORTNAME=	dillo
 PORTVERSION=	${DILLOVERSION}.${I18NVERSION}
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://teki.jpn.ph/pc/software/
 PKGNAMESUFFIX=	-i18n
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index a4f6b66f177f..c1b664c1dd6e 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -11,6 +11,7 @@
 
 PORTNAME=	dillo
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.dillo.org/download/
 
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index a4f6b66f177f..c1b664c1dd6e 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -11,6 +11,7 @@
 
 PORTNAME=	dillo
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.dillo.org/download/
 
diff --git a/www/dokeos/Makefile b/www/dokeos/Makefile
index fa6a4db05797..094ccb328fe4 100644
--- a/www/dokeos/Makefile
+++ b/www/dokeos/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dokeos
 PORTVERSION=	1.6.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.dokeos.com/download/
 
diff --git a/www/dokuwiki-devel/Makefile b/www/dokuwiki-devel/Makefile
index 1420f59101a0..0873ca18f531 100644
--- a/www/dokuwiki-devel/Makefile
+++ b/www/dokuwiki-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dokuwiki
 PORTVERSION=	${DIST_VER:S/${PORTNAME}//:S/-//g}
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/chinsan \
 		http://dev.splitbrain.org/browse/snapshots/
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index 2fc67b35fe8b..51b2eec86657 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dokuwiki
 PORTVERSION=	${DIST_VER:S/${PORTNAME}//:S/-//g}
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.splitbrain.org/_media/projects/dokuwiki/ \
 		http://dev.splitbrain.org/browse/snapshots/
diff --git a/www/dotproject-devel/Makefile b/www/dotproject-devel/Makefile
index e675cea5a72a..0c8d2741f410 100644
--- a/www/dotproject-devel/Makefile
+++ b/www/dotproject-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dotproject
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/dotproject/Makefile b/www/dotproject/Makefile
index e675cea5a72a..0c8d2741f410 100644
--- a/www/dotproject/Makefile
+++ b/www/dotproject/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dotproject
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/drupal4-attachment/Makefile b/www/drupal4-attachment/Makefile
index eb5fcf69a216..37974308ba33 100644
--- a/www/drupal4-attachment/Makefile
+++ b/www/drupal4-attachment/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	attachment
 DISTVERSION=	${DRUPAL_VERSION}
-PORTREVISION=	20060928
+PORTREVISION=	20060929
 CATEGORIES=	www security
 
 MAINTAINER=	nick@foobar.org
diff --git a/www/drupal4-filemanager/Makefile b/www/drupal4-filemanager/Makefile
index f20301fd2086..2f43aa07b4b6 100644
--- a/www/drupal4-filemanager/Makefile
+++ b/www/drupal4-filemanager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	filemanager
 DISTVERSION=	${DRUPAL_VERSION}
-PORTREVISION=	20060914
+PORTREVISION=	20060915
 CATEGORIES=	www security
 
 MAINTAINER=	nick@foobar.org
diff --git a/www/drupal4-gsitemap/Makefile b/www/drupal4-gsitemap/Makefile
index 8a5dadfda11b..b1b63936e3ff 100644
--- a/www/drupal4-gsitemap/Makefile
+++ b/www/drupal4-gsitemap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gsitemap
 DISTVERSION=	4.7.x-1.0
-PORTREVISION=	20070111
+PORTREVISION=	20070112
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 
diff --git a/www/drupal4-i18n/Makefile b/www/drupal4-i18n/Makefile
index f42c02523c68..ad1f3a0a6523 100644
--- a/www/drupal4-i18n/Makefile
+++ b/www/drupal4-i18n/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	i18n
 DISTVERSION=	4.7.x-1.0
-PORTREVISION=	20061208
+PORTREVISION=	20061209
 CATEGORIES=	www security
 MASTER_SITE_SUBDIR=	pav/drupal
 
diff --git a/www/drupal4-nice_menus/Makefile b/www/drupal4-nice_menus/Makefile
index c3aef8d271d4..7923d5da606e 100644
--- a/www/drupal4-nice_menus/Makefile
+++ b/www/drupal4-nice_menus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nice_menus
 DISTVERSION=	${DRUPAL_VERSION}
-PORTREVISION=	20060811
+PORTREVISION=	20060812
 CATEGORIES=	www security
 MASTER_SITE=	http://ftp.osuosl.org/pub/drupal/files/projects/
 
diff --git a/www/drupal4-taxonomy_access/Makefile b/www/drupal4-taxonomy_access/Makefile
index 1d5e2128eae1..b3e058f5589a 100644
--- a/www/drupal4-taxonomy_access/Makefile
+++ b/www/drupal4-taxonomy_access/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	taxonomy_access
 DISTVERSION=	4.7.x-1.x-dev
-PORTREVISION=	20070205
+PORTREVISION=	20070206
 PORTEPOCH=	2
 CATEGORIES=	www security
 MASTER_SITE_SUBDIR=	pav/drupal
diff --git a/www/drupal4-textile/Makefile b/www/drupal4-textile/Makefile
index 0cbaf64048b3..e0b172a1094e 100644
--- a/www/drupal4-textile/Makefile
+++ b/www/drupal4-textile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	textile
 DISTVERSION=	4.7.x-1.x-dev
-PORTREVISION=	20061113
+PORTREVISION=	20061114
 CATEGORIES=	www textproc
 MASTER_SITE_SUBDIR=	brooks
 
diff --git a/www/drupal4/Makefile b/www/drupal4/Makefile
index 9782b9d3ecfb..5db484fd0105 100644
--- a/www/drupal4/Makefile
+++ b/www/drupal4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drupal4
 PORTVERSION=	4.7.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 DISTNAME=	drupal-${PORTVERSION}
diff --git a/www/drupal5-adsense/Makefile b/www/drupal5-adsense/Makefile
index c601f64543ff..a313c785d83a 100644
--- a/www/drupal5-adsense/Makefile
+++ b/www/drupal5-adsense/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	adsense
 DISTVERSION=	5.x-1.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 
diff --git a/www/drupal5-google_analytics/Makefile b/www/drupal5-google_analytics/Makefile
index 6e9f9d883cbf..f5103dbabfc2 100644
--- a/www/drupal5-google_analytics/Makefile
+++ b/www/drupal5-google_analytics/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	google_analytics
 DISTVERSION=	5.x-1.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 
diff --git a/www/drupal5-gsitemap/Makefile b/www/drupal5-gsitemap/Makefile
index 1abcf55b8d0c..1b95e780950b 100644
--- a/www/drupal5-gsitemap/Makefile
+++ b/www/drupal5-gsitemap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gsitemap
 DISTVERSION=	5.x-1.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 
diff --git a/www/drupal5-i18n/Makefile b/www/drupal5-i18n/Makefile
index f42c02523c68..ad1f3a0a6523 100644
--- a/www/drupal5-i18n/Makefile
+++ b/www/drupal5-i18n/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	i18n
 DISTVERSION=	4.7.x-1.0
-PORTREVISION=	20061208
+PORTREVISION=	20061209
 CATEGORIES=	www security
 MASTER_SITE_SUBDIR=	pav/drupal
 
diff --git a/www/drupal5-nice_menus/Makefile b/www/drupal5-nice_menus/Makefile
index c3aef8d271d4..7923d5da606e 100644
--- a/www/drupal5-nice_menus/Makefile
+++ b/www/drupal5-nice_menus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nice_menus
 DISTVERSION=	${DRUPAL_VERSION}
-PORTREVISION=	20060811
+PORTREVISION=	20060812
 CATEGORIES=	www security
 MASTER_SITE=	http://ftp.osuosl.org/pub/drupal/files/projects/
 
diff --git a/www/drupal5-taxonomy_access/Makefile b/www/drupal5-taxonomy_access/Makefile
index fc30c5b01b1d..019ba65cc8ee 100644
--- a/www/drupal5-taxonomy_access/Makefile
+++ b/www/drupal5-taxonomy_access/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	taxonomy_access
 DISTVERSION=	5.x-1.x-dev
-PORTREVISION=	20070217
+PORTREVISION=	20070218
 CATEGORIES=	www security
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav/drupal
diff --git a/www/drupal5-tinymce/Makefile b/www/drupal5-tinymce/Makefile
index 61c95f229467..31ffa91b33b0 100644
--- a/www/drupal5-tinymce/Makefile
+++ b/www/drupal5-tinymce/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tinymce
 DISTVERSION=	5.x-1.x-dev
-PORTREVISION=	20070331
+PORTREVISION=	20070332
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav/drupal
diff --git a/www/drupal5-xmlsitemap/Makefile b/www/drupal5-xmlsitemap/Makefile
index 1abcf55b8d0c..1b95e780950b 100644
--- a/www/drupal5-xmlsitemap/Makefile
+++ b/www/drupal5-xmlsitemap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gsitemap
 DISTVERSION=	5.x-1.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 
diff --git a/www/drupal5/Makefile b/www/drupal5/Makefile
index b1ac113bf8e9..7a0d18911947 100644
--- a/www/drupal5/Makefile
+++ b/www/drupal5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drupal5
 PORTVERSION=	5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 DISTNAME=	drupal-${PORTVERSION}
diff --git a/www/drupal6-google_analytics/Makefile b/www/drupal6-google_analytics/Makefile
index 6e9f9d883cbf..f5103dbabfc2 100644
--- a/www/drupal6-google_analytics/Makefile
+++ b/www/drupal6-google_analytics/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	google_analytics
 DISTVERSION=	5.x-1.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 
diff --git a/www/drupal6-nice_menus/Makefile b/www/drupal6-nice_menus/Makefile
index c3aef8d271d4..7923d5da606e 100644
--- a/www/drupal6-nice_menus/Makefile
+++ b/www/drupal6-nice_menus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nice_menus
 DISTVERSION=	${DRUPAL_VERSION}
-PORTREVISION=	20060811
+PORTREVISION=	20060812
 CATEGORIES=	www security
 MASTER_SITE=	http://ftp.osuosl.org/pub/drupal/files/projects/
 
diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile
index b1ac113bf8e9..7a0d18911947 100644
--- a/www/drupal6/Makefile
+++ b/www/drupal6/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drupal5
 PORTVERSION=	5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 DISTNAME=	drupal-${PORTVERSION}
diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index b1ac113bf8e9..7a0d18911947 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drupal5
 PORTVERSION=	5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/drupal/files/projects/
 DISTNAME=	drupal-${PORTVERSION}
diff --git a/www/dummyflash/Makefile b/www/dummyflash/Makefile
index 91ee0fb67956..d255ff30bc5e 100644
--- a/www/dummyflash/Makefile
+++ b/www/dummyflash/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dummyflash
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.netscape.com/pub/sdk/plugin/unix/
 DISTNAME=	unix-sdk-3.0b5
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 3cc7ddbfb3cb..7d4978c36d5e 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	elinks
 PORTVERSION=	0.11.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://elinks.or.cz/download/ \
 		http://keyserver.kjsl.com/~jharris/distfiles/
diff --git a/www/elinks/pkg-plist b/www/elinks/pkg-plist
index a5f5bc633a0c..c3a0e92a2ace 100644
--- a/www/elinks/pkg-plist
+++ b/www/elinks/pkg-plist
@@ -29,25 +29,3 @@ bin/elinks
 %%NLS%%share/locale/sv/LC_MESSAGES/elinks.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/elinks.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/elinks.mo
-%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/be
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 1ffa8592e210..f7aaa7b0d30c 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs-w3m
 PORTVERSION=	1.4.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www elisp
 MASTER_SITES=	http://emacs-w3m.namazu.org/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 4a5aff627b3e..074c10efa122 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	epiphany
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index adaa34befc64..da97d5e91538 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -166,35 +166,7 @@ share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 @dirrmtry lib/epiphany/%%VERSION%%/plugins
 @dirrmtry lib/epiphany/%%VERSION%%
 @dirrmtry lib/epiphany
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 98cf56bd5296..87d59dd68853 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	epiphany
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 00f0b4d79202..32740265c631 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -340,61 +340,21 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm include/epiphany
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @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/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/www/erwn/Makefile b/www/erwn/Makefile
index 5c237b4ce2c7..777be4314be5 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erwn
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www editors
 MASTER_SITES=	http://lisas.de/erwin/
 DISTNAME=	erwin-${PORTVERSION}
diff --git a/www/etoile-bookmarkkit/Makefile b/www/etoile-bookmarkkit/Makefile
index a150ae5c526a..aeb7ad7b992c 100644
--- a/www/etoile-bookmarkkit/Makefile
+++ b/www/etoile-bookmarkkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bookmarkkit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	www gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/www/etoile-mollusk/Makefile b/www/etoile-mollusk/Makefile
index e643578d4dbc..b0849478b6b8 100644
--- a/www/etoile-mollusk/Makefile
+++ b/www/etoile-mollusk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mollusk
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	www gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/www/etoile-rsskit/Makefile b/www/etoile-rsskit/Makefile
index 8b09b909e782..a26c14f4db19 100644
--- a/www/etoile-rsskit/Makefile
+++ b/www/etoile-rsskit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rsskit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	www gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/www/eventum/Makefile b/www/eventum/Makefile
index e0dd467ce55c..71d6453be195 100644
--- a/www/eventum/Makefile
+++ b/www/eventum/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eventum
 PORTVERSION=	1.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	eventum
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index e16cc25eac41..2531a0582f54 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	webcal
 PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index 19e0896fa81e..faa941663b8f 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -66,56 +66,24 @@ share/locale/xh/LC_MESSAGES/evolution-webcal.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-webcal.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-webcal.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/as/LC_MESSAGES
diff --git a/www/extsm/Makefile b/www/extsm/Makefile
index 348bfa0f9e65..d3ac77e64ad2 100644
--- a/www/extsm/Makefile
+++ b/www/extsm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	extsm
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=rxsm
diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index c9555cc7d2c3..06a77b659a56 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	3.0.a2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -89,7 +90,6 @@ port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 .if !defined(WITHOUT_NEWTAB)
 	${ECHO_CMD} >> ${SYSTEM_PREFS}
 	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index eb7b875cc775..49e9f047cf77 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	2.0.0.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
@@ -88,7 +89,6 @@ pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 .if !defined(WITHOUT_NEWTAB)
 	${ECHO_CMD} >> ${SYSTEM_PREFS}
 	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index eb7b875cc775..49e9f047cf77 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	2.0.0.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
@@ -88,7 +89,6 @@ pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 .if !defined(WITHOUT_NEWTAB)
 	${ECHO_CMD} >> ${SYSTEM_PREFS}
 	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index d8e53bc6f119..87c39c161c23 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	1.5.0.11
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
@@ -82,7 +83,6 @@ pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 .if !defined(WITHOUT_NEWTAB)
 	${ECHO_CMD} >> ${SYSTEM_PREFS}
 	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index c9555cc7d2c3..06a77b659a56 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	3.0.a2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -89,7 +90,6 @@ port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 .if !defined(WITHOUT_NEWTAB)
 	${ECHO_CMD} >> ${SYSTEM_PREFS}
 	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index c9555cc7d2c3..06a77b659a56 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	3.0.a2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -89,7 +90,6 @@ port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 .if !defined(WITHOUT_NEWTAB)
 	${ECHO_CMD} >> ${SYSTEM_PREFS}
 	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index eb7b875cc775..49e9f047cf77 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	2.0.0.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
@@ -88,7 +89,6 @@ pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 .if !defined(WITHOUT_NEWTAB)
 	${ECHO_CMD} >> ${SYSTEM_PREFS}
 	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
diff --git a/www/flashplugin-mozilla/Makefile b/www/flashplugin-mozilla/Makefile
index f7de2a01120c..d25d7545fe6b 100644
--- a/www/flashplugin-mozilla/Makefile
+++ b/www/flashplugin-mozilla/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	flashplugin-mozilla
 PORTVERSION=	0.4.13
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gplflash
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 61c4259cf5be..df6f02a0cd11 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	flock
 DISTVERSION=	0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 # http://ftp.osuosl.org/pub/${PORTNAME}/source/${PORTVERSION}/:flock
@@ -89,7 +89,6 @@ pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FLOCK_ICON}' >> ${PLIST}
-	${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 
 do-install:
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
diff --git a/www/fluxcms/Makefile b/www/fluxcms/Makefile
index 3d9234d8b9c2..96d6c3021f98 100644
--- a/www/fluxcms/Makefile
+++ b/www/fluxcms/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fluxcms
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://bitflux.org/download/ \
 		http://www.chruetertee.ch/files/download/
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 51ee066faf22..2b8e9f3f13eb 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	galeon
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://osdn.dl.sourceforge.net/sourceforge/galeon/
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index cd206fb133fb..c2136ee67bb4 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -230,41 +230,7 @@ share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
 @dirrm share/gnome/galeon
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index abdb4137039a..f8c2d2add7e9 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gallery2
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gallery
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index abdb4137039a..f8c2d2add7e9 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gallery2
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gallery
diff --git a/www/gecko-sharp10/Makefile b/www/gecko-sharp10/Makefile
index 055c14cf9fb9..9a64e88e2f1e 100644
--- a/www/gecko-sharp10/Makefile
+++ b/www/gecko-sharp10/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gecko-sharp
 PORTVERSION=	0.6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	http://go-mono.com/sources/gecko-sharp/
 
diff --git a/www/gecko-sharp20/Makefile b/www/gecko-sharp20/Makefile
index 1cbf848fe778..80172ffec633 100644
--- a/www/gecko-sharp20/Makefile
+++ b/www/gecko-sharp20/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gecko-sharp
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.go-mono.com/sources/gecko-sharp-2.0/
 DISTNAME=	gecko-sharp-2.0-${PORTVERSION}
diff --git a/www/gekko-modules/Makefile b/www/gekko-modules/Makefile
index d6d1010dfa3f..ccac97202cd4 100644
--- a/www/gekko-modules/Makefile
+++ b/www/gekko-modules/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gekko-modules
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gekkoware
diff --git a/www/gekko/Makefile b/www/gekko/Makefile
index f33caf4fb8a2..a19eacc43753 100644
--- a/www/gekko/Makefile
+++ b/www/gekko/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gekko
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gekkoware
diff --git a/www/geneweb/Makefile b/www/geneweb/Makefile
index d782d171f805..13f21667239a 100644
--- a/www/geneweb/Makefile
+++ b/www/geneweb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geneweb
 PORTVERSION=	4.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/geneweb/Src/
 DISTNAME=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}-1${DISTVERSIONSUFFIX}
diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile
index 8f7aae48f0fe..3e8c34bed2ee 100644
--- a/www/geronimo/Makefile
+++ b/www/geronimo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	geronimo
 PORTVERSION=	2.0.M3
+PORTREVISION=	1
 CATEGORIES=	www devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	geronimo/${PORTVERSION:C/\.M/-M/}
diff --git a/www/getleft/Makefile b/www/getleft/Makefile
index 3c09ad1d6dec..44be38759ae2 100644
--- a/www/getleft/Makefile
+++ b/www/getleft/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	getleft
 PORTVERSION=	1.2b2
+PORTREVISION=	1
 CATEGORIES=	www ftp
 MASTER_SITES=	SF/getleftdown
 DISTNAME=	Getleft-${PORTVERSION}
diff --git a/www/gforge/Makefile b/www/gforge/Makefile
index a790a01db665..7177b5adb06a 100644
--- a/www/gforge/Makefile
+++ b/www/gforge/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gforge
 PORTVERSION=	4.5.16
+PORTREVISION=	1
 CATEGORIES=	www devel
 MASTER_SITES=	http://gforge.org/frs/download.php/236/
 
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 0b8f0c9edb2f..e992ee3a6331 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glibwww
 PORTVERSION=	0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/glibwww/0.2
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 539a0a019f92..6dff469968db 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-user-share
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	www deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile
index 05a3a0eec0c7..aa8336d5d467 100644
--- a/www/gnome-web-photo/Makefile
+++ b/www/gnome-web-photo/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-web-photo
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
diff --git a/www/gnustep-ticker/Makefile b/www/gnustep-ticker/Makefile
index c209102dcd60..be659967fcda 100644
--- a/www/gnustep-ticker/Makefile
+++ b/www/gnustep-ticker/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ticker
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	www gnustep
 MASTER_SITES=	http://www.gnustep.it/marko/Ticker/
 PKGNAMEPREFIX=	gnustep-
diff --git a/www/gstreamer-plugins-neon/Makefile b/www/gstreamer-plugins-neon/Makefile
index 8a8a1545b984..1e73a85abada 100644
--- a/www/gstreamer-plugins-neon/Makefile
+++ b/www/gstreamer-plugins-neon/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/www/gstreamer-plugins-neon/Makefile,v 1.1 2006/07/06 19:32:35 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 COMMENT=	Gstreamer neon plugin
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 4ddf7141fa0c..1561810ba991 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkhtml
 PORTVERSION=	1.1.10
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist
index 43c5598eeee2..4eae08527c73 100644
--- a/www/gtkhtml/pkg-plist
+++ b/www/gtkhtml/pkg-plist
@@ -202,33 +202,3 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
 @dirrm %%DOCSDIR%%
 @dirrm include/gtkhtml-1.1/gtkhtml
 @dirrm include/gtkhtml-1.1
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 831d6fbfa4ab..5dc161eff07a 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtkhtml3
 PORTVERSION=	3.14.1
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 1a964af4bdf9..4ee0f4ca1fa6 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -117,55 +117,19 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 @dirrm lib/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 831d6fbfa4ab..5dc161eff07a 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtkhtml3
 PORTVERSION=	3.14.1
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 1a964af4bdf9..4ee0f4ca1fa6 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -117,55 +117,19 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 @dirrm lib/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index 97bf2faffcbe..5c31e295eefe 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gurlchecker
 PORTVERSION=	0.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	http://labs.libre-entreprise.org/frs/download.php/%SUBDIR%/
 MASTER_SITE_SUBDIR=	547
diff --git a/www/helixplugin/Makefile b/www/helixplugin/Makefile
index d7b7814252fd..bdfc7981e5aa 100644
--- a/www/helixplugin/Makefile
+++ b/www/helixplugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hxplugin
 PORTVERSION=	20070318
+PORTREVISION=	1
 CATEGORIES=	www multimedia
 MASTER_SITES=	http://virtual-estates.net/~mi/port-stuff/
 
diff --git a/www/horde-ansel/Makefile b/www/horde-ansel/Makefile
index 4c6645d9877e..cd737f5b63e0 100644
--- a/www/horde-ansel/Makefile
+++ b/www/horde-ansel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ansel
 PORTVERSION=	0.1.b20070319
+PORTREVISION=	1
 DISTVERSIONPREFIX=
 CATEGORIES=	www
 MASTER_SITES=	CENKES http://freebsd.alaskaparadise.com/source/
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index 406035e9b688..d5693b0825a0 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	horde
 DISTVERSIONPREFIX=
 DISTVERSION=	3.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 PKGNAMESUFFIX=	-base
 
diff --git a/www/horde-meta/Makefile b/www/horde-meta/Makefile
index 73c6f7455f5b..dde6d8863fb9 100644
--- a/www/horde-meta/Makefile
+++ b/www/horde-meta/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	meta
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	# Empty
 PKGNAMEPREFIX=	horde-
diff --git a/www/horde-passwd/Makefile b/www/horde-passwd/Makefile
index 7ed47f7c157f..4fc8669e08e5 100644
--- a/www/horde-passwd/Makefile
+++ b/www/horde-passwd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	passwd
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	www mail
 PKGNAMEPREFIX=	horde-
 DIST_SUBDIR=	horde
diff --git a/www/horde-trean/Makefile b/www/horde-trean/Makefile
index 10b9e163918f..613ac33e87b0 100644
--- a/www/horde-trean/Makefile
+++ b/www/horde-trean/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	trean
 DISTVERSIONPREFIX=
 DISTVERSION=	0.1.beta20070316
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	CENKES
 PKGNAMEPREFIX=	horde-
diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index 406035e9b688..d5693b0825a0 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	horde
 DISTVERSIONPREFIX=
 DISTVERSION=	3.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 PKGNAMESUFFIX=	-base
 
diff --git a/www/horde4-meta/Makefile b/www/horde4-meta/Makefile
index 73c6f7455f5b..dde6d8863fb9 100644
--- a/www/horde4-meta/Makefile
+++ b/www/horde4-meta/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	meta
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	# Empty
 PKGNAMEPREFIX=	horde-
diff --git a/www/http-analyze/Makefile b/www/http-analyze/Makefile
index d86cbe44529b..17e4fa2190f8 100644
--- a/www/http-analyze/Makefile
+++ b/www/http-analyze/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	http-analyze
 PORTVERSION=	2.01
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	http://sce-tindy.tecnik93.com/FreeBSD/others_ports/http-analyze/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 851cd9700eb0..fddc9ad46d55 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	httrack
 PORTVERSION=	3.41.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.httrack.com/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist
index 09b3cfa4deb7..e131a5f86ba7 100644
--- a/www/httrack/pkg-plist
+++ b/www/httrack/pkg-plist
@@ -242,5 +242,4 @@ share/pixmaps/httrack.xpm
 @dirrm %%DOCSDIR%%
 @dirrm lib/httrack
 @dirrm include/httrack
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
diff --git a/www/igal/Makefile b/www/igal/Makefile
index 8354c0e6032a..e8e1adcc4594 100644
--- a/www/igal/Makefile
+++ b/www/igal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	igal
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www graphics
 MASTER_SITES=	http://www.stanford.edu/~epop/igal/
 
diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index 6aeca2c4eb36..1f6fb3d15ab1 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ilias
 PORTVERSION=	3.7.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.ilias.de/download/src/
 
diff --git a/www/ilias3/Makefile b/www/ilias3/Makefile
index 6aeca2c4eb36..1f6fb3d15ab1 100644
--- a/www/ilias3/Makefile
+++ b/www/ilias3/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ilias
 PORTVERSION=	3.7.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.ilias.de/download/src/
 
diff --git a/www/imgsizer/Makefile b/www/imgsizer/Makefile
index 7aefe8efdd95..4b30ba426e48 100644
--- a/www/imgsizer/Makefile
+++ b/www/imgsizer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		imgsizer
 PORTVERSION=		2.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		www textproc
 MASTER_SITES=		http://www.catb.org/~esr/imgsizer/
 
diff --git a/www/jakarta-jmeter/Makefile b/www/jakarta-jmeter/Makefile
index 5367e93f7547..fe0dcd7c5f99 100644
--- a/www/jakarta-jmeter/Makefile
+++ b/www/jakarta-jmeter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jmeter
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	www benchmarks java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	jmeter/binaries
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index a6920741b5f0..baf807b43060 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.0.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www java
 MASTER_SITES=	http://distfiles.coredump.cn/ \
 		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/liukang/
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index 0313b92bea6e..e596cf7ddd77 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	5.0.30
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_TOMCAT}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
diff --git a/www/jetspeed/Makefile b/www/jetspeed/Makefile
index 83404ade4c68..8747e0004840 100644
--- a/www/jetspeed/Makefile
+++ b/www/jetspeed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jetspeed
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=jetspeed/binaries
diff --git a/www/jetty/Makefile b/www/jetty/Makefile
index 97f5f7d3dded..6516b042a602 100644
--- a/www/jetty/Makefile
+++ b/www/jetty/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jetty
 DISTVERSION=	6.1.1
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/joomla/Makefile b/www/joomla/Makefile
index 3d105b3aea57..ceed50d16832 100644
--- a/www/joomla/Makefile
+++ b/www/joomla/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	joomla
 PORTVERSION=	1.0.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://forge.joomla.org/sf/frs/do/downloadFile/projects.joomla/frs.joomla_1_0.1_0_12/frs8162?dl=1/:source1
 DISTFILES=	${JOOMLA_SRC}:source1
diff --git a/www/joomla15/Makefile b/www/joomla15/Makefile
index 3d105b3aea57..ceed50d16832 100644
--- a/www/joomla15/Makefile
+++ b/www/joomla15/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	joomla
 PORTVERSION=	1.0.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://forge.joomla.org/sf/frs/do/downloadFile/projects.joomla/frs.joomla_1_0.1_0_12/frs8162?dl=1/:source1
 DISTFILES=	${JOOMLA_SRC}:source1
diff --git a/www/joomla25/Makefile b/www/joomla25/Makefile
index 3d105b3aea57..ceed50d16832 100644
--- a/www/joomla25/Makefile
+++ b/www/joomla25/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	joomla
 PORTVERSION=	1.0.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://forge.joomla.org/sf/frs/do/downloadFile/projects.joomla/frs.joomla_1_0.1_0_12/frs8162?dl=1/:source1
 DISTFILES=	${JOOMLA_SRC}:source1
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 8588ccabd16e..492278ac5bfa 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kazehakase
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	${PORTNAME}/24791
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index 588b101c19aa..25305e2d601f 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdewebdev
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 588b101c19aa..25305e2d601f 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdewebdev
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/www/kompozer/Makefile b/www/kompozer/Makefile
index 0352bc8f7124..8ab7005a0c67 100644
--- a/www/kompozer/Makefile
+++ b/www/kompozer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	nvu
 DISTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://cvs.nvu.com/download/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-sources
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 64796c8b248e..cc5ff50fb94d 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgtkhtml
 PORTVERSION=	2.11.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.11
diff --git a/www/lifetype/Makefile b/www/lifetype/Makefile
index ad68790f02ff..ac0f988db380 100644
--- a/www/lifetype/Makefile
+++ b/www/lifetype/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lifetype
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lifetype
diff --git a/www/lightsquid/Makefile b/www/lightsquid/Makefile
index 4abd481fb2ab..84a6e30b133d 100644
--- a/www/lightsquid/Makefile
+++ b/www/lightsquid/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lightsquid
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index fec4f7b42d2d..4d269a9380d0 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	linkchecker
 PORTVERSION=	4.6
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/linkchecker/pkg-plist b/www/linkchecker/pkg-plist
index 54f2d6201ef4..f8975c52693e 100644
--- a/www/linkchecker/pkg-plist
+++ b/www/linkchecker/pkg-plist
@@ -450,9 +450,3 @@ bin/linkchecker
 %%NLS%%share/locale/de/LC_MESSAGES/linkchecker.mo
 %%NLS%%share/locale/es/LC_MESSAGES/linkchecker.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/linkchecker.mo
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
diff --git a/www/links/Makefile b/www/links/Makefile
index 2144628869cc..4f7d02e3614b 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	links
 PORTVERSION=	2.1.p21
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES?=	www
 MASTER_SITES=	http://links.twibright.com/download/
diff --git a/www/linux-mplayer-plugin/Makefile b/www/linux-mplayer-plugin/Makefile
index bbfd4fd83ab2..7c4cd9b63a0a 100644
--- a/www/linux-mplayer-plugin/Makefile
+++ b/www/linux-mplayer-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mplayerplug-in
 PORTVERSION=	3.35
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-1.rh9.rf
 CATEGORIES=	www multimedia
 MASTER_SITES=	ftp://fr2.rpmfind.net/linux/dag/redhat/9/en/i386/dag/RPMS/ \
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index d6419467069a..0059bb151815 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -85,7 +85,6 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/svg-se.dat
 %%DATADIR%%/svg-sebd.dat
 share/pixmaps/linux-opera.png
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/styles/user
 @dirrm %%DATADIR%%/styles/images
 @dirrm %%DATADIR%%/styles
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index d6419467069a..0059bb151815 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -85,7 +85,6 @@ share/applications/linux-opera.desktop
 %%DATADIR%%/svg-se.dat
 %%DATADIR%%/svg-sebd.dat
 share/pixmaps/linux-opera.png
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/styles/user
 @dirrm %%DATADIR%%/styles/images
 @dirrm %%DATADIR%%/styles
diff --git a/www/linuxpluginwrapper/Makefile b/www/linuxpluginwrapper/Makefile
index 838c7fba4e3c..9b941465971d 100644
--- a/www/linuxpluginwrapper/Makefile
+++ b/www/linuxpluginwrapper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	linuxpluginwrapper
 PORTVERSION=	20051113
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://people.FreeBSD.org/~nork/distfiles/ \
 		${MASTER_SITE_LOCAL}
diff --git a/www/ljdeps/Makefile b/www/ljdeps/Makefile
index f2ec91e5741e..042feef543ca 100644
--- a/www/ljdeps/Makefile
+++ b/www/ljdeps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ljdeps
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	# Undefined
 DISTFILES=	# Undefined
diff --git a/www/llgal/Makefile b/www/llgal/Makefile
index 5a4668533cbe..8c57ed6dc082 100644
--- a/www/llgal/Makefile
+++ b/www/llgal/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	llgal
 PORTVERSION=	0.13.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.gna.org/llgal/
 
diff --git a/www/mambo/Makefile b/www/mambo/Makefile
index a9015af06f38..6a0de671d11f 100644
--- a/www/mambo/Makefile
+++ b/www/mambo/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	mambo
 PORTVERSION=	4.6.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://mamboxchange.com/frs/download.php/8290/:source1
 DISTFILES=	${MAMBO_SRC}:source1
diff --git a/www/mgstat/Makefile b/www/mgstat/Makefile
index c7174e105995..f837ac03771b 100644
--- a/www/mgstat/Makefile
+++ b/www/mgstat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mgstat
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://wizard.ae.krakow.pl/~mike/download/
 
diff --git a/www/mmosaic/Makefile b/www/mmosaic/Makefile
index 40a466d6ed31..e02bf27e7f9f 100644
--- a/www/mmosaic/Makefile
+++ b/www/mmosaic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mmosaic
 PORTVERSION=	3.7.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.enst.fr/pub/mbone/mMosaic/ \
 		ftp://ftp.uni-koeln.de/net/inet/WWW/mosaic/unix/ \
diff --git a/www/moodle/Makefile b/www/moodle/Makefile
index 100888cf6610..3663cb6d706e 100644
--- a/www/moodle/Makefile
+++ b/www/moodle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	moodle
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.moodle.org/stable18/
 EXTRACT_SUFX=	.tgz
diff --git a/www/moodle2/Makefile b/www/moodle2/Makefile
index 100888cf6610..3663cb6d706e 100644
--- a/www/moodle2/Makefile
+++ b/www/moodle2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	moodle
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.moodle.org/stable18/
 EXTRACT_SUFX=	.tgz
diff --git a/www/mozex/Makefile b/www/mozex/Makefile
index 70030e6b388c..9de365a0e5b7 100644
--- a/www/mozex/Makefile
+++ b/www/mozex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mozex
 PORTVERSION=	1.07
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www mail news ftp
 MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 7de5b7b73d67..2d4a91a00a46 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.7.13
-PORTREVISION?=	2
+PORTREVISION?=	3
 PORTEPOCH=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
diff --git a/www/mozplugger/Makefile b/www/mozplugger/Makefile
index 33a6a3a00960..2f7c18195de3 100644
--- a/www/mozplugger/Makefile
+++ b/www/mozplugger/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mozplugger
 PORTVERSION=	1.7.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile
index e0dcc5c5fd25..fa577b668b6f 100644
--- a/www/mplayer-plugin/Makefile
+++ b/www/mplayer-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mplayerplug-in
 PORTVERSION=	3.40
+PORTREVISION=	1
 CATEGORIES=	www multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mplayerplug-in
diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist
index 52edcb674b01..b8bde107c22e 100644
--- a/www/mplayer-plugin/pkg-plist
+++ b/www/mplayer-plugin/pkg-plist
@@ -31,13 +31,7 @@ share/locale/se/LC_MESSAGES/mplayerplug-in.mo
 share/locale/wa/LC_MESSAGES/mplayerplug-in.mo
 share/locale/zh_CN/LC_MESSAGES/mplayerplug-in.mo
 @dirrmtry lib/browser_plugins
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/se/LC_MESSAGES
 @dirrmtry share/locale/se
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
diff --git a/www/myfaces/Makefile b/www/myfaces/Makefile
index 7791eb057510..458f414a8872 100644
--- a/www/myfaces/Makefile
+++ b/www/myfaces/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	myfaces
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	www devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	${PORTNAME}/binaries
diff --git a/www/netoffice/Makefile b/www/netoffice/Makefile
index 3902d1e68d12..84650b1180ce 100644
--- a/www/netoffice/Makefile
+++ b/www/netoffice/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	netoffice
 PORTVERSION=	2.6.0b2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	netoffice
diff --git a/www/newsfeed/Makefile b/www/newsfeed/Makefile
index 3af25b0c35d3..0cdd140305bb 100644
--- a/www/newsfeed/Makefile
+++ b/www/newsfeed/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	newsfeed
 PORTVERSION=	2.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://home.arcor.de/mdoege/newsfeed/ CENKES
 DISTNAME=	NewsFeed-${DISTVERSION}
diff --git a/www/npapi-xine/Makefile b/www/npapi-xine/Makefile
index 9c0835a65b77..ab06497e9b64 100644
--- a/www/npapi-xine/Makefile
+++ b/www/npapi-xine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	plugin-
 CATEGORIES=     www multimedia
 MASTER_SITES=	SF
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index 14c9b0c3218f..c54a19bf173e 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nscache
 PORTVERSION=	0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.idata.sk/~ondrej/sw/
diff --git a/www/nscache/pkg-plist b/www/nscache/pkg-plist
index 50d9f91a1031..c67f02bef6d8 100644
--- a/www/nscache/pkg-plist
+++ b/www/nscache/pkg-plist
@@ -9,5 +9,3 @@ share/locale/sk/LC_MESSAGES/nscache.mo
 share/locale/tr/LC_MESSAGES/nscache.mo
 share/gnome/apps/Internet/nscache.desktop
 share/gnome/pixmaps/nscache.xpm
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
diff --git a/www/nspluginwrapper-devel/Makefile b/www/nspluginwrapper-devel/Makefile
index f4cc0902d05f..3197d7620fa4 100644
--- a/www/nspluginwrapper-devel/Makefile
+++ b/www/nspluginwrapper-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nspluginwrapper
 PORTVERSION=	0.9.91.4
+PORTREVISION=	1
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RPMFILE}
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index f4cc0902d05f..3197d7620fa4 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nspluginwrapper
 PORTVERSION=	0.9.91.4
+PORTREVISION=	1
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RPMFILE}
diff --git a/www/nvu/Makefile b/www/nvu/Makefile
index 0352bc8f7124..8ab7005a0c67 100644
--- a/www/nvu/Makefile
+++ b/www/nvu/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	nvu
 DISTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://cvs.nvu.com/download/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-sources
diff --git a/www/ocaml-net/Makefile b/www/ocaml-net/Makefile
index 968a7b93d43e..fc2fe12471ba 100644
--- a/www/ocaml-net/Makefile
+++ b/www/ocaml-net/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	net
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ocamlnet
diff --git a/www/ocaml-wdialog/Makefile b/www/ocaml-wdialog/Makefile
index 3e45db62919c..923e2d47c38d 100644
--- a/www/ocaml-wdialog/Makefile
+++ b/www/ocaml-wdialog/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wdialog
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wdialog
diff --git a/www/ocsigen/Makefile b/www/ocsigen/Makefile
index 5dd2625387a1..581c1d070658 100644
--- a/www/ocsigen/Makefile
+++ b/www/ocsigen/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ocsigen
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.ocsigen.org/download/
 
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index a4d55d79d3ac..c0d6850ba6c0 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openvrml
 PORTVERSION=	0.15.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/openvrml/pkg-plist b/www/openvrml/pkg-plist
index ac860cb3607b..ca4e10060b88 100644
--- a/www/openvrml/pkg-plist
+++ b/www/openvrml/pkg-plist
@@ -59,4 +59,3 @@ lib/mozilla/plugins/openvrml.xpt
 @dirrmtry share/gtk-doc/html/gtkglext
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
-@dirrmtry share/pixmaps
diff --git a/www/opera-linuxplugins/Makefile b/www/opera-linuxplugins/Makefile
index bc87aa727c8d..52884aa0666e 100644
--- a/www/opera-linuxplugins/Makefile
+++ b/www/opera-linuxplugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
+PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://opera.inode.at/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
 		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/i386/static/ \
diff --git a/www/opera/Makefile b/www/opera/Makefile
index ac1dda2f27fd..fe6a01ae8b86 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
 		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
diff --git a/www/osb-browser/Makefile b/www/osb-browser/Makefile
index cf6ec7ab396c..14630bfa461b 100644
--- a/www/osb-browser/Makefile
+++ b/www/osb-browser/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osb-browser
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-webcore
diff --git a/www/osb-nrcit/Makefile b/www/osb-nrcit/Makefile
index 5f2922771ba9..680ab41ec7c8 100644
--- a/www/osb-nrcit/Makefile
+++ b/www/osb-nrcit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osb-nrcit
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-webcore
diff --git a/www/osb-nrcore/Makefile b/www/osb-nrcore/Makefile
index e4e41d7e4a60..b50b45371e26 100644
--- a/www/osb-nrcore/Makefile
+++ b/www/osb-nrcore/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osb-nrcore
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk-webcore
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 3b064440f24b..128014c972bd 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Apache-Gallery
 PORTVERSION=	1.0RC3
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	http://apachegallery.dk/download/ \
 		${MASTER_SITE_PERL_CPAN}
diff --git a/www/p5-Catalyst-View-GraphViz/Makefile b/www/p5-Catalyst-View-GraphViz/Makefile
index 547ce86f272d..ac8dfecf6a10 100644
--- a/www/p5-Catalyst-View-GraphViz/Makefile
+++ b/www/p5-Catalyst-View-GraphViz/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Catalyst-View-GraphViz
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Catalyst
diff --git a/www/p5-Kwiki-GDGraphGenerator/Makefile b/www/p5-Kwiki-GDGraphGenerator/Makefile
index f2d346ed6fdb..452fdc1d70eb 100644
--- a/www/p5-Kwiki-GDGraphGenerator/Makefile
+++ b/www/p5-Kwiki-GDGraphGenerator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Kwiki-GDGraphGenerator
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Kwiki
diff --git a/www/p5-RTx-Statistics/Makefile b/www/p5-RTx-Statistics/Makefile
index 5ac74dc39258..87bd60d60eea 100644
--- a/www/p5-RTx-Statistics/Makefile
+++ b/www/p5-RTx-Statistics/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	RTx-Statistics
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	http://opensvn.csie.org/RTx_Statistics/releases/${PORTVERSION}/
 PKGNAMEPREFIX=	p5-
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index ebc4bf3bf1ac..9485b733829e 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	peacock
 PORTVERSION=	1.9.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/phpmyfaq/Makefile b/www/phpmyfaq/Makefile
index c53784277c18..607692006610 100644
--- a/www/phpmyfaq/Makefile
+++ b/www/phpmyfaq/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phpmyfaq
 PORTVERSION=	1.6.11
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.phpmyfaq.de/download/
 
diff --git a/www/plone/Makefile b/www/plone/Makefile
index 2fa3ddc6d48b..7b006179c1b0 100644
--- a/www/plone/Makefile
+++ b/www/plone/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	plone
 PORTVERSION=	2.5.2
+PORTREVISION=	1
 CATEGORIES=	www zope
 MASTER_SITES=	http://plone.googlecode.com/files/:src
 DISTFILES=	Plone-${PORTVERSION}-1.tar.gz:src
diff --git a/www/plone3/Makefile b/www/plone3/Makefile
index 2fa3ddc6d48b..7b006179c1b0 100644
--- a/www/plone3/Makefile
+++ b/www/plone3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	plone
 PORTVERSION=	2.5.2
+PORTREVISION=	1
 CATEGORIES=	www zope
 MASTER_SITES=	http://plone.googlecode.com/files/:src
 DISTFILES=	Plone-${PORTVERSION}-1.tar.gz:src
diff --git a/www/plugger-plugins-hubbe/Makefile b/www/plugger-plugins-hubbe/Makefile
index 941185996c89..f308569f02fb 100644
--- a/www/plugger-plugins-hubbe/Makefile
+++ b/www/plugger-plugins-hubbe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	plugger-plugins-hubbe
 PORTVERSION=	5.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www multimedia audio graphics print editors
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/www/plugger/Makefile b/www/plugger/Makefile
index 40b4cddf40f1..0f9163c84bf4 100644
--- a/www/plugger/Makefile
+++ b/www/plugger/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	plugger
 PORTVERSION=	5.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www audio graphics multimedia
 MASTER_SITES=	http://fredrik.hubbe.net/plugger/
 
diff --git a/www/preferential/Makefile b/www/preferential/Makefile
index 43f1565d6a78..e1a9218b821f 100644
--- a/www/preferential/Makefile
+++ b/www/preferential/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	preferential
 PORTVERSION=	0.7.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	${PORTNAME}/versions
diff --git a/www/pwebstats/Makefile b/www/pwebstats/Makefile
index 35b44a3ae13a..c4736901f106 100644
--- a/www/pwebstats/Makefile
+++ b/www/pwebstats/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pwebstats
 PORTVERSION=	1.3.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.psg.com/pub/pwebstats/
 
diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile
index 4de88524e8cb..62f1a9c8f337 100644
--- a/www/py-funkload/Makefile
+++ b/www/py-funkload/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	funkload
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://funkload.nuxeo.org/ \
 		http://cheeseshop.python.org/packages/source/f/funkload/
diff --git a/www/raqdevil/Makefile b/www/raqdevil/Makefile
index 2f35af8d12a5..3e9ec65ed503 100644
--- a/www/raqdevil/Makefile
+++ b/www/raqdevil/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	raqdevil
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www sysutils
 MASTER_SITES=	http://www.raqdevil.com/
 
diff --git a/www/reportmagic/Makefile b/www/reportmagic/Makefile
index 285d0ee4138e..ee219ab43495 100644
--- a/www/reportmagic/Makefile
+++ b/www/reportmagic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	reportmagic
 PORTVERSION=	2.21
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.reportmagic.org/	\
 		http://www.reportmagic.org.uk/	\
diff --git a/www/resin2/Makefile b/www/resin2/Makefile
index d43b623e2c12..e8b05799f7de 100644
--- a/www/resin2/Makefile
+++ b/www/resin2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		resin
 PORTVERSION=		2.1.17
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		www java
 MASTER_SITES=		http://www.caucho.com/download/
 
diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index e5aedb70dd25..924ae46bb7d4 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		resin
 PORTVERSION=		3.1.0
+PORTREVISION=	1
 CATEGORIES=		www java
 MASTER_SITES=		http://www.caucho.com/download/
 
diff --git a/www/roundup/Makefile b/www/roundup/Makefile
index bc14dcfd3e19..70f69d9da136 100644
--- a/www/roundup/Makefile
+++ b/www/roundup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	roundup
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://cheeseshop.python.org/packages/source/r/roundup/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/www/roundup/pkg-plist b/www/roundup/pkg-plist
index c4923460a127..64e870e584d7 100644
--- a/www/roundup/pkg-plist
+++ b/www/roundup/pkg-plist
@@ -334,17 +334,5 @@ share/locale/zh_TW/LC_MESSAGES/roundup.mo
 @dirrm %%PYTHON_SITELIBDIR%%/roundup/cgi
 @dirrm %%PYTHON_SITELIBDIR%%/roundup/backends
 @dirrm %%PYTHON_SITELIBDIR%%/roundup
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/ru/LC_MESSAGES
-@dirrmtry share/locale/ru
-@dirrmtry share/locale/fr/LC_MESSAGES
-@dirrmtry share/locale/fr
 @dirrmtry share/locale/es_AR/LC_MESSAGES
 @dirrmtry share/locale/es_AR
-@dirrmtry share/locale/es/LC_MESSAGES
-@dirrmtry share/locale/es
-@dirrmtry share/locale/de/LC_MESSAGES
-@dirrmtry share/locale/de
diff --git a/www/rssowl/Makefile b/www/rssowl/Makefile
index 31ce55b97a50..2f4c5c718bca 100644
--- a/www/rssowl/Makefile
+++ b/www/rssowl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rssowl
 PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	rssowl
diff --git a/www/rt36/Makefile b/www/rt36/Makefile
index 2fad53fe8f08..d53266368b51 100644
--- a/www/rt36/Makefile
+++ b/www/rt36/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rt
 PORTVERSION?=	3.6.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES?=	http://download.bestpractical.com/pub/rt/release/ \
 		http://download.bestpractical.com/pub/rt/devel/ \
diff --git a/www/ruby-gtkhtml2/Makefile b/www/ruby-gtkhtml2/Makefile
index 68d9d2a10da2..5303698ab9aa 100644
--- a/www/ruby-gtkhtml2/Makefile
+++ b/www/ruby-gtkhtml2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtkhtml2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	www gnome ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/www/ruby-gtkmozembed/Makefile b/www/ruby-gtkmozembed/Makefile
index 69d2569ba2dd..337804c62297 100644
--- a/www/ruby-gtkmozembed/Makefile
+++ b/www/ruby-gtkmozembed/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtkmozembed
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	www ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/www/sams/Makefile b/www/sams/Makefile
index 6437ff83ab86..064f12ce8aaa 100644
--- a/www/sams/Makefile
+++ b/www/sams/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sams
 PORTVERSION=	20060417
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://sams.irc.perm.ru/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 8047815ad03e..2bc2e8e255cf 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sarg
 PORTVERSION=	2.2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF
 
diff --git a/www/scloader/Makefile b/www/scloader/Makefile
index c75166b6cc5e..3cc360656aaa 100644
--- a/www/scloader/Makefile
+++ b/www/scloader/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scloader
 PORTVERSION=	0.28
+PORTREVISION=	1
 #PORTREVISION=	0
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 551d4616db4b..c12b979f75cf 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	screem
 PORTVERSION=	0.16.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist
index a51df3a2b1fb..b78d729b40d9 100644
--- a/www/screem-devel/pkg-plist
+++ b/www/screem-devel/pkg-plist
@@ -247,21 +247,5 @@ share/mime/packages/screem.xml
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 551d4616db4b..c12b979f75cf 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	screem
 PORTVERSION=	0.16.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index a51df3a2b1fb..b78d729b40d9 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -247,21 +247,5 @@ share/mime/packages/screem.xml
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index da1c5847557b..d6da6b4d3260 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index da1c5847557b..d6da6b4d3260 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
diff --git a/www/serendipity-devel/Makefile b/www/serendipity-devel/Makefile
index 84f7e89d2e7a..d2de5052d110 100644
--- a/www/serendipity-devel/Makefile
+++ b/www/serendipity-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	serendipity-devel
 PORTVERSION=	1.0.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.s9y.org/snapshots/
 DISTNAME=	s9y_${SNAPSHOT}
diff --git a/www/serendipity/Makefile b/www/serendipity/Makefile
index d368b7b8bc4d..afa61ac9978e 100644
--- a/www/serendipity/Makefile
+++ b/www/serendipity/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	serendipity
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	php-blog
diff --git a/www/servlet-api/Makefile b/www/servlet-api/Makefile
index c13beb9bf4d1..061adba3492c 100644
--- a/www/servlet-api/Makefile
+++ b/www/servlet-api/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	servlet-api
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/maven2/javax/servlet/servlet-api/2.5/
 EXTRACT_SUFX=	.jar
diff --git a/www/sidplug/Makefile b/www/sidplug/Makefile
index 696bf7188ddf..9be0dffe754c 100644
--- a/www/sidplug/Makefile
+++ b/www/sidplug/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sidplug
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	www audio
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz
diff --git a/www/siteframe/Makefile b/www/siteframe/Makefile
index de8cc2587332..03f7849f241b 100644
--- a/www/siteframe/Makefile
+++ b/www/siteframe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	siteframe
 PORTVERSION=	5.0.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.broadpool.net/pub/siteframe/
 
diff --git a/www/spip/Makefile b/www/spip/Makefile
index 286fbe94867c..6dad05b5e7a5 100644
--- a/www/spip/Makefile
+++ b/www/spip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spip
 PORTVERSION=	1.8.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.spip.net/spip-dev/DISTRIB/ \
 		http://trac.rezo.net/files/spip/
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index d3ad90c4e9d2..bd3fb6dff877 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	swfdec-plugin
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec-mozilla/0.4/
 DISTNAME=	swfdec-mozilla-${PORTVERSION}
diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile
index 9722d9de2875..7a2de67fe739 100644
--- a/www/syndigator/Makefile
+++ b/www/syndigator/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	syndigator
 PORTVERSION=	0.15.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index 4da41355b8c3..b530733332f5 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apache-tomcat
 PORTVERSION=	4.1.34
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_TOMCAT}
 MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 313e222225f5..642f3dd6519a 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tomcat
 PORTVERSION=	5.5.23
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 80737964bb5a..87215212d339 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apache-tomcat
 PORTVERSION=	6.0.10
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-6/v${PORTVERSION}/bin
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 80737964bb5a..87215212d339 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apache-tomcat
 PORTVERSION=	6.0.10
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-6/v${PORTVERSION}/bin
diff --git a/www/trac-pagetopdf/Makefile b/www/trac-pagetopdf/Makefile
index 5f83f3c0f934..34c87db60dae 100644
--- a/www/trac-pagetopdf/Makefile
+++ b/www/trac-pagetopdf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pagetopdf
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.gerritbeine.de/downloads/trac-hacks/
 PKGNAMEPREFIX=	trac-
diff --git a/www/ump/Makefile b/www/ump/Makefile
index 5ae864f3e37c..566a9f960fd5 100644
--- a/www/ump/Makefile
+++ b/www/ump/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ump
 PORTVERSION=	1.10
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:timidity/} \
 		http://www.geocities.com/SiliconValley/Lab/2826/1-10/:ump \
diff --git a/www/vtiger/Makefile b/www/vtiger/Makefile
index 914870f41768..707c01202b26 100644
--- a/www/vtiger/Makefile
+++ b/www/vtiger/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vtiger
 DISTVERSION=	5.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vtigercrm
diff --git a/www/vtiger4/Makefile b/www/vtiger4/Makefile
index 155d76801a23..34e5d1a06392 100644
--- a/www/vtiger4/Makefile
+++ b/www/vtiger4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vtiger4
 DISTVERSION=	4.2.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vtigercrm
diff --git a/www/w3-4/Makefile b/www/w3-4/Makefile
index 3f5592d77839..3449343a83d9 100644
--- a/www/w3-4/Makefile
+++ b/www/w3-4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	w3-${EMACS_PORT_NAME}
 PORTVERSION=	4.0.p47
+PORTREVISION=	1
 CATEGORIES+=	www elisp
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	emacs-w3
diff --git a/www/w3/Makefile b/www/w3/Makefile
index eb07ba3ed6ac..25432c06d11e 100644
--- a/www/w3/Makefile
+++ b/www/w3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	w3
 PORTVERSION=	2.2.26
+PORTREVISION=	1
 CATEGORIES+=	www elisp
 MASTER_SITES=	http://fresh.t-systems-sfr.com/unix/src/www/
 
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 620968650b61..4437205db6dd 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	webalizer
 PORTVERSION=	2.1.10
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES+=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/:main \
 		ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/:main \
diff --git a/www/webstats/Makefile b/www/webstats/Makefile
index 709b3f4b67f0..0d0358db6b44 100644
--- a/www/webstats/Makefile
+++ b/www/webstats/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	webstats
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.patsplanet.com/software/webstats/files/ \
 		http://www.caomhin.org/geek/ports/
diff --git a/www/winhelpcgi/Makefile b/www/winhelpcgi/Makefile
index 96068402cd24..2504a4ab76b6 100644
--- a/www/winhelpcgi/Makefile
+++ b/www/winhelpcgi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	winhelpcgi
 PORTVERSION=	1.0r3
+PORTREVISION=	1
 CATEGORIES=	www textproc
 MASTER_SITES=	http://www.herdsoft.com/ftp/
 DISTNAME=	${PORTNAME}_1.0rc3-1
diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile
index 1f238bb902e6..1d53b899413b 100644
--- a/www/xfce4-smartbookmark-plugin/Makefile
+++ b/www/xfce4-smartbookmark-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-smartbookmark-plugin
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/www/xfce4-smartbookmark-plugin/pkg-plist b/www/xfce4-smartbookmark-plugin/pkg-plist
index 706d92445be9..dcf5be4bda38 100644
--- a/www/xfce4-smartbookmark-plugin/pkg-plist
+++ b/www/xfce4-smartbookmark-plugin/pkg-plist
@@ -8,7 +8,5 @@ share/locale/zh_TW/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
 share/xfce4/panel-plugins/smartbookmark.desktop
 @dirrm share/xfce4/panel-plugins
 @dirrm share/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
 @dirrm lib/xfce4/panel-plugins
 @dirrm lib/xfce4
diff --git a/www/xist/Makefile b/www/xist/Makefile
index 8b251b64a418..6d841c0bcebe 100644
--- a/www/xist/Makefile
+++ b/www/xist/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xist
 PORTVERSION=	2.15.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://ftp.livinglogic.de/xist/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/xpi-conkeror/Makefile b/www/xpi-conkeror/Makefile
index c1459fbbb270..7a846cda1f46 100644
--- a/www/xpi-conkeror/Makefile
+++ b/www/xpi-conkeror/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	conkeror
 PORTVERSION=	0.42
+PORTREVISION=	1
 DISTVERSIONPREFIX=	firefox-
 CATEGORIES=	www
 MASTER_SITES=	MOZDEV
diff --git a/www/xulrunner/Makefile b/www/xulrunner/Makefile
index 819bab3d5e3c..1ec16436be1b 100644
--- a/www/xulrunner/Makefile
+++ b/www/xulrunner/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xulrunner
 PORTVERSION=	1.8.0.4
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES?=	www devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	xulrunner/releases/${PORTVERSION}/source/
diff --git a/www/yaws/Makefile b/www/yaws/Makefile
index 3a2b5321cdb2..d916714ee2a0 100644
--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yaws
 PORTVERSION=	1.68
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://yaws.hyber.org/download/
 
diff --git a/www/ziproxy/Makefile b/www/ziproxy/Makefile
index f3c1cb860a45..e5b09c7ee673 100644
--- a/www/ziproxy/Makefile
+++ b/www/ziproxy/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		ziproxy
 PORTVERSION=		2.2.1
+PORTREVISION=	1
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/zope-archetypes/Makefile b/www/zope-archetypes/Makefile
index ddcddeb85a22..468ae81b6d09 100644
--- a/www/zope-archetypes/Makefile
+++ b/www/zope-archetypes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	archetypes
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	www zope
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	archetypes
diff --git a/www/zope-calendaring/Makefile b/www/zope-calendaring/Makefile
index c5b7a19a3326..516dc38f30ac 100644
--- a/www/zope-calendaring/Makefile
+++ b/www/zope-calendaring/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	calendaring
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	www zope
 MASTER_SITES=	http://www.enfoldsystems.com/Products/Open/Downloads/
 PKGNAMEPREFIX=	zope-
diff --git a/www/zope-cmfphoto/Makefile b/www/zope-cmfphoto/Makefile
index 5903622cf093..ad9aded6f7c0 100644
--- a/www/zope-cmfphoto/Makefile
+++ b/www/zope-cmfphoto/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cmfphoto
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	www zope
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	collective
diff --git a/www/zope-cmfphotoalbum/Makefile b/www/zope-cmfphotoalbum/Makefile
index 542d1195760e..4732cb14c2bc 100644
--- a/www/zope-cmfphotoalbum/Makefile
+++ b/www/zope-cmfphotoalbum/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cmfphotoalbum
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	www zope
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	collective
diff --git a/www/zope-coreblog2/Makefile b/www/zope-coreblog2/Makefile
index 88b4421b10ee..80ade4708199 100644
--- a/www/zope-coreblog2/Makefile
+++ b/www/zope-coreblog2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	coreblog2
 PORTVERSION=	0.90b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www zope
 MASTER_SITES=	http://coreblog.org/junk/
 PKGNAMEPREFIX=	zope-
diff --git a/www/zope-i18nlayer/Makefile b/www/zope-i18nlayer/Makefile
index 8780e0087761..ee5dfe7fe3ad 100644
--- a/www/zope-i18nlayer/Makefile
+++ b/www/zope-i18nlayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	i18nlayer
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	www zope
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	collective
diff --git a/www/zope-plonelanguagetool/Makefile b/www/zope-plonelanguagetool/Makefile
index 14efbace2a9f..807717c631e3 100644
--- a/www/zope-plonelanguagetool/Makefile
+++ b/www/zope-plonelanguagetool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	plonelanguagetool
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	www zope
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	collective
diff --git a/www/zope-portaltransforms/Makefile b/www/zope-portaltransforms/Makefile
index b188581f1a56..8ec2a1863286 100644
--- a/www/zope-portaltransforms/Makefile
+++ b/www/zope-portaltransforms/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	portaltransforms
 PORTVERSION=	1.3.7
+PORTREVISION=	1
 CATEGORIES=	www zope
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	archetypes
diff --git a/www/zope-simpleblog/Makefile b/www/zope-simpleblog/Makefile
index 3bd72ba388de..f127a5e115b7 100644
--- a/www/zope-simpleblog/Makefile
+++ b/www/zope-simpleblog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	simpleblog
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www zope
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	collective
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/
 
diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile
new file mode 100644
index 000000000000..6cfcb6d9f564
--- /dev/null
+++ b/x11-drivers/Makefile
@@ -0,0 +1,66 @@
+# $FreeBSD$
+#
+
+    COMMENT = X11 drivers
+
+    SUBDIR += xf86-input-acecad
+    SUBDIR += xf86-input-calcomp
+    SUBDIR += xf86-input-citron
+    SUBDIR += xf86-input-digitaledge
+    SUBDIR += xf86-input-dmc
+    SUBDIR += xf86-input-dynapro
+    SUBDIR += xf86-input-elo2300
+    SUBDIR += xf86-input-elographics
+    SUBDIR += xf86-input-fpit
+    SUBDIR += xf86-input-hyperpen
+    SUBDIR += xf86-input-jamstudio
+    SUBDIR += xf86-input-joystick
+    SUBDIR += xf86-input-keyboard
+    SUBDIR += xf86-input-magellan
+    SUBDIR += xf86-input-magictouch
+    SUBDIR += xf86-input-microtouch
+    SUBDIR += xf86-input-mouse
+    SUBDIR += xf86-input-mutouch
+    SUBDIR += xf86-input-palmax
+    SUBDIR += xf86-input-penmount
+    SUBDIR += xf86-input-spaceorb
+    SUBDIR += xf86-input-summa
+    SUBDIR += xf86-input-tek4957
+    SUBDIR += xf86-input-void
+    SUBDIR += xf86-video-apm
+    SUBDIR += xf86-video-ark
+    SUBDIR += xf86-video-ati
+    SUBDIR += xf86-video-chips
+    SUBDIR += xf86-video-cirrus
+    SUBDIR += xf86-video-cyrix
+    SUBDIR += xf86-video-dummy
+    SUBDIR += xf86-video-fbdev
+    SUBDIR += xf86-video-glint
+    SUBDIR += xf86-video-i128
+    SUBDIR += xf86-video-i740
+    SUBDIR += xf86-video-i810
+    SUBDIR += xf86-video-imstt
+    SUBDIR += xf86-video-mga
+    SUBDIR += xf86-video-neomagic
+    SUBDIR += xf86-video-newport
+    SUBDIR += xf86-video-nsc
+    SUBDIR += xf86-video-nv
+    SUBDIR += xf86-video-rendition
+    SUBDIR += xf86-video-s3
+    SUBDIR += xf86-video-s3virge
+    SUBDIR += xf86-video-savage
+    SUBDIR += xf86-video-siliconmotion
+    SUBDIR += xf86-video-sis
+    SUBDIR += xf86-video-sunffb
+    SUBDIR += xf86-video-tdfx
+    SUBDIR += xf86-video-tga
+    SUBDIR += xf86-video-trident
+    SUBDIR += xf86-video-tseng
+    SUBDIR += xf86-video-vesa
+    SUBDIR += xf86-video-vga
+    SUBDIR += xf86-video-via
+    SUBDIR += xf86-video-vmware
+    SUBDIR += xf86-video-voodoo
+    SUBDIR += xorg-drivers
+
+.include <bsd.port.subdir.mk>
diff --git a/x11-drivers/synaptics/Makefile b/x11-drivers/synaptics/Makefile
index f5fab0f2353f..7a39ce27f533 100644
--- a/x11-drivers/synaptics/Makefile
+++ b/x11-drivers/synaptics/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	synaptics
 PORTVERSION=	0.14.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://web.telia.com/~u89404340/touchpad/files/:synaptics
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \
@@ -31,10 +31,15 @@ X11VERSION!=	${MAKE} -C `${MAKE} -f bsd.port.mk -VX_SERVER_PORT` \
 
 .if	${X_WINDOW_SYSTEM:L} == xorg
 
-MASTER_SITES+=	${MASTER_SITE_XORG:C/$/:x11/}
-MASTER_SITE_SUBDIR=	X11R${X11VERSION}/src/:x11
-DIST_SUBDIR=	xorg
-X_DISTFILES=	X11R${X11VERSION}-src3.tar.gz
+MASTER_SITES+=	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \
+                http://xorg.freedesktop.org/releases/individual/xserver/:x11
+DIST_SUBDIR=	xorg/xserver
+X_DISTFILES=	xorg-server-${X11VERSION}.tar.bz2
+PLIST_SUB+=	XORG="" XFREE86="@comment "
+
+post-patch:
+	@${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${X11BASE}/include|' \
+		${WRKSRC}/Makefile
 
 .elif	${X_WINDOW_SYSTEM:L} == xfree86-4
 
@@ -42,6 +47,7 @@ MASTER_SITES+=	${MASTER_SITE_XFREE:C/$/:x11/}
 MASTER_SITE_SUBDIR=	${X11VERSION}/:x11
 DIST_SUBDIR=	xc
 X_DISTFILES=	XFree86-${X11VERSION}-src-3.tgz
+PLIST_SUB+=	XORG="@comment " XFREE86=""
 
 .else
 
@@ -62,6 +68,11 @@ post-extract:
 		${GZIP_CMD} -dc ${_DISTDIR}/${FILE} | ${TAR} -xf -
 .endfor
 
+.if	${X_WINDOW_SYSTEM:L} == xorg
+pre-install:
+	${MKDIR} ${X11BASE}/lib/xorg/modules/input/
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/x11-drivers/synaptics/distinfo b/x11-drivers/synaptics/distinfo
index c2b2b6e25022..a4b8415f3a1e 100644
--- a/x11-drivers/synaptics/distinfo
+++ b/x11-drivers/synaptics/distinfo
@@ -1,9 +1,9 @@
-MD5 (xorg/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
-SHA256 (xorg/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
-SIZE (xorg/synaptics-0.14.6.tar.bz2) = 126833
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
+MD5 (xorg/xserver/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
+SHA256 (xorg/xserver/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
+SIZE (xorg/xserver/synaptics-0.14.6.tar.bz2) = 126833
+MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6
+SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
+SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596
 MD5 (xc/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
 SHA256 (xc/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
 SIZE (xc/synaptics-0.14.6.tar.bz2) = 126833
diff --git a/x11-drivers/synaptics/pkg-plist b/x11-drivers/synaptics/pkg-plist
index 9eb476975db3..46e202c29d17 100644
--- a/x11-drivers/synaptics/pkg-plist
+++ b/x11-drivers/synaptics/pkg-plist
@@ -1,3 +1,7 @@
 bin/synclient
 @comment bin/syndaemon
-lib/modules/input/synaptics_drv.o
+%%XORG%%lib/xorg/modules/input/synaptics_drv.so
+%%XORG%%@dirrmtry lib/xorg/modules/input
+%%XORG%%@dirrmtry lib/xorg/modules
+%%XORG%%@dirrmtry lib/xorg
+%%XFREE86%%lib/modules/input/synaptics_drv.o
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
new file mode 100644
index 000000000000..42a7b7a477a8
--- /dev/null
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-acecad
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-acecad
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org acecad input driver
+
+XORG_CAT=	driver
+MAN4=		acecad.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo
new file mode 100644
index 000000000000..16af938dad3d
--- /dev/null
+++ b/x11-drivers/xf86-input-acecad/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-acecad-1.1.0.tar.bz2) = ce0b7bec500273ad935cbfa212b8ac8a
+SHA256 (xorg/driver/xf86-input-acecad-1.1.0.tar.bz2) = 3e5feea79f1d48cd46a2a40661140042ac586f90311669f79d65fea6cfc112ad
+SIZE (xorg/driver/xf86-input-acecad-1.1.0.tar.bz2) = 230176
diff --git a/x11-drivers/xf86-input-acecad/pkg-descr b/x11-drivers/xf86-input-acecad/pkg-descr
new file mode 100644
index 000000000000..d20ae8373e09
--- /dev/null
+++ b/x11-drivers/xf86-input-acecad/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-acecad driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-acecad/pkg-plist b/x11-drivers/xf86-input-acecad/pkg-plist
new file mode 100644
index 000000000000..bece9a428b81
--- /dev/null
+++ b/x11-drivers/xf86-input-acecad/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/acecad_drv.la
+lib/xorg/modules/input/acecad_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-calcomp/Makefile b/x11-drivers/xf86-input-calcomp/Makefile
new file mode 100644
index 000000000000..d9a335967cf0
--- /dev/null
+++ b/x11-drivers/xf86-input-calcomp/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-calcomp
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-calcomp
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org calcomp input driver
+
+XORG_CAT=	driver
+MAN4=		calcomp.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-calcomp/distinfo b/x11-drivers/xf86-input-calcomp/distinfo
new file mode 100644
index 000000000000..3c739f96fbd2
--- /dev/null
+++ b/x11-drivers/xf86-input-calcomp/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-calcomp-1.1.0.tar.bz2) = af13f9de2af4e1d03b2da0c037fd718a
+SHA256 (xorg/driver/xf86-input-calcomp-1.1.0.tar.bz2) = ebc446e74eea72d391104b1ce3b2a5376bced098154ec089a944f4311d240904
+SIZE (xorg/driver/xf86-input-calcomp-1.1.0.tar.bz2) = 231496
diff --git a/x11-drivers/xf86-input-calcomp/pkg-descr b/x11-drivers/xf86-input-calcomp/pkg-descr
new file mode 100644
index 000000000000..5a94b55371fc
--- /dev/null
+++ b/x11-drivers/xf86-input-calcomp/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-calcomp driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-calcomp/pkg-plist b/x11-drivers/xf86-input-calcomp/pkg-plist
new file mode 100644
index 000000000000..1b007218a3f4
--- /dev/null
+++ b/x11-drivers/xf86-input-calcomp/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/calcomp_drv.la
+lib/xorg/modules/input/calcomp_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-citron/Makefile b/x11-drivers/xf86-input-citron/Makefile
new file mode 100644
index 000000000000..4c21d32b3b16
--- /dev/null
+++ b/x11-drivers/xf86-input-citron/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-citron
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-citron
+PORTVERSION=	2.2.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org citron input driver
+
+XORG_CAT=	driver
+MAN4=		citron.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-citron/distinfo b/x11-drivers/xf86-input-citron/distinfo
new file mode 100644
index 000000000000..067361f9aa45
--- /dev/null
+++ b/x11-drivers/xf86-input-citron/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-citron-2.2.0.tar.bz2) = 1fe53cd055a69650f3c2e02377ec728c
+SHA256 (xorg/driver/xf86-input-citron-2.2.0.tar.bz2) = 26cfa755d3a383f80039fcd286c44ba5f7b353feb8c674f386bb08d741d2c3fe
+SIZE (xorg/driver/xf86-input-citron-2.2.0.tar.bz2) = 257145
diff --git a/x11-drivers/xf86-input-citron/pkg-descr b/x11-drivers/xf86-input-citron/pkg-descr
new file mode 100644
index 000000000000..1213821d5f70
--- /dev/null
+++ b/x11-drivers/xf86-input-citron/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-citron driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-citron/pkg-plist b/x11-drivers/xf86-input-citron/pkg-plist
new file mode 100644
index 000000000000..5505ae753929
--- /dev/null
+++ b/x11-drivers/xf86-input-citron/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/citron_drv.la
+lib/xorg/modules/input/citron_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-digitaledge/Makefile b/x11-drivers/xf86-input-digitaledge/Makefile
new file mode 100644
index 000000000000..5fa9940a20e0
--- /dev/null
+++ b/x11-drivers/xf86-input-digitaledge/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86-input-digitaledge
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-digitaledge
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org digitaledge input driver
+
+XORG_CAT=	driver
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-digitaledge/distinfo b/x11-drivers/xf86-input-digitaledge/distinfo
new file mode 100644
index 000000000000..8fe3d8ba77a6
--- /dev/null
+++ b/x11-drivers/xf86-input-digitaledge/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 53461c34cc0712aacab92b820b9fcb84
+SHA256 (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 24001f19b46b5bc2fcf8212f04863e4efa90175fac797350525e14848ab98a38
+SIZE (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 232925
diff --git a/x11-drivers/xf86-input-digitaledge/pkg-descr b/x11-drivers/xf86-input-digitaledge/pkg-descr
new file mode 100644
index 000000000000..d8a47536572c
--- /dev/null
+++ b/x11-drivers/xf86-input-digitaledge/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-digitaledge driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-digitaledge/pkg-plist b/x11-drivers/xf86-input-digitaledge/pkg-plist
new file mode 100644
index 000000000000..766c3665b352
--- /dev/null
+++ b/x11-drivers/xf86-input-digitaledge/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/digitaledge_drv.la
+lib/xorg/modules/input/digitaledge_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-dmc/Makefile b/x11-drivers/xf86-input-dmc/Makefile
new file mode 100644
index 000000000000..6b7d69b88eb2
--- /dev/null
+++ b/x11-drivers/xf86-input-dmc/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-dmc
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-dmc
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org dmc input driver
+
+XORG_CAT=	driver
+MAN4=		dmc.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-dmc/distinfo b/x11-drivers/xf86-input-dmc/distinfo
new file mode 100644
index 000000000000..5b548b06c199
--- /dev/null
+++ b/x11-drivers/xf86-input-dmc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-dmc-1.1.0.tar.bz2) = e1bcbdefcb839173de79aeb3cd038b77
+SHA256 (xorg/driver/xf86-input-dmc-1.1.0.tar.bz2) = c5ca8fb2dfe0130767b2c10bd0661277a67e7d5b9171a7f5f6264ec48790473f
+SIZE (xorg/driver/xf86-input-dmc-1.1.0.tar.bz2) = 228592
diff --git a/x11-drivers/xf86-input-dmc/pkg-descr b/x11-drivers/xf86-input-dmc/pkg-descr
new file mode 100644
index 000000000000..9c1356edfb70
--- /dev/null
+++ b/x11-drivers/xf86-input-dmc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-dmc driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-dmc/pkg-plist b/x11-drivers/xf86-input-dmc/pkg-plist
new file mode 100644
index 000000000000..f9949431ab76
--- /dev/null
+++ b/x11-drivers/xf86-input-dmc/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/dmc_drv.la
+lib/xorg/modules/input/dmc_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-dynapro/Makefile b/x11-drivers/xf86-input-dynapro/Makefile
new file mode 100644
index 000000000000..9772be78c52e
--- /dev/null
+++ b/x11-drivers/xf86-input-dynapro/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-dynapro
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-dynapro
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org dynapro input driver
+
+XORG_CAT=	driver
+MAN4=		dynapro.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-dynapro/distinfo b/x11-drivers/xf86-input-dynapro/distinfo
new file mode 100644
index 000000000000..12e972f2610d
--- /dev/null
+++ b/x11-drivers/xf86-input-dynapro/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-dynapro-1.1.0.tar.bz2) = 1683178d09dfc604dde9ea2aab950a28
+SHA256 (xorg/driver/xf86-input-dynapro-1.1.0.tar.bz2) = fc2ad50b1aa027fe57da53cbb73db0b4b9d0de9032f00dd42e7cc0aae7c50d6a
+SIZE (xorg/driver/xf86-input-dynapro-1.1.0.tar.bz2) = 227960
diff --git a/x11-drivers/xf86-input-dynapro/pkg-descr b/x11-drivers/xf86-input-dynapro/pkg-descr
new file mode 100644
index 000000000000..7bfe758d0f13
--- /dev/null
+++ b/x11-drivers/xf86-input-dynapro/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-dynapro driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-dynapro/pkg-plist b/x11-drivers/xf86-input-dynapro/pkg-plist
new file mode 100644
index 000000000000..3bf6d0acce85
--- /dev/null
+++ b/x11-drivers/xf86-input-dynapro/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/dynapro_drv.la
+lib/xorg/modules/input/dynapro_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-elo2300/Makefile b/x11-drivers/xf86-input-elo2300/Makefile
new file mode 100644
index 000000000000..5ddc621a95e2
--- /dev/null
+++ b/x11-drivers/xf86-input-elo2300/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86-input-elo2300
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-elo2300
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org elo2300 input driver
+
+XORG_CAT=	driver
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-elo2300/distinfo b/x11-drivers/xf86-input-elo2300/distinfo
new file mode 100644
index 000000000000..485614280ed6
--- /dev/null
+++ b/x11-drivers/xf86-input-elo2300/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-elo2300-1.1.0.tar.bz2) = 43885769d6f741272dda162e82902b0d
+SHA256 (xorg/driver/xf86-input-elo2300-1.1.0.tar.bz2) = 9551f67e24c4573867a64d032d1ff6b63654caab8a85d3c6b2af7748daaa2134
+SIZE (xorg/driver/xf86-input-elo2300-1.1.0.tar.bz2) = 230654
diff --git a/x11-drivers/xf86-input-elo2300/pkg-descr b/x11-drivers/xf86-input-elo2300/pkg-descr
new file mode 100644
index 000000000000..9383465cf8d3
--- /dev/null
+++ b/x11-drivers/xf86-input-elo2300/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-elo2300 driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-elo2300/pkg-plist b/x11-drivers/xf86-input-elo2300/pkg-plist
new file mode 100644
index 000000000000..49a3c9807397
--- /dev/null
+++ b/x11-drivers/xf86-input-elo2300/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/elo2300_drv.la
+lib/xorg/modules/input/elo2300_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
new file mode 100644
index 000000000000..384dfc284b21
--- /dev/null
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-elographics
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-elographics
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org elographics input driver
+
+XORG_CAT=	driver
+MAN4=		elographics.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-elographics/distinfo b/x11-drivers/xf86-input-elographics/distinfo
new file mode 100644
index 000000000000..ad1f75673b19
--- /dev/null
+++ b/x11-drivers/xf86-input-elographics/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = ecb2bf1f800d4f5f4c295f2a0e6b1de7
+SHA256 (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = 1583e1dae6e3ecd34ba55deae7dfc052efede0378f852de6224308d7e7d5b2d8
+SIZE (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = 236648
diff --git a/x11-drivers/xf86-input-elographics/pkg-descr b/x11-drivers/xf86-input-elographics/pkg-descr
new file mode 100644
index 000000000000..aed30dc012b2
--- /dev/null
+++ b/x11-drivers/xf86-input-elographics/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-elographics driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-elographics/pkg-plist b/x11-drivers/xf86-input-elographics/pkg-plist
new file mode 100644
index 000000000000..b6f57b12c197
--- /dev/null
+++ b/x11-drivers/xf86-input-elographics/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/elographics_drv.la
+lib/xorg/modules/input/elographics_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile
new file mode 100644
index 000000000000..aea79a7ba49e
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-fpit
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-fpit
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org fpit input driver
+
+XORG_CAT=	driver
+MAN4=		fpit.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-fpit/distinfo b/x11-drivers/xf86-input-fpit/distinfo
new file mode 100644
index 000000000000..a4c1fbe0592f
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = a31066a2076d18619ceaea67f6d89698
+SHA256 (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = 8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8
+SIZE (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = 232340
diff --git a/x11-drivers/xf86-input-fpit/pkg-descr b/x11-drivers/xf86-input-fpit/pkg-descr
new file mode 100644
index 000000000000..9ebd6609662a
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-fpit driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-fpit/pkg-plist b/x11-drivers/xf86-input-fpit/pkg-plist
new file mode 100644
index 000000000000..988bba8a51fb
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/fpit_drv.la
+lib/xorg/modules/input/fpit_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
new file mode 100644
index 000000000000..ad37c01a6cf1
--- /dev/null
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86-input-hyperpen
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-hyperpen
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org hyperpen input driver
+
+XORG_CAT=	driver
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-hyperpen/distinfo b/x11-drivers/xf86-input-hyperpen/distinfo
new file mode 100644
index 000000000000..bdff1d50303b
--- /dev/null
+++ b/x11-drivers/xf86-input-hyperpen/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = 1dfccb75069e61e0c6f990b47eb58c40
+SHA256 (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = d1c20a3340e06c5634759832dcf2edc6acb41476a4f637eba6880730e607f493
+SIZE (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = 235132
diff --git a/x11-drivers/xf86-input-hyperpen/pkg-descr b/x11-drivers/xf86-input-hyperpen/pkg-descr
new file mode 100644
index 000000000000..a45a59abed70
--- /dev/null
+++ b/x11-drivers/xf86-input-hyperpen/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-hyperpen driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-hyperpen/pkg-plist b/x11-drivers/xf86-input-hyperpen/pkg-plist
new file mode 100644
index 000000000000..59dc01716933
--- /dev/null
+++ b/x11-drivers/xf86-input-hyperpen/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/hyperpen_drv.la
+lib/xorg/modules/input/hyperpen_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-jamstudio/Makefile b/x11-drivers/xf86-input-jamstudio/Makefile
new file mode 100644
index 000000000000..41aa4e5ed53b
--- /dev/null
+++ b/x11-drivers/xf86-input-jamstudio/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-jamstudio
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-jamstudio
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org jamstudio input driver
+
+XORG_CAT=	driver
+MAN4=		js_x.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-jamstudio/distinfo b/x11-drivers/xf86-input-jamstudio/distinfo
new file mode 100644
index 000000000000..6bb120620b44
--- /dev/null
+++ b/x11-drivers/xf86-input-jamstudio/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = a32e36a24545791a3408cdc5563b6523
+SHA256 (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = ce41b360bd08ea31036b79cfc25a32c854147522e4580f5ca1a203233e657e1a
+SIZE (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = 226459
diff --git a/x11-drivers/xf86-input-jamstudio/pkg-descr b/x11-drivers/xf86-input-jamstudio/pkg-descr
new file mode 100644
index 000000000000..bc679dd0919a
--- /dev/null
+++ b/x11-drivers/xf86-input-jamstudio/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-jamstudio driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-jamstudio/pkg-plist b/x11-drivers/xf86-input-jamstudio/pkg-plist
new file mode 100644
index 000000000000..8fd0ef12bfc8
--- /dev/null
+++ b/x11-drivers/xf86-input-jamstudio/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/js_x_drv.la
+lib/xorg/modules/input/js_x_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
new file mode 100644
index 000000000000..bb746ad58726
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86-input-joystick
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-joystick
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org joystick input driver
+
+XORG_CAT=	driver
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo
new file mode 100644
index 000000000000..c4b7d151af72
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-joystick-1.1.0.tar.bz2) = e0025215542c7a11c5a7f9548631dbd7
+SHA256 (xorg/driver/xf86-input-joystick-1.1.0.tar.bz2) = 11c3e8056e8f44b9a6f348b5366c7e725155563374770b82e339e913b9a60d16
+SIZE (xorg/driver/xf86-input-joystick-1.1.0.tar.bz2) = 228374
diff --git a/x11-drivers/xf86-input-joystick/pkg-descr b/x11-drivers/xf86-input-joystick/pkg-descr
new file mode 100644
index 000000000000..14f2aaafa43e
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-joystick driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist
new file mode 100644
index 000000000000..358a463f054f
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/joystick_drv.la
+lib/xorg/modules/input/joystick_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
new file mode 100644
index 000000000000..7c2f223e4759
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-input-keyboard
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-keyboard
+PORTVERSION=	1.1.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org keyboard input driver
+
+XORG_CAT=	driver
+USE_XORG=	kbproto
+MAN4=		kbd.4x keyboard.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
new file mode 100644
index 000000000000..87ec2cfc238b
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-keyboard-1.1.1.tar.bz2) = babf094e37bdfc08076d4adb4c69c1d9
+SHA256 (xorg/driver/xf86-input-keyboard-1.1.1.tar.bz2) = b7e7377d75f3a10cceb5df18019b8e4498fbed0100478edd4af75bf8cd45d6fd
+SIZE (xorg/driver/xf86-input-keyboard-1.1.1.tar.bz2) = 235022
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-kbd.c b/x11-drivers/xf86-input-keyboard/files/patch-kbd.c
new file mode 100644
index 000000000000..d43b9056148b
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/patch-kbd.c
@@ -0,0 +1,18 @@
+--- src/kbd.c.orig	Wed Nov  9 22:31:23 2005
++++ src/kbd.c	Sat Oct  7 21:09:40 2006
+@@ -635,7 +635,6 @@
+ 	      return;
+   }
+   
+-#ifndef __sparc64__
+   /*
+    * PC keyboards generate separate key codes for
+    * Alt+Print and Control+Pause but in the X keyboard model
+@@ -648,7 +647,6 @@
+     else if (scanCode == KEY_Break)
+       scanCode = KEY_Pause;
+   }
+-#endif
+ 
+ sunKeyboards:
+   /*
diff --git a/x11-drivers/xf86-input-keyboard/pkg-descr b/x11-drivers/xf86-input-keyboard/pkg-descr
new file mode 100644
index 000000000000..032961e5144a
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-keyboard driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist
new file mode 100644
index 000000000000..32d077162789
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/pkg-plist
@@ -0,0 +1,7 @@
+lib/xorg/modules/input/kbd_drv.la
+lib/xorg/modules/input/kbd_drv.so
+lib/xorg/modules/input/keyboard_drv.la
+lib/xorg/modules/input/keyboard_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-magellan/Makefile b/x11-drivers/xf86-input-magellan/Makefile
new file mode 100644
index 000000000000..bf936bae3d7e
--- /dev/null
+++ b/x11-drivers/xf86-input-magellan/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86-input-magellan
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-magellan
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org magellan input driver
+
+XORG_CAT=	driver
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-magellan/distinfo b/x11-drivers/xf86-input-magellan/distinfo
new file mode 100644
index 000000000000..59784431ba6c
--- /dev/null
+++ b/x11-drivers/xf86-input-magellan/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-magellan-1.1.0.tar.bz2) = 0d6a81aa864ac790d9a8b517ca7016ad
+SHA256 (xorg/driver/xf86-input-magellan-1.1.0.tar.bz2) = 8eef54b50c428513a330ed7183ce37f269050252a4d1199d3b00ad6bf0a7833d
+SIZE (xorg/driver/xf86-input-magellan-1.1.0.tar.bz2) = 228401
diff --git a/x11-drivers/xf86-input-magellan/pkg-descr b/x11-drivers/xf86-input-magellan/pkg-descr
new file mode 100644
index 000000000000..e38af8c0800b
--- /dev/null
+++ b/x11-drivers/xf86-input-magellan/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-magellan driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-magellan/pkg-plist b/x11-drivers/xf86-input-magellan/pkg-plist
new file mode 100644
index 000000000000..55620db1ca0d
--- /dev/null
+++ b/x11-drivers/xf86-input-magellan/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/magellan_drv.la
+lib/xorg/modules/input/magellan_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
new file mode 100644
index 000000000000..6b902f3d71f4
--- /dev/null
+++ b/x11-drivers/xf86-input-magictouch/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86-input-magictouch
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-magictouch
+PORTVERSION=	1.0.0.5
+PORTREVISION=	1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org magictouch input driver
+
+XORG_CAT=	driver
+MAN4=		magictouch.4x
+USE_AUTOTOOLS=	libtool:15
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-magictouch/distinfo b/x11-drivers/xf86-input-magictouch/distinfo
new file mode 100644
index 000000000000..306280024c5a
--- /dev/null
+++ b/x11-drivers/xf86-input-magictouch/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-magictouch-1.0.0.5.tar.bz2) = d23f2791cd634ef85b7cc5e9da8f8407
+SHA256 (xorg/driver/xf86-input-magictouch-1.0.0.5.tar.bz2) = 9cedc831e9d86889f473fbe3b8f1478afe5ed8c0dd71492aeb896cc681d7444c
+SIZE (xorg/driver/xf86-input-magictouch-1.0.0.5.tar.bz2) = 218289
diff --git a/x11-drivers/xf86-input-magictouch/pkg-descr b/x11-drivers/xf86-input-magictouch/pkg-descr
new file mode 100644
index 000000000000..685c1e00b41a
--- /dev/null
+++ b/x11-drivers/xf86-input-magictouch/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-magictouch driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-magictouch/pkg-plist b/x11-drivers/xf86-input-magictouch/pkg-plist
new file mode 100644
index 000000000000..c9dff9282436
--- /dev/null
+++ b/x11-drivers/xf86-input-magictouch/pkg-plist
@@ -0,0 +1,6 @@
+lib/xorg/modules/input/magictouch_drv.a
+lib/xorg/modules/input/magictouch_drv.la
+lib/xorg/modules/input/magictouch_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-microtouch/Makefile b/x11-drivers/xf86-input-microtouch/Makefile
new file mode 100644
index 000000000000..137c05d886f5
--- /dev/null
+++ b/x11-drivers/xf86-input-microtouch/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-microtouch
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-microtouch
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org microtouch input driver
+
+XORG_CAT=	driver
+MAN4=		microtouch.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-microtouch/distinfo b/x11-drivers/xf86-input-microtouch/distinfo
new file mode 100644
index 000000000000..dce1b3e71abc
--- /dev/null
+++ b/x11-drivers/xf86-input-microtouch/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-microtouch-1.1.0.tar.bz2) = 7b3cc0330d70e7e4e07914fcb325b331
+SHA256 (xorg/driver/xf86-input-microtouch-1.1.0.tar.bz2) = 7f92f5531495ecfbfd00744198fd4b2aa3b8f5c188b115e55e865e961bca2039
+SIZE (xorg/driver/xf86-input-microtouch-1.1.0.tar.bz2) = 231483
diff --git a/x11-drivers/xf86-input-microtouch/pkg-descr b/x11-drivers/xf86-input-microtouch/pkg-descr
new file mode 100644
index 000000000000..1e3fcd8b14b0
--- /dev/null
+++ b/x11-drivers/xf86-input-microtouch/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-microtouch driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-microtouch/pkg-plist b/x11-drivers/xf86-input-microtouch/pkg-plist
new file mode 100644
index 000000000000..a73958340c63
--- /dev/null
+++ b/x11-drivers/xf86-input-microtouch/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/microtouch_drv.la
+lib/xorg/modules/input/microtouch_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
new file mode 100644
index 000000000000..df7cf282513f
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-mouse
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-mouse
+PORTVERSION=	1.1.2
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org mouse input driver
+
+XORG_CAT=	driver
+MAN4=		mousedrv.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo
new file mode 100644
index 000000000000..eebc5df3524b
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-mouse-1.1.2.tar.bz2) = d8bcd9fb1b4efb02acd251495f9a30c1
+SHA256 (xorg/driver/xf86-input-mouse-1.1.2.tar.bz2) = 7d4c2ecbe8f9327f7c8093c05401ab68b22f3343bcf04e4838cc40c21b7f8e0a
+SIZE (xorg/driver/xf86-input-mouse-1.1.2.tar.bz2) = 279229
diff --git a/x11-drivers/xf86-input-mouse/pkg-descr b/x11-drivers/xf86-input-mouse/pkg-descr
new file mode 100644
index 000000000000..866b4d8ae7e3
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-mouse driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/pkg-plist b/x11-drivers/xf86-input-mouse/pkg-plist
new file mode 100644
index 000000000000..dd465f17a16a
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/mouse_drv.la
+lib/xorg/modules/input/mouse_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
new file mode 100644
index 000000000000..1f04efd1a5dd
--- /dev/null
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-mutouch
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-mutouch
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org mutouch input driver
+
+XORG_CAT=	driver
+MAN4=		mutouch.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mutouch/distinfo b/x11-drivers/xf86-input-mutouch/distinfo
new file mode 100644
index 000000000000..591d113a6c22
--- /dev/null
+++ b/x11-drivers/xf86-input-mutouch/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = 98ae915c67cabf0e6d40a425dbdbe10b
+SHA256 (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = cc67e0dd4f4fcc8d798f0bfe42b975132c5739bdd80809580a74182e4d1b62ea
+SIZE (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = 236844
diff --git a/x11-drivers/xf86-input-mutouch/pkg-descr b/x11-drivers/xf86-input-mutouch/pkg-descr
new file mode 100644
index 000000000000..881ac7c0e623
--- /dev/null
+++ b/x11-drivers/xf86-input-mutouch/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-mutouch driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mutouch/pkg-plist b/x11-drivers/xf86-input-mutouch/pkg-plist
new file mode 100644
index 000000000000..b3ef9f346861
--- /dev/null
+++ b/x11-drivers/xf86-input-mutouch/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/mutouch_drv.la
+lib/xorg/modules/input/mutouch_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-palmax/Makefile b/x11-drivers/xf86-input-palmax/Makefile
new file mode 100644
index 000000000000..81cef2b16242
--- /dev/null
+++ b/x11-drivers/xf86-input-palmax/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-palmax
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-palmax
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org palmax input driver
+
+XORG_CAT=	driver
+MAN4=		palmax.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-palmax/distinfo b/x11-drivers/xf86-input-palmax/distinfo
new file mode 100644
index 000000000000..6becf1468b7f
--- /dev/null
+++ b/x11-drivers/xf86-input-palmax/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 0959dbf7972dfb95f56e4bd3f56447cf
+SHA256 (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 5c00c85eed2950a575362bee2f21c2fa68eb8af81e7f1d451273a1302eac4145
+SIZE (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 229673
diff --git a/x11-drivers/xf86-input-palmax/pkg-descr b/x11-drivers/xf86-input-palmax/pkg-descr
new file mode 100644
index 000000000000..727c1f7bdcc6
--- /dev/null
+++ b/x11-drivers/xf86-input-palmax/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-palmax driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-palmax/pkg-plist b/x11-drivers/xf86-input-palmax/pkg-plist
new file mode 100644
index 000000000000..1e5fc6983848
--- /dev/null
+++ b/x11-drivers/xf86-input-palmax/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/palmax_drv.la
+lib/xorg/modules/input/palmax_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
new file mode 100644
index 000000000000..26d6e860f58b
--- /dev/null
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-penmount
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-penmount
+PORTVERSION=	1.2.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org penmount input driver
+
+XORG_CAT=	driver
+MAN4=		penmount.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo
new file mode 100644
index 000000000000..d099b3757f0a
--- /dev/null
+++ b/x11-drivers/xf86-input-penmount/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-penmount-1.2.0.tar.bz2) = 0589f2eaa84afb9bd49b226ce7dacdda
+SHA256 (xorg/driver/xf86-input-penmount-1.2.0.tar.bz2) = dea18a07cf8f59e7bc981cfa1f6ef476dd14f7d9bee3bb1a55a6cc49f766150e
+SIZE (xorg/driver/xf86-input-penmount-1.2.0.tar.bz2) = 210083
diff --git a/x11-drivers/xf86-input-penmount/pkg-descr b/x11-drivers/xf86-input-penmount/pkg-descr
new file mode 100644
index 000000000000..ea15a1e1b21f
--- /dev/null
+++ b/x11-drivers/xf86-input-penmount/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-penmount driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-penmount/pkg-plist b/x11-drivers/xf86-input-penmount/pkg-plist
new file mode 100644
index 000000000000..a48eb1404b7c
--- /dev/null
+++ b/x11-drivers/xf86-input-penmount/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/penmount_drv.la
+lib/xorg/modules/input/penmount_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-spaceorb/Makefile b/x11-drivers/xf86-input-spaceorb/Makefile
new file mode 100644
index 000000000000..81bbdab1b33a
--- /dev/null
+++ b/x11-drivers/xf86-input-spaceorb/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86-input-spaceorb
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-spaceorb
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org spaceorb input driver
+
+XORG_CAT=	driver
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-spaceorb/distinfo b/x11-drivers/xf86-input-spaceorb/distinfo
new file mode 100644
index 000000000000..1fb4db5f22f1
--- /dev/null
+++ b/x11-drivers/xf86-input-spaceorb/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-spaceorb-1.1.0.tar.bz2) = 294810ca9e93c4096458c6a0f2fb5679
+SHA256 (xorg/driver/xf86-input-spaceorb-1.1.0.tar.bz2) = 9cd53cb719bf401ff3f72233d3a88c59539b94eaf11e586e307c807a325f0815
+SIZE (xorg/driver/xf86-input-spaceorb-1.1.0.tar.bz2) = 227457
diff --git a/x11-drivers/xf86-input-spaceorb/pkg-descr b/x11-drivers/xf86-input-spaceorb/pkg-descr
new file mode 100644
index 000000000000..68b25b58a3f9
--- /dev/null
+++ b/x11-drivers/xf86-input-spaceorb/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-spaceorb driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-spaceorb/pkg-plist b/x11-drivers/xf86-input-spaceorb/pkg-plist
new file mode 100644
index 000000000000..5a104746a5a5
--- /dev/null
+++ b/x11-drivers/xf86-input-spaceorb/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/spaceorb_drv.la
+lib/xorg/modules/input/spaceorb_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-summa/Makefile b/x11-drivers/xf86-input-summa/Makefile
new file mode 100644
index 000000000000..ab531a1af6da
--- /dev/null
+++ b/x11-drivers/xf86-input-summa/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86-input-summa
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-summa
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org summa input driver
+
+XORG_CAT=	driver
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-summa/distinfo b/x11-drivers/xf86-input-summa/distinfo
new file mode 100644
index 000000000000..1c67f94379c3
--- /dev/null
+++ b/x11-drivers/xf86-input-summa/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = b37a432fd87bb9f46d011622d6fce6b3
+SHA256 (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = f10f2cadd4120b40b3658000c87f910e3005f4d787441c7dd83b48ebbf2a11f2
+SIZE (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = 235031
diff --git a/x11-drivers/xf86-input-summa/pkg-descr b/x11-drivers/xf86-input-summa/pkg-descr
new file mode 100644
index 000000000000..d67a25cb6ce7
--- /dev/null
+++ b/x11-drivers/xf86-input-summa/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-summa driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-summa/pkg-plist b/x11-drivers/xf86-input-summa/pkg-plist
new file mode 100644
index 000000000000..70370c9b4156
--- /dev/null
+++ b/x11-drivers/xf86-input-summa/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/summa_drv.la
+lib/xorg/modules/input/summa_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-tek4957/Makefile b/x11-drivers/xf86-input-tek4957/Makefile
new file mode 100644
index 000000000000..5c9e0e3fef05
--- /dev/null
+++ b/x11-drivers/xf86-input-tek4957/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-tek4957
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-tek4957
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org tek4957 input driver
+
+XORG_CAT=	driver
+MAN4=		tek4957.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-tek4957/distinfo b/x11-drivers/xf86-input-tek4957/distinfo
new file mode 100644
index 000000000000..7defb616273d
--- /dev/null
+++ b/x11-drivers/xf86-input-tek4957/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = be8a4bd474ad6c85b93f66dd6fcfa6ee
+SHA256 (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = 09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727
+SIZE (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = 229426
diff --git a/x11-drivers/xf86-input-tek4957/pkg-descr b/x11-drivers/xf86-input-tek4957/pkg-descr
new file mode 100644
index 000000000000..1c0ccc0ae887
--- /dev/null
+++ b/x11-drivers/xf86-input-tek4957/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-tek4957 driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-tek4957/pkg-plist b/x11-drivers/xf86-input-tek4957/pkg-plist
new file mode 100644
index 000000000000..1a0f36354448
--- /dev/null
+++ b/x11-drivers/xf86-input-tek4957/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/tek4957_drv.la
+lib/xorg/modules/input/tek4957_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
new file mode 100644
index 000000000000..d2253dcc174a
--- /dev/null
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-input-void
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-input-void
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org void input driver
+
+XORG_CAT=	driver
+MAN4=		void.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-void/distinfo b/x11-drivers/xf86-input-void/distinfo
new file mode 100644
index 000000000000..01b44a382693
--- /dev/null
+++ b/x11-drivers/xf86-input-void/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-input-void-1.1.0.tar.bz2) = ea72a92d43b95f413347df96d6a73933
+SHA256 (xorg/driver/xf86-input-void-1.1.0.tar.bz2) = b43c5d920821bd06b6a1a131dd071ab838bf024c3cb092c6d1f10d57b648b0e4
+SIZE (xorg/driver/xf86-input-void-1.1.0.tar.bz2) = 226456
diff --git a/x11-drivers/xf86-input-void/pkg-descr b/x11-drivers/xf86-input-void/pkg-descr
new file mode 100644
index 000000000000..abb187620eb3
--- /dev/null
+++ b/x11-drivers/xf86-input-void/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-input-void driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-void/pkg-plist b/x11-drivers/xf86-input-void/pkg-plist
new file mode 100644
index 000000000000..554c36808518
--- /dev/null
+++ b/x11-drivers/xf86-input-void/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/input/void_drv.la
+lib/xorg/modules/input/void_drv.so
+@dirrmtry lib/xorg/modules/input
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
new file mode 100644
index 000000000000..8d7f55db9827
--- /dev/null
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-apm
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-apm
+PORTVERSION=	1.1.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org apm display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+MAN4=		apm.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo
new file mode 100644
index 000000000000..6255b59dc11d
--- /dev/null
+++ b/x11-drivers/xf86-video-apm/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = ac7e05f0dfc7e02cac0bf17b9eb89b11
+SHA256 (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = 09d7e6cf30b94f141f8ebe2560b301a058f645e74108edc28c908e750865dcec
+SIZE (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = 268210
diff --git a/x11-drivers/xf86-video-apm/pkg-descr b/x11-drivers/xf86-video-apm/pkg-descr
new file mode 100644
index 000000000000..5d3847a314c3
--- /dev/null
+++ b/x11-drivers/xf86-video-apm/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-apm driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-apm/pkg-plist b/x11-drivers/xf86-video-apm/pkg-plist
new file mode 100644
index 000000000000..e43fd8984848
--- /dev/null
+++ b/x11-drivers/xf86-video-apm/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/apm_drv.la
+lib/xorg/modules/drivers/apm_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
new file mode 100644
index 000000000000..1c323e2943e6
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-video-ark
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-ark
+PORTVERSION=	0.6.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org ark display driver
+
+XORG_CAT=	driver
+USE_XORG=	xextproto
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo
new file mode 100644
index 000000000000..2e32a0bbc272
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = 6921479baca8f7b156029489fd335854
+SHA256 (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = e5abc4f4ae643ce56d5773f052515196f05786235e4afd155a3232e20dbc84d7
+SIZE (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = 231223
diff --git a/x11-drivers/xf86-video-ark/pkg-descr b/x11-drivers/xf86-video-ark/pkg-descr
new file mode 100644
index 000000000000..8de2e6e90406
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-ark driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/pkg-plist b/x11-drivers/xf86-video-ark/pkg-plist
new file mode 100644
index 000000000000..ce3a4e949570
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/ark_drv.la
+lib/xorg/modules/drivers/ark_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
new file mode 100644
index 000000000000..a529247c3365
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86-video-ati
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-ati
+PORTVERSION=	6.6.3
+PORTREVISION=	2
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org ati display driver
+
+USE_GL=		gl
+
+XORG_CAT=	driver
+USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
+MAN4=		ati.4x r128.4x radeon.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
new file mode 100644
index 000000000000..b618867a33c5
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = f6d559f9d20f61567d381916b376590f
+SHA256 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780
+SIZE (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = 723083
diff --git a/x11-drivers/xf86-video-ati/pkg-descr b/x11-drivers/xf86-video-ati/pkg-descr
new file mode 100644
index 000000000000..16d71008faf7
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-ati driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati/pkg-plist b/x11-drivers/xf86-video-ati/pkg-plist
new file mode 100644
index 000000000000..db42381ea904
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/pkg-plist
@@ -0,0 +1,18 @@
+lib/xorg/modules/drivers/ati_drv.la
+lib/xorg/modules/drivers/ati_drv.so
+lib/xorg/modules/drivers/atimisc_drv.la
+lib/xorg/modules/drivers/atimisc_drv.so
+lib/xorg/modules/drivers/r128_drv.la
+lib/xorg/modules/drivers/r128_drv.so
+lib/xorg/modules/drivers/radeon_drv.la
+lib/xorg/modules/drivers/radeon_drv.so
+lib/xorg/modules/multimedia/theatre200_drv.la
+lib/xorg/modules/multimedia/theatre200_drv.so
+lib/xorg/modules/multimedia/theatre_detect_drv.la
+lib/xorg/modules/multimedia/theatre_detect_drv.so
+lib/xorg/modules/multimedia/theatre_drv.la
+lib/xorg/modules/multimedia/theatre_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules/multimedia
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
new file mode 100644
index 000000000000..a529247c3365
--- /dev/null
+++ b/x11-drivers/xf86-video-ati613/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86-video-ati
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-ati
+PORTVERSION=	6.6.3
+PORTREVISION=	2
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org ati display driver
+
+USE_GL=		gl
+
+XORG_CAT=	driver
+USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
+MAN4=		ati.4x r128.4x radeon.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati613/distinfo b/x11-drivers/xf86-video-ati613/distinfo
new file mode 100644
index 000000000000..b618867a33c5
--- /dev/null
+++ b/x11-drivers/xf86-video-ati613/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = f6d559f9d20f61567d381916b376590f
+SHA256 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780
+SIZE (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = 723083
diff --git a/x11-drivers/xf86-video-ati613/pkg-descr b/x11-drivers/xf86-video-ati613/pkg-descr
new file mode 100644
index 000000000000..16d71008faf7
--- /dev/null
+++ b/x11-drivers/xf86-video-ati613/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-ati driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati613/pkg-plist b/x11-drivers/xf86-video-ati613/pkg-plist
new file mode 100644
index 000000000000..db42381ea904
--- /dev/null
+++ b/x11-drivers/xf86-video-ati613/pkg-plist
@@ -0,0 +1,18 @@
+lib/xorg/modules/drivers/ati_drv.la
+lib/xorg/modules/drivers/ati_drv.so
+lib/xorg/modules/drivers/atimisc_drv.la
+lib/xorg/modules/drivers/atimisc_drv.so
+lib/xorg/modules/drivers/r128_drv.la
+lib/xorg/modules/drivers/r128_drv.so
+lib/xorg/modules/drivers/radeon_drv.la
+lib/xorg/modules/drivers/radeon_drv.so
+lib/xorg/modules/multimedia/theatre200_drv.la
+lib/xorg/modules/multimedia/theatre200_drv.so
+lib/xorg/modules/multimedia/theatre_detect_drv.la
+lib/xorg/modules/multimedia/theatre_detect_drv.so
+lib/xorg/modules/multimedia/theatre_drv.la
+lib/xorg/modules/multimedia/theatre_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules/multimedia
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
new file mode 100644
index 000000000000..8de94022099c
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-chips
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-chips
+PORTVERSION=	1.1.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org chips display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+MAN4=		chips.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
new file mode 100644
index 000000000000..cd1bd89ac0fd
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 3182d43439ca4cbf08ff9aa76990bba3
+SHA256 (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 16a81cdb6b311176936c3326d279c0d75530adbcf9a3489eea55992ac5bc7494
+SIZE (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 324093
diff --git a/x11-drivers/xf86-video-chips/pkg-descr b/x11-drivers/xf86-video-chips/pkg-descr
new file mode 100644
index 000000000000..9983550b36ad
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-chips driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-chips/pkg-plist b/x11-drivers/xf86-video-chips/pkg-plist
new file mode 100644
index 000000000000..437be4ca72ac
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/chips_drv.la
+lib/xorg/modules/drivers/chips_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
new file mode 100644
index 000000000000..dce4d94b3771
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-cirrus
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-cirrus
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org cirrus display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+MAN4=		cirrus.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo
new file mode 100644
index 000000000000..f6d5c31b4749
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 66344e315def275605dafb314ce59851
+SHA256 (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b
+SIZE (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 264167
diff --git a/x11-drivers/xf86-video-cirrus/pkg-descr b/x11-drivers/xf86-video-cirrus/pkg-descr
new file mode 100644
index 000000000000..b1bbce565d6f
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-cirrus driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cirrus/pkg-plist b/x11-drivers/xf86-video-cirrus/pkg-plist
new file mode 100644
index 000000000000..74f53f53dc0e
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/pkg-plist
@@ -0,0 +1,9 @@
+lib/xorg/modules/drivers/cirrus_alpine.la
+lib/xorg/modules/drivers/cirrus_alpine.so
+lib/xorg/modules/drivers/cirrus_drv.la
+lib/xorg/modules/drivers/cirrus_drv.so
+lib/xorg/modules/drivers/cirrus_laguna.la
+lib/xorg/modules/drivers/cirrus_laguna.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
new file mode 100644
index 000000000000..1d69ba7275a7
--- /dev/null
+++ b/x11-drivers/xf86-video-cyrix/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-cyrix
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-cyrix
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org cyrix display driver
+
+XORG_CAT=	driver
+USE_XORG=	xextproto xf86dgaproto
+MAN4=		cyrix.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-cyrix/distinfo b/x11-drivers/xf86-video-cyrix/distinfo
new file mode 100644
index 000000000000..515a434b6b19
--- /dev/null
+++ b/x11-drivers/xf86-video-cyrix/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-cyrix-1.1.0.tar.bz2) = 02ed7d5215610a3463a0307b30bb5425
+SHA256 (xorg/driver/xf86-video-cyrix-1.1.0.tar.bz2) = d6a66778e0f6ddd907cba5784386bd6bb526f773b5db9faa35875ba67c2ca6ad
+SIZE (xorg/driver/xf86-video-cyrix-1.1.0.tar.bz2) = 249372
diff --git a/x11-drivers/xf86-video-cyrix/pkg-descr b/x11-drivers/xf86-video-cyrix/pkg-descr
new file mode 100644
index 000000000000..81d4933f7776
--- /dev/null
+++ b/x11-drivers/xf86-video-cyrix/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-cyrix driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cyrix/pkg-plist b/x11-drivers/xf86-video-cyrix/pkg-plist
new file mode 100644
index 000000000000..3354c4136282
--- /dev/null
+++ b/x11-drivers/xf86-video-cyrix/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/cyrix_drv.la
+lib/xorg/modules/drivers/cyrix_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
new file mode 100644
index 000000000000..f20bb5936e1d
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-video-dummy
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-dummy
+PORTVERSION=	0.2.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org dummy display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xf86dgaproto
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo
new file mode 100644
index 000000000000..180edab7c5b5
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 22b7cc20a33443cbd218bd2521850cfe
+SHA256 (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910
+SIZE (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 229159
diff --git a/x11-drivers/xf86-video-dummy/pkg-descr b/x11-drivers/xf86-video-dummy/pkg-descr
new file mode 100644
index 000000000000..b979373c5272
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-dummy driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/pkg-plist b/x11-drivers/xf86-video-dummy/pkg-plist
new file mode 100644
index 000000000000..d9b858d452de
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/dummy_drv.la
+lib/xorg/modules/drivers/dummy_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
new file mode 100644
index 000000000000..5e22ad7eba6b
--- /dev/null
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-fbdev
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-fbdev
+PORTVERSION=	0.3.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org fbdev display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto
+MAN4=		fbdev.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-fbdev/distinfo b/x11-drivers/xf86-video-fbdev/distinfo
new file mode 100644
index 000000000000..26ed50186775
--- /dev/null
+++ b/x11-drivers/xf86-video-fbdev/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 9ae810c6c6c3c9713a67866fe794d4ff
+SHA256 (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 309d1f618c77559ea494c05d45b09577790c44900685e17bc812e4e1b19df6e7
+SIZE (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 217635
diff --git a/x11-drivers/xf86-video-fbdev/pkg-descr b/x11-drivers/xf86-video-fbdev/pkg-descr
new file mode 100644
index 000000000000..8488cf84f820
--- /dev/null
+++ b/x11-drivers/xf86-video-fbdev/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-fbdev driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-fbdev/pkg-plist b/x11-drivers/xf86-video-fbdev/pkg-plist
new file mode 100644
index 000000000000..274315cac50d
--- /dev/null
+++ b/x11-drivers/xf86-video-fbdev/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/fbdev_drv.la
+lib/xorg/modules/drivers/fbdev_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
new file mode 100644
index 000000000000..b8fa4207be60
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86-video-glint
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-glint
+PORTVERSION=	1.1.1
+PORTREVISION=	2
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org glint display driver
+
+USE_GL=		gl
+
+XORG_CAT=	driver
+USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
+MAN4=		glint.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
new file mode 100644
index 000000000000..8cb471c608ec
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = 2cf49f701024a145bd25aff9da11d479
+SHA256 (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = d63e0dd3f5cecebaf1915193a68ac83e90c1e973e3276a71bd14651d67115e6d
+SIZE (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = 347413
diff --git a/x11-drivers/xf86-video-glint/pkg-descr b/x11-drivers/xf86-video-glint/pkg-descr
new file mode 100644
index 000000000000..9d7d17f48926
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-glint driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/pkg-plist b/x11-drivers/xf86-video-glint/pkg-plist
new file mode 100644
index 000000000000..cb5ce1fa5e07
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/glint_drv.la
+lib/xorg/modules/drivers/glint_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
new file mode 100644
index 000000000000..255830e8d6e2
--- /dev/null
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-i128
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-i128
+PORTVERSION=	1.2.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org i128 display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+MAN4=		i128.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-i128/distinfo b/x11-drivers/xf86-video-i128/distinfo
new file mode 100644
index 000000000000..a575c50907c9
--- /dev/null
+++ b/x11-drivers/xf86-video-i128/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = d0080732eaa15059b0a953aa3522185a
+SHA256 (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = 0d023cacf8134241cd8efcd5744eb156399406c92f59d3895392f2b5fd055eb1
+SIZE (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = 264809
diff --git a/x11-drivers/xf86-video-i128/pkg-descr b/x11-drivers/xf86-video-i128/pkg-descr
new file mode 100644
index 000000000000..06b51e337361
--- /dev/null
+++ b/x11-drivers/xf86-video-i128/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-i128 driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i128/pkg-plist b/x11-drivers/xf86-video-i128/pkg-plist
new file mode 100644
index 000000000000..585e6b4e044f
--- /dev/null
+++ b/x11-drivers/xf86-video-i128/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/i128_drv.la
+lib/xorg/modules/drivers/i128_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
new file mode 100644
index 000000000000..bea875b8e7d2
--- /dev/null
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-i740
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-i740
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org i740 display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+MAN4=		i740.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-i740/distinfo b/x11-drivers/xf86-video-i740/distinfo
new file mode 100644
index 000000000000..91af48cfdf8d
--- /dev/null
+++ b/x11-drivers/xf86-video-i740/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = 57302e225060a7286ae1a970c87a589b
+SHA256 (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = b8f2144c987d8a14f8b477ee3aa43fc1c76d040a77e40938c3c97c8e34e2b7c5
+SIZE (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = 258461
diff --git a/x11-drivers/xf86-video-i740/pkg-descr b/x11-drivers/xf86-video-i740/pkg-descr
new file mode 100644
index 000000000000..4504d5855cfc
--- /dev/null
+++ b/x11-drivers/xf86-video-i740/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-i740 driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/pkg-plist b/x11-drivers/xf86-video-i740/pkg-plist
new file mode 100644
index 000000000000..60628b412c8e
--- /dev/null
+++ b/x11-drivers/xf86-video-i740/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/i740_drv.la
+lib/xorg/modules/drivers/i740_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-i810/Makefile b/x11-drivers/xf86-video-i810/Makefile
new file mode 100644
index 000000000000..81cc52fc0c2e
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86-video-i810
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-i810
+PORTVERSION=	1.6.5
+PORTREVISION=	2
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org i810 display driver
+
+USE_GL=		gl
+
+XORG_CAT=	driver
+USE_XORG=	xvmc xf86driproto xextproto x11 xextproto glproto xineramaproto
+MAN4=		i810.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-i810/distinfo b/x11-drivers/xf86-video-i810/distinfo
new file mode 100644
index 000000000000..dd921a731f5c
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-i810-1.6.5.tar.bz2) = fc1e0da3430551bf25a7babf7ccfd3bf
+SHA256 (xorg/driver/xf86-video-i810-1.6.5.tar.bz2) = 30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f
+SIZE (xorg/driver/xf86-video-i810-1.6.5.tar.bz2) = 439503
diff --git a/x11-drivers/xf86-video-i810/pkg-descr b/x11-drivers/xf86-video-i810/pkg-descr
new file mode 100644
index 000000000000..5eecb408d592
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-i810 driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i810/pkg-plist b/x11-drivers/xf86-video-i810/pkg-plist
new file mode 100644
index 000000000000..b84469f23387
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/pkg-plist
@@ -0,0 +1,8 @@
+lib/libI810XvMC.la
+lib/libI810XvMC.so
+lib/libI810XvMC.so.1
+lib/xorg/modules/drivers/i810_drv.la
+lib/xorg/modules/drivers/i810_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile
new file mode 100644
index 000000000000..99c208429a9e
--- /dev/null
+++ b/x11-drivers/xf86-video-imstt/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-video-imstt
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-imstt
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org imstt display driver
+
+XORG_CAT=	driver
+MAN4=		imstt.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-imstt/distinfo b/x11-drivers/xf86-video-imstt/distinfo
new file mode 100644
index 000000000000..511580f43991
--- /dev/null
+++ b/x11-drivers/xf86-video-imstt/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-imstt-1.1.0.tar.bz2) = 94853ca217238ed1f568a10cbeebe057
+SHA256 (xorg/driver/xf86-video-imstt-1.1.0.tar.bz2) = 9238c2257f9437dd7ab37c049d7f20c010e2f5ff833a37d2d6243f223f10fb7d
+SIZE (xorg/driver/xf86-video-imstt-1.1.0.tar.bz2) = 234492
diff --git a/x11-drivers/xf86-video-imstt/pkg-descr b/x11-drivers/xf86-video-imstt/pkg-descr
new file mode 100644
index 000000000000..6a8354606a5f
--- /dev/null
+++ b/x11-drivers/xf86-video-imstt/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-imstt driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-imstt/pkg-plist b/x11-drivers/xf86-video-imstt/pkg-plist
new file mode 100644
index 000000000000..b50e55fd9c44
--- /dev/null
+++ b/x11-drivers/xf86-video-imstt/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/imstt_drv.la
+lib/xorg/modules/drivers/imstt_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
new file mode 100644
index 000000000000..e4ec426b464e
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	xf86-video-mga
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-mga
+PORTVERSION=	1.4.6.1
+PORTREVISION=	1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org mga display driver
+
+USE_GL=		gl
+
+XORG_CAT=	driver
+USE_XORG=	xf86driproto videoproto xextproto glproto
+MAN4=		mga.4x
+USE_REINPLACE=	yes
+
+pre-patch:
+	${REINPLACE_CMD} \
+		-e 's|values.h|sys/limits.h|g' \
+		-e 's|MAXSHORT|SHRT_MAX|g' \
+		${WRKSRC}/src/mga_arc.c
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo
new file mode 100644
index 000000000000..84a79c17200e
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-mga-1.4.6.1.tar.bz2) = a678b429a35648f96d3ebf328300de46
+SHA256 (xorg/driver/xf86-video-mga-1.4.6.1.tar.bz2) = a7ace8c088cc214122c5f9d85f5566b0790207c8f15b960a4fc673d1bdaffdfc
+SIZE (xorg/driver/xf86-video-mga-1.4.6.1.tar.bz2) = 376624
diff --git a/x11-drivers/xf86-video-mga/pkg-descr b/x11-drivers/xf86-video-mga/pkg-descr
new file mode 100644
index 000000000000..a5938e3982b6
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-mga driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mga/pkg-plist b/x11-drivers/xf86-video-mga/pkg-plist
new file mode 100644
index 000000000000..56532927ad3f
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/mga_drv.la
+lib/xorg/modules/drivers/mga_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
new file mode 100644
index 000000000000..4dc26f657770
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-neomagic
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-neomagic
+PORTVERSION=	1.1.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org neomagic display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto xf86dgaproto
+MAN4=		neomagic.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-neomagic/distinfo b/x11-drivers/xf86-video-neomagic/distinfo
new file mode 100644
index 000000000000..8111104ec84d
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = 7a3d3d6e60b9686d955c45d9ebbd5c1b
+SHA256 (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86
+SIZE (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = 263711
diff --git a/x11-drivers/xf86-video-neomagic/pkg-descr b/x11-drivers/xf86-video-neomagic/pkg-descr
new file mode 100644
index 000000000000..77a454efa172
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-neomagic driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-neomagic/pkg-plist b/x11-drivers/xf86-video-neomagic/pkg-plist
new file mode 100644
index 000000000000..e96d47e4acf9
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/neomagic_drv.la
+lib/xorg/modules/drivers/neomagic_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
new file mode 100644
index 000000000000..71d9006f9326
--- /dev/null
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	xf86-video-newport
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-newport
+PORTVERSION=	0.2.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org newport display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto
+MAN4=		newport.4x
+
+post-patch:
+		${REINPLACE_CMD} -e 's|values.h|sys/limits.h|' \
+				 -e 's|MAXSHORT|SHRT_MAX|g' \
+				 ${WRKSRC}/src/newport_accel.c
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-newport/distinfo b/x11-drivers/xf86-video-newport/distinfo
new file mode 100644
index 000000000000..76c0473d19ce
--- /dev/null
+++ b/x11-drivers/xf86-video-newport/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-newport-0.2.1.tar.bz2) = 2bd8e5b9ea68e0dcd80dfcaca0eff82c
+SHA256 (xorg/driver/xf86-video-newport-0.2.1.tar.bz2) = 66ac855452690ef896400577806dc1dd86318940f8a62ce20039037318b1ce08
+SIZE (xorg/driver/xf86-video-newport-0.2.1.tar.bz2) = 257576
diff --git a/x11-drivers/xf86-video-newport/pkg-descr b/x11-drivers/xf86-video-newport/pkg-descr
new file mode 100644
index 000000000000..f04af1ef2092
--- /dev/null
+++ b/x11-drivers/xf86-video-newport/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-newport driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-newport/pkg-plist b/x11-drivers/xf86-video-newport/pkg-plist
new file mode 100644
index 000000000000..2100eb2b282f
--- /dev/null
+++ b/x11-drivers/xf86-video-newport/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/newport_drv.la
+lib/xorg/modules/drivers/newport_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-nsc/Makefile b/x11-drivers/xf86-video-nsc/Makefile
new file mode 100644
index 000000000000..43a40a233d6c
--- /dev/null
+++ b/x11-drivers/xf86-video-nsc/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-nsc
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-nsc
+PORTVERSION=	2.8.2
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org nsc display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto xf86dgaproto
+MAN4=		nsc.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-nsc/distinfo b/x11-drivers/xf86-video-nsc/distinfo
new file mode 100644
index 000000000000..ca2fd1878d41
--- /dev/null
+++ b/x11-drivers/xf86-video-nsc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-nsc-2.8.2.tar.bz2) = 1fbdd5e9b5508b032c0102f72d1e555c
+SHA256 (xorg/driver/xf86-video-nsc-2.8.2.tar.bz2) = 060493a9dcad81e8912381d2a8d14a3e32a34414296a089756868f3442103c8c
+SIZE (xorg/driver/xf86-video-nsc-2.8.2.tar.bz2) = 479445
diff --git a/x11-drivers/xf86-video-nsc/pkg-descr b/x11-drivers/xf86-video-nsc/pkg-descr
new file mode 100644
index 000000000000..87059c5c8a23
--- /dev/null
+++ b/x11-drivers/xf86-video-nsc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-nsc driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nsc/pkg-plist b/x11-drivers/xf86-video-nsc/pkg-plist
new file mode 100644
index 000000000000..4db02541a7c4
--- /dev/null
+++ b/x11-drivers/xf86-video-nsc/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/nsc_drv.la
+lib/xorg/modules/drivers/nsc_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
new file mode 100644
index 000000000000..e0f2dd76dc7b
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-nv
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-nv
+PORTVERSION=	1.2.2.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org nv display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+MAN4=		nv.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-nv/distinfo b/x11-drivers/xf86-video-nv/distinfo
new file mode 100644
index 000000000000..9fb641c87e56
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-nv-1.2.2.1.tar.bz2) = e4dc415b1e45db0bbdacc203ed33024a
+SHA256 (xorg/driver/xf86-video-nv-1.2.2.1.tar.bz2) = 97d47df7720d3cfcb56c4debca9218c3fc5352d34d82bc4880c8a620185f8c5e
+SIZE (xorg/driver/xf86-video-nv-1.2.2.1.tar.bz2) = 297424
diff --git a/x11-drivers/xf86-video-nv/pkg-descr b/x11-drivers/xf86-video-nv/pkg-descr
new file mode 100644
index 000000000000..615030068d6b
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-nv driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nv/pkg-plist b/x11-drivers/xf86-video-nv/pkg-plist
new file mode 100644
index 000000000000..365057700814
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/pkg-plist
@@ -0,0 +1,7 @@
+lib/xorg/modules/drivers/nv_drv.la
+lib/xorg/modules/drivers/nv_drv.so
+lib/xorg/modules/drivers/riva128.la
+lib/xorg/modules/drivers/riva128.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
new file mode 100644
index 000000000000..1bc3961e2191
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-rendition
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-rendition
+PORTVERSION=	4.1.3
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org rendition display driver
+
+XORG_CAT=	driver
+USE_XORG=	xextproto
+MAN4=		rendition.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo
new file mode 100644
index 000000000000..5e6d96c83221
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = a8b97feccb32184820d5856fe78d34db
+SHA256 (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = 37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408
+SIZE (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = 292618
diff --git a/x11-drivers/xf86-video-rendition/pkg-descr b/x11-drivers/xf86-video-rendition/pkg-descr
new file mode 100644
index 000000000000..7ff79bc2df1e
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-rendition driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rendition/pkg-plist b/x11-drivers/xf86-video-rendition/pkg-plist
new file mode 100644
index 000000000000..e27659167b4b
--- /dev/null
+++ b/x11-drivers/xf86-video-rendition/pkg-plist
@@ -0,0 +1,7 @@
+lib/xorg/modules/drivers/rendition_drv.la
+lib/xorg/modules/drivers/rendition_drv.so
+lib/xorg/modules/v10002d.uc
+lib/xorg/modules/v20002d.uc
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
new file mode 100644
index 000000000000..fa89fbedc081
--- /dev/null
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-video-s3
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-s3
+PORTVERSION=	0.5.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org s3 display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3/distinfo b/x11-drivers/xf86-video-s3/distinfo
new file mode 100644
index 000000000000..bb59a8349108
--- /dev/null
+++ b/x11-drivers/xf86-video-s3/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = d95ab6445cab477f39adfbbc81006f67
+SHA256 (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = 4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97
+SIZE (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = 240067
diff --git a/x11-drivers/xf86-video-s3/pkg-descr b/x11-drivers/xf86-video-s3/pkg-descr
new file mode 100644
index 000000000000..db7f321d3f8a
--- /dev/null
+++ b/x11-drivers/xf86-video-s3/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-s3 driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3/pkg-plist b/x11-drivers/xf86-video-s3/pkg-plist
new file mode 100644
index 000000000000..0f96af8d750b
--- /dev/null
+++ b/x11-drivers/xf86-video-s3/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/s3_drv.la
+lib/xorg/modules/drivers/s3_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
new file mode 100644
index 000000000000..5a08dbf2726d
--- /dev/null
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-s3virge
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-s3virge
+PORTVERSION=	1.9.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org s3virge display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+MAN4=		s3virge.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo
new file mode 100644
index 000000000000..28c1a680972f
--- /dev/null
+++ b/x11-drivers/xf86-video-s3virge/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = a91c73285ef67ee7cd9e2da28acb6cc4
+SHA256 (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = cef5702963f49e737fb8b1472dc0241f7a5da49f844ac77f2df3e693a84bc822
+SIZE (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = 279913
diff --git a/x11-drivers/xf86-video-s3virge/pkg-descr b/x11-drivers/xf86-video-s3virge/pkg-descr
new file mode 100644
index 000000000000..dc782f753950
--- /dev/null
+++ b/x11-drivers/xf86-video-s3virge/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-s3virge driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/pkg-plist b/x11-drivers/xf86-video-s3virge/pkg-plist
new file mode 100644
index 000000000000..0db60dcaeebe
--- /dev/null
+++ b/x11-drivers/xf86-video-s3virge/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/s3virge_drv.la
+lib/xorg/modules/drivers/s3virge_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
new file mode 100644
index 000000000000..5c74c2e52a83
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86-video-savage
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-savage
+PORTVERSION=	2.1.2
+PORTREVISION=	2
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org savage display driver
+
+USE_GL=		gl
+
+XORG_CAT=	driver
+USE_XORG=	xf86driproto videoproto xextproto glproto
+MAN4=		savage.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
new file mode 100644
index 000000000000..6d16a63d6167
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-savage-2.1.2.tar.bz2) = 6367e921a98f6a7fec9d0a9bc5ff0a47
+SHA256 (xorg/driver/xf86-video-savage-2.1.2.tar.bz2) = 1a9aa442152c139e3c54bc6c323bd13edf0bfff70a81c03969bcb1159317edb2
+SIZE (xorg/driver/xf86-video-savage-2.1.2.tar.bz2) = 303497
diff --git a/x11-drivers/xf86-video-savage/pkg-descr b/x11-drivers/xf86-video-savage/pkg-descr
new file mode 100644
index 000000000000..7d97ae643222
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-savage driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/pkg-plist b/x11-drivers/xf86-video-savage/pkg-plist
new file mode 100644
index 000000000000..6969a648e048
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/savage_drv.la
+lib/xorg/modules/drivers/savage_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
new file mode 100644
index 000000000000..cda2eb02c3ab
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-siliconmotion
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-siliconmotion
+PORTVERSION=	1.4.2
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org siliconmotion display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+MAN4=		siliconmotion.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
new file mode 100644
index 000000000000..2a735f8620d3
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-siliconmotion-1.4.2.tar.bz2) = 31fa07bfc6f06e07216bf34a35091af0
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.4.2.tar.bz2) = a47a60920c454342a212260b5ec74c93f7889a6df4942bd2d6c0c0672aa25fdd
+SIZE (xorg/driver/xf86-video-siliconmotion-1.4.2.tar.bz2) = 279048
diff --git a/x11-drivers/xf86-video-siliconmotion/pkg-descr b/x11-drivers/xf86-video-siliconmotion/pkg-descr
new file mode 100644
index 000000000000..e98df3da9c1e
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-siliconmotion driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-siliconmotion/pkg-plist b/x11-drivers/xf86-video-siliconmotion/pkg-plist
new file mode 100644
index 000000000000..199eda7785f9
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/siliconmotion_drv.la
+lib/xorg/modules/drivers/siliconmotion_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
new file mode 100644
index 000000000000..27cd0b35edb6
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86-video-sis
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-sis
+PORTVERSION=	0.9.3
+PORTREVISION=	1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org sis display driver
+
+USE_GL=		gl
+
+XORG_CAT=	driver
+USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
+MAN4=		sis.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
new file mode 100644
index 000000000000..6d672f933d67
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-sis-0.9.3.tar.bz2) = e35d817fa4ee7beb6cd5aa744b9c0783
+SHA256 (xorg/driver/xf86-video-sis-0.9.3.tar.bz2) = 898ee8fb16fff89ba8ac5c83b9f5a2371084719db0cf034140427229191436f6
+SIZE (xorg/driver/xf86-video-sis-0.9.3.tar.bz2) = 617592
diff --git a/x11-drivers/xf86-video-sis/files/patch-src_sis__dri.c b/x11-drivers/xf86-video-sis/files/patch-src_sis__dri.c
new file mode 100644
index 000000000000..501faf40c6f7
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/files/patch-src_sis__dri.c
@@ -0,0 +1,12 @@
+--- src/sis_dri.c.orig	Thu Dec  7 19:02:49 2006
++++ src/sis_dri.c	Thu Dec  7 19:04:16 2006
+@@ -45,6 +45,9 @@
+ #include "sis.h"
+ #include "sis_regs.h"
+ 
++/* XXX - It doesn't work for a reason but I'm too lazy to find out why. */
++void SISDRICloseScreen(ScreenPtr pScreen);
++
+ #include "fb.h"
+ #include "GL/glxtokens.h"
+ 
diff --git a/x11-drivers/xf86-video-sis/pkg-descr b/x11-drivers/xf86-video-sis/pkg-descr
new file mode 100644
index 000000000000..18f08cfb9478
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-sis driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sis/pkg-plist b/x11-drivers/xf86-video-sis/pkg-plist
new file mode 100644
index 000000000000..e1daba86088a
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/sis_drv.la
+lib/xorg/modules/drivers/sis_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
new file mode 100644
index 000000000000..69574b731df9
--- /dev/null
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86-video-sunffb
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-sunffb
+PORTVERSION=	1.1.0
+PORTREVISION=	3
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org sunffb display driver
+
+USE_GL=		gl
+
+XORG_CAT=	driver
+USE_XORG=	xf86driproto xextproto glproto
+MAN4=		sunffb.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sunffb/distinfo b/x11-drivers/xf86-video-sunffb/distinfo
new file mode 100644
index 000000000000..b5c0eaa23b0e
--- /dev/null
+++ b/x11-drivers/xf86-video-sunffb/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = dee23564c0d8069f52c7cd29c78be667
+SHA256 (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = f897a427e83cf6965fd82724e3298aea44eb3131ba62f904cb514dfd0a879029
+SIZE (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = 268148
diff --git a/x11-drivers/xf86-video-sunffb/pkg-descr b/x11-drivers/xf86-video-sunffb/pkg-descr
new file mode 100644
index 000000000000..8b5134cfd813
--- /dev/null
+++ b/x11-drivers/xf86-video-sunffb/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-sunffb driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sunffb/pkg-plist b/x11-drivers/xf86-video-sunffb/pkg-plist
new file mode 100644
index 000000000000..ca5a8365050a
--- /dev/null
+++ b/x11-drivers/xf86-video-sunffb/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/sunffb_drv.la
+lib/xorg/modules/drivers/sunffb_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
new file mode 100644
index 000000000000..22ae395d8403
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86-video-tdfx
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-tdfx
+PORTVERSION=	1.3.0
+PORTREVISION=	1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org tdfx display driver
+
+USE_GL=		gl
+
+XORG_CAT=	driver
+USE_XORG=	xf86driproto videoproto xextproto glproto
+MAN4=		tdfx.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tdfx/distinfo b/x11-drivers/xf86-video-tdfx/distinfo
new file mode 100644
index 000000000000..1fb963e32cf3
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 04c49acb5c5dbde14eabd32d06df6e73
+SHA256 (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624
+SIZE (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 261448
diff --git a/x11-drivers/xf86-video-tdfx/pkg-descr b/x11-drivers/xf86-video-tdfx/pkg-descr
new file mode 100644
index 000000000000..8bd624be0425
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-tdfx driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/pkg-plist b/x11-drivers/xf86-video-tdfx/pkg-plist
new file mode 100644
index 000000000000..97d1e6df842b
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/tdfx_drv.la
+lib/xorg/modules/drivers/tdfx_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
new file mode 100644
index 000000000000..c503e4265085
--- /dev/null
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xf86-video-tga
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-tga
+PORTVERSION=	1.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org tga display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto xf86dgaproto
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tga/distinfo b/x11-drivers/xf86-video-tga/distinfo
new file mode 100644
index 000000000000..df6f9124213f
--- /dev/null
+++ b/x11-drivers/xf86-video-tga/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 9eda4d4490706b2dd8f4ecdbaf779856
+SHA256 (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 50143dfdd259fd114dc2f41518a4898d5407bf55422251df75812b96a1fa6e9b
+SIZE (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 260342
diff --git a/x11-drivers/xf86-video-tga/pkg-descr b/x11-drivers/xf86-video-tga/pkg-descr
new file mode 100644
index 000000000000..849be023fde4
--- /dev/null
+++ b/x11-drivers/xf86-video-tga/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-tga driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tga/pkg-plist b/x11-drivers/xf86-video-tga/pkg-plist
new file mode 100644
index 000000000000..342702c9fbab
--- /dev/null
+++ b/x11-drivers/xf86-video-tga/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/tga_drv.la
+lib/xorg/modules/drivers/tga_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
new file mode 100644
index 000000000000..109d5972ae52
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-trident
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-trident
+PORTVERSION=	1.2.3
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org trident display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto xf86dgaproto
+MAN4=		trident.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo
new file mode 100644
index 000000000000..9a37d95edf96
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = c0e8b2f54942b6902b7dd4f30defe800
+SHA256 (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = d23eb8fa165d238ddf64da63dcd60c70a01cd761608a18402cfb95aed6722495
+SIZE (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = 288372
diff --git a/x11-drivers/xf86-video-trident/pkg-descr b/x11-drivers/xf86-video-trident/pkg-descr
new file mode 100644
index 000000000000..a24c2cbdcd36
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-trident driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-trident/pkg-plist b/x11-drivers/xf86-video-trident/pkg-plist
new file mode 100644
index 000000000000..a2348baf7684
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/trident_drv.la
+lib/xorg/modules/drivers/trident_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
new file mode 100644
index 000000000000..2b7abc0d92fe
--- /dev/null
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-tseng
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-tseng
+PORTVERSION=	1.1.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org tseng display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+MAN4=		tseng.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tseng/distinfo b/x11-drivers/xf86-video-tseng/distinfo
new file mode 100644
index 000000000000..9d86bd5720c5
--- /dev/null
+++ b/x11-drivers/xf86-video-tseng/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = 488aa9c3ec7a95e6589afa4b50bec8b4
+SHA256 (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e
+SIZE (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = 273211
diff --git a/x11-drivers/xf86-video-tseng/pkg-descr b/x11-drivers/xf86-video-tseng/pkg-descr
new file mode 100644
index 000000000000..947118f13261
--- /dev/null
+++ b/x11-drivers/xf86-video-tseng/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-tseng driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tseng/pkg-plist b/x11-drivers/xf86-video-tseng/pkg-plist
new file mode 100644
index 000000000000..62decd9aa3df
--- /dev/null
+++ b/x11-drivers/xf86-video-tseng/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/tseng_drv.la
+lib/xorg/modules/drivers/tseng_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
new file mode 100644
index 000000000000..e34412cb5ef7
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-vesa
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-vesa
+PORTVERSION=	1.3.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org vesa display driver
+
+XORG_CAT=	driver
+USE_XORG=	xextproto
+MAN4=		vesa.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vesa/distinfo b/x11-drivers/xf86-video-vesa/distinfo
new file mode 100644
index 000000000000..307da5ea252a
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = 4a307852f3b4850e436a41dab2a73676
+SHA256 (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = b96c80ae81f5123ecef344dac4c734b2e281143d3ab7a7e633d6bf04c893e203
+SIZE (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = 237759
diff --git a/x11-drivers/xf86-video-vesa/pkg-descr b/x11-drivers/xf86-video-vesa/pkg-descr
new file mode 100644
index 000000000000..1c5752ff4cff
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-vesa driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/pkg-plist b/x11-drivers/xf86-video-vesa/pkg-plist
new file mode 100644
index 000000000000..5a9cf2e0b42c
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/vesa_drv.la
+lib/xorg/modules/drivers/vesa_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-vga/Makefile b/x11-drivers/xf86-video-vga/Makefile
new file mode 100644
index 000000000000..7a8e5c299d40
--- /dev/null
+++ b/x11-drivers/xf86-video-vga/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-vga
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-vga
+PORTVERSION=	4.1.0
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org vga display driver
+
+XORG_CAT=	driver
+USE_XORG=	xextproto
+MAN4=		vga.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vga/distinfo b/x11-drivers/xf86-video-vga/distinfo
new file mode 100644
index 000000000000..f7948b74eca7
--- /dev/null
+++ b/x11-drivers/xf86-video-vga/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-vga-4.1.0.tar.bz2) = b93e5fe9757db779a75cd3ce97b9613d
+SHA256 (xorg/driver/xf86-video-vga-4.1.0.tar.bz2) = ca25f4c0f706688cbc2dcd03ffaf6a57a17290290257f0cc1b1f1bb261f95b41
+SIZE (xorg/driver/xf86-video-vga-4.1.0.tar.bz2) = 233642
diff --git a/x11-drivers/xf86-video-vga/pkg-descr b/x11-drivers/xf86-video-vga/pkg-descr
new file mode 100644
index 000000000000..3146a042499c
--- /dev/null
+++ b/x11-drivers/xf86-video-vga/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-vga driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vga/pkg-plist b/x11-drivers/xf86-video-vga/pkg-plist
new file mode 100644
index 000000000000..ab3f33516e95
--- /dev/null
+++ b/x11-drivers/xf86-video-vga/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/vga_drv.la
+lib/xorg/modules/drivers/vga_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile
new file mode 100644
index 000000000000..d45f1b5cc290
--- /dev/null
+++ b/x11-drivers/xf86-video-via/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86-video-via
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-via
+PORTVERSION=	0.2.2
+PORTREVISION=	1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org via display driver
+
+USE_GL=		gl
+
+XORG_CAT=	driver
+USE_XORG=	xvmc xf86driproto xextproto x11 glproto
+MAN4=		via.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-via/distinfo b/x11-drivers/xf86-video-via/distinfo
new file mode 100644
index 000000000000..b05a46c1fdbc
--- /dev/null
+++ b/x11-drivers/xf86-video-via/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-via-0.2.2.tar.bz2) = d5fe25d3cfa0a64cc77681f15f9c3159
+SHA256 (xorg/driver/xf86-video-via-0.2.2.tar.bz2) = 5026bdaf644178fee66a26190453b0dddb99558b8c97c4a592a482a2434dc862
+SIZE (xorg/driver/xf86-video-via-0.2.2.tar.bz2) = 397641
diff --git a/x11-drivers/xf86-video-via/pkg-descr b/x11-drivers/xf86-video-via/pkg-descr
new file mode 100644
index 000000000000..f8c4810d09da
--- /dev/null
+++ b/x11-drivers/xf86-video-via/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-via driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-via/pkg-plist b/x11-drivers/xf86-video-via/pkg-plist
new file mode 100644
index 000000000000..06c919d0743b
--- /dev/null
+++ b/x11-drivers/xf86-video-via/pkg-plist
@@ -0,0 +1,11 @@
+lib/libviaXvMC.la
+lib/libviaXvMC.so
+lib/libviaXvMC.so.1
+lib/libviaXvMCPro.la
+lib/libviaXvMCPro.so
+lib/libviaXvMCPro.so.1
+lib/xorg/modules/drivers/via_drv.la
+lib/xorg/modules/drivers/via_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
new file mode 100644
index 000000000000..ca50e650a30c
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-vmware
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-vmware
+PORTVERSION=	10.14.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org vmware display driver
+
+XORG_CAT=	driver
+USE_XORG=	xextproto xineramaproto
+MAN4=		vmware.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo
new file mode 100644
index 000000000000..68bb42406ba3
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-vmware-10.14.1.tar.bz2) = eaf1ce9fa23363799140602afaa10f37
+SHA256 (xorg/driver/xf86-video-vmware-10.14.1.tar.bz2) = 1971fd356ba54204c3611edb9144c43c25c21167a5fa5ee725d3f2e3f9864fa9
+SIZE (xorg/driver/xf86-video-vmware-10.14.1.tar.bz2) = 265946
diff --git a/x11-drivers/xf86-video-vmware/pkg-descr b/x11-drivers/xf86-video-vmware/pkg-descr
new file mode 100644
index 000000000000..301ee7405158
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-vmware driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/pkg-plist b/x11-drivers/xf86-video-vmware/pkg-plist
new file mode 100644
index 000000000000..11352322763d
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/vmware_drv.la
+lib/xorg/modules/drivers/vmware_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
new file mode 100644
index 000000000000..cf4d2bedd12b
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-voodoo
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86-video-voodoo
+PORTVERSION=	1.1.1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org voodoo display driver
+
+XORG_CAT=	driver
+USE_XORG=	xf86dgaproto xextproto
+MAN4=		voodoo.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo
new file mode 100644
index 000000000000..671498aacf80
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = bc878e795688b49a595b355482d27174
+SHA256 (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = 3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c
+SIZE (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = 248401
diff --git a/x11-drivers/xf86-video-voodoo/pkg-descr b/x11-drivers/xf86-video-voodoo/pkg-descr
new file mode 100644
index 000000000000..47285cb240ab
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-voodoo driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-voodoo/pkg-plist b/x11-drivers/xf86-video-voodoo/pkg-plist
new file mode 100644
index 000000000000..98df90622eca
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/voodoo_drv.la
+lib/xorg/modules/drivers/voodoo_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
new file mode 100644
index 000000000000..6bbbe2f402ef
--- /dev/null
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -0,0 +1,92 @@
+# New ports collection makefile for:    xorg-drivers
+# Date created:				Jun 22 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xorg-drivers
+PORTVERSION=	7.2
+CATEGORIES=	x11-drivers
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.org drivers meta-port
+
+USE_X_PREFIX=	yes
+VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
+INPUTDIR=	${PREFIX}/lib/xorg/modules/input
+
+RUN_DEPENDS=	${INPUTDIR}/acecad_drv.so:${PORTSDIR}/x11-drivers/xf86-input-acecad \
+		${INPUTDIR}/calcomp_drv.so:${PORTSDIR}/x11-drivers/xf86-input-calcomp \
+		${INPUTDIR}/citron_drv.so:${PORTSDIR}/x11-drivers/xf86-input-citron \
+		${INPUTDIR}/digitaledge_drv.so:${PORTSDIR}/x11-drivers/xf86-input-digitaledge \
+		${INPUTDIR}/dmc_drv.so:${PORTSDIR}/x11-drivers/xf86-input-dmc \
+		${INPUTDIR}/dynapro_drv.so:${PORTSDIR}/x11-drivers/xf86-input-dynapro \
+		${INPUTDIR}/elo2300_drv.so:${PORTSDIR}/x11-drivers/xf86-input-elo2300 \
+		${INPUTDIR}/elographics_drv.so:${PORTSDIR}/x11-drivers/xf86-input-elographics \
+		${INPUTDIR}/fpit_drv.so:${PORTSDIR}/x11-drivers/xf86-input-fpit \
+		${INPUTDIR}/hyperpen_drv.so:${PORTSDIR}/x11-drivers/xf86-input-hyperpen \
+		${INPUTDIR}/js_x_drv.so:${PORTSDIR}/x11-drivers/xf86-input-jamstudio \
+		${INPUTDIR}/joystick_drv.so:${PORTSDIR}/x11-drivers/xf86-input-joystick \
+		${INPUTDIR}/keyboard_drv.so:${PORTSDIR}/x11-drivers/xf86-input-keyboard \
+		${INPUTDIR}/magellan_drv.so:${PORTSDIR}/x11-drivers/xf86-input-magellan \
+		${INPUTDIR}/magictouch_drv.so:${PORTSDIR}/x11-drivers/xf86-input-magictouch \
+		${INPUTDIR}/microtouch_drv.so:${PORTSDIR}/x11-drivers/xf86-input-microtouch \
+		${INPUTDIR}/mouse_drv.so:${PORTSDIR}/x11-drivers/xf86-input-mouse \
+		${INPUTDIR}/mutouch_drv.so:${PORTSDIR}/x11-drivers/xf86-input-mutouch \
+		${INPUTDIR}/palmax_drv.so:${PORTSDIR}/x11-drivers/xf86-input-palmax \
+		${INPUTDIR}/penmount_drv.so:${PORTSDIR}/x11-drivers/xf86-input-penmount \
+		${INPUTDIR}/spaceorb_drv.so:${PORTSDIR}/x11-drivers/xf86-input-spaceorb \
+		${INPUTDIR}/summa_drv.so:${PORTSDIR}/x11-drivers/xf86-input-summa \
+		${INPUTDIR}/tek4957_drv.so:${PORTSDIR}/x11-drivers/xf86-input-tek4957 \
+		${INPUTDIR}/void_drv.so:${PORTSDIR}/x11-drivers/xf86-input-void \
+		${VIDEODIR}/apm_drv.so:${PORTSDIR}/x11-drivers/xf86-video-apm \
+		${VIDEODIR}/ark_drv.so:${PORTSDIR}/x11-drivers/xf86-video-ark \
+		${VIDEODIR}/ati_drv.so:${PORTSDIR}/x11-drivers/xf86-video-ati \
+		${VIDEODIR}/chips_drv.so:${PORTSDIR}/x11-drivers/xf86-video-chips \
+		${VIDEODIR}/cirrus_drv.so:${PORTSDIR}/x11-drivers/xf86-video-cirrus \
+		${VIDEODIR}/cyrix_drv.so:${PORTSDIR}/x11-drivers/xf86-video-cyrix \
+		${VIDEODIR}/dummy_drv.so:${PORTSDIR}/x11-drivers/xf86-video-dummy \
+		${VIDEODIR}/fbdev_drv.so:${PORTSDIR}/x11-drivers/xf86-video-fbdev \
+		${VIDEODIR}/glint_drv.so:${PORTSDIR}/x11-drivers/xf86-video-glint \
+		${VIDEODIR}/i128_drv.so:${PORTSDIR}/x11-drivers/xf86-video-i128 \
+		${VIDEODIR}/i740_drv.so:${PORTSDIR}/x11-drivers/xf86-video-i740 \
+		${VIDEODIR}/i810_drv.so:${PORTSDIR}/x11-drivers/xf86-video-i810 \
+		${VIDEODIR}/imstt_drv.so:${PORTSDIR}/x11-drivers/xf86-video-imstt \
+		${VIDEODIR}/mga_drv.so:${PORTSDIR}/x11-drivers/xf86-video-mga \
+		${VIDEODIR}/neomagic_drv.so:${PORTSDIR}/x11-drivers/xf86-video-neomagic \
+		${VIDEODIR}/newport_drv.so:${PORTSDIR}/x11-drivers/xf86-video-newport \
+		${VIDEODIR}/nsc_drv.so:${PORTSDIR}/x11-drivers/xf86-video-nsc \
+		${VIDEODIR}/nv_drv.so:${PORTSDIR}/x11-drivers/xf86-video-nv \
+		${VIDEODIR}/rendition_drv.so:${PORTSDIR}/x11-drivers/xf86-video-rendition \
+		${VIDEODIR}/s3_drv.so:${PORTSDIR}/x11-drivers/xf86-video-s3 \
+		${VIDEODIR}/s3virge_drv.so:${PORTSDIR}/x11-drivers/xf86-video-s3virge \
+		${VIDEODIR}/savage_drv.so:${PORTSDIR}/x11-drivers/xf86-video-savage \
+		${VIDEODIR}/siliconmotion_drv.so:${PORTSDIR}/x11-drivers/xf86-video-siliconmotion \
+		${VIDEODIR}/sis_drv.so:${PORTSDIR}/x11-drivers/xf86-video-sis \
+		${VIDEODIR}/tdfx_drv.so:${PORTSDIR}/x11-drivers/xf86-video-tdfx \
+		${VIDEODIR}/tga_drv.so:${PORTSDIR}/x11-drivers/xf86-video-tga \
+		${VIDEODIR}/trident_drv.so:${PORTSDIR}/x11-drivers/xf86-video-trident \
+		${VIDEODIR}/tseng_drv.so:${PORTSDIR}/x11-drivers/xf86-video-tseng \
+		${VIDEODIR}/vesa_drv.so:${PORTSDIR}/x11-drivers/xf86-video-vesa \
+		${VIDEODIR}/vga_drv.so:${PORTSDIR}/x11-drivers/xf86-video-vga \
+		${VIDEODIR}/via_drv.so:${PORTSDIR}/x11-drivers/xf86-video-via \
+		${VIDEODIR}/vmware_drv.so:${PORTSDIR}/x11-drivers/xf86-video-vmware \
+		${VIDEODIR}/voodoo_drv.so:${PORTSDIR}/x11-drivers/xf86-video-voodoo \
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "sparc64"
+RUN_DEPENDS+= 	${VIDEODIR}/sunffb_drv.so:${PORTSDIR}/x11-drivers/xf86-video-sunffb
+.endif
+
+NO_BUILD=	yes
+
+do-install:
+		${MKDIR} ${PREFIX}/libdata/xorg
+		${TOUCH} ${PREFIX}/libdata/xorg/drivers
+
+.include <bsd.port.post.mk>
diff --git a/x11-drivers/xorg-drivers/pkg-descr b/x11-drivers/xorg-drivers/pkg-descr
new file mode 100644
index 000000000000..dcd8e1cf3595
--- /dev/null
+++ b/x11-drivers/xorg-drivers/pkg-descr
@@ -0,0 +1,6 @@
+This package contains X.Org shared libraries, headers, and related files.
+
+WWW: http://www.x.org/
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11-drivers/xorg-drivers/pkg-plist b/x11-drivers/xorg-drivers/pkg-plist
new file mode 100644
index 000000000000..d5bf8042ce29
--- /dev/null
+++ b/x11-drivers/xorg-drivers/pkg-plist
@@ -0,0 +1,2 @@
+libdata/xorg/drivers
+@dirrmtry libdata/xorg
diff --git a/x11-fm/FSViewer/Makefile b/x11-fm/FSViewer/Makefile
index 2256a9df73cf..3ca486cd7245 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 c623cf6dccc3..f35c69987930 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 62a6668edd22..418601d2fee2 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 2f624f2c0cf7..ebd22923967b 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 5fc7189f8f0b..b4c0b6d05e07 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 9068244a8a4c..3f00d47ec4b2 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 da4ae47f2d13..0cd18ed3f171 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 ff96073acf2f..2a36f6208fe3 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 b32887a848a9..d0ba890c8dc0 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 a8f4cd3f075f..e3bd9388e664 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 1bdb06359cd1..2d1eaabc945c 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 a57ebffee108..0d6276960970 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 8bb2766d25de..2ce5dc73de14 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 d2d24b011d19..8bbdc0fbdba2 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 de342584788a..5d0cff957986 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 e212bd339be2..a41c07df27e8 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 c5ac261e27cb..45df6468be42 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 a00a8964689b..09db8cf1e3b1 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 fdc2b0e22b38..1c520f244867 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 805b347a0a46..8e34ead06c62 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 620b27b03efc..a0aca6330ad6 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 5ffebc978b52..04a00e2783d2 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 620b27b03efc..a0aca6330ad6 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 5ffebc978b52..04a00e2783d2 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 886f8af78fea..8f4821c82c9b 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 da42fb00bf95..cce3ebe7420f 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 55542c59aeae..7703d0c14384 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 7a1f7b218bdf..010e964206fc 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 ba8f5ff8839c..6f89cdffdd58 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 69ea2de50531..165ea48ec389 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 afb7b56a3b58..ec10f3743d1b 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 991e301ce573..7b0b2c25b2cc 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 aab8700e6678..fbf320ec6c14 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 8db2ac4feff6..fbdd9a6bbfab 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 900729cd23cf..8fd7ccb62613 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 72a795f9fc78..499a5b0ff6a2 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 5dc18f8d77d6..46ff339a8bd0 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 837d55870454..fa9c51b241cd 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 42b53b0b41ec..e63360ab1d51 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 8399dc40da28..470c10dcf1a1 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 fe2d6cdf9337..29dc375210c2 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 319689359ccc..d1c93f89407c 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 048c13ac2296..c8d2232c77fd 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 402b0d6cc49b..7b01073f63b2 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 f6afb2ad7b52..c62e81156ea6 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 7fc450474f50..03b2c65eb686 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 84e3a5246336..ba7ab1b60182 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 075323292851..671734947a6a 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 d0efc886d6a0..da23d26a68d5 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}/
 
diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index 01b23b18637b..e98e92ae4b97 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -17,20 +17,63 @@
     SUBDIR += artwiz-fonts
     SUBDIR += avifonts
     SUBDIR += bdfresize
+    SUBDIR += bdftopcf
     SUBDIR += bitmap-fonts
     SUBDIR += bitstream-vera
     SUBDIR += code2000
     SUBDIR += cyberbit-ttfonts
     SUBDIR += cyr-rfx
     SUBDIR += dejavu
+    SUBDIR += encodings
     SUBDIR += etlfonts
     SUBDIR += farsifonts
     SUBDIR += fntsample
+    SUBDIR += font-adobe-100dpi
+    SUBDIR += font-adobe-75dpi
+    SUBDIR += font-adobe-utopia-100dpi
+    SUBDIR += font-adobe-utopia-75dpi
+    SUBDIR += font-adobe-utopia-type1
+    SUBDIR += font-alias
+    SUBDIR += font-arabic-misc
+    SUBDIR += font-bh-100dpi
+    SUBDIR += font-bh-75dpi
+    SUBDIR += font-bh-lucidatypewriter-100dpi
+    SUBDIR += font-bh-lucidatypewriter-75dpi
+    SUBDIR += font-bh-ttf
+    SUBDIR += font-bh-type1
+    SUBDIR += font-bitstream-100dpi
+    SUBDIR += font-bitstream-75dpi
+    SUBDIR += font-bitstream-speedo
+    SUBDIR += font-bitstream-type1
+    SUBDIR += font-cronyx-cyrillic
+    SUBDIR += font-cursor-misc
+    SUBDIR += font-daewoo-misc
+    SUBDIR += font-dec-misc
+    SUBDIR += font-ibm-type1
+    SUBDIR += font-isas-misc
+    SUBDIR += font-jis-misc
+    SUBDIR += font-micro-misc
+    SUBDIR += font-misc-cyrillic
+    SUBDIR += font-misc-ethiopic
+    SUBDIR += font-misc-meltho
+    SUBDIR += font-misc-misc
+    SUBDIR += font-mutt-misc
+    SUBDIR += font-schumacher-misc
+    SUBDIR += font-screen-cyrillic
+    SUBDIR += font-sony-misc
+    SUBDIR += font-sun-misc
+    SUBDIR += font-util
+    SUBDIR += font-winitzki-cyrillic
+    SUBDIR += font-xfree86-type1
+    SUBDIR += fontcacheproto
     SUBDIR += fontconfig
     SUBDIR += fontconfig-reference
     SUBDIR += fonts-te
+    SUBDIR += fontsproto
+    SUBDIR += fonttosfnt
     SUBDIR += freefont-ttf
     SUBDIR += freefonts
+    SUBDIR += fslsfonts
     SUBDIR += geminifonts
     SUBDIR += gentium
     SUBDIR += getbdf
@@ -41,6 +84,10 @@
     SUBDIR += junicode
     SUBDIR += lfpfonts-fix
     SUBDIR += lfpfonts-var
+    SUBDIR += libFS
+    SUBDIR += libfontenc
+    SUBDIR += libXfont
+    SUBDIR += libXfontcache
     SUBDIR += libXft
     SUBDIR += linux-fontconfig
     SUBDIR += manu-gothica
@@ -48,6 +95,8 @@
     SUBDIR += mgopen
     SUBDIR += mkbold
     SUBDIR += mkbold-mkitalic
+    SUBDIR += mkfontdir
+    SUBDIR += mkfontscale
     SUBDIR += mkitalic
     SUBDIR += mozilla-fonts
     SUBDIR += nexfontsel
@@ -61,6 +110,7 @@
     SUBDIR += proggy_fonts
     SUBDIR += sgifonts
     SUBDIR += sharefonts
+    SUBDIR += showfont
     SUBDIR += suxus
     SUBDIR += terminus-font
     SUBDIR += texcm-ttf
@@ -72,12 +122,17 @@
     SUBDIR += urwfonts-ttf
     SUBDIR += webfonts
     SUBDIR += wqy
+    SUBDIR += xf86bigfontproto
     SUBDIR += xfed
+    SUBDIR += xfs
+    SUBDIR += xfsinfo
+    SUBDIR += xfontsel
+    SUBDIR += xlsfonts
     SUBDIR += xmbdfed
+    SUBDIR += xorg-fonts
     SUBDIR += xorg-fonts-100dpi
     SUBDIR += xorg-fonts-75dpi
     SUBDIR += xorg-fonts-cyrillic
-    SUBDIR += xorg-fonts-encodings
     SUBDIR += xorg-fonts-miscbitmaps
     SUBDIR += xorg-fonts-truetype
     SUBDIR += xorg-fonts-type1
diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile
index 4ec99aabc26e..6e3f9089a526 100644
--- a/x11-fonts/XFree86-4-font100dpi/Makefile
+++ b/x11-fonts/XFree86-4-font100dpi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	font100dpi
 PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile
index d053307b77cd..fa9713170876 100644
--- a/x11-fonts/XFree86-4-font75dpi/Makefile
+++ b/x11-fonts/XFree86-4-font75dpi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	font75dpi
 PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile
index 34c545c17487..21b62333608d 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/Makefile
+++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fontCyrillic
 PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
index bf4638defec3..02eeb9f273d1 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fontDefaultBitmaps
 PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile
index 71be1f74c2b7..e5ea1d9c07c0 100644
--- a/x11-fonts/XFree86-4-fontEncodings/Makefile
+++ b/x11-fonts/XFree86-4-fontEncodings/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fontEncodings
 PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR= ${PORTVERSION}
@@ -19,7 +19,7 @@ COMMENT=	XFree86-4 font encoding files
 
 BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 
-CONFLICTS=	xorg-fonts-encodings-*
+CONFLICTS=	encodings-*
 
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile
index 07944ef57e22..d1120c797035 100644
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fontScalable
 PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-fonts/Xg/Makefile b/x11-fonts/Xg/Makefile
index 959e1eb0199d..9d77873f1b13 100644
--- a/x11-fonts/Xg/Makefile
+++ b/x11-fonts/Xg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libXgFonts
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts plan9
 MASTER_SITES=	ftp://ftp.cs.usyd.edu.au/matty/unicode/
 DISTNAME=	libXg.utf.fonts
diff --git a/x11-fonts/arkpandora/Makefile b/x11-fonts/arkpandora/Makefile
index 343d3799e9a9..535510ca68c2 100644
--- a/x11-fonts/arkpandora/Makefile
+++ b/x11-fonts/arkpandora/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	arkpandora
 PORTVERSION=	2.04
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.users.bigpond.net.au/gavindi/
 DISTNAME=	ttf-${PORTNAME}-${PORTVERSION}
diff --git a/x11-fonts/artwiz-aleczapka-de/Makefile b/x11-fonts/artwiz-aleczapka-de/Makefile
index 00ebe4534314..9d88c0142187 100644
--- a/x11-fonts/artwiz-aleczapka-de/Makefile
+++ b/x11-fonts/artwiz-aleczapka-de/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		artwiz-aleczapka-de
 PORTVERSION=		1.3
+PORTREVISION=	1
 CATEGORIES=		x11-fonts
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	artwizaleczapka
diff --git a/x11-fonts/artwiz-aleczapka-se/Makefile b/x11-fonts/artwiz-aleczapka-se/Makefile
index 31a1f05394f2..5379d1b99a09 100644
--- a/x11-fonts/artwiz-aleczapka-se/Makefile
+++ b/x11-fonts/artwiz-aleczapka-se/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		artwiz-aleczapka-se
 PORTVERSION=		1.3
+PORTREVISION=	1
 CATEGORIES=		x11-fonts
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	artwizaleczapka
diff --git a/x11-fonts/artwiz-aleczapka/Makefile b/x11-fonts/artwiz-aleczapka/Makefile
index bce6d8d5d68f..85e0292d559e 100644
--- a/x11-fonts/artwiz-aleczapka/Makefile
+++ b/x11-fonts/artwiz-aleczapka/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		artwiz-aleczapka-en
 PORTVERSION=		1.3
+PORTREVISION=	1
 CATEGORIES=		x11-fonts
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	artwizaleczapka
diff --git a/x11-fonts/artwiz-fonts/Makefile b/x11-fonts/artwiz-fonts/Makefile
index 97562e051646..edfae236aadb 100644
--- a/x11-fonts/artwiz-fonts/Makefile
+++ b/x11-fonts/artwiz-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	artwiz-fonts
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.xs4all.nl/~hanb/software/fluxbox/ \
 		http://www.cus.org.uk/~dom/distfiles/artwiz-fonts/
diff --git a/x11-fonts/avifonts/Makefile b/x11-fonts/avifonts/Makefile
index cc85c2f506cc..121c95b70c4a 100644
--- a/x11-fonts/avifonts/Makefile
+++ b/x11-fonts/avifonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	avifonts
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://graphis.hellug.gr/packages/
 DISTNAME=	avifonts
diff --git a/x11-fonts/bdfresize/Makefile b/x11-fonts/bdfresize/Makefile
index fd8bf1d05a03..21e9f10d4103 100644
--- a/x11-fonts/bdfresize/Makefile
+++ b/x11-fonts/bdfresize/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bdfresize
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/
 
diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile
new file mode 100644
index 000000000000..9b34c3ca6013
--- /dev/null
+++ b/x11-fonts/bdftopcf/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	bdftopcf
+# Date Created:				28 Aug 2005
+# Whom:					Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	bdftopcf
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Convert X font from BDF to PCF
+
+XORG_CAT=	app
+USE_XORG=	xfont
+
+MAN1=		bdftopcf.1
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/bdftopcf/distinfo b/x11-fonts/bdftopcf/distinfo
new file mode 100644
index 000000000000..df5967d8f544
--- /dev/null
+++ b/x11-fonts/bdftopcf/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/bdftopcf-1.0.0.tar.bz2) = 41f4ac6760ef5e671ba8d4baa7236f12
+SHA256 (xorg/app/bdftopcf-1.0.0.tar.bz2) = 8c01b85eab01f35ed6bc9d597d4c6c76cf9ddbe2596d9120d66e66135df1f9a1
+SIZE (xorg/app/bdftopcf-1.0.0.tar.bz2) = 74756
diff --git a/x11-fonts/bdftopcf/pkg-descr b/x11-fonts/bdftopcf/pkg-descr
new file mode 100644
index 000000000000..13bd0efdf00a
--- /dev/null
+++ b/x11-fonts/bdftopcf/pkg-descr
@@ -0,0 +1,5 @@
+This package contains bdftopcf, a font compiler for the X server and font
+server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/bdftopcf/pkg-plist b/x11-fonts/bdftopcf/pkg-plist
new file mode 100644
index 000000000000..2cab9edfa503
--- /dev/null
+++ b/x11-fonts/bdftopcf/pkg-plist
@@ -0,0 +1 @@
+bin/bdftopcf
diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile
index 2528c1cd584c..342ba0512467 100644
--- a/x11-fonts/bitmap-fonts/Makefile
+++ b/x11-fonts/bitmap-fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bitmap-fonts
 PORTVERSION=	${BITMAP_FONTS_VER}
+PORTREVISION=	1
 CATEGORIES=	x11-fonts elisp
 MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/bitmap/ \
 		ftp://ftp.jpl.org/pub/elisp/bitmap/snapshots/
diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index 0124e6f85e53..559ff0d0c858 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bitstream-vera
 PORTVERSION=	1.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ttf-${PORTNAME}/1.10
diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index b8c9fbce3f48..3649ecfd2df6 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	code2000
 PORTVERSION=	1.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://code2000.net/
 DISTFILES=	${PORTNAME:U}${EXTRACT_SUFX:U}
diff --git a/x11-fonts/code2000/distinfo b/x11-fonts/code2000/distinfo
index 9f88f3865292..a359408d2cbb 100644
--- a/x11-fonts/code2000/distinfo
+++ b/x11-fonts/code2000/distinfo
@@ -1,3 +1,3 @@
-MD5 (code2000-1.16_1/CODE2000.ZIP) = d297dcf4d28e9a494c4d7eb5f36411df
-SHA256 (code2000-1.16_1/CODE2000.ZIP) = 3903565600336112c108d58f35dc73dcd17d4cc7a06010508611d877d911ce5a
-SIZE (code2000-1.16_1/CODE2000.ZIP) = 3710725
+MD5 (code2000-1.16_2/CODE2000.ZIP) = d297dcf4d28e9a494c4d7eb5f36411df
+SHA256 (code2000-1.16_2/CODE2000.ZIP) = 3903565600336112c108d58f35dc73dcd17d4cc7a06010508611d877d911ce5a
+SIZE (code2000-1.16_2/CODE2000.ZIP) = 3710725
diff --git a/x11-fonts/cyberbit-ttfonts/Makefile b/x11-fonts/cyberbit-ttfonts/Makefile
index 78c2a3a2c542..328cb769cd74 100644
--- a/x11-fonts/cyberbit-ttfonts/Makefile
+++ b/x11-fonts/cyberbit-ttfonts/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	cyberbit-ttfonts
 PORTVERSION=	2.0.20050220
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/
 DISTFILES=	Cyberbit.ZIP
diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile
index 5cd7bd449809..bdf91cdf176a 100644
--- a/x11-fonts/cyr-rfx/Makefile
+++ b/x11-fonts/cyr-rfx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cyr-rfx-${CYR_RFX_ENCODING}
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts ukrainian russian
 MASTER_SITES=	ftp://ftp.ptc.spbu.ru/mirror/ftp.inp.nsk.su/%SUBDIR%/ \
 		ftp://ftp.inp.nsk.su/%SUBDIR%/
diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile
index bb93d84a81e3..f74b23ab3fa0 100644
--- a/x11-fonts/dejavu/Makefile
+++ b/x11-fonts/dejavu/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	dejavu
 DISTVERSION=	2.15
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile
new file mode 100644
index 000000000000..c2b67b538114
--- /dev/null
+++ b/x11-fonts/encodings/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:    encodings
+# Date created:				Oct 29 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	encodings
+PORTVERSION=	1.0.2
+PORTEPOCH=	1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Encoding fonts
+
+XORG_CAT=	font
+USE_XORG=	fontutil
+FONTDIR=	encodings/large encodings
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/encodings/distinfo b/x11-fonts/encodings/distinfo
new file mode 100644
index 000000000000..aa62d5a86549
--- /dev/null
+++ b/x11-fonts/encodings/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/encodings-1.0.2.tar.bz2) = 11adda157b03d63fd61d95ad7ef00466
+SHA256 (xorg/font/encodings-1.0.2.tar.bz2) = 6d19107b66bbc96c085b0c2dd286ece22dcb73ba56a17fc95b0f2cbc5d6f4eac
+SIZE (xorg/font/encodings-1.0.2.tar.bz2) = 571623
diff --git a/x11-fonts/encodings/pkg-descr b/x11-fonts/encodings/pkg-descr
new file mode 100644
index 000000000000..308c83e6a2e2
--- /dev/null
+++ b/x11-fonts/encodings/pkg-descr
@@ -0,0 +1,4 @@
+This package contains encondings X.Org fonts.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-fonts/encodings/pkg-plist b/x11-fonts/encodings/pkg-plist
new file mode 100644
index 000000000000..36d3fe3951f7
--- /dev/null
+++ b/x11-fonts/encodings/pkg-plist
@@ -0,0 +1,51 @@
+lib/X11/fonts/encodings/large/big5.eten-0.enc.gz
+lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz
+lib/X11/fonts/encodings/large/cns11643-1.enc.gz
+lib/X11/fonts/encodings/large/cns11643-2.enc.gz
+lib/X11/fonts/encodings/large/cns11643-3.enc.gz
+lib/X11/fonts/encodings/large/gb18030-0.enc.gz
+lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz
+lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz
+lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz
+lib/X11/fonts/encodings/large/gbk-0.enc.gz
+lib/X11/fonts/encodings/large/jisx0201.1976-0.enc.gz
+lib/X11/fonts/encodings/large/jisx0208.1990-0.enc.gz
+lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz
+lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz
+lib/X11/fonts/encodings/large/ksc5601.1992-3.enc.gz
+lib/X11/fonts/encodings/large/sun.unicode.india-0.enc.gz
+lib/X11/fonts/encodings/large/encodings.dir
+lib/X11/fonts/encodings/adobe-dingbats.enc.gz
+lib/X11/fonts/encodings/adobe-standard.enc.gz
+lib/X11/fonts/encodings/adobe-symbol.enc.gz
+lib/X11/fonts/encodings/armscii-8.enc.gz
+lib/X11/fonts/encodings/ascii-0.enc.gz
+lib/X11/fonts/encodings/dec-special.enc.gz
+lib/X11/fonts/encodings/ibm-cp437.enc.gz
+lib/X11/fonts/encodings/ibm-cp850.enc.gz
+lib/X11/fonts/encodings/ibm-cp852.enc.gz
+lib/X11/fonts/encodings/ibm-cp866.enc.gz
+lib/X11/fonts/encodings/iso8859-11.enc.gz
+lib/X11/fonts/encodings/iso8859-13.enc.gz
+lib/X11/fonts/encodings/iso8859-16.enc.gz
+lib/X11/fonts/encodings/iso8859-6.16.enc.gz
+lib/X11/fonts/encodings/iso8859-6.8x.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1250.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1251.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1252.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1253.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1254.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1255.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1256.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1257.enc.gz
+lib/X11/fonts/encodings/microsoft-cp1258.enc.gz
+lib/X11/fonts/encodings/microsoft-win3.1.enc.gz
+lib/X11/fonts/encodings/mulearabic-0.enc.gz
+lib/X11/fonts/encodings/mulearabic-1.enc.gz
+lib/X11/fonts/encodings/mulearabic-2.enc.gz
+lib/X11/fonts/encodings/mulelao-1.enc.gz
+lib/X11/fonts/encodings/suneu-greek.enc.gz
+lib/X11/fonts/encodings/tcvn-0.enc.gz
+lib/X11/fonts/encodings/tis620-2.enc.gz
+lib/X11/fonts/encodings/viscii1.1-1.enc.gz
+lib/X11/fonts/encodings/encodings.dir
diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile
index cee819e98877..e386b6f7eb62 100644
--- a/x11-fonts/etlfonts/Makefile
+++ b/x11-fonts/etlfonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	etlfonts-noncjk
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# disappeared
 DISTNAME=	non-cjk
diff --git a/x11-fonts/farsifonts/Makefile b/x11-fonts/farsifonts/Makefile
index 1e5b29062a7f..4c3c6f922f97 100644
--- a/x11-fonts/farsifonts/Makefile
+++ b/x11-fonts/farsifonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	farsifonts
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.unixified.net/distfiles/ \
 		http://www.farsiweb.info/font/
diff --git a/x11-fonts/fntsample/Makefile b/x11-fonts/fntsample/Makefile
index e17a69c891bb..41e4ff7e4155 100644
--- a/x11-fonts/fntsample/Makefile
+++ b/x11-fonts/fntsample/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fntsample
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF http://unicode.org/Public/5.0.0/ucd/:unidata
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Blocks.txt:unidata
diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile
new file mode 100644
index 000000000000..7e6bea6ef0c2
--- /dev/null
+++ b/x11-fonts/font-adobe-100dpi/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:    font-adobe-100dpi
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-adobe-100dpi
+PORTVERSION=	1.0.0
+PORTREVISION=	1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Adobe 100dpi font
+
+XORG_CAT=	font
+USE_XORG=	fontutil
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-100dpi/distinfo b/x11-fonts/font-adobe-100dpi/distinfo
new file mode 100644
index 000000000000..2a18121b3ad6
--- /dev/null
+++ b/x11-fonts/font-adobe-100dpi/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-adobe-100dpi-1.0.0.tar.bz2) = 443acfe70e26716282f9068730fe92c4
+SHA256 (xorg/font/font-adobe-100dpi-1.0.0.tar.bz2) = f16c1b3a1625c9a225aff2ac12067bd3907d157b0c60625689a5080f092e9a19
+SIZE (xorg/font/font-adobe-100dpi-1.0.0.tar.bz2) = 1064316
diff --git a/x11-fonts/font-adobe-100dpi/pkg-descr b/x11-fonts/font-adobe-100dpi/pkg-descr
new file mode 100644
index 000000000000..a2b4649a0ec8
--- /dev/null
+++ b/x11-fonts/font-adobe-100dpi/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Adobe 100dpi font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts-100dpi/pkg-plist b/x11-fonts/font-adobe-100dpi/pkg-plist
index 3abfa064b642..66313fd27e5e 100644
--- a/x11-fonts/xorg-fonts-100dpi/pkg-plist
+++ b/x11-fonts/font-adobe-100dpi/pkg-plist
@@ -1,227 +1,3 @@
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTBI__10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTBI__12.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTBI__14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTBI__18.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTBI__24.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTB___10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTB___10.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTB___12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTB___12.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTB___14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTB___14.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTB___18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTB___18.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTB___24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTB___24.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTI___10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTI___10.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTI___12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTI___12.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTI___14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTI___14.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTI___18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTI___18.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTI___24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTI___24.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTRG__10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTRG__12.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTRG__14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTRG__18.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/UTRG__24.pcf.gz
-lib/X11/fonts/100dpi/charB08.pcf.gz
-lib/X11/fonts/100dpi/charB10.pcf.gz
-lib/X11/fonts/100dpi/charB12.pcf.gz
-lib/X11/fonts/100dpi/charB14.pcf.gz
-lib/X11/fonts/100dpi/charB18.pcf.gz
-lib/X11/fonts/100dpi/charB24.pcf.gz
-lib/X11/fonts/100dpi/charBI08.pcf.gz
-lib/X11/fonts/100dpi/charBI10.pcf.gz
-lib/X11/fonts/100dpi/charBI12.pcf.gz
-lib/X11/fonts/100dpi/charBI14.pcf.gz
-lib/X11/fonts/100dpi/charBI18.pcf.gz
-lib/X11/fonts/100dpi/charBI24.pcf.gz
-lib/X11/fonts/100dpi/charI08.pcf.gz
-lib/X11/fonts/100dpi/charI10.pcf.gz
-lib/X11/fonts/100dpi/charI12.pcf.gz
-lib/X11/fonts/100dpi/charI14.pcf.gz
-lib/X11/fonts/100dpi/charI18.pcf.gz
-lib/X11/fonts/100dpi/charI24.pcf.gz
-lib/X11/fonts/100dpi/charR08.pcf.gz
-lib/X11/fonts/100dpi/charR10.pcf.gz
-lib/X11/fonts/100dpi/charR12.pcf.gz
-lib/X11/fonts/100dpi/charR14.pcf.gz
-lib/X11/fonts/100dpi/charR18.pcf.gz
-lib/X11/fonts/100dpi/charR24.pcf.gz
 lib/X11/fonts/100dpi/courB08-ISO8859-1.pcf.gz
 lib/X11/fonts/100dpi/courB08-ISO8859-10.pcf.gz
 lib/X11/fonts/100dpi/courB08-ISO8859-13.pcf.gz
@@ -462,10 +238,6 @@ lib/X11/fonts/100dpi/courR24-ISO8859-3.pcf.gz
 lib/X11/fonts/100dpi/courR24-ISO8859-4.pcf.gz
 lib/X11/fonts/100dpi/courR24-ISO8859-9.pcf.gz
 lib/X11/fonts/100dpi/courR24.pcf.gz
-lib/X11/fonts/100dpi/encodings.dir
-lib/X11/fonts/100dpi/fonts.alias
-lib/X11/fonts/100dpi/fonts.dir
-lib/X11/fonts/100dpi/fonts.scale
 lib/X11/fonts/100dpi/helvB08-ISO8859-1.pcf.gz
 lib/X11/fonts/100dpi/helvB08-ISO8859-10.pcf.gz
 lib/X11/fonts/100dpi/helvB08-ISO8859-13.pcf.gz
@@ -706,706 +478,6 @@ lib/X11/fonts/100dpi/helvR24-ISO8859-3.pcf.gz
 lib/X11/fonts/100dpi/helvR24-ISO8859-4.pcf.gz
 lib/X11/fonts/100dpi/helvR24-ISO8859-9.pcf.gz
 lib/X11/fonts/100dpi/helvR24.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS08.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS10.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS12.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS14.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS18.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS19.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBIS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBIS24.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS08.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS10.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS12.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS14.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS18.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS19.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luBS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luBS24.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS08.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS10.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS12.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS14.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS18.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS19.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luIS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luIS24.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS08.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS10.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS12.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS14.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS18.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS19.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/luRS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/luRS24.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB08.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB10.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB12.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB14.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB18.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB19.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubB24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubB24.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI08.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI10.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI12.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI14.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI18.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI19.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubBI24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubBI24.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI08.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI10.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI12.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI14.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI18.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI19.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubI24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubI24.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR08.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR10.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR12.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR14.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR18.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR19.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lubR24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lubR24.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS08.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS10.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS12.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS14.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS18.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS19.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutBS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutBS24.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS08-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS08.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS10-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS10.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS12-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS12.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS14-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS14.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS18-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS18.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS19-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS19.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-1.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-10.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-13.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-14.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-15.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-2.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-3.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-4.pcf.gz
-lib/X11/fonts/100dpi/lutRS24-ISO8859-9.pcf.gz
-lib/X11/fonts/100dpi/lutRS24.pcf.gz
 lib/X11/fonts/100dpi/ncenB08-ISO8859-1.pcf.gz
 lib/X11/fonts/100dpi/ncenB08-ISO8859-10.pcf.gz
 lib/X11/fonts/100dpi/ncenB08-ISO8859-13.pcf.gz
@@ -1652,10 +724,6 @@ lib/X11/fonts/100dpi/symb12.pcf.gz
 lib/X11/fonts/100dpi/symb14.pcf.gz
 lib/X11/fonts/100dpi/symb18.pcf.gz
 lib/X11/fonts/100dpi/symb24.pcf.gz
-lib/X11/fonts/100dpi/tech14.pcf.gz
-lib/X11/fonts/100dpi/techB14.pcf.gz
-lib/X11/fonts/100dpi/term14.pcf.gz
-lib/X11/fonts/100dpi/termB14.pcf.gz
 lib/X11/fonts/100dpi/timB08-ISO8859-1.pcf.gz
 lib/X11/fonts/100dpi/timB08-ISO8859-10.pcf.gz
 lib/X11/fonts/100dpi/timB08-ISO8859-13.pcf.gz
@@ -1896,8 +964,3 @@ lib/X11/fonts/100dpi/timR24-ISO8859-3.pcf.gz
 lib/X11/fonts/100dpi/timR24-ISO8859-4.pcf.gz
 lib/X11/fonts/100dpi/timR24-ISO8859-9.pcf.gz
 lib/X11/fonts/100dpi/timR24.pcf.gz
-@exec command fc-cache -v %D/lib/X11/fonts/100dpi 2>/dev/null || true
-@unexec rm %D/lib/X11/fonts/100dpi/fonts.cache-1 2>/dev/null || true
-@unexec command fc-cache -v %D/lib/X11/fonts/100dpi 2>/dev/null || true
-@unexec if [ -e %D/lib/X11/fonts/100dpi/fonts.cache-1 -a ! -s %D/lib/X11/fonts/100dpi/fonts.cache-1 ]; then rm %D/lib/X11/fonts/100dpi/fonts.cache-1; fi
-@dirrmtry lib/X11/fonts/100dpi
diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile
new file mode 100644
index 000000000000..ac20229d0b2a
--- /dev/null
+++ b/x11-fonts/font-adobe-75dpi/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:    font-adobe-75dpi
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-adobe-75dpi
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Adobe 75dpi font
+
+XORG_CAT=	font
+USE_XORG=	fontutil
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-75dpi/distinfo b/x11-fonts/font-adobe-75dpi/distinfo
new file mode 100644
index 000000000000..07a503bc94bd
--- /dev/null
+++ b/x11-fonts/font-adobe-75dpi/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-adobe-75dpi-1.0.0.tar.bz2) = 813b5d3723c84388a938ab6732e1329c
+SHA256 (xorg/font/font-adobe-75dpi-1.0.0.tar.bz2) = d62745bee0f5e4f355f237020667d783ae9fea5f18a864d748ae1287bd176339
+SIZE (xorg/font/font-adobe-75dpi-1.0.0.tar.bz2) = 846752
diff --git a/x11-fonts/font-adobe-75dpi/pkg-descr b/x11-fonts/font-adobe-75dpi/pkg-descr
new file mode 100644
index 000000000000..cd48a40db782
--- /dev/null
+++ b/x11-fonts/font-adobe-75dpi/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Adobe 75dpi font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts-75dpi/pkg-plist b/x11-fonts/font-adobe-75dpi/pkg-plist
index b8153cdcb280..9f0932d8b03e 100644
--- a/x11-fonts/xorg-fonts-75dpi/pkg-plist
+++ b/x11-fonts/font-adobe-75dpi/pkg-plist
@@ -1,227 +1,3 @@
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTBI__10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTBI__12.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTBI__14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTBI__18.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTBI__24.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTB___10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTB___10.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTB___12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTB___12.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTB___14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTB___14.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTB___18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTB___18.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTB___24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTB___24.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTI___10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTI___10.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTI___12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTI___12.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTI___14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTI___14.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTI___18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTI___18.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTI___24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTI___24.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTRG__10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTRG__12.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTRG__14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTRG__18.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/UTRG__24.pcf.gz
-lib/X11/fonts/75dpi/charB08.pcf.gz
-lib/X11/fonts/75dpi/charB10.pcf.gz
-lib/X11/fonts/75dpi/charB12.pcf.gz
-lib/X11/fonts/75dpi/charB14.pcf.gz
-lib/X11/fonts/75dpi/charB18.pcf.gz
-lib/X11/fonts/75dpi/charB24.pcf.gz
-lib/X11/fonts/75dpi/charBI08.pcf.gz
-lib/X11/fonts/75dpi/charBI10.pcf.gz
-lib/X11/fonts/75dpi/charBI12.pcf.gz
-lib/X11/fonts/75dpi/charBI14.pcf.gz
-lib/X11/fonts/75dpi/charBI18.pcf.gz
-lib/X11/fonts/75dpi/charBI24.pcf.gz
-lib/X11/fonts/75dpi/charI08.pcf.gz
-lib/X11/fonts/75dpi/charI10.pcf.gz
-lib/X11/fonts/75dpi/charI12.pcf.gz
-lib/X11/fonts/75dpi/charI14.pcf.gz
-lib/X11/fonts/75dpi/charI18.pcf.gz
-lib/X11/fonts/75dpi/charI24.pcf.gz
-lib/X11/fonts/75dpi/charR08.pcf.gz
-lib/X11/fonts/75dpi/charR10.pcf.gz
-lib/X11/fonts/75dpi/charR12.pcf.gz
-lib/X11/fonts/75dpi/charR14.pcf.gz
-lib/X11/fonts/75dpi/charR18.pcf.gz
-lib/X11/fonts/75dpi/charR24.pcf.gz
 lib/X11/fonts/75dpi/courB08-ISO8859-1.pcf.gz
 lib/X11/fonts/75dpi/courB08-ISO8859-10.pcf.gz
 lib/X11/fonts/75dpi/courB08-ISO8859-13.pcf.gz
@@ -462,10 +238,6 @@ lib/X11/fonts/75dpi/courR24-ISO8859-3.pcf.gz
 lib/X11/fonts/75dpi/courR24-ISO8859-4.pcf.gz
 lib/X11/fonts/75dpi/courR24-ISO8859-9.pcf.gz
 lib/X11/fonts/75dpi/courR24.pcf.gz
-lib/X11/fonts/75dpi/encodings.dir
-lib/X11/fonts/75dpi/fonts.alias
-lib/X11/fonts/75dpi/fonts.dir
-lib/X11/fonts/75dpi/fonts.scale
 lib/X11/fonts/75dpi/helvB08-ISO8859-1.pcf.gz
 lib/X11/fonts/75dpi/helvB08-ISO8859-10.pcf.gz
 lib/X11/fonts/75dpi/helvB08-ISO8859-13.pcf.gz
@@ -706,706 +478,6 @@ lib/X11/fonts/75dpi/helvR24-ISO8859-3.pcf.gz
 lib/X11/fonts/75dpi/helvR24-ISO8859-4.pcf.gz
 lib/X11/fonts/75dpi/helvR24-ISO8859-9.pcf.gz
 lib/X11/fonts/75dpi/helvR24.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS08.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS10.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS12.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS14.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS18.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS19.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBIS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBIS24.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS08.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS10.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS12.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS14.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS18.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS19.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luBS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luBS24.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS08.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS10.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS12.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS14.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS18.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS19.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luIS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luIS24.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS08.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS10.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS12.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS14.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS18.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS19.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/luRS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/luRS24.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB08.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB10.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB12.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB14.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB18.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB19.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubB24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubB24.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI08.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI10.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI12.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI14.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI18.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI19.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubBI24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubBI24.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI08.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI10.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI12.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI14.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI18.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI19.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubI24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubI24.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR08.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR10.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR12.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR14.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR18.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR19.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lubR24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lubR24.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS08.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS10.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS12.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS14.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS18.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS19.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutBS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutBS24.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS08-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS08.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS10-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS10.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS12-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS12.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS14-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS14.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS18-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS18.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS19-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS19.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-1.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-10.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-13.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-14.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-15.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-2.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-3.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-4.pcf.gz
-lib/X11/fonts/75dpi/lutRS24-ISO8859-9.pcf.gz
-lib/X11/fonts/75dpi/lutRS24.pcf.gz
 lib/X11/fonts/75dpi/ncenB08-ISO8859-1.pcf.gz
 lib/X11/fonts/75dpi/ncenB08-ISO8859-10.pcf.gz
 lib/X11/fonts/75dpi/ncenB08-ISO8859-13.pcf.gz
@@ -1652,10 +724,6 @@ lib/X11/fonts/75dpi/symb12.pcf.gz
 lib/X11/fonts/75dpi/symb14.pcf.gz
 lib/X11/fonts/75dpi/symb18.pcf.gz
 lib/X11/fonts/75dpi/symb24.pcf.gz
-lib/X11/fonts/75dpi/tech14.pcf.gz
-lib/X11/fonts/75dpi/techB14.pcf.gz
-lib/X11/fonts/75dpi/term14.pcf.gz
-lib/X11/fonts/75dpi/termB14.pcf.gz
 lib/X11/fonts/75dpi/timB08-ISO8859-1.pcf.gz
 lib/X11/fonts/75dpi/timB08-ISO8859-10.pcf.gz
 lib/X11/fonts/75dpi/timB08-ISO8859-13.pcf.gz
@@ -1896,8 +964,3 @@ lib/X11/fonts/75dpi/timR24-ISO8859-3.pcf.gz
 lib/X11/fonts/75dpi/timR24-ISO8859-4.pcf.gz
 lib/X11/fonts/75dpi/timR24-ISO8859-9.pcf.gz
 lib/X11/fonts/75dpi/timR24.pcf.gz
-@exec command fc-cache -v %D/lib/X11/fonts/75dpi 2>/dev/null || true
-@unexec rm %D/lib/X11/fonts/75dpi/fonts.cache-1 2>/dev/null || true
-@unexec command fc-cache -v %D/lib/X11/fonts/75dpi 2>/dev/null || true
-@unexec if [ -e %D/lib/X11/fonts/75dpi/fonts.cache-1 -a ! -s %D/lib/X11/fonts/75dpi/fonts.cache-1 ]; then rm %D/lib/X11/fonts/75dpi/fonts.cache-1; fi
-@dirrmtry lib/X11/fonts/75dpi
diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile
new file mode 100644
index 000000000000..f495514c3a37
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-100dpi/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:    font-adobe-utopia-100dpi
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-adobe-utopia-100dpi
+PORTVERSION=	1.0.1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Adobe Utopia 100dpi font
+
+XORG_CAT=	font
+USE_XORG=	fontutil
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-utopia-100dpi/distinfo b/x11-fonts/font-adobe-utopia-100dpi/distinfo
new file mode 100644
index 000000000000..8a8b10eae693
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-100dpi/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2) = 5d28a30efef966f8dbbaff9a6619f01a
+SHA256 (xorg/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2) = 1943e1aa70c169b13bc7a308c8e949267f9ce6327479803203fbf10c06a9b5fe
+SIZE (xorg/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2) = 289990
diff --git a/x11-fonts/font-adobe-utopia-100dpi/pkg-descr b/x11-fonts/font-adobe-utopia-100dpi/pkg-descr
new file mode 100644
index 000000000000..3542947e44ea
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-100dpi/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Adobe Utopia 100dpi font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-100dpi/pkg-plist b/x11-fonts/font-adobe-utopia-100dpi/pkg-plist
new file mode 100644
index 000000000000..a41766529735
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-100dpi/pkg-plist
@@ -0,0 +1,200 @@
+lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTBI__10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTBI__10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTBI__10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTBI__10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTBI__10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTBI__10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTBI__10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTBI__10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTBI__10.pcf.gz
+lib/X11/fonts/100dpi/UTBI__12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTBI__12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTBI__12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTBI__12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTBI__12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTBI__12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTBI__12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTBI__12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTBI__12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTBI__12.pcf.gz
+lib/X11/fonts/100dpi/UTBI__14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTBI__14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTBI__14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTBI__14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTBI__14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTBI__14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTBI__14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTBI__14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTBI__14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTBI__14.pcf.gz
+lib/X11/fonts/100dpi/UTBI__18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTBI__18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTBI__18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTBI__18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTBI__18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTBI__18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTBI__18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTBI__18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTBI__18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTBI__18.pcf.gz
+lib/X11/fonts/100dpi/UTBI__24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTBI__24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTBI__24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTBI__24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTBI__24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTBI__24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTBI__24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTBI__24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTBI__24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTBI__24.pcf.gz
+lib/X11/fonts/100dpi/UTB___10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTB___10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTB___10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTB___10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTB___10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTB___10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTB___10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTB___10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTB___10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTB___10.pcf.gz
+lib/X11/fonts/100dpi/UTB___12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTB___12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTB___12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTB___12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTB___12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTB___12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTB___12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTB___12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTB___12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTB___12.pcf.gz
+lib/X11/fonts/100dpi/UTB___14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTB___14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTB___14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTB___14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTB___14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTB___14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTB___14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTB___14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTB___14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTB___14.pcf.gz
+lib/X11/fonts/100dpi/UTB___18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTB___18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTB___18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTB___18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTB___18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTB___18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTB___18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTB___18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTB___18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTB___18.pcf.gz
+lib/X11/fonts/100dpi/UTB___24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTB___24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTB___24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTB___24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTB___24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTB___24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTB___24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTB___24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTB___24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTB___24.pcf.gz
+lib/X11/fonts/100dpi/UTI___10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTI___10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTI___10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTI___10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTI___10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTI___10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTI___10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTI___10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTI___10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTI___10.pcf.gz
+lib/X11/fonts/100dpi/UTI___12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTI___12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTI___12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTI___12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTI___12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTI___12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTI___12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTI___12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTI___12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTI___12.pcf.gz
+lib/X11/fonts/100dpi/UTI___14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTI___14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTI___14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTI___14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTI___14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTI___14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTI___14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTI___14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTI___14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTI___14.pcf.gz
+lib/X11/fonts/100dpi/UTI___18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTI___18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTI___18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTI___18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTI___18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTI___18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTI___18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTI___18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTI___18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTI___18.pcf.gz
+lib/X11/fonts/100dpi/UTI___24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTI___24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTI___24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTI___24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTI___24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTI___24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTI___24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTI___24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTI___24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTI___24.pcf.gz
+lib/X11/fonts/100dpi/UTRG__10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTRG__10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTRG__10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTRG__10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTRG__10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTRG__10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTRG__10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTRG__10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTRG__10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTRG__10.pcf.gz
+lib/X11/fonts/100dpi/UTRG__12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTRG__12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTRG__12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTRG__12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTRG__12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTRG__12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTRG__12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTRG__12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTRG__12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTRG__12.pcf.gz
+lib/X11/fonts/100dpi/UTRG__14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTRG__14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTRG__14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTRG__14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTRG__14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTRG__14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTRG__14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTRG__14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTRG__14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTRG__14.pcf.gz
+lib/X11/fonts/100dpi/UTRG__18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTRG__18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTRG__18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTRG__18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTRG__18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTRG__18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTRG__18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTRG__18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTRG__18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTRG__18.pcf.gz
+lib/X11/fonts/100dpi/UTRG__24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/UTRG__24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/UTRG__24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/UTRG__24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/UTRG__24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/UTRG__24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/UTRG__24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/UTRG__24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/UTRG__24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/UTRG__24.pcf.gz
diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile
new file mode 100644
index 000000000000..f147da5b9b81
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-75dpi/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:    font-adobe-utopia-75dpi
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-adobe-utopia-75dpi
+PORTVERSION=	1.0.1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Adobe Utopia 75dpi font
+
+XORG_CAT=	font
+USE_XORG=	fontutil
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-utopia-75dpi/distinfo b/x11-fonts/font-adobe-utopia-75dpi/distinfo
new file mode 100644
index 000000000000..b52e56e68d16
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-75dpi/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2) = dd912284e4750023f9682812532fa033
+SHA256 (xorg/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2) = ebd4e2194bbc727e3bbda0f5dc1493fe3a211c7cf77e3d41f93135dd04ca7089
+SIZE (xorg/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2) = 213520
diff --git a/x11-fonts/font-adobe-utopia-75dpi/pkg-descr b/x11-fonts/font-adobe-utopia-75dpi/pkg-descr
new file mode 100644
index 000000000000..e9fa541eeccb
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-75dpi/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Adobe Utopia 75dpi font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-75dpi/pkg-plist b/x11-fonts/font-adobe-utopia-75dpi/pkg-plist
new file mode 100644
index 000000000000..787a8ba9084b
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-75dpi/pkg-plist
@@ -0,0 +1,200 @@
+lib/X11/fonts/75dpi/UTBI__10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTBI__10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTBI__10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTBI__10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTBI__10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTBI__10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTBI__10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTBI__10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTBI__10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTBI__10.pcf.gz
+lib/X11/fonts/75dpi/UTBI__12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTBI__12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTBI__12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTBI__12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTBI__12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTBI__12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTBI__12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTBI__12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTBI__12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTBI__12.pcf.gz
+lib/X11/fonts/75dpi/UTBI__14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTBI__14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTBI__14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTBI__14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTBI__14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTBI__14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTBI__14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTBI__14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTBI__14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTBI__14.pcf.gz
+lib/X11/fonts/75dpi/UTBI__18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTBI__18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTBI__18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTBI__18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTBI__18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTBI__18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTBI__18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTBI__18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTBI__18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTBI__18.pcf.gz
+lib/X11/fonts/75dpi/UTBI__24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTBI__24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTBI__24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTBI__24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTBI__24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTBI__24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTBI__24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTBI__24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTBI__24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTBI__24.pcf.gz
+lib/X11/fonts/75dpi/UTB___10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTB___10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTB___10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTB___10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTB___10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTB___10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTB___10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTB___10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTB___10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTB___10.pcf.gz
+lib/X11/fonts/75dpi/UTB___12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTB___12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTB___12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTB___12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTB___12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTB___12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTB___12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTB___12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTB___12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTB___12.pcf.gz
+lib/X11/fonts/75dpi/UTB___14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTB___14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTB___14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTB___14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTB___14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTB___14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTB___14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTB___14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTB___14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTB___14.pcf.gz
+lib/X11/fonts/75dpi/UTB___18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTB___18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTB___18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTB___18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTB___18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTB___18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTB___18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTB___18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTB___18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTB___18.pcf.gz
+lib/X11/fonts/75dpi/UTB___24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTB___24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTB___24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTB___24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTB___24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTB___24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTB___24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTB___24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTB___24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTB___24.pcf.gz
+lib/X11/fonts/75dpi/UTI___10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTI___10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTI___10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTI___10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTI___10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTI___10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTI___10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTI___10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTI___10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTI___10.pcf.gz
+lib/X11/fonts/75dpi/UTI___12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTI___12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTI___12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTI___12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTI___12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTI___12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTI___12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTI___12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTI___12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTI___12.pcf.gz
+lib/X11/fonts/75dpi/UTI___14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTI___14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTI___14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTI___14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTI___14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTI___14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTI___14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTI___14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTI___14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTI___14.pcf.gz
+lib/X11/fonts/75dpi/UTI___18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTI___18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTI___18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTI___18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTI___18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTI___18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTI___18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTI___18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTI___18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTI___18.pcf.gz
+lib/X11/fonts/75dpi/UTI___24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTI___24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTI___24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTI___24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTI___24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTI___24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTI___24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTI___24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTI___24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTI___24.pcf.gz
+lib/X11/fonts/75dpi/UTRG__10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTRG__10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTRG__10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTRG__10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTRG__10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTRG__10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTRG__10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTRG__10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTRG__10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTRG__10.pcf.gz
+lib/X11/fonts/75dpi/UTRG__12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTRG__12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTRG__12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTRG__12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTRG__12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTRG__12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTRG__12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTRG__12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTRG__12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTRG__12.pcf.gz
+lib/X11/fonts/75dpi/UTRG__14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTRG__14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTRG__14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTRG__14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTRG__14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTRG__14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTRG__14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTRG__14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTRG__14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTRG__14.pcf.gz
+lib/X11/fonts/75dpi/UTRG__18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTRG__18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTRG__18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTRG__18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTRG__18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTRG__18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTRG__18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTRG__18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTRG__18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTRG__18.pcf.gz
+lib/X11/fonts/75dpi/UTRG__24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/UTRG__24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/UTRG__24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/UTRG__24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/UTRG__24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/UTRG__24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/UTRG__24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/UTRG__24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/UTRG__24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/UTRG__24.pcf.gz
diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile
new file mode 100644
index 000000000000..cbdf205a97a3
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-type1/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-adobe-utopia-type1
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-adobe-utopia-type1
+PORTVERSION=	1.0.1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Adobe Utopia Type1 font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-utopia-type1/distinfo b/x11-fonts/font-adobe-utopia-type1/distinfo
new file mode 100644
index 000000000000..17f27030d46e
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-type1/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-adobe-utopia-type1-1.0.1.tar.bz2) = aa7ff4bd20b961afda9c15d103b972a5
+SHA256 (xorg/font/font-adobe-utopia-type1-1.0.1.tar.bz2) = e9c672c8ff275fd5c2d76dda9a9f11138766e246e31e45763cd7e14d8824c0dc
+SIZE (xorg/font/font-adobe-utopia-type1-1.0.1.tar.bz2) = 208596
diff --git a/x11-fonts/font-adobe-utopia-type1/pkg-descr b/x11-fonts/font-adobe-utopia-type1/pkg-descr
new file mode 100644
index 000000000000..f2328e33c098
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-type1/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Adobe Utopia Type1 font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-type1/pkg-plist b/x11-fonts/font-adobe-utopia-type1/pkg-plist
new file mode 100644
index 000000000000..1f049370cd7f
--- /dev/null
+++ b/x11-fonts/font-adobe-utopia-type1/pkg-plist
@@ -0,0 +1,8 @@
+lib/X11/fonts/Type1/UTBI____.afm
+lib/X11/fonts/Type1/UTBI____.pfa
+lib/X11/fonts/Type1/UTB_____.afm
+lib/X11/fonts/Type1/UTB_____.pfa
+lib/X11/fonts/Type1/UTI_____.afm
+lib/X11/fonts/Type1/UTI_____.pfa
+lib/X11/fonts/Type1/UTRG____.afm
+lib/X11/fonts/Type1/UTRG____.pfa
diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile
new file mode 100644
index 000000000000..22233efb048d
--- /dev/null
+++ b/x11-fonts/font-alias/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:    font-alias
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-alias
+PORTVERSION=	1.0.1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Font aliases
+
+XORG_CAT=	font
+FONTDIR=	100dpi 75dpi misc cyrillic
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-alias/distinfo b/x11-fonts/font-alias/distinfo
new file mode 100644
index 000000000000..c1021a4d8327
--- /dev/null
+++ b/x11-fonts/font-alias/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-alias-1.0.1.tar.bz2) = c4776b6f0f2ecdb7670b6fe64b5d2a2d
+SHA256 (xorg/font/font-alias-1.0.1.tar.bz2) = 77db60d63224b9d856129d23c0b0d0e9154a166137daf749d39abfd56a4f89b6
+SIZE (xorg/font/font-alias-1.0.1.tar.bz2) = 42537
diff --git a/x11-fonts/font-alias/pkg-descr b/x11-fonts/font-alias/pkg-descr
new file mode 100644
index 000000000000..dc26cae3d2be
--- /dev/null
+++ b/x11-fonts/font-alias/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Font aliases.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-alias/pkg-plist b/x11-fonts/font-alias/pkg-plist
new file mode 100644
index 000000000000..77c2e5ec4897
--- /dev/null
+++ b/x11-fonts/font-alias/pkg-plist
@@ -0,0 +1,4 @@
+lib/X11/fonts/100dpi/fonts.alias
+lib/X11/fonts/75dpi/fonts.alias
+lib/X11/fonts/cyrillic/fonts.alias
+lib/X11/fonts/misc/fonts.alias
diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile
new file mode 100644
index 000000000000..74cab5931d0a
--- /dev/null
+++ b/x11-fonts/font-arabic-misc/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-arabic-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-arabic-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Arabic fonts
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-arabic-misc/distinfo b/x11-fonts/font-arabic-misc/distinfo
new file mode 100644
index 000000000000..8438a375047e
--- /dev/null
+++ b/x11-fonts/font-arabic-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-arabic-misc-1.0.0.tar.bz2) = 81595016e2ff859716fc256ebb136ba6
+SHA256 (xorg/font/font-arabic-misc-1.0.0.tar.bz2) = 90e9dfa3f33805ea2ffe06faa7258d8335cdf415826f963a1d0a76bd8df7bc94
+SIZE (xorg/font/font-arabic-misc-1.0.0.tar.bz2) = 52922
diff --git a/x11-fonts/font-arabic-misc/pkg-descr b/x11-fonts/font-arabic-misc/pkg-descr
new file mode 100644
index 000000000000..794e2b03da30
--- /dev/null
+++ b/x11-fonts/font-arabic-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Arabic fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-arabic-misc/pkg-plist b/x11-fonts/font-arabic-misc/pkg-plist
new file mode 100644
index 000000000000..707f58b3afba
--- /dev/null
+++ b/x11-fonts/font-arabic-misc/pkg-plist
@@ -0,0 +1 @@
+lib/X11/fonts/misc/arabic24.pcf.gz
diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile
new file mode 100644
index 000000000000..b2a5899fc1de
--- /dev/null
+++ b/x11-fonts/font-bh-100dpi/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:    font-bh-100dpi
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-bh-100dpi
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Bigelow Holmes 100dpi font
+
+XORG_CAT=	font
+USE_XORG=	fontutil
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-100dpi/distinfo b/x11-fonts/font-bh-100dpi/distinfo
new file mode 100644
index 000000000000..822b09e13410
--- /dev/null
+++ b/x11-fonts/font-bh-100dpi/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-bh-100dpi-1.0.0.tar.bz2) = e5592de74a5c04e3a2608800dd079197
+SHA256 (xorg/font/font-bh-100dpi-1.0.0.tar.bz2) = ae8a11777579a2242f52ed19b5fdd6c6ef6fe2c2661a49d0599188de78cfee4a
+SIZE (xorg/font/font-bh-100dpi-1.0.0.tar.bz2) = 662648
diff --git a/x11-fonts/font-bh-100dpi/pkg-descr b/x11-fonts/font-bh-100dpi/pkg-descr
new file mode 100644
index 000000000000..3225ba430355
--- /dev/null
+++ b/x11-fonts/font-bh-100dpi/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Bigelow Holmes 100dpi font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-bh-100dpi/pkg-plist b/x11-fonts/font-bh-100dpi/pkg-plist
new file mode 100644
index 000000000000..e7eb8388e0a3
--- /dev/null
+++ b/x11-fonts/font-bh-100dpi/pkg-plist
@@ -0,0 +1,560 @@
+lib/X11/fonts/100dpi/luBIS08-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBIS08-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBIS08-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBIS08-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBIS08-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBIS08-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBIS08-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBIS08-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBIS08-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBIS08.pcf.gz
+lib/X11/fonts/100dpi/luBIS10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBIS10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBIS10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBIS10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBIS10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBIS10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBIS10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBIS10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBIS10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBIS10.pcf.gz
+lib/X11/fonts/100dpi/luBIS12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBIS12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBIS12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBIS12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBIS12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBIS12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBIS12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBIS12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBIS12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBIS12.pcf.gz
+lib/X11/fonts/100dpi/luBIS14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBIS14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBIS14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBIS14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBIS14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBIS14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBIS14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBIS14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBIS14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBIS14.pcf.gz
+lib/X11/fonts/100dpi/luBIS18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBIS18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBIS18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBIS18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBIS18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBIS18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBIS18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBIS18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBIS18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBIS18.pcf.gz
+lib/X11/fonts/100dpi/luBIS19-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBIS19-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBIS19-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBIS19-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBIS19-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBIS19-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBIS19-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBIS19-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBIS19-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBIS19.pcf.gz
+lib/X11/fonts/100dpi/luBIS24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBIS24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBIS24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBIS24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBIS24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBIS24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBIS24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBIS24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBIS24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBIS24.pcf.gz
+lib/X11/fonts/100dpi/luBS08-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBS08-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBS08-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBS08-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBS08-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBS08-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBS08-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBS08-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBS08-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBS08.pcf.gz
+lib/X11/fonts/100dpi/luBS10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBS10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBS10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBS10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBS10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBS10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBS10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBS10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBS10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBS10.pcf.gz
+lib/X11/fonts/100dpi/luBS12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBS12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBS12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBS12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBS12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBS12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBS12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBS12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBS12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBS12.pcf.gz
+lib/X11/fonts/100dpi/luBS14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBS14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBS14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBS14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBS14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBS14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBS14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBS14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBS14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBS14.pcf.gz
+lib/X11/fonts/100dpi/luBS18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBS18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBS18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBS18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBS18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBS18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBS18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBS18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBS18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBS18.pcf.gz
+lib/X11/fonts/100dpi/luBS19-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBS19-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBS19-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBS19-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBS19-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBS19-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBS19-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBS19-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBS19-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBS19.pcf.gz
+lib/X11/fonts/100dpi/luBS24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luBS24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luBS24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luBS24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luBS24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luBS24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luBS24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luBS24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luBS24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luBS24.pcf.gz
+lib/X11/fonts/100dpi/luIS08-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luIS08-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luIS08-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luIS08-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luIS08-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luIS08-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luIS08-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luIS08-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luIS08-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luIS08.pcf.gz
+lib/X11/fonts/100dpi/luIS10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luIS10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luIS10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luIS10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luIS10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luIS10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luIS10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luIS10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luIS10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luIS10.pcf.gz
+lib/X11/fonts/100dpi/luIS12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luIS12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luIS12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luIS12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luIS12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luIS12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luIS12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luIS12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luIS12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luIS12.pcf.gz
+lib/X11/fonts/100dpi/luIS14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luIS14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luIS14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luIS14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luIS14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luIS14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luIS14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luIS14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luIS14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luIS14.pcf.gz
+lib/X11/fonts/100dpi/luIS18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luIS18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luIS18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luIS18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luIS18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luIS18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luIS18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luIS18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luIS18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luIS18.pcf.gz
+lib/X11/fonts/100dpi/luIS19-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luIS19-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luIS19-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luIS19-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luIS19-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luIS19-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luIS19-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luIS19-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luIS19-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luIS19.pcf.gz
+lib/X11/fonts/100dpi/luIS24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luIS24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luIS24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luIS24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luIS24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luIS24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luIS24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luIS24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luIS24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luIS24.pcf.gz
+lib/X11/fonts/100dpi/luRS08-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luRS08-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luRS08-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luRS08-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luRS08-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luRS08-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luRS08-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luRS08-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luRS08-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luRS08.pcf.gz
+lib/X11/fonts/100dpi/luRS10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luRS10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luRS10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luRS10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luRS10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luRS10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luRS10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luRS10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luRS10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luRS10.pcf.gz
+lib/X11/fonts/100dpi/luRS12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luRS12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luRS12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luRS12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luRS12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luRS12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luRS12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luRS12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luRS12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luRS12.pcf.gz
+lib/X11/fonts/100dpi/luRS14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luRS14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luRS14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luRS14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luRS14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luRS14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luRS14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luRS14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luRS14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luRS14.pcf.gz
+lib/X11/fonts/100dpi/luRS18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luRS18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luRS18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luRS18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luRS18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luRS18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luRS18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luRS18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luRS18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luRS18.pcf.gz
+lib/X11/fonts/100dpi/luRS19-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luRS19-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luRS19-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luRS19-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luRS19-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luRS19-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luRS19-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luRS19-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luRS19-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luRS19.pcf.gz
+lib/X11/fonts/100dpi/luRS24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/luRS24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/luRS24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/luRS24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/luRS24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/luRS24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/luRS24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/luRS24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/luRS24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/luRS24.pcf.gz
+lib/X11/fonts/100dpi/lubB08-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubB08-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubB08-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubB08-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubB08-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubB08-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubB08-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubB08-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubB08-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubB08.pcf.gz
+lib/X11/fonts/100dpi/lubB10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubB10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubB10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubB10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubB10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubB10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubB10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubB10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubB10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubB10.pcf.gz
+lib/X11/fonts/100dpi/lubB12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubB12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubB12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubB12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubB12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubB12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubB12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubB12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubB12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubB12.pcf.gz
+lib/X11/fonts/100dpi/lubB14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubB14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubB14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubB14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubB14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubB14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubB14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubB14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubB14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubB14.pcf.gz
+lib/X11/fonts/100dpi/lubB18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubB18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubB18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubB18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubB18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubB18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubB18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubB18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubB18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubB18.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubB19.pcf.gz
+lib/X11/fonts/100dpi/lubB24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubB24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubB24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubB24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubB24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubB24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubB24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubB24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubB24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubB24.pcf.gz
+lib/X11/fonts/100dpi/lubBI08-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubBI08-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubBI08-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubBI08-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubBI08-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubBI08-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubBI08-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubBI08-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubBI08-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubBI08.pcf.gz
+lib/X11/fonts/100dpi/lubBI10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubBI10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubBI10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubBI10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubBI10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubBI10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubBI10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubBI10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubBI10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubBI10.pcf.gz
+lib/X11/fonts/100dpi/lubBI12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubBI12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubBI12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubBI12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubBI12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubBI12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubBI12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubBI12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubBI12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubBI12.pcf.gz
+lib/X11/fonts/100dpi/lubBI14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubBI14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubBI14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubBI14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubBI14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubBI14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubBI14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubBI14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubBI14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubBI14.pcf.gz
+lib/X11/fonts/100dpi/lubBI18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubBI18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubBI18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubBI18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubBI18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubBI18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubBI18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubBI18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubBI18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubBI18.pcf.gz
+lib/X11/fonts/100dpi/lubBI19-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubBI19-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubBI19-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubBI19-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubBI19-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubBI19-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubBI19-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubBI19-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubBI19-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubBI19.pcf.gz
+lib/X11/fonts/100dpi/lubBI24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubBI24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubBI24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubBI24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubBI24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubBI24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubBI24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubBI24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubBI24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubBI24.pcf.gz
+lib/X11/fonts/100dpi/lubI08-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubI08-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubI08-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubI08-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubI08-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubI08-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubI08-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubI08-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubI08-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubI08.pcf.gz
+lib/X11/fonts/100dpi/lubI10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubI10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubI10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubI10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubI10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubI10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubI10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubI10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubI10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubI10.pcf.gz
+lib/X11/fonts/100dpi/lubI12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubI12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubI12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubI12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubI12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubI12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubI12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubI12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubI12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubI12.pcf.gz
+lib/X11/fonts/100dpi/lubI14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubI14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubI14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubI14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubI14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubI14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubI14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubI14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubI14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubI14.pcf.gz
+lib/X11/fonts/100dpi/lubI18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubI18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubI18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubI18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubI18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubI18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubI18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubI18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubI18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubI18.pcf.gz
+lib/X11/fonts/100dpi/lubI19-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubI19-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubI19-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubI19-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubI19-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubI19-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubI19-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubI19-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubI19-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubI19.pcf.gz
+lib/X11/fonts/100dpi/lubI24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubI24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubI24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubI24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubI24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubI24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubI24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubI24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubI24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubI24.pcf.gz
+lib/X11/fonts/100dpi/lubR08-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubR08-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubR08-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubR08-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubR08-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubR08-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubR08-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubR08-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubR08-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubR08.pcf.gz
+lib/X11/fonts/100dpi/lubR10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubR10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubR10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubR10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubR10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubR10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubR10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubR10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubR10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubR10.pcf.gz
+lib/X11/fonts/100dpi/lubR12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubR12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubR12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubR12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubR12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubR12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubR12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubR12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubR12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubR12.pcf.gz
+lib/X11/fonts/100dpi/lubR14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubR14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubR14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubR14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubR14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubR14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubR14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubR14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubR14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubR14.pcf.gz
+lib/X11/fonts/100dpi/lubR18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubR18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubR18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubR18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubR18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubR18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubR18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubR18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubR18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubR18.pcf.gz
+lib/X11/fonts/100dpi/lubR19-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubR19-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubR19-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubR19-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubR19-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubR19-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubR19-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubR19-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubR19-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubR19.pcf.gz
+lib/X11/fonts/100dpi/lubR24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubR24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubR24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubR24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubR24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubR24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubR24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubR24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubR24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lubR24.pcf.gz
diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile
new file mode 100644
index 000000000000..87e706164556
--- /dev/null
+++ b/x11-fonts/font-bh-75dpi/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:    font-bh-75dpi
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-bh-75dpi
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Bigelow Holmes 75dpi font
+
+XORG_CAT=	font
+USE_XORG=	fontutil
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-75dpi/distinfo b/x11-fonts/font-bh-75dpi/distinfo
new file mode 100644
index 000000000000..3753b064529a
--- /dev/null
+++ b/x11-fonts/font-bh-75dpi/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-bh-75dpi-1.0.0.tar.bz2) = 6e51cd02f4ce32e1393e34ab17a9b211
+SHA256 (xorg/font/font-bh-75dpi-1.0.0.tar.bz2) = c79467b440cc9389c75d55fba64d0126d0f2e1e6c019dfafb7d89d07802c05bf
+SIZE (xorg/font/font-bh-75dpi-1.0.0.tar.bz2) = 510710
diff --git a/x11-fonts/font-bh-75dpi/pkg-descr b/x11-fonts/font-bh-75dpi/pkg-descr
new file mode 100644
index 000000000000..b53defe047bb
--- /dev/null
+++ b/x11-fonts/font-bh-75dpi/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Bigelow Holmes 75dpi font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-bh-75dpi/pkg-plist b/x11-fonts/font-bh-75dpi/pkg-plist
new file mode 100644
index 000000000000..e9996206a8aa
--- /dev/null
+++ b/x11-fonts/font-bh-75dpi/pkg-plist
@@ -0,0 +1,560 @@
+lib/X11/fonts/75dpi/luBIS08-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBIS08-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBIS08-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBIS08-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBIS08-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBIS08-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBIS08-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBIS08-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBIS08-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBIS08.pcf.gz
+lib/X11/fonts/75dpi/luBIS10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBIS10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBIS10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBIS10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBIS10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBIS10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBIS10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBIS10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBIS10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBIS10.pcf.gz
+lib/X11/fonts/75dpi/luBIS12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBIS12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBIS12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBIS12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBIS12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBIS12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBIS12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBIS12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBIS12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBIS12.pcf.gz
+lib/X11/fonts/75dpi/luBIS14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBIS14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBIS14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBIS14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBIS14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBIS14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBIS14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBIS14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBIS14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBIS14.pcf.gz
+lib/X11/fonts/75dpi/luBIS18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBIS18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBIS18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBIS18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBIS18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBIS18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBIS18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBIS18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBIS18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBIS18.pcf.gz
+lib/X11/fonts/75dpi/luBIS19-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBIS19-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBIS19-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBIS19-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBIS19-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBIS19-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBIS19-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBIS19-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBIS19-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBIS19.pcf.gz
+lib/X11/fonts/75dpi/luBIS24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBIS24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBIS24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBIS24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBIS24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBIS24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBIS24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBIS24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBIS24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBIS24.pcf.gz
+lib/X11/fonts/75dpi/luBS08-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBS08-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBS08-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBS08-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBS08-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBS08-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBS08-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBS08-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBS08-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBS08.pcf.gz
+lib/X11/fonts/75dpi/luBS10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBS10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBS10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBS10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBS10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBS10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBS10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBS10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBS10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBS10.pcf.gz
+lib/X11/fonts/75dpi/luBS12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBS12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBS12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBS12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBS12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBS12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBS12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBS12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBS12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBS12.pcf.gz
+lib/X11/fonts/75dpi/luBS14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBS14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBS14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBS14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBS14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBS14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBS14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBS14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBS14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBS14.pcf.gz
+lib/X11/fonts/75dpi/luBS18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBS18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBS18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBS18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBS18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBS18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBS18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBS18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBS18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBS18.pcf.gz
+lib/X11/fonts/75dpi/luBS19-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBS19-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBS19-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBS19-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBS19-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBS19-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBS19-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBS19-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBS19-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBS19.pcf.gz
+lib/X11/fonts/75dpi/luBS24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luBS24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luBS24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luBS24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luBS24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luBS24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luBS24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luBS24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luBS24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luBS24.pcf.gz
+lib/X11/fonts/75dpi/luIS08-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luIS08-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luIS08-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luIS08-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luIS08-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luIS08-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luIS08-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luIS08-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luIS08-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luIS08.pcf.gz
+lib/X11/fonts/75dpi/luIS10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luIS10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luIS10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luIS10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luIS10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luIS10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luIS10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luIS10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luIS10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luIS10.pcf.gz
+lib/X11/fonts/75dpi/luIS12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luIS12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luIS12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luIS12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luIS12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luIS12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luIS12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luIS12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luIS12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luIS12.pcf.gz
+lib/X11/fonts/75dpi/luIS14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luIS14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luIS14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luIS14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luIS14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luIS14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luIS14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luIS14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luIS14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luIS14.pcf.gz
+lib/X11/fonts/75dpi/luIS18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luIS18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luIS18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luIS18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luIS18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luIS18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luIS18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luIS18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luIS18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luIS18.pcf.gz
+lib/X11/fonts/75dpi/luIS19-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luIS19-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luIS19-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luIS19-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luIS19-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luIS19-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luIS19-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luIS19-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luIS19-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luIS19.pcf.gz
+lib/X11/fonts/75dpi/luIS24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luIS24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luIS24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luIS24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luIS24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luIS24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luIS24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luIS24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luIS24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luIS24.pcf.gz
+lib/X11/fonts/75dpi/luRS08-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luRS08-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luRS08-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luRS08-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luRS08-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luRS08-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luRS08-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luRS08-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luRS08-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luRS08.pcf.gz
+lib/X11/fonts/75dpi/luRS10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luRS10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luRS10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luRS10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luRS10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luRS10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luRS10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luRS10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luRS10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luRS10.pcf.gz
+lib/X11/fonts/75dpi/luRS12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luRS12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luRS12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luRS12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luRS12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luRS12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luRS12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luRS12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luRS12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luRS12.pcf.gz
+lib/X11/fonts/75dpi/luRS14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luRS14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luRS14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luRS14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luRS14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luRS14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luRS14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luRS14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luRS14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luRS14.pcf.gz
+lib/X11/fonts/75dpi/luRS18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luRS18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luRS18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luRS18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luRS18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luRS18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luRS18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luRS18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luRS18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luRS18.pcf.gz
+lib/X11/fonts/75dpi/luRS19-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luRS19-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luRS19-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luRS19-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luRS19-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luRS19-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luRS19-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luRS19-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luRS19-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luRS19.pcf.gz
+lib/X11/fonts/75dpi/luRS24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/luRS24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/luRS24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/luRS24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/luRS24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/luRS24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/luRS24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/luRS24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/luRS24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/luRS24.pcf.gz
+lib/X11/fonts/75dpi/lubB08-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubB08-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubB08-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubB08-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubB08-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubB08-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubB08-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubB08-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubB08-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubB08.pcf.gz
+lib/X11/fonts/75dpi/lubB10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubB10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubB10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubB10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubB10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubB10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubB10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubB10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubB10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubB10.pcf.gz
+lib/X11/fonts/75dpi/lubB12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubB12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubB12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubB12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubB12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubB12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubB12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubB12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubB12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubB12.pcf.gz
+lib/X11/fonts/75dpi/lubB14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubB14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubB14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubB14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubB14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubB14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubB14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubB14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubB14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubB14.pcf.gz
+lib/X11/fonts/75dpi/lubB18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubB18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubB18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubB18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubB18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubB18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubB18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubB18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubB18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubB18.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubB19.pcf.gz
+lib/X11/fonts/75dpi/lubB24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubB24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubB24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubB24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubB24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubB24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubB24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubB24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubB24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubB24.pcf.gz
+lib/X11/fonts/75dpi/lubBI08-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubBI08-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubBI08-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubBI08-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubBI08-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubBI08-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubBI08-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubBI08-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubBI08-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubBI08.pcf.gz
+lib/X11/fonts/75dpi/lubBI10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubBI10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubBI10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubBI10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubBI10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubBI10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubBI10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubBI10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubBI10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubBI10.pcf.gz
+lib/X11/fonts/75dpi/lubBI12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubBI12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubBI12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubBI12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubBI12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubBI12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubBI12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubBI12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubBI12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubBI12.pcf.gz
+lib/X11/fonts/75dpi/lubBI14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubBI14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubBI14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubBI14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubBI14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubBI14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubBI14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubBI14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubBI14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubBI14.pcf.gz
+lib/X11/fonts/75dpi/lubBI18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubBI18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubBI18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubBI18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubBI18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubBI18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubBI18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubBI18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubBI18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubBI18.pcf.gz
+lib/X11/fonts/75dpi/lubBI19-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubBI19-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubBI19-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubBI19-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubBI19-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubBI19-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubBI19-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubBI19-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubBI19-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubBI19.pcf.gz
+lib/X11/fonts/75dpi/lubBI24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubBI24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubBI24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubBI24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubBI24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubBI24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubBI24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubBI24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubBI24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubBI24.pcf.gz
+lib/X11/fonts/75dpi/lubI08-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubI08-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubI08-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubI08-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubI08-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubI08-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubI08-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubI08-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubI08-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubI08.pcf.gz
+lib/X11/fonts/75dpi/lubI10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubI10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubI10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubI10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubI10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubI10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubI10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubI10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubI10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubI10.pcf.gz
+lib/X11/fonts/75dpi/lubI12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubI12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubI12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubI12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubI12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubI12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubI12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubI12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubI12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubI12.pcf.gz
+lib/X11/fonts/75dpi/lubI14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubI14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubI14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubI14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubI14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubI14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubI14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubI14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubI14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubI14.pcf.gz
+lib/X11/fonts/75dpi/lubI18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubI18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubI18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubI18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubI18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubI18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubI18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubI18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubI18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubI18.pcf.gz
+lib/X11/fonts/75dpi/lubI19-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubI19-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubI19-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubI19-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubI19-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubI19-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubI19-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubI19-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubI19-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubI19.pcf.gz
+lib/X11/fonts/75dpi/lubI24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubI24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubI24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubI24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubI24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubI24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubI24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubI24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubI24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubI24.pcf.gz
+lib/X11/fonts/75dpi/lubR08-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubR08-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubR08-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubR08-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubR08-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubR08-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubR08-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubR08-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubR08-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubR08.pcf.gz
+lib/X11/fonts/75dpi/lubR10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubR10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubR10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubR10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubR10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubR10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubR10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubR10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubR10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubR10.pcf.gz
+lib/X11/fonts/75dpi/lubR12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubR12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubR12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubR12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubR12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubR12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubR12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubR12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubR12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubR12.pcf.gz
+lib/X11/fonts/75dpi/lubR14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubR14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubR14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubR14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubR14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubR14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubR14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubR14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubR14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubR14.pcf.gz
+lib/X11/fonts/75dpi/lubR18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubR18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubR18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubR18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubR18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubR18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubR18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubR18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubR18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubR18.pcf.gz
+lib/X11/fonts/75dpi/lubR19-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubR19-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubR19-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubR19-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubR19-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubR19-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubR19-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubR19-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubR19-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubR19.pcf.gz
+lib/X11/fonts/75dpi/lubR24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubR24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubR24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubR24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubR24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubR24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubR24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubR24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubR24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lubR24.pcf.gz
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
new file mode 100644
index 000000000000..f249698a5d0c
--- /dev/null
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-bh-lucidatypewriter-100dpi
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Bigelow Holmes Lucida TypeWriter 100dpi font
+
+XORG_CAT=	font
+USE_XORG=	fontutil
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/distinfo b/x11-fonts/font-bh-lucidatypewriter-100dpi/distinfo
new file mode 100644
index 000000000000..4c6ba21fe921
--- /dev/null
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2) = c44d3f730564da465993e9292a33c235
+SHA256 (xorg/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2) = 36d47dcba591037b6af35fc151e3d7a6c9f16f42b3182e083ea140cb584d7013
+SIZE (xorg/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2) = 185364
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-descr b/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-descr
new file mode 100644
index 000000000000..3eba6ff3202b
--- /dev/null
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Bigelow Holmes Lucida TypeWriter 100dpi font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-plist b/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-plist
new file mode 100644
index 000000000000..7f1b534517e5
--- /dev/null
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-plist
@@ -0,0 +1,140 @@
+lib/X11/fonts/100dpi/lutBS08-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutBS08-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutBS08-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutBS08-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutBS08-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutBS08-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutBS08-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutBS08-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutBS08-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutBS08.pcf.gz
+lib/X11/fonts/100dpi/lutBS10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutBS10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutBS10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutBS10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutBS10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutBS10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutBS10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutBS10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutBS10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutBS10.pcf.gz
+lib/X11/fonts/100dpi/lutBS12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutBS12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutBS12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutBS12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutBS12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutBS12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutBS12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutBS12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutBS12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutBS12.pcf.gz
+lib/X11/fonts/100dpi/lutBS14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutBS14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutBS14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutBS14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutBS14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutBS14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutBS14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutBS14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutBS14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutBS14.pcf.gz
+lib/X11/fonts/100dpi/lutBS18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutBS18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutBS18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutBS18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutBS18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutBS18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutBS18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutBS18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutBS18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutBS18.pcf.gz
+lib/X11/fonts/100dpi/lutBS19-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutBS19-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutBS19-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutBS19-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutBS19-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutBS19-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutBS19-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutBS19-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutBS19-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutBS19.pcf.gz
+lib/X11/fonts/100dpi/lutBS24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutBS24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutBS24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutBS24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutBS24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutBS24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutBS24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutBS24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutBS24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutBS24.pcf.gz
+lib/X11/fonts/100dpi/lutRS08-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutRS08-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutRS08-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutRS08-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutRS08-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutRS08-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutRS08-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutRS08-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutRS08-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutRS08.pcf.gz
+lib/X11/fonts/100dpi/lutRS10-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutRS10-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutRS10-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutRS10-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutRS10-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutRS10-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutRS10-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutRS10-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutRS10-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutRS10.pcf.gz
+lib/X11/fonts/100dpi/lutRS12-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutRS12-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutRS12-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutRS12-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutRS12-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutRS12-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutRS12-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutRS12-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutRS12-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutRS12.pcf.gz
+lib/X11/fonts/100dpi/lutRS14-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutRS14-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutRS14-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutRS14-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutRS14-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutRS14-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutRS14-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutRS14-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutRS14-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutRS14.pcf.gz
+lib/X11/fonts/100dpi/lutRS18-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutRS18-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutRS18-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutRS18-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutRS18-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutRS18-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutRS18-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutRS18-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutRS18-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutRS18.pcf.gz
+lib/X11/fonts/100dpi/lutRS19-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutRS19-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutRS19-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutRS19-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutRS19-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutRS19-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutRS19-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutRS19-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutRS19-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutRS19.pcf.gz
+lib/X11/fonts/100dpi/lutRS24-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lutRS24-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lutRS24-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lutRS24-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lutRS24-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lutRS24-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lutRS24-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lutRS24-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lutRS24-ISO8859-9.pcf.gz
+lib/X11/fonts/100dpi/lutRS24.pcf.gz
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
new file mode 100644
index 000000000000..3982dc0f2f94
--- /dev/null
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-bh-lucidatypewriter-75dpi
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Bigelow Holmes Lucida TypeWriter 75dpi font
+
+XORG_CAT=	font
+USE_XORG=	fontutil
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/distinfo b/x11-fonts/font-bh-lucidatypewriter-75dpi/distinfo
new file mode 100644
index 000000000000..14ebf5eb9e9f
--- /dev/null
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2) = fdd9be5b9db94ef363a33e39b7977e2b
+SHA256 (xorg/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2) = 50f2f36f533a49c65842568052fe4d065354ff6f39ab36dd2129f465741da046
+SIZE (xorg/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2) = 152897
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-descr b/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-descr
new file mode 100644
index 000000000000..54bc5cc797e2
--- /dev/null
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Bigelow Holmes Lucida TypeWriter 75dpi font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-plist b/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-plist
new file mode 100644
index 000000000000..bbff888f1b13
--- /dev/null
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-plist
@@ -0,0 +1,140 @@
+lib/X11/fonts/75dpi/lutBS08-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutBS08-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutBS08-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutBS08-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutBS08-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutBS08-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutBS08-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutBS08-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutBS08-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutBS08.pcf.gz
+lib/X11/fonts/75dpi/lutBS10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutBS10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutBS10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutBS10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutBS10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutBS10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutBS10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutBS10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutBS10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutBS10.pcf.gz
+lib/X11/fonts/75dpi/lutBS12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutBS12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutBS12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutBS12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutBS12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutBS12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutBS12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutBS12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutBS12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutBS12.pcf.gz
+lib/X11/fonts/75dpi/lutBS14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutBS14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutBS14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutBS14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutBS14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutBS14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutBS14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutBS14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutBS14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutBS14.pcf.gz
+lib/X11/fonts/75dpi/lutBS18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutBS18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutBS18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutBS18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutBS18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutBS18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutBS18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutBS18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutBS18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutBS18.pcf.gz
+lib/X11/fonts/75dpi/lutBS19-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutBS19-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutBS19-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutBS19-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutBS19-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutBS19-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutBS19-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutBS19-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutBS19-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutBS19.pcf.gz
+lib/X11/fonts/75dpi/lutBS24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutBS24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutBS24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutBS24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutBS24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutBS24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutBS24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutBS24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutBS24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutBS24.pcf.gz
+lib/X11/fonts/75dpi/lutRS08-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutRS08-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutRS08-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutRS08-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutRS08-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutRS08-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutRS08-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutRS08-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutRS08-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutRS08.pcf.gz
+lib/X11/fonts/75dpi/lutRS10-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutRS10-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutRS10-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutRS10-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutRS10-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutRS10-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutRS10-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutRS10-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutRS10-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutRS10.pcf.gz
+lib/X11/fonts/75dpi/lutRS12-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutRS12-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutRS12-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutRS12-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutRS12-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutRS12-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutRS12-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutRS12-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutRS12-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutRS12.pcf.gz
+lib/X11/fonts/75dpi/lutRS14-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutRS14-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutRS14-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutRS14-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutRS14-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutRS14-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutRS14-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutRS14-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutRS14-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutRS14.pcf.gz
+lib/X11/fonts/75dpi/lutRS18-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutRS18-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutRS18-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutRS18-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutRS18-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutRS18-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutRS18-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutRS18-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutRS18-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutRS18.pcf.gz
+lib/X11/fonts/75dpi/lutRS19-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutRS19-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutRS19-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutRS19-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutRS19-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutRS19-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutRS19-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutRS19-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutRS19-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutRS19.pcf.gz
+lib/X11/fonts/75dpi/lutRS24-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lutRS24-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lutRS24-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lutRS24-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lutRS24-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lutRS24-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lutRS24-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lutRS24-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lutRS24-ISO8859-9.pcf.gz
+lib/X11/fonts/75dpi/lutRS24.pcf.gz
diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile
new file mode 100644
index 000000000000..c5db3d9bc7b5
--- /dev/null
+++ b/x11-fonts/font-bh-ttf/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-bh-ttf
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-bh-ttf
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Bigelow & Holmes TTF font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-ttf/distinfo b/x11-fonts/font-bh-ttf/distinfo
new file mode 100644
index 000000000000..de92edaad305
--- /dev/null
+++ b/x11-fonts/font-bh-ttf/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-bh-ttf-1.0.0.tar.bz2) = ad43cf739b3d46ba1e7dc778a0608a52
+SHA256 (xorg/font/font-bh-ttf-1.0.0.tar.bz2) = 7a1a5e72f7e42398b98d70aa64252837e85ed76eea77a1b9a4cd0f1203d7d644
+SIZE (xorg/font/font-bh-ttf-1.0.0.tar.bz2) = 384019
diff --git a/x11-fonts/font-bh-ttf/pkg-descr b/x11-fonts/font-bh-ttf/pkg-descr
new file mode 100644
index 000000000000..4720034b4ea6
--- /dev/null
+++ b/x11-fonts/font-bh-ttf/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Bigelow & Holmes TTF font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-bh-ttf/pkg-plist b/x11-fonts/font-bh-ttf/pkg-plist
new file mode 100644
index 000000000000..4b17598470b9
--- /dev/null
+++ b/x11-fonts/font-bh-ttf/pkg-plist
@@ -0,0 +1,12 @@
+lib/X11/fonts/TTF/luximb.ttf
+lib/X11/fonts/TTF/luximbi.ttf
+lib/X11/fonts/TTF/luximr.ttf
+lib/X11/fonts/TTF/luximri.ttf
+lib/X11/fonts/TTF/luxirb.ttf
+lib/X11/fonts/TTF/luxirbi.ttf
+lib/X11/fonts/TTF/luxirr.ttf
+lib/X11/fonts/TTF/luxirri.ttf
+lib/X11/fonts/TTF/luxisb.ttf
+lib/X11/fonts/TTF/luxisbi.ttf
+lib/X11/fonts/TTF/luxisr.ttf
+lib/X11/fonts/TTF/luxisri.ttf
diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile
new file mode 100644
index 000000000000..8091ad02bcea
--- /dev/null
+++ b/x11-fonts/font-bh-type1/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-bh-type1
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-bh-type1
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Bigelow Holmes Type1 font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-type1/distinfo b/x11-fonts/font-bh-type1/distinfo
new file mode 100644
index 000000000000..22e198f32d09
--- /dev/null
+++ b/x11-fonts/font-bh-type1/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-bh-type1-1.0.0.tar.bz2) = 46588b22678e440741d6220bc3945cbf
+SHA256 (xorg/font/font-bh-type1-1.0.0.tar.bz2) = 5a8a5513f2c829d56043a0f74980efc11b4b4522f21116f16711998f72c3645b
+SIZE (xorg/font/font-bh-type1-1.0.0.tar.bz2) = 575775
diff --git a/x11-fonts/font-bh-type1/pkg-descr b/x11-fonts/font-bh-type1/pkg-descr
new file mode 100644
index 000000000000..832ce319aebd
--- /dev/null
+++ b/x11-fonts/font-bh-type1/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Bigelow Holmes Type1 font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-bh-type1/pkg-plist b/x11-fonts/font-bh-type1/pkg-plist
new file mode 100644
index 000000000000..b090e187805f
--- /dev/null
+++ b/x11-fonts/font-bh-type1/pkg-plist
@@ -0,0 +1,24 @@
+lib/X11/fonts/Type1/l047013t.afm
+lib/X11/fonts/Type1/l047013t.pfa
+lib/X11/fonts/Type1/l047016t.afm
+lib/X11/fonts/Type1/l047016t.pfa
+lib/X11/fonts/Type1/l047033t.afm
+lib/X11/fonts/Type1/l047033t.pfa
+lib/X11/fonts/Type1/l047036t.afm
+lib/X11/fonts/Type1/l047036t.pfa
+lib/X11/fonts/Type1/l048013t.afm
+lib/X11/fonts/Type1/l048013t.pfa
+lib/X11/fonts/Type1/l048016t.afm
+lib/X11/fonts/Type1/l048016t.pfa
+lib/X11/fonts/Type1/l048033t.afm
+lib/X11/fonts/Type1/l048033t.pfa
+lib/X11/fonts/Type1/l048036t.afm
+lib/X11/fonts/Type1/l048036t.pfa
+lib/X11/fonts/Type1/l049013t.afm
+lib/X11/fonts/Type1/l049013t.pfa
+lib/X11/fonts/Type1/l049016t.afm
+lib/X11/fonts/Type1/l049016t.pfa
+lib/X11/fonts/Type1/l049033t.afm
+lib/X11/fonts/Type1/l049033t.pfa
+lib/X11/fonts/Type1/l049036t.afm
+lib/X11/fonts/Type1/l049036t.pfa
diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile
new file mode 100644
index 000000000000..58a122b78c3a
--- /dev/null
+++ b/x11-fonts/font-bitstream-100dpi/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-bitstream-100dpi
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-bitstream-100dpi
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Bitstream Vera 100dpi font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-bitstream-100dpi/distinfo b/x11-fonts/font-bitstream-100dpi/distinfo
new file mode 100644
index 000000000000..adc61059c060
--- /dev/null
+++ b/x11-fonts/font-bitstream-100dpi/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-bitstream-100dpi-1.0.0.tar.bz2) = 173352ddec3d26e2b91df1edcf1ae85b
+SHA256 (xorg/font/font-bitstream-100dpi-1.0.0.tar.bz2) = 0c705a74d7b52e41a1f1aa6732f0200877ba2d4303b79513a524e7cc1b30e2d2
+SIZE (xorg/font/font-bitstream-100dpi-1.0.0.tar.bz2) = 135530
diff --git a/x11-fonts/font-bitstream-100dpi/pkg-descr b/x11-fonts/font-bitstream-100dpi/pkg-descr
new file mode 100644
index 000000000000..94f9f27d7c57
--- /dev/null
+++ b/x11-fonts/font-bitstream-100dpi/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Bitstream Vera 100dpi font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-100dpi/pkg-plist b/x11-fonts/font-bitstream-100dpi/pkg-plist
new file mode 100644
index 000000000000..6d905816031a
--- /dev/null
+++ b/x11-fonts/font-bitstream-100dpi/pkg-plist
@@ -0,0 +1,28 @@
+lib/X11/fonts/100dpi/charB08.pcf.gz
+lib/X11/fonts/100dpi/charB10.pcf.gz
+lib/X11/fonts/100dpi/charB12.pcf.gz
+lib/X11/fonts/100dpi/charB14.pcf.gz
+lib/X11/fonts/100dpi/charB18.pcf.gz
+lib/X11/fonts/100dpi/charB24.pcf.gz
+lib/X11/fonts/100dpi/charBI08.pcf.gz
+lib/X11/fonts/100dpi/charBI10.pcf.gz
+lib/X11/fonts/100dpi/charBI12.pcf.gz
+lib/X11/fonts/100dpi/charBI14.pcf.gz
+lib/X11/fonts/100dpi/charBI18.pcf.gz
+lib/X11/fonts/100dpi/charBI24.pcf.gz
+lib/X11/fonts/100dpi/charI08.pcf.gz
+lib/X11/fonts/100dpi/charI10.pcf.gz
+lib/X11/fonts/100dpi/charI12.pcf.gz
+lib/X11/fonts/100dpi/charI14.pcf.gz
+lib/X11/fonts/100dpi/charI18.pcf.gz
+lib/X11/fonts/100dpi/charI24.pcf.gz
+lib/X11/fonts/100dpi/charR08.pcf.gz
+lib/X11/fonts/100dpi/charR10.pcf.gz
+lib/X11/fonts/100dpi/charR12.pcf.gz
+lib/X11/fonts/100dpi/charR14.pcf.gz
+lib/X11/fonts/100dpi/charR18.pcf.gz
+lib/X11/fonts/100dpi/charR24.pcf.gz
+lib/X11/fonts/100dpi/tech14.pcf.gz
+lib/X11/fonts/100dpi/techB14.pcf.gz
+lib/X11/fonts/100dpi/term14.pcf.gz
+lib/X11/fonts/100dpi/termB14.pcf.gz
diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile
new file mode 100644
index 000000000000..9eff6eca1c32
--- /dev/null
+++ b/x11-fonts/font-bitstream-75dpi/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-bitstream-75dpi
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-bitstream-75dpi
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Bitstream Vera 75dpi font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-bitstream-75dpi/distinfo b/x11-fonts/font-bitstream-75dpi/distinfo
new file mode 100644
index 000000000000..08a6ead3b7b4
--- /dev/null
+++ b/x11-fonts/font-bitstream-75dpi/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-bitstream-75dpi-1.0.0.tar.bz2) = beb476657d50d07d17eef7c325a5ed08
+SHA256 (xorg/font/font-bitstream-75dpi-1.0.0.tar.bz2) = 2ddfeaccca97524e1b0f4fb37b2fd0f1338698e35f8b05b22b594fe29e201bfb
+SIZE (xorg/font/font-bitstream-75dpi-1.0.0.tar.bz2) = 103852
diff --git a/x11-fonts/font-bitstream-75dpi/pkg-descr b/x11-fonts/font-bitstream-75dpi/pkg-descr
new file mode 100644
index 000000000000..56d509118538
--- /dev/null
+++ b/x11-fonts/font-bitstream-75dpi/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Bitstream Vera 75dpi font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-75dpi/pkg-plist b/x11-fonts/font-bitstream-75dpi/pkg-plist
new file mode 100644
index 000000000000..83931add168e
--- /dev/null
+++ b/x11-fonts/font-bitstream-75dpi/pkg-plist
@@ -0,0 +1,28 @@
+lib/X11/fonts/75dpi/charB08.pcf.gz
+lib/X11/fonts/75dpi/charB10.pcf.gz
+lib/X11/fonts/75dpi/charB12.pcf.gz
+lib/X11/fonts/75dpi/charB14.pcf.gz
+lib/X11/fonts/75dpi/charB18.pcf.gz
+lib/X11/fonts/75dpi/charB24.pcf.gz
+lib/X11/fonts/75dpi/charBI08.pcf.gz
+lib/X11/fonts/75dpi/charBI10.pcf.gz
+lib/X11/fonts/75dpi/charBI12.pcf.gz
+lib/X11/fonts/75dpi/charBI14.pcf.gz
+lib/X11/fonts/75dpi/charBI18.pcf.gz
+lib/X11/fonts/75dpi/charBI24.pcf.gz
+lib/X11/fonts/75dpi/charI08.pcf.gz
+lib/X11/fonts/75dpi/charI10.pcf.gz
+lib/X11/fonts/75dpi/charI12.pcf.gz
+lib/X11/fonts/75dpi/charI14.pcf.gz
+lib/X11/fonts/75dpi/charI18.pcf.gz
+lib/X11/fonts/75dpi/charI24.pcf.gz
+lib/X11/fonts/75dpi/charR08.pcf.gz
+lib/X11/fonts/75dpi/charR10.pcf.gz
+lib/X11/fonts/75dpi/charR12.pcf.gz
+lib/X11/fonts/75dpi/charR14.pcf.gz
+lib/X11/fonts/75dpi/charR18.pcf.gz
+lib/X11/fonts/75dpi/charR24.pcf.gz
+lib/X11/fonts/75dpi/tech14.pcf.gz
+lib/X11/fonts/75dpi/techB14.pcf.gz
+lib/X11/fonts/75dpi/term14.pcf.gz
+lib/X11/fonts/75dpi/termB14.pcf.gz
diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile
new file mode 100644
index 000000000000..84a96fd758c1
--- /dev/null
+++ b/x11-fonts/font-bitstream-speedo/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-bitstream-speedo
+# Date created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-bitstream-speedo
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Bitstream Vera Speedo font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-bitstream-speedo/distinfo b/x11-fonts/font-bitstream-speedo/distinfo
new file mode 100644
index 000000000000..898e0853c491
--- /dev/null
+++ b/x11-fonts/font-bitstream-speedo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-bitstream-speedo-1.0.0.tar.bz2) = 1399dc18aeb9571b0951d9570ea1059d
+SHA256 (xorg/font/font-bitstream-speedo-1.0.0.tar.bz2) = 99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6
+SIZE (xorg/font/font-bitstream-speedo-1.0.0.tar.bz2) = 337282
diff --git a/x11-fonts/font-bitstream-speedo/pkg-descr b/x11-fonts/font-bitstream-speedo/pkg-descr
new file mode 100644
index 000000000000..96f5b11b6cbc
--- /dev/null
+++ b/x11-fonts/font-bitstream-speedo/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Bitstream Vera Speedo font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-speedo/pkg-plist b/x11-fonts/font-bitstream-speedo/pkg-plist
new file mode 100644
index 000000000000..7ae910470103
--- /dev/null
+++ b/x11-fonts/font-bitstream-speedo/pkg-plist
@@ -0,0 +1,8 @@
+lib/X11/fonts/Speedo/font0419.spd
+lib/X11/fonts/Speedo/font0582.spd
+lib/X11/fonts/Speedo/font0583.spd
+lib/X11/fonts/Speedo/font0611.spd
+lib/X11/fonts/Speedo/font0648.spd
+lib/X11/fonts/Speedo/font0649.spd
+lib/X11/fonts/Speedo/font0709.spd
+lib/X11/fonts/Speedo/font0710.spd
diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile
new file mode 100644
index 000000000000..dd7d9b783b79
--- /dev/null
+++ b/x11-fonts/font-bitstream-type1/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-bitstream-type1
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-bitstream-type1
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Bitstream Vera Type1 font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-bitstream-type1/distinfo b/x11-fonts/font-bitstream-type1/distinfo
new file mode 100644
index 000000000000..2feed35a3787
--- /dev/null
+++ b/x11-fonts/font-bitstream-type1/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-bitstream-type1-1.0.0.tar.bz2) = 6610475e2e231242f8f2122a709c3695
+SHA256 (xorg/font/font-bitstream-type1-1.0.0.tar.bz2) = 4fce492dcf168837342ea1787ac35b53e4d30361239cba207c9520c42454d903
+SIZE (xorg/font/font-bitstream-type1-1.0.0.tar.bz2) = 351885
diff --git a/x11-fonts/font-bitstream-type1/pkg-descr b/x11-fonts/font-bitstream-type1/pkg-descr
new file mode 100644
index 000000000000..49b8a5a921ea
--- /dev/null
+++ b/x11-fonts/font-bitstream-type1/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Bitstream Vera Type1 font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-type1/pkg-plist b/x11-fonts/font-bitstream-type1/pkg-plist
new file mode 100644
index 000000000000..2dc4d5ba5e14
--- /dev/null
+++ b/x11-fonts/font-bitstream-type1/pkg-plist
@@ -0,0 +1,16 @@
+lib/X11/fonts/Type1/c0419bt_.afm
+lib/X11/fonts/Type1/c0419bt_.pfb
+lib/X11/fonts/Type1/c0582bt_.afm
+lib/X11/fonts/Type1/c0582bt_.pfb
+lib/X11/fonts/Type1/c0583bt_.afm
+lib/X11/fonts/Type1/c0583bt_.pfb
+lib/X11/fonts/Type1/c0611bt_.afm
+lib/X11/fonts/Type1/c0611bt_.pfb
+lib/X11/fonts/Type1/c0632bt_.afm
+lib/X11/fonts/Type1/c0632bt_.pfb
+lib/X11/fonts/Type1/c0633bt_.afm
+lib/X11/fonts/Type1/c0633bt_.pfb
+lib/X11/fonts/Type1/c0648bt_.afm
+lib/X11/fonts/Type1/c0648bt_.pfb
+lib/X11/fonts/Type1/c0649bt_.afm
+lib/X11/fonts/Type1/c0649bt_.pfb
diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile
new file mode 100644
index 000000000000..1373db71b863
--- /dev/null
+++ b/x11-fonts/font-cronyx-cyrillic/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-cronyx-cyrillic
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-cronyx-cyrillic
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Cronyx Cyrillic font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-cronyx-cyrillic/distinfo b/x11-fonts/font-cronyx-cyrillic/distinfo
new file mode 100644
index 000000000000..e107954ab52b
--- /dev/null
+++ b/x11-fonts/font-cronyx-cyrillic/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-cronyx-cyrillic-1.0.0.tar.bz2) = 22b451e7230b8c003cfc496ee2d360cc
+SHA256 (xorg/font/font-cronyx-cyrillic-1.0.0.tar.bz2) = 06c94e7033f5cae77b9ba27b84af7c1d3e7f73a7239346aabf98eda6c7f484ee
+SIZE (xorg/font/font-cronyx-cyrillic-1.0.0.tar.bz2) = 196033
diff --git a/x11-fonts/font-cronyx-cyrillic/pkg-descr b/x11-fonts/font-cronyx-cyrillic/pkg-descr
new file mode 100644
index 000000000000..5a978881cbac
--- /dev/null
+++ b/x11-fonts/font-cronyx-cyrillic/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Cronyx Cyrillic font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts-cyrillic/pkg-plist b/x11-fonts/font-cronyx-cyrillic/pkg-plist
index 420ee72f398c..f7015be6cb87 100644
--- a/x11-fonts/xorg-fonts-cyrillic/pkg-plist
+++ b/x11-fonts/font-cronyx-cyrillic/pkg-plist
@@ -58,34 +58,7 @@ lib/X11/fonts/cyrillic/crox6t.pcf.gz
 lib/X11/fonts/cyrillic/crox6tb.pcf.gz
 lib/X11/fonts/cyrillic/crox6tbo.pcf.gz
 lib/X11/fonts/cyrillic/crox6to.pcf.gz
-lib/X11/fonts/cyrillic/encodings.dir
-lib/X11/fonts/cyrillic/fonts.alias
-lib/X11/fonts/cyrillic/fonts.dir
-lib/X11/fonts/cyrillic/fonts.scale
 lib/X11/fonts/cyrillic/koi10x16b.pcf.gz
 lib/X11/fonts/cyrillic/koi10x20.pcf.gz
-lib/X11/fonts/cyrillic/koi12x24.pcf.gz
-lib/X11/fonts/cyrillic/koi12x24b.pcf.gz
-lib/X11/fonts/cyrillic/koi5x8.pcf.gz
 lib/X11/fonts/cyrillic/koi6x10.pcf.gz
-lib/X11/fonts/cyrillic/koi6x13.pcf.gz
-lib/X11/fonts/cyrillic/koi6x13b.pcf.gz
-lib/X11/fonts/cyrillic/koi6x9.pcf.gz
-lib/X11/fonts/cyrillic/koi7x14.pcf.gz
-lib/X11/fonts/cyrillic/koi7x14b.pcf.gz
-lib/X11/fonts/cyrillic/koi8x13.pcf.gz
-lib/X11/fonts/cyrillic/koi8x16.pcf.gz
-lib/X11/fonts/cyrillic/koi8x16b.pcf.gz
-lib/X11/fonts/cyrillic/koi9x15.pcf.gz
-lib/X11/fonts/cyrillic/koi9x15b.pcf.gz
-lib/X11/fonts/cyrillic/koi9x18.pcf.gz
-lib/X11/fonts/cyrillic/koi9x18b.pcf.gz
 lib/X11/fonts/cyrillic/koinil2.pcf.gz
-lib/X11/fonts/cyrillic/proof9x16.pcf.gz
-lib/X11/fonts/cyrillic/screen8x16.pcf.gz
-lib/X11/fonts/cyrillic/screen8x16b.pcf.gz
-@exec command fc-cache -v %D/lib/X11/fonts/cyrillic 2>/dev/null || true
-@unexec rm %D/lib/X11/fonts/cyrillic/fonts.cache-1 2>/dev/null || true
-@unexec command fc-cache -v %D/lib/X11/fonts/cyrillic 2>/dev/null || true
-@unexec if [ -e %D/lib/X11/fonts/cyrillic/fonts.cache-1 -a ! -s %D/lib/X11/fonts/cyrillic/fonts.cache-1 ]; then rm %D/lib/X11/fonts/cyrillic/fonts.cache-1; fi
-@dirrmtry lib/X11/fonts/cyrillic
diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile
new file mode 100644
index 000000000000..57976c33f25e
--- /dev/null
+++ b/x11-fonts/font-cursor-misc/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-cursor-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-cursor-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Cursor fonts
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-cursor-misc/distinfo b/x11-fonts/font-cursor-misc/distinfo
new file mode 100644
index 000000000000..bd084b95b3e9
--- /dev/null
+++ b/x11-fonts/font-cursor-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-cursor-misc-1.0.0.tar.bz2) = 305fa22cdfefb8f80babd711051a534b
+SHA256 (xorg/font/font-cursor-misc-1.0.0.tar.bz2) = 955de27117581ba501d7c2abae7f38b0a65662e4ab2e2b54b9eb2dc07aa5f3c5
+SIZE (xorg/font/font-cursor-misc-1.0.0.tar.bz2) = 42656
diff --git a/x11-fonts/font-cursor-misc/pkg-descr b/x11-fonts/font-cursor-misc/pkg-descr
new file mode 100644
index 000000000000..7bf45735a4c4
--- /dev/null
+++ b/x11-fonts/font-cursor-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Cursor fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-cursor-misc/pkg-plist b/x11-fonts/font-cursor-misc/pkg-plist
new file mode 100644
index 000000000000..f3e551fc268a
--- /dev/null
+++ b/x11-fonts/font-cursor-misc/pkg-plist
@@ -0,0 +1 @@
+lib/X11/fonts/misc/cursor.pcf.gz
diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile
new file mode 100644
index 000000000000..6705546aa0de
--- /dev/null
+++ b/x11-fonts/font-daewoo-misc/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-daewoo-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-daewoo-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Daewoo fonts
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-daewoo-misc/distinfo b/x11-fonts/font-daewoo-misc/distinfo
new file mode 100644
index 000000000000..78c20271c81a
--- /dev/null
+++ b/x11-fonts/font-daewoo-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-daewoo-misc-1.0.0.tar.bz2) = 61f9eab48c619af5494d3e384d8d7d79
+SHA256 (xorg/font/font-daewoo-misc-1.0.0.tar.bz2) = f198eac92e343a38b1e23288880bac91c439bdc90c61a79a7cb0718e9a468926
+SIZE (xorg/font/font-daewoo-misc-1.0.0.tar.bz2) = 682909
diff --git a/x11-fonts/font-daewoo-misc/pkg-descr b/x11-fonts/font-daewoo-misc/pkg-descr
new file mode 100644
index 000000000000..fcf6ce89e836
--- /dev/null
+++ b/x11-fonts/font-daewoo-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Daewoo fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-daewoo-misc/pkg-plist b/x11-fonts/font-daewoo-misc/pkg-plist
new file mode 100644
index 000000000000..b7c4a9b0d0b8
--- /dev/null
+++ b/x11-fonts/font-daewoo-misc/pkg-plist
@@ -0,0 +1,3 @@
+lib/X11/fonts/misc/hanglg16.pcf.gz
+lib/X11/fonts/misc/hanglm16.pcf.gz
+lib/X11/fonts/misc/hanglm24.pcf.gz
diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile
new file mode 100644
index 000000000000..e0c7b8e18250
--- /dev/null
+++ b/x11-fonts/font-dec-misc/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-dec-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-dec-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Dec fonts
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-dec-misc/distinfo b/x11-fonts/font-dec-misc/distinfo
new file mode 100644
index 000000000000..e2bce8b1c147
--- /dev/null
+++ b/x11-fonts/font-dec-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-dec-misc-1.0.0.tar.bz2) = 284e554db1c64fb7580a06df01444a2b
+SHA256 (xorg/font/font-dec-misc-1.0.0.tar.bz2) = 83386d1225dab1ebc58e7d197acc4c310ed4e29840abf291b1fa2ffac1b68bb9
+SIZE (xorg/font/font-dec-misc-1.0.0.tar.bz2) = 40715
diff --git a/x11-fonts/font-dec-misc/pkg-descr b/x11-fonts/font-dec-misc/pkg-descr
new file mode 100644
index 000000000000..7f524348141b
--- /dev/null
+++ b/x11-fonts/font-dec-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Dec fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-dec-misc/pkg-plist b/x11-fonts/font-dec-misc/pkg-plist
new file mode 100644
index 000000000000..c3b865c41afa
--- /dev/null
+++ b/x11-fonts/font-dec-misc/pkg-plist
@@ -0,0 +1,2 @@
+lib/X11/fonts/misc/deccurs.pcf.gz
+lib/X11/fonts/misc/decsess.pcf.gz
diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile
new file mode 100644
index 000000000000..0f4b26c48e74
--- /dev/null
+++ b/x11-fonts/font-ibm-type1/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-ibm-type1
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-ibm-type1
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org IBM Type1 font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-ibm-type1/distinfo b/x11-fonts/font-ibm-type1/distinfo
new file mode 100644
index 000000000000..116fe03f0b97
--- /dev/null
+++ b/x11-fonts/font-ibm-type1/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-ibm-type1-1.0.0.tar.bz2) = 8e8733051371e2b51123376b49f5d3ea
+SHA256 (xorg/font/font-ibm-type1-1.0.0.tar.bz2) = 30d091c2e3506943f8a6e152c4be973c462ba19293a864bbb48b82c6cf9c461e
+SIZE (xorg/font/font-ibm-type1-1.0.0.tar.bz2) = 315324
diff --git a/x11-fonts/font-ibm-type1/pkg-descr b/x11-fonts/font-ibm-type1/pkg-descr
new file mode 100644
index 000000000000..3d6f835fc549
--- /dev/null
+++ b/x11-fonts/font-ibm-type1/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org IBM Type1 font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-ibm-type1/pkg-plist b/x11-fonts/font-ibm-type1/pkg-plist
new file mode 100644
index 000000000000..0c4236bccf1a
--- /dev/null
+++ b/x11-fonts/font-ibm-type1/pkg-plist
@@ -0,0 +1,8 @@
+lib/X11/fonts/Type1/cour.afm
+lib/X11/fonts/Type1/cour.pfa
+lib/X11/fonts/Type1/courb.afm
+lib/X11/fonts/Type1/courb.pfa
+lib/X11/fonts/Type1/courbi.afm
+lib/X11/fonts/Type1/courbi.pfa
+lib/X11/fonts/Type1/couri.afm
+lib/X11/fonts/Type1/couri.pfa
diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile
new file mode 100644
index 000000000000..b7cce42aaba0
--- /dev/null
+++ b/x11-fonts/font-isas-misc/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-isas-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-isas-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous ISAS fonts
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-isas-misc/distinfo b/x11-fonts/font-isas-misc/distinfo
new file mode 100644
index 000000000000..d1709ee0133b
--- /dev/null
+++ b/x11-fonts/font-isas-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-isas-misc-1.0.0.tar.bz2) = ec709a96b64b497a5cb5658c93bd38dc
+SHA256 (xorg/font/font-isas-misc-1.0.0.tar.bz2) = 97e61313ce0bf229da5d489fc5a05562fdca14f9acc17c40d0b272a345ba4ea2
+SIZE (xorg/font/font-isas-misc-1.0.0.tar.bz2) = 776580
diff --git a/x11-fonts/font-isas-misc/pkg-descr b/x11-fonts/font-isas-misc/pkg-descr
new file mode 100644
index 000000000000..171946ef4d28
--- /dev/null
+++ b/x11-fonts/font-isas-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org ISAS fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-isas-misc/pkg-plist b/x11-fonts/font-isas-misc/pkg-plist
new file mode 100644
index 000000000000..97e2c9372c78
--- /dev/null
+++ b/x11-fonts/font-isas-misc/pkg-plist
@@ -0,0 +1,3 @@
+lib/X11/fonts/misc/gb16fs.pcf.gz
+lib/X11/fonts/misc/gb16st.pcf.gz
+lib/X11/fonts/misc/gb24st.pcf.gz
diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile
new file mode 100644
index 000000000000..12a2d7a72da9
--- /dev/null
+++ b/x11-fonts/font-jis-misc/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-jis-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-jis-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous JIS fonts
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-jis-misc/distinfo b/x11-fonts/font-jis-misc/distinfo
new file mode 100644
index 000000000000..f4a40cd979da
--- /dev/null
+++ b/x11-fonts/font-jis-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-jis-misc-1.0.0.tar.bz2) = 61febb49a71065723a1fba17cbf23c67
+SHA256 (xorg/font/font-jis-misc-1.0.0.tar.bz2) = 3721eefd4ffc47c6948065f7acf9d5c731c4e8e54105d096735876d3712dc7ba
+SIZE (xorg/font/font-jis-misc-1.0.0.tar.bz2) = 564585
diff --git a/x11-fonts/font-jis-misc/pkg-descr b/x11-fonts/font-jis-misc/pkg-descr
new file mode 100644
index 000000000000..7f0339f5ec6f
--- /dev/null
+++ b/x11-fonts/font-jis-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org JIS fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-jis-misc/pkg-plist b/x11-fonts/font-jis-misc/pkg-plist
new file mode 100644
index 000000000000..be07e50c3695
--- /dev/null
+++ b/x11-fonts/font-jis-misc/pkg-plist
@@ -0,0 +1,2 @@
+lib/X11/fonts/misc/jiskan16.pcf.gz
+lib/X11/fonts/misc/jiskan24.pcf.gz
diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile
new file mode 100644
index 000000000000..8221efc0b6f2
--- /dev/null
+++ b/x11-fonts/font-micro-misc/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-micro-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-micro-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Micro fonts
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-micro-misc/distinfo b/x11-fonts/font-micro-misc/distinfo
new file mode 100644
index 000000000000..03c85a549645
--- /dev/null
+++ b/x11-fonts/font-micro-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-micro-misc-1.0.0.tar.bz2) = 8c8bffd7540f05caa0dbb4e6e1d6c58e
+SHA256 (xorg/font/font-micro-misc-1.0.0.tar.bz2) = 16b17b5939e12e9381c8096c1f77f064ee0073fa9cb09297dec278bade17a572
+SIZE (xorg/font/font-micro-misc-1.0.0.tar.bz2) = 38895
diff --git a/x11-fonts/font-micro-misc/pkg-descr b/x11-fonts/font-micro-misc/pkg-descr
new file mode 100644
index 000000000000..0e99cb0f138d
--- /dev/null
+++ b/x11-fonts/font-micro-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Micro fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-micro-misc/pkg-plist b/x11-fonts/font-micro-misc/pkg-plist
new file mode 100644
index 000000000000..ab2014fcd2aa
--- /dev/null
+++ b/x11-fonts/font-micro-misc/pkg-plist
@@ -0,0 +1 @@
+lib/X11/fonts/misc/micro.pcf.gz
diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile
new file mode 100644
index 000000000000..665dd7f4ea36
--- /dev/null
+++ b/x11-fonts/font-misc-cyrillic/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-misc-cyrillic
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-misc-cyrillic
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Cyrillic font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-cyrillic/distinfo b/x11-fonts/font-misc-cyrillic/distinfo
new file mode 100644
index 000000000000..61487016e3cf
--- /dev/null
+++ b/x11-fonts/font-misc-cyrillic/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-misc-cyrillic-1.0.0.tar.bz2) = 3596907d7a2a99c81d8de99bc4552b6a
+SHA256 (xorg/font/font-misc-cyrillic-1.0.0.tar.bz2) = 7c0bac1302129d3bf40ec7d9830e728b0251dc20dda8c8979227b478663290ff
+SIZE (xorg/font/font-misc-cyrillic-1.0.0.tar.bz2) = 65561
diff --git a/x11-fonts/font-misc-cyrillic/pkg-descr b/x11-fonts/font-misc-cyrillic/pkg-descr
new file mode 100644
index 000000000000..0aae99c139fe
--- /dev/null
+++ b/x11-fonts/font-misc-cyrillic/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Cyrillic fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-misc-cyrillic/pkg-plist b/x11-fonts/font-misc-cyrillic/pkg-plist
new file mode 100644
index 000000000000..fcaeb11d80d5
--- /dev/null
+++ b/x11-fonts/font-misc-cyrillic/pkg-plist
@@ -0,0 +1,15 @@
+lib/X11/fonts/cyrillic/koi12x24.pcf.gz
+lib/X11/fonts/cyrillic/koi12x24b.pcf.gz
+lib/X11/fonts/cyrillic/koi5x8.pcf.gz
+lib/X11/fonts/cyrillic/koi6x13.pcf.gz
+lib/X11/fonts/cyrillic/koi6x13b.pcf.gz
+lib/X11/fonts/cyrillic/koi6x9.pcf.gz
+lib/X11/fonts/cyrillic/koi7x14.pcf.gz
+lib/X11/fonts/cyrillic/koi7x14b.pcf.gz
+lib/X11/fonts/cyrillic/koi8x13.pcf.gz
+lib/X11/fonts/cyrillic/koi8x16.pcf.gz
+lib/X11/fonts/cyrillic/koi8x16b.pcf.gz
+lib/X11/fonts/cyrillic/koi9x15.pcf.gz
+lib/X11/fonts/cyrillic/koi9x15b.pcf.gz
+lib/X11/fonts/cyrillic/koi9x18.pcf.gz
+lib/X11/fonts/cyrillic/koi9x18b.pcf.gz
diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile
new file mode 100644
index 000000000000..edc2a243ca2a
--- /dev/null
+++ b/x11-fonts/font-misc-ethiopic/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:    font-misc-ethiopic
+# Date created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-misc-ethiopic
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Ethiopic font
+
+XORG_CAT=	font
+INSTALLS_TTF=	yes
+FONTDIR=	TTF OTF
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-ethiopic/distinfo b/x11-fonts/font-misc-ethiopic/distinfo
new file mode 100644
index 000000000000..e562f22d93aa
--- /dev/null
+++ b/x11-fonts/font-misc-ethiopic/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-misc-ethiopic-1.0.0.tar.bz2) = 0b271fc617087d77560bdca20c0cdbb0
+SHA256 (xorg/font/font-misc-ethiopic-1.0.0.tar.bz2) = 58d2868801ca063797fa88fb4aea59f7c550473be4e9a4f96d84fe39b967d141
+SIZE (xorg/font/font-misc-ethiopic-1.0.0.tar.bz2) = 184348
diff --git a/x11-fonts/font-misc-ethiopic/pkg-descr b/x11-fonts/font-misc-ethiopic/pkg-descr
new file mode 100644
index 000000000000..6e6a7e098de0
--- /dev/null
+++ b/x11-fonts/font-misc-ethiopic/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Ethiopic fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-misc-ethiopic/pkg-plist b/x11-fonts/font-misc-ethiopic/pkg-plist
new file mode 100644
index 000000000000..307895907127
--- /dev/null
+++ b/x11-fonts/font-misc-ethiopic/pkg-plist
@@ -0,0 +1,2 @@
+lib/X11/fonts/OTF/GohaTibebZemen.otf
+lib/X11/fonts/TTF/GohaTibebZemen.ttf
diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile
new file mode 100644
index 000000000000..ba60b6161436
--- /dev/null
+++ b/x11-fonts/font-misc-meltho/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:    font-misc-meltho
+# Date created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-misc-meltho
+PORTVERSION=	1.0.0
+PORTREVISION=	1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Meltho font
+
+XORG_CAT=	font
+INSTALLS_TTF=	yes
+FONTDIR=	OTF
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-meltho/distinfo b/x11-fonts/font-misc-meltho/distinfo
new file mode 100644
index 000000000000..be2fdb0d7b0b
--- /dev/null
+++ b/x11-fonts/font-misc-meltho/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-misc-meltho-1.0.0.tar.bz2) = ccb212a7badf7aefdc9f9a92af428d32
+SHA256 (xorg/font/font-misc-meltho-1.0.0.tar.bz2) = c7e12b9926b6053f3567eae548840f0b3d283ce34f842b06309a81c1d98d3924
+SIZE (xorg/font/font-misc-meltho-1.0.0.tar.bz2) = 1491421
diff --git a/x11-fonts/font-misc-meltho/pkg-descr b/x11-fonts/font-misc-meltho/pkg-descr
new file mode 100644
index 000000000000..cc90011dc9eb
--- /dev/null
+++ b/x11-fonts/font-misc-meltho/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Meltho fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-misc-meltho/pkg-plist b/x11-fonts/font-misc-meltho/pkg-plist
new file mode 100644
index 000000000000..80064816d46f
--- /dev/null
+++ b/x11-fonts/font-misc-meltho/pkg-plist
@@ -0,0 +1,22 @@
+lib/X11/fonts/OTF/SyrCOMAdiabene.otf
+lib/X11/fonts/OTF/SyrCOMAntioch.otf
+lib/X11/fonts/OTF/SyrCOMBatnan.otf
+lib/X11/fonts/OTF/SyrCOMBatnanBold.otf
+lib/X11/fonts/OTF/SyrCOMCtesiphon.otf
+lib/X11/fonts/OTF/SyrCOMEdessa.otf
+lib/X11/fonts/OTF/SyrCOMJerusalem.otf
+lib/X11/fonts/OTF/SyrCOMJerusalemBold.otf
+lib/X11/fonts/OTF/SyrCOMJerusalemItalic.otf
+lib/X11/fonts/OTF/SyrCOMJerusalemOutline.otf
+lib/X11/fonts/OTF/SyrCOMKharput.otf
+lib/X11/fonts/OTF/SyrCOMMalankara.otf
+lib/X11/fonts/OTF/SyrCOMMardin.otf
+lib/X11/fonts/OTF/SyrCOMMardinBold.otf
+lib/X11/fonts/OTF/SyrCOMMidyat.otf
+lib/X11/fonts/OTF/SyrCOMNisibin.otf
+lib/X11/fonts/OTF/SyrCOMNisibinOutline.otf
+lib/X11/fonts/OTF/SyrCOMQenNeshrin.otf
+lib/X11/fonts/OTF/SyrCOMTalada.otf
+lib/X11/fonts/OTF/SyrCOMTurAbdin.otf
+lib/X11/fonts/OTF/SyrCOMUrhoy.otf
+lib/X11/fonts/OTF/SyrCOMUrhoyBold.otf
diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile
new file mode 100644
index 000000000000..bc704e67249f
--- /dev/null
+++ b/x11-fonts/font-misc-misc/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:    font-misc-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-misc-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Misc fonts
+
+XORG_CAT=	font
+USE_XORG=	fontutil
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-misc/distinfo b/x11-fonts/font-misc-misc/distinfo
new file mode 100644
index 000000000000..188b26851423
--- /dev/null
+++ b/x11-fonts/font-misc-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-misc-misc-1.0.0.tar.bz2) = 2a57f6188c41d4bc1b88ca3d08ad011d
+SHA256 (xorg/font/font-misc-misc-1.0.0.tar.bz2) = 26a02560ad1f1648e7c36be6daf42910762131d3974422d1b306e6cae13f17db
+SIZE (xorg/font/font-misc-misc-1.0.0.tar.bz2) = 1856323
diff --git a/x11-fonts/font-misc-misc/pkg-descr b/x11-fonts/font-misc-misc/pkg-descr
new file mode 100644
index 000000000000..3bd55d294a46
--- /dev/null
+++ b/x11-fonts/font-misc-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist b/x11-fonts/font-misc-misc/pkg-plist
index 1f4cf0080822..9d2a6143b370 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist
+++ b/x11-fonts/font-misc-misc/pkg-plist
@@ -15,8 +15,6 @@ lib/X11/fonts/misc/10x20-ISO8859-9.pcf.gz
 lib/X11/fonts/misc/10x20-KOI8-R.pcf.gz
 lib/X11/fonts/misc/10x20.pcf.gz
 lib/X11/fonts/misc/12x13ja.pcf.gz
-lib/X11/fonts/misc/12x24.pcf.gz
-lib/X11/fonts/misc/12x24rk.pcf.gz
 lib/X11/fonts/misc/18x18ja.pcf.gz
 lib/X11/fonts/misc/18x18ko.pcf.gz
 lib/X11/fonts/misc/4x6-ISO8859-1.pcf.gz
@@ -271,8 +269,6 @@ lib/X11/fonts/misc/8x13O-ISO8859-5.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-7.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-9.pcf.gz
 lib/X11/fonts/misc/8x13O.pcf.gz
-lib/X11/fonts/misc/8x16.pcf.gz
-lib/X11/fonts/misc/8x16rk.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-11.pcf.gz
@@ -334,85 +330,5 @@ lib/X11/fonts/misc/9x18B-ISO8859-7.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-8.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-9.pcf.gz
 lib/X11/fonts/misc/9x18B.pcf.gz
-lib/X11/fonts/misc/arabic24.pcf.gz
-lib/X11/fonts/misc/clB6x10.pcf.gz
-lib/X11/fonts/misc/clB6x12.pcf.gz
-lib/X11/fonts/misc/clB8x10.pcf.gz
-lib/X11/fonts/misc/clB8x12.pcf.gz
-lib/X11/fonts/misc/clB8x13.pcf.gz
-lib/X11/fonts/misc/clB8x14.pcf.gz
-lib/X11/fonts/misc/clB8x16.pcf.gz
-lib/X11/fonts/misc/clB8x8.pcf.gz
-lib/X11/fonts/misc/clB9x15.pcf.gz
-lib/X11/fonts/misc/clI6x12.pcf.gz
-lib/X11/fonts/misc/clI8x8.pcf.gz
-lib/X11/fonts/misc/clR4x6.pcf.gz
-lib/X11/fonts/misc/clR5x10.pcf.gz
-lib/X11/fonts/misc/clR5x6.pcf.gz
-lib/X11/fonts/misc/clR5x8.pcf.gz
-lib/X11/fonts/misc/clR6x10.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-1.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-10.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-13.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-14.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-15.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-16.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-2.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-3.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-4.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-5.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-7.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-8.pcf.gz
-lib/X11/fonts/misc/clR6x12-ISO8859-9.pcf.gz
-lib/X11/fonts/misc/clR6x12-KOI8-R.pcf.gz
-lib/X11/fonts/misc/clR6x12.pcf.gz
-lib/X11/fonts/misc/clR6x13.pcf.gz
-lib/X11/fonts/misc/clR6x6.pcf.gz
-lib/X11/fonts/misc/clR6x8.pcf.gz
-lib/X11/fonts/misc/clR7x10.pcf.gz
-lib/X11/fonts/misc/clR7x12.pcf.gz
-lib/X11/fonts/misc/clR7x14.pcf.gz
-lib/X11/fonts/misc/clR7x8.pcf.gz
-lib/X11/fonts/misc/clR8x10.pcf.gz
-lib/X11/fonts/misc/clR8x12.pcf.gz
-lib/X11/fonts/misc/clR8x13.pcf.gz
-lib/X11/fonts/misc/clR8x14.pcf.gz
-lib/X11/fonts/misc/clR8x16.pcf.gz
-lib/X11/fonts/misc/clR8x8.pcf.gz
-lib/X11/fonts/misc/clR9x15.pcf.gz
-lib/X11/fonts/misc/cu-alt12.pcf.gz
-lib/X11/fonts/misc/cu-arabic12.pcf.gz
-lib/X11/fonts/misc/cu-devnag12.pcf.gz
-lib/X11/fonts/misc/cu-lig12.pcf.gz
-lib/X11/fonts/misc/cu-pua12.pcf.gz
-lib/X11/fonts/misc/cu12.pcf.gz
-lib/X11/fonts/misc/cuarabic12.pcf.gz
-lib/X11/fonts/misc/cudevnag12.pcf.gz
-lib/X11/fonts/misc/cursor.pcf.gz
-lib/X11/fonts/misc/deccurs.pcf.gz
-lib/X11/fonts/misc/decsess.pcf.gz
-lib/X11/fonts/misc/encodings.dir
-lib/X11/fonts/misc/fonts.alias
-lib/X11/fonts/misc/fonts.dir
-lib/X11/fonts/misc/fonts.scale
-lib/X11/fonts/misc/gb16fs.pcf.gz
-lib/X11/fonts/misc/gb16st.pcf.gz
-lib/X11/fonts/misc/gb24st.pcf.gz
-lib/X11/fonts/misc/hanglg16.pcf.gz
-lib/X11/fonts/misc/hanglm16.pcf.gz
-lib/X11/fonts/misc/hanglm24.pcf.gz
-lib/X11/fonts/misc/jiskan16.pcf.gz
-lib/X11/fonts/misc/jiskan24.pcf.gz
 lib/X11/fonts/misc/k14.pcf.gz
-lib/X11/fonts/misc/micro.pcf.gz
 lib/X11/fonts/misc/nil2.pcf.gz
-lib/X11/fonts/misc/olcursor.pcf.gz
-lib/X11/fonts/misc/olgl10.pcf.gz
-lib/X11/fonts/misc/olgl12.pcf.gz
-lib/X11/fonts/misc/olgl14.pcf.gz
-lib/X11/fonts/misc/olgl19.pcf.gz
-@exec command fc-cache -v %D/lib/X11/fonts/misc 2>/dev/null || true
-@unexec rm %D/lib/X11/fonts/misc/fonts.cache-1 2>/dev/null || true
-@unexec command fc-cache -v %D/lib/X11/fonts/misc 2>/dev/null || true
-@unexec if [ -e %D/lib/X11/fonts/misc/fonts.cache-1 -a ! -s %D/lib/X11/fonts/misc/fonts.cache-1 ]; then rm %D/lib/X11/fonts/misc/fonts.cache-1; fi
-@dirrmtry lib/X11/fonts/misc
diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile
new file mode 100644
index 000000000000..8d13ca3ceb47
--- /dev/null
+++ b/x11-fonts/font-mutt-misc/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-mutt-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-mutt-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Mutt fonts
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-mutt-misc/distinfo b/x11-fonts/font-mutt-misc/distinfo
new file mode 100644
index 000000000000..662032b8efbf
--- /dev/null
+++ b/x11-fonts/font-mutt-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-mutt-misc-1.0.0.tar.bz2) = 648b409b7eb78ad1cd5f6d7fac3eef88
+SHA256 (xorg/font/font-mutt-misc-1.0.0.tar.bz2) = f219183bd0f2b8ceca42a8a345c921f2a8ee19f4d86fef11c4ce8918d41aedff
+SIZE (xorg/font/font-mutt-misc-1.0.0.tar.bz2) = 203608
diff --git a/x11-fonts/font-mutt-misc/pkg-descr b/x11-fonts/font-mutt-misc/pkg-descr
new file mode 100644
index 000000000000..5d7af6352f8d
--- /dev/null
+++ b/x11-fonts/font-mutt-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Mutt fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-mutt-misc/pkg-plist b/x11-fonts/font-mutt-misc/pkg-plist
new file mode 100644
index 000000000000..b5c86ec9bc12
--- /dev/null
+++ b/x11-fonts/font-mutt-misc/pkg-plist
@@ -0,0 +1,8 @@
+lib/X11/fonts/misc/cu-alt12.pcf.gz
+lib/X11/fonts/misc/cu-arabic12.pcf.gz
+lib/X11/fonts/misc/cu-devnag12.pcf.gz
+lib/X11/fonts/misc/cu-lig12.pcf.gz
+lib/X11/fonts/misc/cu-pua12.pcf.gz
+lib/X11/fonts/misc/cu12.pcf.gz
+lib/X11/fonts/misc/cuarabic12.pcf.gz
+lib/X11/fonts/misc/cudevnag12.pcf.gz
diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile
new file mode 100644
index 000000000000..900512c31632
--- /dev/null
+++ b/x11-fonts/font-schumacher-misc/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:    font-schumacher-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-schumacher-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Schumacher fonts
+
+XORG_CAT=	font
+USE_XORG=	fontutil
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-schumacher-misc/distinfo b/x11-fonts/font-schumacher-misc/distinfo
new file mode 100644
index 000000000000..34f3244949cb
--- /dev/null
+++ b/x11-fonts/font-schumacher-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-schumacher-misc-1.0.0.tar.bz2) = f1c6063d2fadc57e696a0aab69afd6e0
+SHA256 (xorg/font/font-schumacher-misc-1.0.0.tar.bz2) = 454e6cf885a4475569ce24ad3d4a82cb331d74e1a25f0747694a71098b56ef7a
+SIZE (xorg/font/font-schumacher-misc-1.0.0.tar.bz2) = 78084
diff --git a/x11-fonts/font-schumacher-misc/pkg-descr b/x11-fonts/font-schumacher-misc/pkg-descr
new file mode 100644
index 000000000000..ee01530fc07d
--- /dev/null
+++ b/x11-fonts/font-schumacher-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Schumacher fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-schumacher-misc/pkg-plist b/x11-fonts/font-schumacher-misc/pkg-plist
new file mode 100644
index 000000000000..f33899512a58
--- /dev/null
+++ b/x11-fonts/font-schumacher-misc/pkg-plist
@@ -0,0 +1,45 @@
+lib/X11/fonts/misc/clB6x10.pcf.gz
+lib/X11/fonts/misc/clB6x12.pcf.gz
+lib/X11/fonts/misc/clB8x10.pcf.gz
+lib/X11/fonts/misc/clB8x12.pcf.gz
+lib/X11/fonts/misc/clB8x13.pcf.gz
+lib/X11/fonts/misc/clB8x14.pcf.gz
+lib/X11/fonts/misc/clB8x16.pcf.gz
+lib/X11/fonts/misc/clB8x8.pcf.gz
+lib/X11/fonts/misc/clB9x15.pcf.gz
+lib/X11/fonts/misc/clI6x12.pcf.gz
+lib/X11/fonts/misc/clI8x8.pcf.gz
+lib/X11/fonts/misc/clR4x6.pcf.gz
+lib/X11/fonts/misc/clR5x10.pcf.gz
+lib/X11/fonts/misc/clR5x6.pcf.gz
+lib/X11/fonts/misc/clR5x8.pcf.gz
+lib/X11/fonts/misc/clR6x10.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-1.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-14.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-16.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-3.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-4.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-8.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/clR6x12-KOI8-R.pcf.gz
+lib/X11/fonts/misc/clR6x12.pcf.gz
+lib/X11/fonts/misc/clR6x13.pcf.gz
+lib/X11/fonts/misc/clR6x6.pcf.gz
+lib/X11/fonts/misc/clR6x8.pcf.gz
+lib/X11/fonts/misc/clR7x10.pcf.gz
+lib/X11/fonts/misc/clR7x12.pcf.gz
+lib/X11/fonts/misc/clR7x14.pcf.gz
+lib/X11/fonts/misc/clR7x8.pcf.gz
+lib/X11/fonts/misc/clR8x10.pcf.gz
+lib/X11/fonts/misc/clR8x12.pcf.gz
+lib/X11/fonts/misc/clR8x13.pcf.gz
+lib/X11/fonts/misc/clR8x14.pcf.gz
+lib/X11/fonts/misc/clR8x16.pcf.gz
+lib/X11/fonts/misc/clR8x8.pcf.gz
+lib/X11/fonts/misc/clR9x15.pcf.gz
diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile
new file mode 100644
index 000000000000..1a76d5c7dd1c
--- /dev/null
+++ b/x11-fonts/font-screen-cyrillic/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-screen-cyrillic
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-screen-cyrillic
+PORTVERSION=	1.0.1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Screen Cyrillic font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-screen-cyrillic/distinfo b/x11-fonts/font-screen-cyrillic/distinfo
new file mode 100644
index 000000000000..bd2108898056
--- /dev/null
+++ b/x11-fonts/font-screen-cyrillic/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-screen-cyrillic-1.0.1.tar.bz2) = c8d5aef01c906c7aaea329702a8b1b63
+SHA256 (xorg/font/font-screen-cyrillic-1.0.1.tar.bz2) = d9575f0f302a183590d2bad82a8f260aed06fd93695a1faf79f1842a6a16c51f
+SIZE (xorg/font/font-screen-cyrillic-1.0.1.tar.bz2) = 45471
diff --git a/x11-fonts/font-screen-cyrillic/pkg-descr b/x11-fonts/font-screen-cyrillic/pkg-descr
new file mode 100644
index 000000000000..35cbe41b7b61
--- /dev/null
+++ b/x11-fonts/font-screen-cyrillic/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Screen Cyrillic font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-screen-cyrillic/pkg-plist b/x11-fonts/font-screen-cyrillic/pkg-plist
new file mode 100644
index 000000000000..e2c5755f5fb5
--- /dev/null
+++ b/x11-fonts/font-screen-cyrillic/pkg-plist
@@ -0,0 +1,2 @@
+lib/X11/fonts/cyrillic/screen8x16.pcf.gz
+lib/X11/fonts/cyrillic/screen8x16b.pcf.gz
diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile
new file mode 100644
index 000000000000..8fe780cec367
--- /dev/null
+++ b/x11-fonts/font-sony-misc/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-sony-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-sony-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Sony fonts
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-sony-misc/distinfo b/x11-fonts/font-sony-misc/distinfo
new file mode 100644
index 000000000000..5fa44e80d90b
--- /dev/null
+++ b/x11-fonts/font-sony-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-sony-misc-1.0.0.tar.bz2) = 0dfddd1a946e4497f009094c0ae1bdd5
+SHA256 (xorg/font/font-sony-misc-1.0.0.tar.bz2) = 1ae93ae76020b57cb0054ba9f33b4d5aec71342c6596750c07303d5c53452e23
+SIZE (xorg/font/font-sony-misc-1.0.0.tar.bz2) = 48480
diff --git a/x11-fonts/font-sony-misc/pkg-descr b/x11-fonts/font-sony-misc/pkg-descr
new file mode 100644
index 000000000000..ec305d0cf55e
--- /dev/null
+++ b/x11-fonts/font-sony-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Sony fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-sony-misc/pkg-plist b/x11-fonts/font-sony-misc/pkg-plist
new file mode 100644
index 000000000000..2e24fda8fe89
--- /dev/null
+++ b/x11-fonts/font-sony-misc/pkg-plist
@@ -0,0 +1,4 @@
+lib/X11/fonts/misc/12x24.pcf.gz
+lib/X11/fonts/misc/12x24rk.pcf.gz
+lib/X11/fonts/misc/8x16.pcf.gz
+lib/X11/fonts/misc/8x16rk.pcf.gz
diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile
new file mode 100644
index 000000000000..3496789e44cb
--- /dev/null
+++ b/x11-fonts/font-sun-misc/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-sun-misc
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-sun-misc
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org miscellaneous Sun fonts
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-sun-misc/distinfo b/x11-fonts/font-sun-misc/distinfo
new file mode 100644
index 000000000000..108fbfcd55da
--- /dev/null
+++ b/x11-fonts/font-sun-misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-sun-misc-1.0.0.tar.bz2) = e17d43a7c6c0d862cfba0908ff132ffa
+SHA256 (xorg/font/font-sun-misc-1.0.0.tar.bz2) = 03c12d8f4d8e7f0178f501ea3ee0709ee3a1deda733afecd631807e6ba5729e5
+SIZE (xorg/font/font-sun-misc-1.0.0.tar.bz2) = 56416
diff --git a/x11-fonts/font-sun-misc/pkg-descr b/x11-fonts/font-sun-misc/pkg-descr
new file mode 100644
index 000000000000..c7cd347df3cd
--- /dev/null
+++ b/x11-fonts/font-sun-misc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains miscellaneous X.Org Sun fonts.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-sun-misc/pkg-plist b/x11-fonts/font-sun-misc/pkg-plist
new file mode 100644
index 000000000000..545fdca117cb
--- /dev/null
+++ b/x11-fonts/font-sun-misc/pkg-plist
@@ -0,0 +1,5 @@
+lib/X11/fonts/misc/olcursor.pcf.gz
+lib/X11/fonts/misc/olgl10.pcf.gz
+lib/X11/fonts/misc/olgl12.pcf.gz
+lib/X11/fonts/misc/olgl14.pcf.gz
+lib/X11/fonts/misc/olgl19.pcf.gz
diff --git a/x11-fonts/font-util/Makefile b/x11-fonts/font-util/Makefile
new file mode 100644
index 000000000000..07412d0a02f1
--- /dev/null
+++ b/x11-fonts/font-util/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	font-util
+# Date Created:				28 Aug 2005
+# Whom:					Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-util
+PORTVERSION=	1.0.1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Create an index of X font files in a directory
+
+XORG_CAT=	font
+
+MAN1=		bdftruncate.1 ucs2any.1
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-util/distinfo b/x11-fonts/font-util/distinfo
new file mode 100644
index 000000000000..59266e2714c4
--- /dev/null
+++ b/x11-fonts/font-util/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-util-1.0.1.tar.bz2) = b81535f78fe05732931f02841e5ca37b
+SHA256 (xorg/font/font-util-1.0.1.tar.bz2) = 048c23b17ea32ee3abb341f0b1105ad07517b2e78efe2e95a4a8218089600612
+SIZE (xorg/font/font-util-1.0.1.tar.bz2) = 98637
diff --git a/x11-fonts/font-util/pkg-descr b/x11-fonts/font-util/pkg-descr
new file mode 100644
index 000000000000..aa29e6388755
--- /dev/null
+++ b/x11-fonts/font-util/pkg-descr
@@ -0,0 +1,5 @@
+This package contains font-util, an application for creating an index of
+X font files in a directory.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-util/pkg-plist b/x11-fonts/font-util/pkg-plist
new file mode 100644
index 000000000000..a89511bdd609
--- /dev/null
+++ b/x11-fonts/font-util/pkg-plist
@@ -0,0 +1,21 @@
+bin/bdftruncate
+bin/ucs2any
+lib/X11/fonts/util/map-ISO8859-1
+lib/X11/fonts/util/map-ISO8859-10
+lib/X11/fonts/util/map-ISO8859-11
+lib/X11/fonts/util/map-ISO8859-13
+lib/X11/fonts/util/map-ISO8859-14
+lib/X11/fonts/util/map-ISO8859-15
+lib/X11/fonts/util/map-ISO8859-16
+lib/X11/fonts/util/map-ISO8859-2
+lib/X11/fonts/util/map-ISO8859-3
+lib/X11/fonts/util/map-ISO8859-4
+lib/X11/fonts/util/map-ISO8859-5
+lib/X11/fonts/util/map-ISO8859-6
+lib/X11/fonts/util/map-ISO8859-7
+lib/X11/fonts/util/map-ISO8859-8
+lib/X11/fonts/util/map-ISO8859-9
+lib/X11/fonts/util/map-JISX0201.1976-0
+lib/X11/fonts/util/map-KOI8-R
+libdata/pkgconfig/fontutil.pc
+share/aclocal/fontutil.m4
diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile
new file mode 100644
index 000000000000..6e61ec8e0b30
--- /dev/null
+++ b/x11-fonts/font-winitzki-cyrillic/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-winitzki-cyrillic
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-winitzki-cyrillic
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Winitzki Cyrillic font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-winitzki-cyrillic/distinfo b/x11-fonts/font-winitzki-cyrillic/distinfo
new file mode 100644
index 000000000000..88f48cff1a9b
--- /dev/null
+++ b/x11-fonts/font-winitzki-cyrillic/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-winitzki-cyrillic-1.0.0.tar.bz2) = b99b02aff36a88ca3379715423c60303
+SHA256 (xorg/font/font-winitzki-cyrillic-1.0.0.tar.bz2) = 478a7f6881fce6a335b409e1326449af4162a147d268f1978b8dd81c834beee3
+SIZE (xorg/font/font-winitzki-cyrillic-1.0.0.tar.bz2) = 41050
diff --git a/x11-fonts/font-winitzki-cyrillic/pkg-descr b/x11-fonts/font-winitzki-cyrillic/pkg-descr
new file mode 100644
index 000000000000..2c895c518959
--- /dev/null
+++ b/x11-fonts/font-winitzki-cyrillic/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org Winitzki Cyrillic font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-winitzki-cyrillic/pkg-plist b/x11-fonts/font-winitzki-cyrillic/pkg-plist
new file mode 100644
index 000000000000..34cd024a0471
--- /dev/null
+++ b/x11-fonts/font-winitzki-cyrillic/pkg-plist
@@ -0,0 +1 @@
+lib/X11/fonts/cyrillic/proof9x16.pcf.gz
diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile
new file mode 100644
index 000000000000..9d61e65426d0
--- /dev/null
+++ b/x11-fonts/font-xfree86-type1/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:    font-xfree86-type1
+# Date created:		28 Aug 2005
+# Whom:			Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-xfree86-type1
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org XFree86 Type1 font
+
+XORG_CAT=	font
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-xfree86-type1/distinfo b/x11-fonts/font-xfree86-type1/distinfo
new file mode 100644
index 000000000000..9c5ec95368fe
--- /dev/null
+++ b/x11-fonts/font-xfree86-type1/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = e66f36a6d68203cc4cf7b56ebbb192dd
+SHA256 (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = ef76d3b91d1bdaa9ff73cc1e5905ad4bbdc028f06157d0d2319d38e7b7f84a4d
+SIZE (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = 66079
diff --git a/x11-fonts/font-xfree86-type1/pkg-descr b/x11-fonts/font-xfree86-type1/pkg-descr
new file mode 100644
index 000000000000..45bfca1dfc20
--- /dev/null
+++ b/x11-fonts/font-xfree86-type1/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org XFree86 Type1 font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/font-xfree86-type1/pkg-plist b/x11-fonts/font-xfree86-type1/pkg-plist
new file mode 100644
index 000000000000..a312274597a2
--- /dev/null
+++ b/x11-fonts/font-xfree86-type1/pkg-plist
@@ -0,0 +1 @@
+lib/X11/fonts/Type1/cursor.pfa
diff --git a/x11-fonts/fontcacheproto/Makefile b/x11-fonts/fontcacheproto/Makefile
new file mode 100644
index 000000000000..94e87d0b2101
--- /dev/null
+++ b/x11-fonts/fontcacheproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	fontcacheproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fontcacheproto
+PORTVERSION=	0.1.2
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Fontcache extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/fontcacheproto/distinfo b/x11-fonts/fontcacheproto/distinfo
new file mode 100644
index 000000000000..af64df8b5eb5
--- /dev/null
+++ b/x11-fonts/fontcacheproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/fontcacheproto-0.1.2.tar.bz2) = 60df6b625074a9790e28543dcea71651
+SHA256 (xorg/proto/fontcacheproto-0.1.2.tar.bz2) = 48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9
+SIZE (xorg/proto/fontcacheproto-0.1.2.tar.bz2) = 38233
diff --git a/x11-fonts/fontcacheproto/pkg-descr b/x11-fonts/fontcacheproto/pkg-descr
new file mode 100644
index 000000000000..2f58ddc8b094
--- /dev/null
+++ b/x11-fonts/fontcacheproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Fontcache extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/fontcacheproto/pkg-plist b/x11-fonts/fontcacheproto/pkg-plist
new file mode 100644
index 000000000000..184f4df3c9ba
--- /dev/null
+++ b/x11-fonts/fontcacheproto/pkg-plist
@@ -0,0 +1,5 @@
+include/X11/extensions/fontcache.h
+include/X11/extensions/fontcacheP.h
+include/X11/extensions/fontcachstr.h
+libdata/pkgconfig/fontcacheproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11-fonts/fontconfig-reference/Makefile b/x11-fonts/fontconfig-reference/Makefile
index c251972adcb9..db880942dfdf 100644
--- a/x11-fonts/fontconfig-reference/Makefile
+++ b/x11-fonts/fontconfig-reference/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	0
 
 DOCSDIR=	${PREFIX}/share/doc/fontconfig-devel
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index afafa3138b19..ecdfd5e5b37f 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.4.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH?=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/release/
@@ -37,8 +37,6 @@ CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/fonts \
 MAKE_ENV=	LC_ALL=C
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
-
 MAN1=		fc-cache.1 fc-cat.1 fc-list.1 fc-match.1
 MAN5=		fonts-conf.5
 PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
@@ -72,6 +70,7 @@ post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${LDCONFIG} -m ${PREFIX}/lib
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/fonts-te/Makefile b/x11-fonts/fonts-te/Makefile
index 8881c90cb434..d4a0f31b78c1 100644
--- a/x11-fonts/fonts-te/Makefile
+++ b/x11-fonts/fonts-te/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	fonts-te
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://itachi.prudhvi.org/te_fonts/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/x11-fonts/fontsproto/Makefile b/x11-fonts/fontsproto/Makefile
new file mode 100644
index 000000000000..590ccf8570e1
--- /dev/null
+++ b/x11-fonts/fontsproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	fontsproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fontsproto
+PORTVERSION=	2.0.2
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Fonts extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/fontsproto/distinfo b/x11-fonts/fontsproto/distinfo
new file mode 100644
index 000000000000..08c1bf729b99
--- /dev/null
+++ b/x11-fonts/fontsproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/fontsproto-2.0.2.tar.bz2) = c946f166107b016a21cc7a02e1132724
+SHA256 (xorg/proto/fontsproto-2.0.2.tar.bz2) = 83bd547131aa11a232717a0f06d3c6cd58a0b2f6d541660bbe9ebf43073a8b7b
+SIZE (xorg/proto/fontsproto-2.0.2.tar.bz2) = 45202
diff --git a/x11-fonts/fontsproto/pkg-descr b/x11-fonts/fontsproto/pkg-descr
new file mode 100644
index 000000000000..746a138d7e87
--- /dev/null
+++ b/x11-fonts/fontsproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org fontsproto protocol headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/fontsproto/pkg-plist b/x11-fonts/fontsproto/pkg-plist
new file mode 100644
index 000000000000..d3034e8617fa
--- /dev/null
+++ b/x11-fonts/fontsproto/pkg-plist
@@ -0,0 +1,8 @@
+include/X11/fonts/FS.h
+include/X11/fonts/FSproto.h
+include/X11/fonts/font.h
+include/X11/fonts/fontproto.h
+include/X11/fonts/fontstruct.h
+include/X11/fonts/fsmasks.h
+libdata/pkgconfig/fontsproto.pc
+@dirrmtry include/X11/fonts
diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile
new file mode 100644
index 000000000000..469dee8ad3b1
--- /dev/null
+++ b/x11-fonts/fonttosfnt/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	fonttosfnt
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fonttosfnt
+PORTVERSION=	1.0.3
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Wrap a bitmap font in a sftn wrapper
+
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+
+XORG_CAT=	app
+USE_XORG=	xproto fontenc
+
+PLIST_FILES=	bin/fonttosfnt
+
+MAN1=		fonttosfnt.1
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/fonttosfnt/distinfo b/x11-fonts/fonttosfnt/distinfo
new file mode 100644
index 000000000000..354f468ff005
--- /dev/null
+++ b/x11-fonts/fonttosfnt/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/fonttosfnt-1.0.3.tar.bz2) = b0ebd86029571239b9d7b0c61191b591
+SHA256 (xorg/app/fonttosfnt-1.0.3.tar.bz2) = 9d2b0149ea49a097ab6c563801c06af9975e98f9fa4c8af1a8ac3238e4fd5243
+SIZE (xorg/app/fonttosfnt-1.0.3.tar.bz2) = 102008
diff --git a/x11-fonts/fonttosfnt/pkg-descr b/x11-fonts/fonttosfnt/pkg-descr
new file mode 100644
index 000000000000..1f681661afd9
--- /dev/null
+++ b/x11-fonts/fonttosfnt/pkg-descr
@@ -0,0 +1,5 @@
+This package contains fonttosfnt, an application used for wrapping a bitmap
+font in a sfnt (TrueType) wrapper.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/freefont-ttf/Makefile b/x11-fonts/freefont-ttf/Makefile
index c1066e135010..cca4bd900f72 100644
--- a/x11-fonts/freefont-ttf/Makefile
+++ b/x11-fonts/freefont-ttf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		freefont-ttf
 PORTVERSION=		20060126
+PORTREVISION=	1
 CATEGORIES=		x11-fonts
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	freefont
diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index 560b06fcd467..9d09fc325172 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freefonts
 PORTVERSION=	0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.fh-heilbronn.de/mirrors/ftp.gimp.org/%SUBDIR%/ \
diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile
new file mode 100644
index 000000000000..a9fb10a95160
--- /dev/null
+++ b/x11-fonts/fslsfonts/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	fslsfonts
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fslsfonts
+PORTVERSION=	1.0.1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	List fonts served by the X font server
+
+XORG_CAT=	app
+USE_XORG=	x11 libfs
+
+PLIST_FILES=	bin/fslsfonts
+
+MAN1=		fslsfonts.1
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/fslsfonts/distinfo b/x11-fonts/fslsfonts/distinfo
new file mode 100644
index 000000000000..702f70488962
--- /dev/null
+++ b/x11-fonts/fslsfonts/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/fslsfonts-1.0.1.tar.bz2) = c7b2f8a938749d41dc86db6bd1e6a4ca
+SHA256 (xorg/app/fslsfonts-1.0.1.tar.bz2) = 3feb006a25f36856924e26249fe84b27142678f97175780960f085e1e263a62e
+SIZE (xorg/app/fslsfonts-1.0.1.tar.bz2) = 76928
diff --git a/x11-fonts/fslsfonts/pkg-descr b/x11-fonts/fslsfonts/pkg-descr
new file mode 100644
index 000000000000..b5f1c4682fee
--- /dev/null
+++ b/x11-fonts/fslsfonts/pkg-descr
@@ -0,0 +1,5 @@
+This package contains fslsfonts, which lists fonts served by an X
+font server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 0627b2436603..0932b80cbc10 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gemini
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.brama.com/compute/unix/
 PKGNAMEPREFIX=	koi8-u-
diff --git a/x11-fonts/gentium-basic/Makefile b/x11-fonts/gentium-basic/Makefile
index 3bd761db92f8..7cbe36b74724 100644
--- a/x11-fonts/gentium-basic/Makefile
+++ b/x11-fonts/gentium-basic/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	gentium
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Gentium_102_L_tar&_sc=1&filename=/
 DISTNAME=	ttf-sil-${PORTNAME}_${PORTVERSION}
diff --git a/x11-fonts/gentium/Makefile b/x11-fonts/gentium/Makefile
index 3bd761db92f8..7cbe36b74724 100644
--- a/x11-fonts/gentium/Makefile
+++ b/x11-fonts/gentium/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	gentium
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Gentium_102_L_tar&_sc=1&filename=/
 DISTNAME=	ttf-sil-${PORTNAME}_${PORTVERSION}
diff --git a/x11-fonts/getbdf/Makefile b/x11-fonts/getbdf/Makefile
index e61eeaa349a6..fbb461bfdcb9 100644
--- a/x11-fonts/getbdf/Makefile
+++ b/x11-fonts/getbdf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	getbdf
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.netsw.org/x11/tools/internal/
 DISTNAME=	${PORTNAME}
diff --git a/x11-fonts/gfe/Makefile b/x11-fonts/gfe/Makefile
index e401f38d00a2..14e46cbd464e 100644
--- a/x11-fonts/gfe/Makefile
+++ b/x11-fonts/gfe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gfe
 PORTVERSION=	0.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/fonts
diff --git a/x11-fonts/gnome-font-sampler/Makefile b/x11-fonts/gnome-font-sampler/Makefile
index e48877bccf83..4de9e6a1df3f 100644
--- a/x11-fonts/gnome-font-sampler/Makefile
+++ b/x11-fonts/gnome-font-sampler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-font-sampler
 PORTVERSION=	0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://linuxadvocate.org/projects/gfontsampler/downloads/
 DISTNAME=	gfontsampler-${PORTVERSION}
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index 9701f1e3e731..2a6641b2530f 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	intlfonts
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	intlfonts
diff --git a/x11-fonts/jmk-x11-fonts/Makefile b/x11-fonts/jmk-x11-fonts/Makefile
index 75acd711dfa8..f766a8043341 100644
--- a/x11-fonts/jmk-x11-fonts/Makefile
+++ b/x11-fonts/jmk-x11-fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jmk-x11-fonts
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.jmknoble.net/fonts/
 
diff --git a/x11-fonts/junicode/Makefile b/x11-fonts/junicode/Makefile
index 94986f1bee15..a6c568bbd691 100644
--- a/x11-fonts/junicode/Makefile
+++ b/x11-fonts/junicode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	junicode
 DISTVERSION=	0-6-12
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-fonts/lfpfonts-fix/Makefile b/x11-fonts/lfpfonts-fix/Makefile
index 175241695a87..75c90d806bf7 100644
--- a/x11-fonts/lfpfonts-fix/Makefile
+++ b/x11-fonts/lfpfonts-fix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lfpfonts-fix
 PORTVERSION=	0.82
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xfonts
diff --git a/x11-fonts/lfpfonts-var/Makefile b/x11-fonts/lfpfonts-var/Makefile
index 4942e6bf0467..8194330500f3 100644
--- a/x11-fonts/lfpfonts-var/Makefile
+++ b/x11-fonts/lfpfonts-var/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lfpfonts-var
 PORTVERSION=	0.83
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xfonts
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
new file mode 100644
index 000000000000..ba00c96739ee
--- /dev/null
+++ b/x11-fonts/libFS/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	libFS
+# Date Created:				21 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libFS
+PORTVERSION=	1.0.0
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	The FS library
+
+XORG_CAT=	lib
+USE_XORG=	fontsproto:both xproto:both xtrans
+USE_AUTOTOOLS=	libtool:15
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/libFS/distinfo b/x11-fonts/libFS/distinfo
new file mode 100644
index 000000000000..78c9b5bf3c3d
--- /dev/null
+++ b/x11-fonts/libFS/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libFS-1.0.0.tar.bz2) = dfd5de47e232db0891410bec8ee6707b
+SHA256 (xorg/lib/libFS-1.0.0.tar.bz2) = 2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde
+SIZE (xorg/lib/libFS-1.0.0.tar.bz2) = 236606
diff --git a/x11-fonts/libFS/pkg-descr b/x11-fonts/libFS/pkg-descr
new file mode 100644
index 000000000000..afa7d79ce21a
--- /dev/null
+++ b/x11-fonts/libFS/pkg-descr
@@ -0,0 +1,4 @@
+This package contains libFS, the X Font Service client library.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/libFS/pkg-plist b/x11-fonts/libFS/pkg-plist
new file mode 100644
index 000000000000..5af5ef33b189
--- /dev/null
+++ b/x11-fonts/libFS/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/fonts/FSlib.h
+lib/libFS.so.6
+lib/libFS.so
+lib/libFS.la
+lib/libFS.a
+libdata/pkgconfig/libfs.pc
+@dirrmtry include/X11/fonts
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index bcce080f3c3d..c3075b0fea39 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -6,27 +6,16 @@
 #
 
 PORTNAME=	libXfont
-PORTVERSION=	1.4.2
-CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
+PORTVERSION=	1.2.8
+PORTEPOCH=	1
+CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X font libary
 
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config \
-		${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_AUTOTOOLS=	libtool:15
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CONFIGURE_ARGS=	--enable-freetype
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+XORG_CAT=	lib
+USE_XORG=	fontcacheproto xproto xtrans fontsproto:both fontenc
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/libXfont/distinfo b/x11-fonts/libXfont/distinfo
index 7611f60f3e11..234774a23667 100644
--- a/x11-fonts/libXfont/distinfo
+++ b/x11-fonts/libXfont/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXfont-1.4.2.tar.bz2) = 7c548377a836a6a7344a62d73d1e8578
-SHA256 (libXfont-1.4.2.tar.bz2) = 37ff10ec3fe97f400b8808fcaf4e413099c310cdf8ba0d52f7d5da85cec48118
-SIZE (libXfont-1.4.2.tar.bz2) = 357750
+MD5 (xorg/lib/libXfont-1.2.8.tar.bz2) = 83b8e21f6ee22512a8f72ba51e2d74f6
+SHA256 (xorg/lib/libXfont-1.2.8.tar.bz2) = 374a2ca12f62a4d9f09a17a34765a5289cefa9db7f9f0913e1c3731b4088aad8
+SIZE (xorg/lib/libXfont-1.2.8.tar.bz2) = 583236
diff --git a/x11-fonts/libXfont/pkg-plist b/x11-fonts/libXfont/pkg-plist
index 874de36d6e0c..4522d0f02a09 100644
--- a/x11-fonts/libXfont/pkg-plist
+++ b/x11-fonts/libXfont/pkg-plist
@@ -1,16 +1,22 @@
-include/X11/fonts/FS.h
-include/X11/fonts/FSproto.h
-include/X11/fonts/font.h
+include/X11/fonts/bdfint.h
+include/X11/fonts/bitmap.h
+include/X11/fonts/bufio.h
+include/X11/fonts/fntfil.h
+include/X11/fonts/fntfilio.h
+include/X11/fonts/fntfilst.h
 include/X11/fonts/fontconf.h
-include/X11/fonts/fontenc.h
+include/X11/fonts/fontencc.h
+include/X11/fonts/fontmisc.h
 include/X11/fonts/fontmod.h
-include/X11/fonts/fontproto.h
-include/X11/fonts/fontstruct.h
+include/X11/fonts/fontshow.h
 include/X11/fonts/fontutil.h
-include/X11/fonts/fsmasks.h
+include/X11/fonts/fontxlfd.h
+include/X11/fonts/ft.h
+include/X11/fonts/ftfuncs.h
+include/X11/fonts/pcf.h
 lib/libXfont.a
 lib/libXfont.la
 lib/libXfont.so
 lib/libXfont.so.1
 libdata/pkgconfig/xfont.pc
-@dirrm include/X11/fonts
+@dirrmtry include/X11/fonts
diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile
new file mode 100644
index 000000000000..cdef90c54031
--- /dev/null
+++ b/x11-fonts/libXfontcache/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	libXfontcache
+# Date Created:				21 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libXfontcache
+PORTVERSION=	1.0.4
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	The Xfontcache library
+
+XORG_CAT=	lib
+USE_XORG=	fontcacheproto:both x11 xext xextproto
+
+MAN3=		FontCacheChangeCacheSettings.3 \
+		FontCacheQueryExtension.3 \
+		FontCacheQueryVersion.3 \
+		FontCacheGetCacheSettings.3 \
+		FontCacheGetCacheStatistics.3 \
+		Xfontcache.3
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/libXfontcache/distinfo b/x11-fonts/libXfontcache/distinfo
new file mode 100644
index 000000000000..df320f2b7ac4
--- /dev/null
+++ b/x11-fonts/libXfontcache/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXfontcache-1.0.4.tar.bz2) = 1adca018aa7bf2d215f20a69c10828ad
+SHA256 (xorg/lib/libXfontcache-1.0.4.tar.bz2) = ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c
+SIZE (xorg/lib/libXfontcache-1.0.4.tar.bz2) = 214869
diff --git a/x11-fonts/libXfontcache/pkg-descr b/x11-fonts/libXfontcache/pkg-descr
new file mode 100644
index 000000000000..5a2c8c9d5177
--- /dev/null
+++ b/x11-fonts/libXfontcache/pkg-descr
@@ -0,0 +1,4 @@
+This package contains libXfontcache, the X.Org Xfontcache library.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/libXfontcache/pkg-plist b/x11-fonts/libXfontcache/pkg-plist
new file mode 100644
index 000000000000..53b501253a0d
--- /dev/null
+++ b/x11-fonts/libXfontcache/pkg-plist
@@ -0,0 +1,5 @@
+lib/libXfontcache.a
+lib/libXfontcache.la
+lib/libXfontcache.so
+lib/libXfontcache.so.1
+libdata/pkgconfig/xfontcache.pc
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 181d7eab3dbc..989911818bc9 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -6,33 +6,20 @@
 #
 
 PORTNAME=	libXft
-PORTVERSION=	2.1.7
-PORTREVISION=	1
+PORTVERSION=	2.1.12
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://xlibs.freedesktop.org/release/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A client-sided font API for X applications
 
-LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_AUTOTOOLS=	libtool:15
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack gnometarget
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib"
+XORG_CAT=	lib
+USE_XORG=	xproto:both xrender
 
+MAN1=		xft-config.1
 MAN3=		Xft.3
 
-#.if defined(WITH_CJK)
-#PATCH_SITES=    http://bsdchat.com/dist/firefly-cjk-patchset/ \
-#		http://bbs.ilc.edu.tw/~chinsan/ \
-#		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
-#PATCHFILES+=    cjk-patch-libXft-20050716.diff.gz
-#.endif
-
 .include <bsd.port.mk>
diff --git a/x11-fonts/libXft/distinfo b/x11-fonts/libXft/distinfo
index f03355848a23..2cd317669699 100644
--- a/x11-fonts/libXft/distinfo
+++ b/x11-fonts/libXft/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXft-2.1.7.tar.bz2) = 3e311b4095283d59488b95c8bd772521
-SHA256 (libXft-2.1.7.tar.bz2) = 6c917395ecd3b39ea0e15a0ab1c89ec862a429d1e5f92de9651522bdae8abf56
-SIZE (libXft-2.1.7.tar.bz2) = 237056
+MD5 (xorg/lib/libXft-2.1.12.tar.bz2) = 1309301e2d979bd475dc58325cb8c056
+SHA256 (xorg/lib/libXft-2.1.12.tar.bz2) = 68b46f85caaf0b30c876bd983abe144c25755bee7532e8738ab7ebe29a428986
+SIZE (xorg/lib/libXft-2.1.12.tar.bz2) = 260437
diff --git a/x11-fonts/libXft/pkg-plist b/x11-fonts/libXft/pkg-plist
index 5cc50dcb281a..f8ec4c5ac63c 100644
--- a/x11-fonts/libXft/pkg-plist
+++ b/x11-fonts/libXft/pkg-plist
@@ -1,9 +1,9 @@
 bin/xft-config
 include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
-lib/libXft.a
-lib/libXft.la
-lib/libXft.so
 lib/libXft.so.2
+lib/libXft.so
+lib/libXft.la
+lib/libXft.a
 libdata/pkgconfig/xft.pc
 @dirrm include/X11/Xft
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
new file mode 100644
index 000000000000..fc44a4f5327a
--- /dev/null
+++ b/x11-fonts/libfontenc/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	libfontenc
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libfontenc
+PORTVERSION=	1.0.4
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	The fontenc Library
+
+XORG_CAT=	lib
+USE_XORG=	xproto
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/libfontenc/distinfo b/x11-fonts/libfontenc/distinfo
new file mode 100644
index 000000000000..aa73b0a491e3
--- /dev/null
+++ b/x11-fonts/libfontenc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libfontenc-1.0.4.tar.bz2) = 5cd16a2e51ca7b96a3081c7486ff98b9
+SHA256 (xorg/lib/libfontenc-1.0.4.tar.bz2) = b993aa3d17e845a12a49160b5d96993059ce919c7ba902005b910b867b6258c8
+SIZE (xorg/lib/libfontenc-1.0.4.tar.bz2) = 224063
diff --git a/x11-fonts/libfontenc/pkg-descr b/x11-fonts/libfontenc/pkg-descr
new file mode 100644
index 000000000000..aa32dfd352dd
--- /dev/null
+++ b/x11-fonts/libfontenc/pkg-descr
@@ -0,0 +1,4 @@
+This package contains libfontenc, the X.Org fontenc library.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/libfontenc/pkg-plist b/x11-fonts/libfontenc/pkg-plist
new file mode 100644
index 000000000000..390f0d5d79fd
--- /dev/null
+++ b/x11-fonts/libfontenc/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/fonts/fontenc.h
+lib/libfontenc.a
+lib/libfontenc.la
+lib/libfontenc.so
+lib/libfontenc.so.1
+libdata/pkgconfig/fontenc.pc
+@dirrmtry include/X11/fonts
diff --git a/x11-fonts/manu-gothica/Makefile b/x11-fonts/manu-gothica/Makefile
index 971db0380f6a..8eb1dd657d8e 100644
--- a/x11-fonts/manu-gothica/Makefile
+++ b/x11-fonts/manu-gothica/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	manu-gothica
 DISTVERSION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.bryld.info/downloads/
 DISTNAME=	manugot19
diff --git a/x11-fonts/mathfonts/Makefile b/x11-fonts/mathfonts/Makefile
index 4a3b9ff9dab6..0a4dd015d319 100644
--- a/x11-fonts/mathfonts/Makefile
+++ b/x11-fonts/mathfonts/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	mathfonts
 PORTVERSION=	4.1	# Don't upgrade this port if not supported by MathML-enabled Mozilla
 # 			# Please check http://www.mozilla.org/projects/mathml/fonts/
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://support.wolfram.com/mathematica/systems/windows/general/files/
 DISTNAME=	MathFonts_TrueType_${PORTVERSION:S/.//}
diff --git a/x11-fonts/mgopen/Makefile b/x11-fonts/mgopen/Makefile
index cf91c168a74d..2c397b54284b 100644
--- a/x11-fonts/mgopen/Makefile
+++ b/x11-fonts/mgopen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mgopen
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.ellak.gr/fonts/mgopen/files/
 DISTNAME=	MgOpen
diff --git a/x11-fonts/mkbold-mkitalic/Makefile b/x11-fonts/mkbold-mkitalic/Makefile
index 00b8156ebbc4..c2a609a588ab 100644
--- a/x11-fonts/mkbold-mkitalic/Makefile
+++ b/x11-fonts/mkbold-mkitalic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mkbold-mkitalic
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA013651/lib/
 
diff --git a/x11-fonts/mkbold/Makefile b/x11-fonts/mkbold/Makefile
index daf48ca01f63..80c46c878d9e 100644
--- a/x11-fonts/mkbold/Makefile
+++ b/x11-fonts/mkbold/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mkbold
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 EXTRACT_SUFX=	.bz2
diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile
new file mode 100644
index 000000000000..44951e45096f
--- /dev/null
+++ b/x11-fonts/mkfontdir/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	mkfontdir
+# Date Created:				28 Aug 2005
+# Whom:					Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mkfontdir
+PORTVERSION=	1.0.2
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Create an index of X font files in a directory
+
+XORG_CAT=	app
+
+MAN1=		mkfontdir.1
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/mkfontdir/distinfo b/x11-fonts/mkfontdir/distinfo
new file mode 100644
index 000000000000..d272f02dae06
--- /dev/null
+++ b/x11-fonts/mkfontdir/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/mkfontdir-1.0.2.tar.bz2) = 94da9dcd2447300e8fdada896d7ed433
+SHA256 (xorg/app/mkfontdir-1.0.2.tar.bz2) = 06055b7e4d03661b987d48ff1a1e1e21c256431141d0f7fb8e4cceefce77b4b7
+SIZE (xorg/app/mkfontdir-1.0.2.tar.bz2) = 61745
diff --git a/x11-fonts/mkfontdir/pkg-descr b/x11-fonts/mkfontdir/pkg-descr
new file mode 100644
index 000000000000..6863f86cf59a
--- /dev/null
+++ b/x11-fonts/mkfontdir/pkg-descr
@@ -0,0 +1,5 @@
+This package contains mkfontdir, used for creating an index of X font files
+in a directory.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/mkfontdir/pkg-plist b/x11-fonts/mkfontdir/pkg-plist
new file mode 100644
index 000000000000..f38b25e58a66
--- /dev/null
+++ b/x11-fonts/mkfontdir/pkg-plist
@@ -0,0 +1 @@
+bin/mkfontdir
diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile
new file mode 100644
index 000000000000..2cc4301f0e91
--- /dev/null
+++ b/x11-fonts/mkfontscale/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	mkfontscale
+# Date Created:				28 Aug 2005
+# Whom:					Pawel Worach
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mkfontscale
+PORTVERSION=	1.0.3
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Creates an index of scalable font files for X
+
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+
+XORG_CAT=	app
+USE_XORG=	xproto fontenc
+
+MAN1=		mkfontscale.1
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/mkfontscale/distinfo b/x11-fonts/mkfontscale/distinfo
new file mode 100644
index 000000000000..d7a2771bbd83
--- /dev/null
+++ b/x11-fonts/mkfontscale/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/mkfontscale-1.0.3.tar.bz2) = 1d608771aca9695b828cec1e34178fd1
+SHA256 (xorg/app/mkfontscale-1.0.3.tar.bz2) = 0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020
+SIZE (xorg/app/mkfontscale-1.0.3.tar.bz2) = 94674
diff --git a/x11-fonts/mkfontscale/pkg-descr b/x11-fonts/mkfontscale/pkg-descr
new file mode 100644
index 000000000000..827cdd35961c
--- /dev/null
+++ b/x11-fonts/mkfontscale/pkg-descr
@@ -0,0 +1,5 @@
+This package contains mkfontscale, an application for creating an index of
+scalable font files for X.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/mkfontscale/pkg-plist b/x11-fonts/mkfontscale/pkg-plist
new file mode 100644
index 000000000000..ecb923a695aa
--- /dev/null
+++ b/x11-fonts/mkfontscale/pkg-plist
@@ -0,0 +1 @@
+bin/mkfontscale
diff --git a/x11-fonts/mkitalic/Makefile b/x11-fonts/mkitalic/Makefile
index 4fdd25c408af..ce404f9a0930 100644
--- a/x11-fonts/mkitalic/Makefile
+++ b/x11-fonts/mkitalic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mkitalic
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 EXTRACT_SUFX=	.bz2
diff --git a/x11-fonts/mozilla-fonts/Makefile b/x11-fonts/mozilla-fonts/Makefile
index b7ed0bdca21f..9216e037adee 100644
--- a/x11-fonts/mozilla-fonts/Makefile
+++ b/x11-fonts/mozilla-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mozilla-fonts
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 
 CATEGORIES=	x11-fonts www
 MASTER_SITES=	http://www.happygiraffe.net/dist/
diff --git a/x11-fonts/nexfontsel/Makefile b/x11-fonts/nexfontsel/Makefile
index df382d632c32..0c72aa28ebd7 100644
--- a/x11-fonts/nexfontsel/Makefile
+++ b/x11-fonts/nexfontsel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nexfontsel
 PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/ \
 		${MASTER_SITE_LOCAL}
diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile
index fede2c555dce..db393bb924cc 100644
--- a/x11-fonts/nucleus/Makefile
+++ b/x11-fonts/nucleus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nucleus
 PORTVERSION=	0.77
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xfonts
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index 5bcfef59421c..1f3cc9b0167b 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	type1inst
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts perl5
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=X11/xutils
diff --git a/x11-fonts/ppantsfonts/Makefile b/x11-fonts/ppantsfonts/Makefile
index 30efc08e075d..ac16c36e7e15 100644
--- a/x11-fonts/ppantsfonts/Makefile
+++ b/x11-fonts/ppantsfonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ppantsfonts
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://cus.org.uk/~dom/distfiles/ppants-fonts/
 DISTNAME=	${PORTNAME}-default-${PORTVERSION}
diff --git a/x11-fonts/proggy_fonts/Makefile b/x11-fonts/proggy_fonts/Makefile
index cdac57282bf6..c6b67f80ab4c 100644
--- a/x11-fonts/proggy_fonts/Makefile
+++ b/x11-fonts/proggy_fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	proggy_fonts
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.proggyfonts.com/download/
 DISTFILES=	ProggyClean.pcf.zip ProggySquare.pcf.zip	\
diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile
index 093dea3d3309..0049ecc34fed 100644
--- a/x11-fonts/sgifonts/Makefile
+++ b/x11-fonts/sgifonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sgifonts
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://patches-europe.sgi.com/pub/linux/ProPack1.4/SRPMS/ \
 		ftp://ftp.rediris.es/sites/patches-europe.sgi.com/pub/linux/ProPack1.4/SRPMS/
diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index 5b4c4d359bc2..414bad1aaebd 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sharefonts
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/fonts/
 
diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile
new file mode 100644
index 000000000000..aca5b89fb8f0
--- /dev/null
+++ b/x11-fonts/showfont/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	showfont
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	showfont
+PORTVERSION=	1.0.1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Font dumper for the X font server
+
+XORG_CAT=	app
+USE_XORG=	libfs
+
+PLIST_FILES=	bin/showfont
+
+MAN1=		showfont.1
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/showfont/distinfo b/x11-fonts/showfont/distinfo
new file mode 100644
index 000000000000..1a91304f82ed
--- /dev/null
+++ b/x11-fonts/showfont/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/showfont-1.0.1.tar.bz2) = 339b2faf1ca5114fda414338e15b6e21
+SHA256 (xorg/app/showfont-1.0.1.tar.bz2) = 87db3cf12914abc6b074d12b35c7f39c8fd7b5d3933b339e2c1260a51061760c
+SIZE (xorg/app/showfont-1.0.1.tar.bz2) = 77016
diff --git a/x11-fonts/showfont/pkg-descr b/x11-fonts/showfont/pkg-descr
new file mode 100644
index 000000000000..fe5b702c638b
--- /dev/null
+++ b/x11-fonts/showfont/pkg-descr
@@ -0,0 +1,4 @@
+This package contains showfont, a font dumper for the X font server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/suxus/Makefile b/x11-fonts/suxus/Makefile
index 199a343d5c80..032a7fe35be3 100644
--- a/x11-fonts/suxus/Makefile
+++ b/x11-fonts/suxus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	suxus
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.goof.com/pcg/marc/data/
 DISTFILES=	${PORTNAME}-iso-8859-1.bdf.gz fonts.alias
diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index 2700016857af..aa5a2f7fc4e1 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	terminus-font
 PORTVERSION=	4.20
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.is-vn.bg/hamster/
 
diff --git a/x11-fonts/texcm-ttf/Makefile b/x11-fonts/texcm-ttf/Makefile
index 6f1c86d12bef..d7a20bf9f414 100644
--- a/x11-fonts/texcm-ttf/Makefile
+++ b/x11-fonts/texcm-ttf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	texcm-ttf
 PORTVERSION=	20010117
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.mozilla.org/projects/mathml/fonts/bakoma/
 DISTFILES=	${PORTNAME}${EXTRACT_SUFX} license.txt
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index 3f456b7f640f..fdaa8d7e1943 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkfont
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	petef
diff --git a/x11-fonts/tolkien-ttf/Makefile b/x11-fonts/tolkien-ttf/Makefile
index e24132c1ba11..8b0e6f9d2014 100644
--- a/x11-fonts/tolkien-ttf/Makefile
+++ b/x11-fonts/tolkien-ttf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tolkien-ttf
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.northernstorm.org/distfiles/
 
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index 889eeb67240b..5e1835740ff9 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ttmkfdir
 PORTVERSION=	3.0.9
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts x11
 MASTER_SITES=	http://mbsd.msk.ru/dist/
diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile
index c7ac1e4967b5..2c80f9856503 100644
--- a/x11-fonts/tv-fonts/Makefile
+++ b/x11-fonts/tv-fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tv-fonts
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://dl.bytesex.org/releases/${PORTNAME}/
 
diff --git a/x11-fonts/urwfonts-ttf/Makefile b/x11-fonts/urwfonts-ttf/Makefile
index 9df1badc7833..1c06d1d181bf 100644
--- a/x11-fonts/urwfonts-ttf/Makefile
+++ b/x11-fonts/urwfonts-ttf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	urwfonts-ttf
 PORTVERSION=	1.0.7b18
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.gnome.ru/fonts/urw/release/
 DISTNAME=	urw-fonts-${PORTVERSION:S/b/pre/}-ttf
diff --git a/x11-fonts/urwfonts/Makefile b/x11-fonts/urwfonts/Makefile
index d68ef4d52e17..9602edfdf495 100644
--- a/x11-fonts/urwfonts/Makefile
+++ b/x11-fonts/urwfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	urwfonts
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/fonts/
 DISTNAME=	urw-fonts
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index 7f5d5554c94f..7c61b7a5b1a6 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	webfonts
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_NETBSD:S/%SUBDIR%/ms-ttf/}:group1 \
 	${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/corefonts/}:group1 \
diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile
index 8a14486811f2..4d4fce20bc69 100644
--- a/x11-fonts/wqy/Makefile
+++ b/x11-fonts/wqy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wqy
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
diff --git a/x11-fonts/xf86bigfontproto/Makefile b/x11-fonts/xf86bigfontproto/Makefile
new file mode 100644
index 000000000000..dbf8ea0d558a
--- /dev/null
+++ b/x11-fonts/xf86bigfontproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86bigfontproto
+# Date Created:				06 Feb 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86bigfontproto
+PORTVERSION=	1.1.2
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XFree86-Bigfont extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/xf86bigfontproto/distinfo b/x11-fonts/xf86bigfontproto/distinfo
new file mode 100644
index 000000000000..b80a3c01a5a8
--- /dev/null
+++ b/x11-fonts/xf86bigfontproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xf86bigfontproto-1.1.2.tar.bz2) = a318c1e86123832d7b0c95fc7d47ef35
+SHA256 (xorg/proto/xf86bigfontproto-1.1.2.tar.bz2) = 01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124
+SIZE (xorg/proto/xf86bigfontproto-1.1.2.tar.bz2) = 37450
diff --git a/x11-fonts/xf86bigfontproto/pkg-descr b/x11-fonts/xf86bigfontproto/pkg-descr
new file mode 100644
index 000000000000..a7644ffe455b
--- /dev/null
+++ b/x11-fonts/xf86bigfontproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XFree86-Bigfont extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/xf86bigfontproto/pkg-plist b/x11-fonts/xf86bigfontproto/pkg-plist
new file mode 100644
index 000000000000..16a3b7e8ef26
--- /dev/null
+++ b/x11-fonts/xf86bigfontproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/xf86bigfont.h
+include/X11/extensions/xf86bigfstr.h
+libdata/pkgconfig/xf86bigfontproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11-fonts/xfed/Makefile b/x11-fonts/xfed/Makefile
index 07f3564b8e77..3affec02d27a 100644
--- a/x11-fonts/xfed/Makefile
+++ b/x11-fonts/xfed/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfed
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		http://mirror2.unixfreunde.de/
diff --git a/x11-fonts/xfontsel/Makefile b/x11-fonts/xfontsel/Makefile
new file mode 100644
index 000000000000..7714d539dfb6
--- /dev/null
+++ b/x11-fonts/xfontsel/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xfontsel
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xfontsel
+PORTVERSION=	1.0.2
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Point and click selection of X11 font names
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		xfontsel.1
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/xfontsel/distinfo b/x11-fonts/xfontsel/distinfo
new file mode 100644
index 000000000000..84586d963ba5
--- /dev/null
+++ b/x11-fonts/xfontsel/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xfontsel-1.0.2.tar.bz2) = 288fe4cf8a990e4e602aac16dd9109fb
+SHA256 (xorg/app/xfontsel-1.0.2.tar.bz2) = 7a66ba3910bd7e39d58f9d4a4a588f191a874b8607369fe2cc9203a7115006a9
+SIZE (xorg/app/xfontsel-1.0.2.tar.bz2) = 106540
diff --git a/x11-fonts/xfontsel/pkg-descr b/x11-fonts/xfontsel/pkg-descr
new file mode 100644
index 000000000000..97b563110b17
--- /dev/null
+++ b/x11-fonts/xfontsel/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xfontsel, an application which provides a simple way to
+display fonts known to your X server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/xfontsel/pkg-plist b/x11-fonts/xfontsel/pkg-plist
new file mode 100644
index 000000000000..e26f937b600d
--- /dev/null
+++ b/x11-fonts/xfontsel/pkg-plist
@@ -0,0 +1,3 @@
+bin/xfontsel
+share/X11/app-defaults/XFontSel
+@dirrmtry share/X11/app-defaults
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index 39dc521a8057..abd7e863acee 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -1,50 +1,30 @@
-# New ports collection makefile for:    xorg-fontserver
-# Date created:		10 June 2004
-# Whom:			anholt@FreeBSD.org
+# New ports collection makefile for:	xfs
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	xorg-fontserver
-PORTVERSION=	6.9.0
-PORTREVISION=	1
-CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src2.tar.gz
+PORTNAME=	xfs
+PORTVERSION=	1.0.4
+PORTREVISION=	3
+PORTEPOCH=	1
+CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X font server from X.Org
+COMMENT=	X.Org font server
 
-CONFLICTS=	XFree86-FontServer-*
-
-EXTRA_PATCHES=	${CF_PATCHES}
-
-USE_XLIB=	yes
-USE_RC_SUBR=	yes
+XORG_CAT=	app
+USE_XORG=	libfs xfont xtrans
+USE_RC_SUBR=	xfs
+ALL_TARGET=	all config
 
 MAN1=		xfs.1
 
-XBUILD_DIRS=	programs/xfs
-XINCLUDE_DIRS=	lib/xtrans
-XMAN_DIRS=	programs/xfs
-
-post-build:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
-		${FILESDIR}/xfs.sh >${WRKDIR}/xfs.sh
-
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/xfs.sh ${PREFIX}/etc/rc.d
-	${INSTALL_SCRIPT} ${WRKSRC}/programs/xfs/config \
-		${PREFIX}/lib/X11/fs/config.default
+	${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config.default
+	@if [ ! -f ${PREFIX}/lib/X11/fs/config ]; then \
+		${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config; \
+	fi
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo
index 1785b7d2df7e..f5fc8d0b76d6 100644
--- a/x11-fonts/xfs/distinfo
+++ b/x11-fonts/xfs/distinfo
@@ -1,6 +1,3 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src2.tar.gz) = f49a0993d89038a46556720688450479
-SHA256 (xorg/X11R6.9.0-src2.tar.gz) = 848289b323d6193ac03ca001f41aa3cdf9cfd129cfbda1c5add209d5c18a8e4c
-SIZE (xorg/X11R6.9.0-src2.tar.gz) = 6056976
+MD5 (xorg/app/xfs-1.0.4.tar.bz2) = f43cb64d623b748208dfd9012d17b654
+SHA256 (xorg/app/xfs-1.0.4.tar.bz2) = 452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b
+SIZE (xorg/app/xfs-1.0.4.tar.bz2) = 149414
diff --git a/x11-fonts/xfs/files/patch-Imakefile b/x11-fonts/xfs/files/patch-Imakefile
deleted file mode 100644
index 64b65de2e69b..000000000000
--- a/x11-fonts/xfs/files/patch-Imakefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- programs/xfs/Imakefile.orig	Tue Jan 18 22:28:55 2005
-+++ programs/xfs/Imakefile	Tue Jan 18 22:30:24 2005
-@@ -37,7 +37,11 @@
- FSLIBDIR = $(LIBDIR)/fs
- FSERRORS = $(LOGDIRECTORY)/xfs.log
- DEFAULTFONTPATH = DefaultFSFontPath
-+#if defined(BuildFontCacheLib) && BuildFontCacheLib
-+SITE_CONFIG = -DDEFAULTFONTPATH=$(DEFAULTFONTPATH) -DFSERRORS=$(FSERRORS) -DFONTCACHE
-+#else
- SITE_CONFIG = -DDEFAULTFONTPATH=$(DEFAULTFONTPATH) -DFSERRORS=$(FSERRORS)
-+#endif
- 
- $(OSLIB):	$(OSDIR)
- 
diff --git a/x11-fonts/xfs/files/patch-Makefile.in b/x11-fonts/xfs/files/patch-Makefile.in
new file mode 100644
index 000000000000..2fecfe5ad0ee
--- /dev/null
+++ b/x11-fonts/xfs/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sat Jul  8 12:35:19 2006
++++ Makefile.in	Sat Jul  8 12:35:21 2006
+@@ -289,7 +289,7 @@
+ FSERRORS = /var/log/xfs.log
+ FONTDIR = $(libdir)/X11/fonts
+ FONTPATH = $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
+-config_DATA = config
++#config_DATA = config
+ EXTRA_DIST = xfs.def config.cpp $(appman_PRE)
+ CLEANFILES = config $(appman_DATA)
+ appmandir = $(APP_MAN_DIR)
diff --git a/x11-fonts/xfs/files/patch-config.cpp b/x11-fonts/xfs/files/patch-config.cpp
deleted file mode 100644
index d44e630c972f..000000000000
--- a/x11-fonts/xfs/files/patch-config.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- programs/xfs/config.cpp.orig	Tue Jan 18 22:31:25 2005
-+++ programs/xfs/config.cpp	Tue Jan 18 22:32:13 2005
-@@ -8,8 +8,10 @@
- XCOMM in decipoints
- default-point-size = 120
- default-resolutions = 75,75,100,100
-+#ifdef FONTCACHE
- 
- XCOMM font cache control, specified in KB
- cache-hi-mark = 2048
- cache-low-mark = 1433
- cache-balance = 70
-+#endif
diff --git a/x11-fonts/xfs/files/xfs.sh b/x11-fonts/xfs/files/xfs.in
index 5aa5f178ecff..cfb562fed5e3 100644
--- a/x11-fonts/xfs/files/xfs.sh
+++ b/x11-fonts/xfs/files/xfs.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/x11-fonts/xfs/files/Attic/xfs.sh,v 1.3 2006-02-20 20:47:50 dougb Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: xfs
@@ -28,8 +28,10 @@ rcvar=`set_rcvar`
 load_rc_config $name
 
 command="%%PREFIX%%/bin/${name}"
-command_args="-config ${xfs_config} -daemon"
+command_args="-config ${xfs_config} -daemon ${xfs_user:+-user ${xfs_user}}"
 required_files="$xfs_config"
 extra_commands="reload"
 
+unset xfs_user
+
 run_rc_command "$1"
diff --git a/x11-fonts/xfs/pkg-descr b/x11-fonts/xfs/pkg-descr
index 10961b30e99b..a3082dc9d0e9 100644
--- a/x11-fonts/xfs/pkg-descr
+++ b/x11-fonts/xfs/pkg-descr
@@ -1,6 +1,4 @@
 This package contains the X.Org font server.
 
-WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist
index 02128e26eb2a..02c0cee1f5f5 100644
--- a/x11-fonts/xfs/pkg-plist
+++ b/x11-fonts/xfs/pkg-plist
@@ -1,5 +1,5 @@
 bin/xfs
-etc/rc.d/xfs.sh
 @unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi
 lib/X11/fs/config.default
+@exec if [ ! -f %D/lib/X11/fs/config ] ; then cp -p %D/%F %B/config; fi
 @dirrmtry lib/X11/fs
diff --git a/x11-fonts/xfs/scripts/configure b/x11-fonts/xfs/scripts/configure
deleted file mode 100644
index 0ccd5cee2917..000000000000
--- a/x11-fonts/xfs/scripts/configure
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer YES"			>> $LOCALDEF
-echo "#define BuildServersOnly YES"		>> $LOCALDEF
-echo "#define XprtServer YES"			>> $LOCALDEF
-echo "#define XnestServer NO"			>> $LOCALDEF
-echo "#define XorgServer NO"			>> $LOCALDEF
-echo "#define XF86Server NO"			>> $LOCALDEF
-echo "#define BuildFontServer NO"		>> $LOCALDEF
-echo "#define BuildLBX NO"			>> $LOCALDEF
-echo "#define InstallFSConfig NO"		>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
-echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile
new file mode 100644
index 000000000000..858ad2b44157
--- /dev/null
+++ b/x11-fonts/xfsinfo/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xfsinfo
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xfsinfo
+PORTVERSION=	1.0.1
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X font server information utility
+
+XORG_CAT=	app
+USE_XORG=	x11 libfs
+
+PLIST_FILES=	bin/xfsinfo
+
+MAN1=		xfsinfo.1
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/xfsinfo/distinfo b/x11-fonts/xfsinfo/distinfo
new file mode 100644
index 000000000000..2a37289742ee
--- /dev/null
+++ b/x11-fonts/xfsinfo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xfsinfo-1.0.1.tar.bz2) = e98b18fbce1261de30b1de819d86f48a
+SHA256 (xorg/app/xfsinfo-1.0.1.tar.bz2) = adc33443b3a7f334d2407de702004a0491f24708e0e1abe74cd8ae114cd60cd9
+SIZE (xorg/app/xfsinfo-1.0.1.tar.bz2) = 74335
diff --git a/x11-fonts/xfsinfo/pkg-descr b/x11-fonts/xfsinfo/pkg-descr
new file mode 100644
index 000000000000..91451af9f60d
--- /dev/null
+++ b/x11-fonts/xfsinfo/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xfsinfo, which is a X font server information utility.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/xlsfonts/Makefile b/x11-fonts/xlsfonts/Makefile
new file mode 100644
index 000000000000..a1660b90a4db
--- /dev/null
+++ b/x11-fonts/xlsfonts/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xlsfonts
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xlsfonts
+PORTVERSION=	1.0.2
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Server font list displayer for X
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+PLIST_FILES=	bin/xlsfonts
+
+MAN1=		xlsfonts.1
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/xlsfonts/distinfo b/x11-fonts/xlsfonts/distinfo
new file mode 100644
index 000000000000..d9c19f49680f
--- /dev/null
+++ b/x11-fonts/xlsfonts/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xlsfonts-1.0.2.tar.bz2) = 28958248590ff60ecd70e8f590d977b7
+SHA256 (xorg/app/xlsfonts-1.0.2.tar.bz2) = cc6e519b783b082a2fe4cd06ea5b3693ee6bdb23f4b36e7a72753c524ef5111c
+SIZE (xorg/app/xlsfonts-1.0.2.tar.bz2) = 99216
diff --git a/x11-fonts/xlsfonts/pkg-descr b/x11-fonts/xlsfonts/pkg-descr
new file mode 100644
index 000000000000..e21c4663296c
--- /dev/null
+++ b/x11-fonts/xlsfonts/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xlsfonts, a server font list displayer for X.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index 3159a8b2a4b1..1cdb7b689e78 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmbdfed
 PORTVERSION=	4.7.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://crl.nmsu.edu/~mleisher/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index ba6900da6166..25e9c1654bab 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -6,34 +6,35 @@
 #
 
 PORTNAME=	xorg-fonts-100dpi
-PORTVERSION=	6.9.0
-PORTREVISION=	1
+PORTVERSION=	7.2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTNAME=	X11R${PORTVERSION}-src1
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org 100dpi bitmap fonts
 
-BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/xorg-clients
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/xorg-fonts-encodings
+RUN_DEPENDS=	${FONTDIR}/100dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-100dpi \
+		${FONTDIR}/100dpi/UTBI__10.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-utopia-100dpi \
+		${FONTDIR}/100dpi/luBIS08.pcf.gz:${PORTSDIR}/x11-fonts/font-bh-100dpi \
+		${FONTDIR}/100dpi/lutBS08.pcf.gz:${PORTSDIR}/x11-fonts/font-bh-lucidatypewriter-100dpi \
+		${FONTDIR}/100dpi/charB08.pcf.gz:${PORTSDIR}/x11-fonts/font-bitstream-100dpi \
+		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
 
 CONFLICTS=	XFree86-font100dpi-*
 
-EXTRA_PATCHES=	${CF_PATCHES}
+NO_BUILD=	# none
+FONTDIR=	${X11BASE}/lib/X11/fonts
 
-XBUILD_DIRS=	fonts/encodings fonts/bdf/100dpi
-XINSTALL_DIRS=	fonts/bdf/100dpi
+do-install:	# empty
 
-post-install:
-	@command fc-cache -v ${PREFIX}/lib/X11/fonts/100dpi || true
-
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
+
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
 	distribution. See The X Window System and Virtual Consoles chapter\
 	of FAQ for more information
 .endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-100dpi/distinfo b/x11-fonts/xorg-fonts-100dpi/distinfo
deleted file mode 100644
index 6f737f23f0df..000000000000
--- a/x11-fonts/xorg-fonts-100dpi/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-100dpi/scripts/configure b/x11-fonts/xorg-fonts-100dpi/scripts/configure
deleted file mode 100644
index 39b6b5a1adfe..000000000000
--- a/x11-fonts/xorg-fonts-100dpi/scripts/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define UseInstalledClients YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index e612bc51038a..f7d2be831c5a 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -6,34 +6,35 @@
 #
 
 PORTNAME=	xorg-fonts-75dpi
-PORTVERSION=	6.9.0
-PORTREVISION=	1
+PORTVERSION=	7.2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTNAME=	X11R${PORTVERSION}-src1
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org 75dpi bitmap fonts
 
-BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/xorg-clients
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/xorg-fonts-encodings
+RUN_DEPENDS=	${FONTDIR}/75dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75dpi \
+		${FONTDIR}/75dpi/UTBI__10.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-utopia-75dpi \
+		${FONTDIR}/75dpi/luBIS08.pcf.gz:${PORTSDIR}/x11-fonts/font-bh-75dpi \
+		${FONTDIR}/75dpi/lutBS08.pcf.gz:${PORTSDIR}/x11-fonts/font-bh-lucidatypewriter-75dpi \
+		${FONTDIR}/75dpi/charB08.pcf.gz:${PORTSDIR}/x11-fonts/font-bitstream-75dpi \
+		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
 
 CONFLICTS=	XFree86-font75dpi-*
 
-EXTRA_PATCHES=	${CF_PATCHES}
+NO_BUILD=	# none
+FONTDIR=	${X11BASE}/lib/X11/fonts
 
-XBUILD_DIRS=	fonts/encodings fonts/bdf/75dpi
-XINSTALL_DIRS=	fonts/bdf/75dpi
+do-install:	# empty
 
-post-install:
-	@command fc-cache -v ${PREFIX}/lib/X11/fonts/75dpi || true
-
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
+
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
 	distribution. See The X Window System and Virtual Consoles chapter\
 	of FAQ for more information
 .endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-75dpi/distinfo b/x11-fonts/xorg-fonts-75dpi/distinfo
deleted file mode 100644
index 6f737f23f0df..000000000000
--- a/x11-fonts/xorg-fonts-75dpi/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-75dpi/scripts/configure b/x11-fonts/xorg-fonts-75dpi/scripts/configure
deleted file mode 100644
index 39b6b5a1adfe..000000000000
--- a/x11-fonts/xorg-fonts-75dpi/scripts/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define UseInstalledClients YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index 04299cf856aa..e80346d7a92e 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -6,34 +6,34 @@
 #
 
 PORTNAME=	xorg-fonts-cyrillic
-PORTVERSION=	6.9.0
-PORTREVISION=	1
+PORTVERSION=	7.2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTNAME=	X11R${PORTVERSION}-src1
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Cyrillic bitmap fonts
 
-BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/xorg-clients
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/xorg-fonts-encodings
+RUN_DEPENDS=	${FONTDIR}/cyrillic/crox1c.pcf.gz:${PORTSDIR}/x11-fonts/font-cronyx-cyrillic \
+		${FONTDIR}/cyrillic/koi12x24.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-cyrillic \
+		${FONTDIR}/cyrillic/screen8x16.pcf.gz:${PORTSDIR}/x11-fonts/font-screen-cyrillic \
+		${FONTDIR}/cyrillic/proof9x16.pcf.gz:${PORTSDIR}/x11-fonts/font-winitzki-cyrillic \
+		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
 
 CONFLICTS=	XFree86-fontCyrillic-*
 
-EXTRA_PATCHES=	${CF_PATCHES}
+NO_BUILD=	# none
+FONTDIR=	${X11BASE}/lib/X11/fonts
 
-XBUILD_DIRS=	fonts/encodings fonts/bdf/cyrillic
-XINSTALL_DIRS=	fonts/bdf/cyrillic
+do-install:	# empty
 
-post-install:
-	@command fc-cache -v ${PREFIX}/lib/X11/fonts/cyrillic || true
-
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
+
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
 	distribution. See The X Window System and Virtual Consoles chapter\
 	of FAQ for more information
 .endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-cyrillic/distinfo b/x11-fonts/xorg-fonts-cyrillic/distinfo
deleted file mode 100644
index 6f737f23f0df..000000000000
--- a/x11-fonts/xorg-fonts-cyrillic/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-cyrillic/scripts/configure b/x11-fonts/xorg-fonts-cyrillic/scripts/configure
deleted file mode 100644
index 39b6b5a1adfe..000000000000
--- a/x11-fonts/xorg-fonts-cyrillic/scripts/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define UseInstalledClients YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index 5bb513307b2e..709c1d774105 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -6,34 +6,41 @@
 #
 
 PORTNAME=	xorg-fonts-miscbitmaps
-PORTVERSION=	6.9.0
-PORTREVISION=	1
+PORTVERSION=	7.2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTNAME=	X11R${PORTVERSION}-src1
+MASTER_SITES=	# none
+DISTFILES=	# none
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous bitmap fonts
 
-BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/xorg-clients
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/xorg-fonts-encodings
+RUN_DEPENDS=	${FONTDIR}/misc/arabic24.pcf.gz:${PORTSDIR}/x11-fonts/font-arabic-misc \
+		${FONTDIR}/misc/cursor.pcf.gz:${PORTSDIR}/x11-fonts/font-cursor-misc \
+		${FONTDIR}/misc/hanglg16.pcf.gz:${PORTSDIR}/x11-fonts/font-daewoo-misc \
+		${FONTDIR}/misc/deccurs.pcf.gz:${PORTSDIR}/x11-fonts/font-dec-misc \
+		${FONTDIR}/misc/gb16fs.pcf.gz:${PORTSDIR}/x11-fonts/font-isas-misc \
+		${FONTDIR}/misc/jiskan16.pcf.gz:${PORTSDIR}/x11-fonts/font-jis-misc \
+		${FONTDIR}/misc/micro.pcf.gz:${PORTSDIR}/x11-fonts/font-micro-misc \
+		${FONTDIR}/misc/10x20-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc \
+		${FONTDIR}/misc/cu-alt12.pcf.gz:${PORTSDIR}/x11-fonts/font-mutt-misc \
+		${FONTDIR}/misc/clB6x10.pcf.gz:${PORTSDIR}/x11-fonts/font-schumacher-misc \
+		${FONTDIR}/misc/12x24.pcf.gz:${PORTSDIR}/x11-fonts/font-sony-misc \
+		${FONTDIR}/misc/olcursor.pcf.gz:${PORTSDIR}/x11-fonts/font-sun-misc \
+		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
 
 CONFLICTS=	XFree86-fontDefaultBitmaps-*
 
-EXTRA_PATCHES=	${CF_PATCHES}
+NO_BUILD=	# none
+FONTDIR=	${X11BASE}/lib/X11/fonts
 
-XBUILD_DIRS=	fonts/encodings fonts/bdf/misc
-XINSTALL_DIRS=	fonts/bdf/misc
+do-install:	# empty
 
-post-install:
-	@command fc-cache -v ${PREFIX}/lib/X11/fonts/misc
-
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
+
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
 	distribution. See The X Window System and Virtual Consoles chapter\
 	of FAQ for more information
 .endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/distinfo b/x11-fonts/xorg-fonts-miscbitmaps/distinfo
deleted file mode 100644
index 6f737f23f0df..000000000000
--- a/x11-fonts/xorg-fonts-miscbitmaps/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/scripts/configure b/x11-fonts/xorg-fonts-miscbitmaps/scripts/configure
deleted file mode 100644
index 39b6b5a1adfe..000000000000
--- a/x11-fonts/xorg-fonts-miscbitmaps/scripts/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define UseInstalledClients YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index 38019103f01e..e12139ca914e 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -6,36 +6,34 @@
 #
 
 PORTNAME=	xorg-fonts-truetype
-PORTVERSION=	6.9.0
+PORTVERSION=	7.2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTNAME=	X11R${PORTVERSION}-src1
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org TrueType fonts
 
-BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/xorg-clients \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/xorg-fonts-encodings \
+RUN_DEPENDS=	${FONTDIR}/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/font-bh-ttf \
+		${FONTDIR}/OTF/SyrCOMAdiabene.otf:${PORTSDIR}/x11-fonts/font-misc-meltho \
+		${FONTDIR}/TTF/GohaTibebZemen.ttf:${PORTSDIR}/x11-fonts/font-misc-ethiopic \
+		${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \
 		${X11BASE}/lib/X11/fonts/bitstream-vera/VeraIt.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 CONFLICTS=	XFree86-fontScalable-*
 
-EXTRA_PATCHES=	${CF_PATCHES}
+do-install:	# empty
 
-XBUILD_DIRS=	fonts/encodings fonts/scaled/TTF
-XINSTALL_DIRS=	fonts/scaled/TTF
+NO_BUILD=	# none
+FONTDIR=	${X11BASE}/lib/X11/fonts
 
-post-install:
-	@command fc-cache -v ${PREFIX}/lib/X11/fonts/TTF || true
-
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
+
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
 	distribution. See The X Window System and Virtual Consoles chapter\
 	of FAQ for more information
 .endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-truetype/distinfo b/x11-fonts/xorg-fonts-truetype/distinfo
deleted file mode 100644
index 6f737f23f0df..000000000000
--- a/x11-fonts/xorg-fonts-truetype/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-truetype/files/patch-TTF-Imakefile b/x11-fonts/xorg-fonts-truetype/files/patch-TTF-Imakefile
deleted file mode 100644
index ca7032fbe6c4..000000000000
--- a/x11-fonts/xorg-fonts-truetype/files/patch-TTF-Imakefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- fonts/scaled/TTF/Imakefile.orig	Sun May 30 17:51:49 2004
-+++ fonts/scaled/TTF/Imakefile	Sun May 30 17:52:06 2004
-@@ -8,7 +8,7 @@
- VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraMoBI.ttf VeraMoBd.ttf \
- 	VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf
- 
--FONTS = $(LUXIFONTS) $(VERAFONTS)
-+FONTS = $(LUXIFONTS)
- OBJS = $(FONTS)
- 
- FONTINSTDIR = $(FONTDIR)/TTF
-@@ -31,6 +31,7 @@
- DependSubdirs($(SUBDIRS))
- #endif
- 
-+.if 0
- LinkSourceFile(Vera.ttf,$(VERASRCDIR))
- LinkSourceFile(VeraBI.ttf,$(VERASRCDIR))
- LinkSourceFile(VeraBd.ttf,$(VERASRCDIR))
-@@ -41,4 +42,4 @@
- LinkSourceFile(VeraMono.ttf,$(VERASRCDIR))
- LinkSourceFile(VeraSe.ttf,$(VERASRCDIR))
- LinkSourceFile(VeraSeBd.ttf,$(VERASRCDIR))
--
-+.endif
diff --git a/x11-fonts/xorg-fonts-truetype/pkg-plist b/x11-fonts/xorg-fonts-truetype/pkg-plist
deleted file mode 100644
index 6111aee20ed6..000000000000
--- a/x11-fonts/xorg-fonts-truetype/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-lib/X11/fonts/TTF/encodings.dir
-lib/X11/fonts/TTF/fonts.dir
-lib/X11/fonts/TTF/fonts.scale
-lib/X11/fonts/TTF/luximb.ttf
-lib/X11/fonts/TTF/luximbi.ttf
-lib/X11/fonts/TTF/luximr.ttf
-lib/X11/fonts/TTF/luximri.ttf
-lib/X11/fonts/TTF/luxirb.ttf
-lib/X11/fonts/TTF/luxirbi.ttf
-lib/X11/fonts/TTF/luxirr.ttf
-lib/X11/fonts/TTF/luxirri.ttf
-lib/X11/fonts/TTF/luxisb.ttf
-lib/X11/fonts/TTF/luxisbi.ttf
-lib/X11/fonts/TTF/luxisr.ttf
-lib/X11/fonts/TTF/luxisri.ttf
-@exec command fc-cache -v %D/lib/X11/fonts/TTF 2>/dev/null || true
-@unexec rm %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || true
-@unexec command fc-cache -v %D/lib/X11/fonts/TTF 2>/dev/null || true
-@unexec if [ -e %D/lib/X11/fonts/TTF/fonts.cache-1 -a ! -s %D/lib/X11/fonts/TTF/fonts.cache-1 ]; then rm %D/lib/X11/fonts/TTF/fonts.cache-1; fi
-@dirrmtry lib/X11/fonts/TTF
diff --git a/x11-fonts/xorg-fonts-truetype/scripts/configure b/x11-fonts/xorg-fonts-truetype/scripts/configure
deleted file mode 100644
index 39b6b5a1adfe..000000000000
--- a/x11-fonts/xorg-fonts-truetype/scripts/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define UseInstalledClients YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index a9278dd8d3bd..1352145f0c5d 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -6,35 +6,35 @@
 #
 
 PORTNAME=	xorg-fonts-type1
-PORTVERSION=	6.9.0
+PORTVERSION=	7.2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTNAME=	X11R${PORTVERSION}-src1
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Type1 fonts
 
-BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/xorg-clients \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/xorg-fonts-encodings \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	${FONTDIR}/Type1/UTBI____.afm:${PORTSDIR}/x11-fonts/font-adobe-utopia-type1 \
+		${FONTDIR}/Type1/l047013t.afm:${PORTSDIR}/x11-fonts/font-bh-type1 \
+		${FONTDIR}/Type1/c0419bt_.afm:${PORTSDIR}/x11-fonts/font-bitstream-type1 \
+		${FONTDIR}/Type1/cour.afm:${PORTSDIR}/x11-fonts/font-ibm-type1 \
+		${FONTDIR}/Type1/cursor.pfa:${PORTSDIR}/x11-fonts/font-xfree86-type1 \
+		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
 
 CONFLICTS=	XFree86-fontScalable-*
 
-EXTRA_PATCHES=	${CF_PATCHES}
+do-install:	# empty
 
-XBUILD_DIRS=	fonts/encodings fonts/scaled/Type1
-XINSTALL_DIRS=	fonts/scaled/Type1
+NO_BUILD=	# none
+FONTDIR=	${X11BASE}/lib/X11/fonts
 
-post-install:
-	@command fc-cache ${PREFIX}/lib/X11/fonts/Type1 || true
-
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
+
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
 	distribution. See The X Window System and Virtual Consoles chapter\
 	of FAQ for more information
 .endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-type1/distinfo b/x11-fonts/xorg-fonts-type1/distinfo
deleted file mode 100644
index 6f737f23f0df..000000000000
--- a/x11-fonts/xorg-fonts-type1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-type1/pkg-plist b/x11-fonts/xorg-fonts-type1/pkg-plist
deleted file mode 100644
index cc63120c0a1a..000000000000
--- a/x11-fonts/xorg-fonts-type1/pkg-plist
+++ /dev/null
@@ -1,65 +0,0 @@
-lib/X11/fonts/Type1/UTBI____.afm
-lib/X11/fonts/Type1/UTBI____.pfa
-lib/X11/fonts/Type1/UTB_____.afm
-lib/X11/fonts/Type1/UTB_____.pfa
-lib/X11/fonts/Type1/UTI_____.afm
-lib/X11/fonts/Type1/UTI_____.pfa
-lib/X11/fonts/Type1/UTRG____.afm
-lib/X11/fonts/Type1/UTRG____.pfa
-lib/X11/fonts/Type1/c0419bt_.afm
-lib/X11/fonts/Type1/c0419bt_.pfb
-lib/X11/fonts/Type1/c0582bt_.afm
-lib/X11/fonts/Type1/c0582bt_.pfb
-lib/X11/fonts/Type1/c0583bt_.afm
-lib/X11/fonts/Type1/c0583bt_.pfb
-lib/X11/fonts/Type1/c0611bt_.afm
-lib/X11/fonts/Type1/c0611bt_.pfb
-lib/X11/fonts/Type1/c0632bt_.afm
-lib/X11/fonts/Type1/c0632bt_.pfb
-lib/X11/fonts/Type1/c0633bt_.afm
-lib/X11/fonts/Type1/c0633bt_.pfb
-lib/X11/fonts/Type1/c0648bt_.afm
-lib/X11/fonts/Type1/c0648bt_.pfb
-lib/X11/fonts/Type1/c0649bt_.afm
-lib/X11/fonts/Type1/c0649bt_.pfb
-lib/X11/fonts/Type1/cour.afm
-lib/X11/fonts/Type1/cour.pfa
-lib/X11/fonts/Type1/courb.afm
-lib/X11/fonts/Type1/courb.pfa
-lib/X11/fonts/Type1/courbi.afm
-lib/X11/fonts/Type1/courbi.pfa
-lib/X11/fonts/Type1/couri.afm
-lib/X11/fonts/Type1/couri.pfa
-lib/X11/fonts/Type1/cursor.pfa
-lib/X11/fonts/Type1/encodings.dir
-lib/X11/fonts/Type1/fonts.dir
-lib/X11/fonts/Type1/fonts.scale
-lib/X11/fonts/Type1/l047013t.afm
-lib/X11/fonts/Type1/l047013t.pfa
-lib/X11/fonts/Type1/l047016t.afm
-lib/X11/fonts/Type1/l047016t.pfa
-lib/X11/fonts/Type1/l047033t.afm
-lib/X11/fonts/Type1/l047033t.pfa
-lib/X11/fonts/Type1/l047036t.afm
-lib/X11/fonts/Type1/l047036t.pfa
-lib/X11/fonts/Type1/l048013t.afm
-lib/X11/fonts/Type1/l048013t.pfa
-lib/X11/fonts/Type1/l048016t.afm
-lib/X11/fonts/Type1/l048016t.pfa
-lib/X11/fonts/Type1/l048033t.afm
-lib/X11/fonts/Type1/l048033t.pfa
-lib/X11/fonts/Type1/l048036t.afm
-lib/X11/fonts/Type1/l048036t.pfa
-lib/X11/fonts/Type1/l049013t.afm
-lib/X11/fonts/Type1/l049013t.pfa
-lib/X11/fonts/Type1/l049016t.afm
-lib/X11/fonts/Type1/l049016t.pfa
-lib/X11/fonts/Type1/l049033t.afm
-lib/X11/fonts/Type1/l049033t.pfa
-lib/X11/fonts/Type1/l049036t.afm
-lib/X11/fonts/Type1/l049036t.pfa
-@exec command fc-cache %D/lib/X11/fonts/Type1 2>/dev/null || true
-@unexec rm %D/lib/X11/fonts/Type1/fonts.cache-1 2>/dev/null || true
-@unexec command fc-cache %D/lib/X11/fonts/Type1 2>/dev/null || true
-@unexec if [ -e %D/lib/X11/fonts/Type1/fonts.cache-1 -a ! -s %D/lib/X11/fonts/Type1/fonts.cache-1 ]; then rm %D/lib/X11/fonts/Type1/fonts.cache-1; fi
-@dirrmtry lib/X11/fonts/Type1
diff --git a/x11-fonts/xorg-fonts-type1/scripts/configure b/x11-fonts/xorg-fonts-type1/scripts/configure
deleted file mode 100644
index 39b6b5a1adfe..000000000000
--- a/x11-fonts/xorg-fonts-type1/scripts/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define UseInstalledClients YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
new file mode 100644
index 000000000000..1ececd434bdd
--- /dev/null
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:    xorg-fonts
+# Date created:				Jun 22 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xorg-fonts
+PORTVERSION=	7.2
+CATEGORIES=	x11-fonts
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.org fonts meta-port
+
+USE_XORG=	fontutil
+PREFIX?=	${X11BASE}
+
+FONTSDIR=	${PREFIX}/lib/X11/fonts
+RUN_DEPENDS=	${FONTSDIR}/100dpi/courB08-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
+		${FONTSDIR}/75dpi/courB08-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-75dpi \
+		${FONTSDIR}/cyrillic/koi12x24.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic \
+		${FONTSDIR}/misc/10x20-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
+		${FONTSDIR}/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
+		${FONTSDIR}/Type1/cour.afm:${PORTSDIR}/x11-fonts/xorg-fonts-type1 \
+		${FONTSDIR}/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias
+
+NO_BUILD=	yes
+
+do-install:
+		${MKDIR} ${PREFIX}/libdata/xorg
+		${TOUCH} ${PREFIX}/libdata/xorg/fonts
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts/pkg-descr b/x11-fonts/xorg-fonts/pkg-descr
new file mode 100644
index 000000000000..9915d82699e5
--- /dev/null
+++ b/x11-fonts/xorg-fonts/pkg-descr
@@ -0,0 +1,6 @@
+This meta-package installs all X.Org fonts and related programs.
+
+WWW: http://www.x.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts/pkg-plist b/x11-fonts/xorg-fonts/pkg-plist
new file mode 100644
index 000000000000..1369ed76f021
--- /dev/null
+++ b/x11-fonts/xorg-fonts/pkg-plist
@@ -0,0 +1,2 @@
+libdata/xorg/fonts
+@dirrmtry libdata/xorg
diff --git a/x11-servers/Makefile b/x11-servers/Makefile
index 300213c09739..f738afdd03b5 100644
--- a/x11-servers/Makefile
+++ b/x11-servers/Makefile
@@ -15,7 +15,6 @@
     SUBDIR += x2vnc
     SUBDIR += x2x
     SUBDIR += xorg-dmx
-    SUBDIR += xorg-fontserver
     SUBDIR += xorg-nestserver
     SUBDIR += xorg-printserver
     SUBDIR += xorg-server
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 0db2afc8f7e5..f33cfb621af0 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	FontServer
 PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 8782a9c7e091..804011d15195 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	NestServer
 PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index cdd1f4f68a6b..4c87db7060af 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	PrintServer
 PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index dc2fc573b7f1..bb61988dbde6 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.5.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 8fd6a015f035..ef300eec9412 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	VirtualFramebufferServer
 PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile
index 56b4ab15cf4d..5ad3a785162c 100644
--- a/x11-servers/Xfstt/Makefile
+++ b/x11-servers/Xfstt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfstt
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://download.berlios.de/xfstt/
 
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index 9cfc0fbfded4..a56537c835a9 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	driglide
 PORTVERSION=	0.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	anholt/driglide/
diff --git a/x11-servers/mga_hal/Makefile b/x11-servers/mga_hal/Makefile
index 87fda45aee9f..ac3ae9917682 100644
--- a/x11-servers/mga_hal/Makefile
+++ b/x11-servers/mga_hal/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mga_hal
 PORTVERSION=	4.4.0
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	ftp://ftp.matrox.com/pub/mga/archive/linux/%SUBDIR%/:i386,amd64
 MASTER_SITE_SUBDIR=	2006/:i386 2006/64bit/:amd64
diff --git a/x11-servers/synaptics/Makefile b/x11-servers/synaptics/Makefile
index f5fab0f2353f..7a39ce27f533 100644
--- a/x11-servers/synaptics/Makefile
+++ b/x11-servers/synaptics/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	synaptics
 PORTVERSION=	0.14.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://web.telia.com/~u89404340/touchpad/files/:synaptics
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \
@@ -31,10 +31,15 @@ X11VERSION!=	${MAKE} -C `${MAKE} -f bsd.port.mk -VX_SERVER_PORT` \
 
 .if	${X_WINDOW_SYSTEM:L} == xorg
 
-MASTER_SITES+=	${MASTER_SITE_XORG:C/$/:x11/}
-MASTER_SITE_SUBDIR=	X11R${X11VERSION}/src/:x11
-DIST_SUBDIR=	xorg
-X_DISTFILES=	X11R${X11VERSION}-src3.tar.gz
+MASTER_SITES+=	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \
+                http://xorg.freedesktop.org/releases/individual/xserver/:x11
+DIST_SUBDIR=	xorg/xserver
+X_DISTFILES=	xorg-server-${X11VERSION}.tar.bz2
+PLIST_SUB+=	XORG="" XFREE86="@comment "
+
+post-patch:
+	@${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${X11BASE}/include|' \
+		${WRKSRC}/Makefile
 
 .elif	${X_WINDOW_SYSTEM:L} == xfree86-4
 
@@ -42,6 +47,7 @@ MASTER_SITES+=	${MASTER_SITE_XFREE:C/$/:x11/}
 MASTER_SITE_SUBDIR=	${X11VERSION}/:x11
 DIST_SUBDIR=	xc
 X_DISTFILES=	XFree86-${X11VERSION}-src-3.tgz
+PLIST_SUB+=	XORG="@comment " XFREE86=""
 
 .else
 
@@ -62,6 +68,11 @@ post-extract:
 		${GZIP_CMD} -dc ${_DISTDIR}/${FILE} | ${TAR} -xf -
 .endfor
 
+.if	${X_WINDOW_SYSTEM:L} == xorg
+pre-install:
+	${MKDIR} ${X11BASE}/lib/xorg/modules/input/
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/x11-servers/synaptics/distinfo b/x11-servers/synaptics/distinfo
index c2b2b6e25022..a4b8415f3a1e 100644
--- a/x11-servers/synaptics/distinfo
+++ b/x11-servers/synaptics/distinfo
@@ -1,9 +1,9 @@
-MD5 (xorg/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
-SHA256 (xorg/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
-SIZE (xorg/synaptics-0.14.6.tar.bz2) = 126833
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
+MD5 (xorg/xserver/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
+SHA256 (xorg/xserver/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
+SIZE (xorg/xserver/synaptics-0.14.6.tar.bz2) = 126833
+MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6
+SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
+SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596
 MD5 (xc/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
 SHA256 (xc/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
 SIZE (xc/synaptics-0.14.6.tar.bz2) = 126833
diff --git a/x11-servers/synaptics/pkg-plist b/x11-servers/synaptics/pkg-plist
index 9eb476975db3..46e202c29d17 100644
--- a/x11-servers/synaptics/pkg-plist
+++ b/x11-servers/synaptics/pkg-plist
@@ -1,3 +1,7 @@
 bin/synclient
 @comment bin/syndaemon
-lib/modules/input/synaptics_drv.o
+%%XORG%%lib/xorg/modules/input/synaptics_drv.so
+%%XORG%%@dirrmtry lib/xorg/modules/input
+%%XORG%%@dirrmtry lib/xorg/modules
+%%XORG%%@dirrmtry lib/xorg
+%%XFREE86%%lib/modules/input/synaptics_drv.o
diff --git a/x11-servers/x2vnc/Makefile b/x11-servers/x2vnc/Makefile
index 754a02378c04..7819adc010b9 100644
--- a/x11-servers/x2vnc/Makefile
+++ b/x11-servers/x2vnc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	x2vnc
 PORTVERSION=	1.72
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://fredrik.hubbe.net/x2vnc/
 DISTNAME=	${PORTNAME}-1.7.2
diff --git a/x11-servers/x2x/Makefile b/x11-servers/x2x/Makefile
index 0004d4036024..3a45fde7a482 100644
--- a/x11-servers/x2x/Makefile
+++ b/x11-servers/x2x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x2x
 PORTVERSION=	1.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://gatekeeper.dec.com/pub/DEC/SRC/x2x/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 050c4221077a..fb4a3751d88f 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,35 +6,33 @@
 #
 
 PORTNAME=	xorg-dmx
-PORTVERSION=	6.9.0
-PORTREVISION=	2
+PORTVERSION=	1.2.0
+PORTEPOCH=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src3.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Distributed Multihead X from X.Org
 
 CONFLICTS=	XFree86-dmx-[0-9]*
 
-EXTRA_PATCHES=	${CF_PATCHES} ${SERVER_PATCHES}
+XORG_CAT=	xserver
 
-USE_XLIB=	yes
+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
+		damageproto xcmiscproto xextproto xf86miscproto \
+		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+		resourceproto fontsproto xf86dgaproto videoproto \
+		compositeproto trapproto recordproto resourceproto \
+		xineramaproto evieproto xkbfile xfont fontenc xkbui \
+		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
+		xau dmx xtst xres
+		
+CONFIGURE_ARGS=	--disable-xprint --disable-xvfb --disable-xorg --disable-xnest \
+		--enable-dmx --localstatedir=/var
 
-XBUILD_DIRS=	lib/font programs/Xserver/miext/damage programs/Xserver
-XINCLUDE_DIRS=	lib/xtrans
-XMAN_DIRS=	programs/Xserver/hw/dmx
+MAN1=		Xdmx.1 dmxtodmx.1 vdltodmx.1 xdmxconfig.1
 
-MAN1=		Xdmx.1
-PLIST_FILES=	bin/Xdmx
+do-install:
+	cd ${WRKSRC}/hw/dmx; ${MAKE} install
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index 177370c87899..b208692af414 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,6 +1,3 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
+MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6
+SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
+SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596
diff --git a/x11-servers/xorg-dmx/files/patch-dmx.c b/x11-servers/xorg-dmx/files/patch-dmx.c
deleted file mode 100644
index d29155b81c81..000000000000
--- a/x11-servers/xorg-dmx/files/patch-dmx.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- programs/Xserver/Xext/dmx.c.orig	Mon Jan 16 07:43:55 2006
-+++ programs/Xserver/Xext/dmx.c	Mon Jan 16 07:44:29 2006
-@@ -57,10 +57,10 @@
- #include "opaque.h"
- 
- #include "dmxextension.h"
--#include <X11/extensions/dmxproto.h>
-+#include "dmxproto.h"
- 
- #define _DMX_SERVER_
--#include <X11/extensions/dmxext.h>
-+#include "dmxext.h"
- 
- #ifdef PANORAMIX
- #include "panoramiX.h"
diff --git a/x11-servers/xorg-dmx/files/patch-dmxextension.c b/x11-servers/xorg-dmx/files/patch-dmxextension.c
deleted file mode 100644
index 0664e3005004..000000000000
--- a/x11-servers/xorg-dmx/files/patch-dmxextension.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/dmx/dmxextension.c.orig	Mon Jan 16 07:48:33 2006
-+++ programs/Xserver/hw/dmx/dmxextension.c	Mon Jan 16 07:51:33 2006
-@@ -62,7 +62,7 @@
- 
- #include "windowstr.h"
- #include "inputstr.h"                 /* For DeviceIntRec */
--#include <X11/extensions/dmxproto.h>  /* For DMX_BAD_* */
-+#include "dmxproto.h"                 /* For DMX_BAD_* */
- #include "cursorstr.h"
- 
- /* The default font is declared in dix/globals.c, but is not included in
diff --git a/x11-servers/xorg-dmx/pkg-plist b/x11-servers/xorg-dmx/pkg-plist
new file mode 100644
index 000000000000..93ae1cd4ba07
--- /dev/null
+++ b/x11-servers/xorg-dmx/pkg-plist
@@ -0,0 +1,12 @@
+bin/Xdmx
+bin/dmxaddinput
+bin/dmxaddscreen
+bin/dmxreconfig
+bin/dmxresize
+bin/dmxrminput
+bin/dmxrmscreen
+bin/dmxtodmx
+bin/dmxwininfo
+bin/vdltodmx
+bin/xdmx
+bin/xdmxconfig
diff --git a/x11-servers/xorg-dmx/scripts/configure b/x11-servers/xorg-dmx/scripts/configure
deleted file mode 100644
index 84870dc79b20..000000000000
--- a/x11-servers/xorg-dmx/scripts/configure
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer YES"			>> $LOCALDEF
-echo "#define BuildServersOnly YES"		>> $LOCALDEF
-echo "#define BuildLibraries NO"		>> $LOCALDEF
-echo "#define XprtServer NO"			>> $LOCALDEF
-echo "#define BuildXprint NO"			>> $LOCALDEF
-echo "#define XnestServer NO"			>> $LOCALDEF
-echo "#define XdmxServer YES"			>> $LOCALDEF
-echo "#define XorgServer NO"			>> $LOCALDEF
-echo "#define XVirtualFramebufferServer NO"	>> $LOCALDEF
-echo "#define XF86Server NO"			>> $LOCALDEF
-echo "#define BuildFontServer NO"		>> $LOCALDEF
-echo "#define BuildLBX NO"			>> $LOCALDEF
-echo "#define BuildXF86DRI NO"			>> $LOCALDEF
-echo "#define InstallSecurityConfig NO"		>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
-echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 7509d18268b0..7cbd05677367 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -6,34 +6,34 @@
 #
 
 PORTNAME=	xorg-nestserver
-PORTVERSION=	6.9.0
-PORTREVISION=	1
+PORTVERSION=	1.2.0
+PORTEPOCH=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src3.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Nesting X server from X.Org
 
 CONFLICTS=	XFree86-NestServer-*
 
-EXTRA_PATCHES=	${CF_PATCHES} ${SERVER_PATCHES}
+XORG_CAT=	xserver
 
-USE_XLIB=	yes
+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
+		damageproto xcmiscproto xextproto xf86miscproto \
+		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+		resourceproto fontsproto xf86dgaproto videoproto \
+		compositeproto trapproto recordproto resourceproto \
+		xineramaproto evieproto xkbfile xfont fontenc xkbui \
+		xxf86misc xxf86vm xaw7 xmu xpm xext
 
-XBUILD_DIRS=	lib/font programs/Xserver/miext/damage programs/Xserver
-XINCLUDE_DIRS=	lib/xtrans
-XMAN_DIRS=	programs/Xserver/hw/xnest
+CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg --disable-xprint \
+		--localstatedir=/var
 
+PLIST_FILES=	bin/Xnest
 MAN1=		Xnest.1
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-.include <bsd.port.post.mk>
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/hw/xnest/Xnest.1 ${PREFIX}/man/man1/
+
+.include <bsd.port.mk>
diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo
index 177370c87899..b208692af414 100644
--- a/x11-servers/xorg-nestserver/distinfo
+++ b/x11-servers/xorg-nestserver/distinfo
@@ -1,6 +1,3 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
+MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6
+SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
+SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596
diff --git a/x11-servers/xorg-nestserver/pkg-plist b/x11-servers/xorg-nestserver/pkg-plist
deleted file mode 100644
index eff754d76af6..000000000000
--- a/x11-servers/xorg-nestserver/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/Xnest
diff --git a/x11-servers/xorg-nestserver/scripts/configure b/x11-servers/xorg-nestserver/scripts/configure
deleted file mode 100644
index f1867eda5fad..000000000000
--- a/x11-servers/xorg-nestserver/scripts/configure
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer YES"			>> $LOCALDEF
-echo "#define BuildServersOnly YES"		>> $LOCALDEF
-echo "#define XprtServer NO"			>> $LOCALDEF
-echo "#define BuildXprint NO"			>> $LOCALDEF
-echo "#define XnestServer YES"			>> $LOCALDEF
-echo "#define XorgServer NO"			>> $LOCALDEF
-echo "#define XVirtualFramebufferServer NO"	>> $LOCALDEF
-echo "#define XF86Server NO"			>> $LOCALDEF
-echo "#define BuildFontServer NO"		>> $LOCALDEF
-echo "#define BuildLBX NO"			>> $LOCALDEF
-echo "#define BuildXF86DRI NO"			>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
-echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-echo "#define InstallSecurityConfig NO"		>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-servers/xorg-printserver/Makefile b/x11-servers/xorg-printserver/Makefile
index 4f3c6d6416d9..ad79d66c09c3 100644
--- a/x11-servers/xorg-printserver/Makefile
+++ b/x11-servers/xorg-printserver/Makefile
@@ -6,37 +6,34 @@
 #
 
 PORTNAME=	xorg-printserver
-PORTVERSION=	6.9.0
-PORTREVISION=	2
+PORTVERSION=	1.2.0
+PORTEPOCH=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src3.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Print server from X.Org
 
 CONFLICTS=	XFree86-PrintServer-*
 
-EXTRA_PATCHES=	${CF_PATCHES} ${SERVER_PATCHES}
+XORG_CAT=	xserver
 
-USE_XLIB=	yes
+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-XBUILD_DIRS=	lib/font programs/Xserver
-XINCLUDE_DIRS=	lib/xtrans
-XMAN_DIRS=	programs/Xserver
+USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
+		damageproto xcmiscproto xextproto xf86miscproto \
+		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+		resourceproto fontsproto xf86dgaproto videoproto \
+		compositeproto trapproto recordproto resourceproto \
+		xineramaproto evieproto xkbfile xfont fontenc xkbui \
+		xxf86misc xxf86vm xaw7 xmu xpm xext
 
-# Ensure that we pick up imake's makedepend instead of devel/makedepend
-MAKE_ENV+=	PATH=${X11BASE}/bin:${PATH}
+CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xorg --disable-xnest \
+		--localstatedir=/var
 
 MAN1=		Xprt.1
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-.include <bsd.port.post.mk>
+do-install:
+	cd ${WRKSRC}/hw/xprint; ${MAKE} install
+
+.include <bsd.port.mk>
diff --git a/x11-servers/xorg-printserver/distinfo b/x11-servers/xorg-printserver/distinfo
index 177370c87899..b208692af414 100644
--- a/x11-servers/xorg-printserver/distinfo
+++ b/x11-servers/xorg-printserver/distinfo
@@ -1,6 +1,3 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
+MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6
+SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
+SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596
diff --git a/x11-servers/xorg-printserver/files/patch-Imakefile b/x11-servers/xorg-printserver/files/patch-Imakefile
deleted file mode 100644
index 8015a8b765d5..000000000000
--- a/x11-servers/xorg-printserver/files/patch-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/Xprint/etc/init.d/Imakefile.orig	Thu Sep 15 00:57:36 2005
-+++ programs/Xserver/Xprint/etc/init.d/Imakefile	Thu Sep 15 00:59:01 2005
-@@ -33,7 +33,7 @@
- MakeScriptFromCpp(xprint, -DDEF_XPCUSTOMGLUE=$(XPCUSTOMGLUE) $(OS_DEFINES))
- 
- #if defined(FreeBSDArchitecture)
--InstallNamedProg(xprint,xprint,$(PROJECTROOT)/etc/rc.d)
-+InstallNamedProg(xprint,xprint.sh.sample,$(PROJECTROOT)/etc/rc.d)
- #else
- XCOMM Solaris, Linux, etc.
- InstallNamedProg(xprint,xprint,$(ETCDIR)/init.d)
diff --git a/x11-servers/xorg-printserver/pkg-plist b/x11-servers/xorg-printserver/pkg-plist
index db513f54d616..3fc4b3cae640 100644
--- a/x11-servers/xorg-printserver/pkg-plist
+++ b/x11-servers/xorg-printserver/pkg-plist
@@ -1,11 +1,13 @@
 bin/Xprt
-etc/rc.d/xprint.sh.sample
+etc/X11/Xsession.d/92xprint-xpserverlist
 lib/X11/xserver/C/print/Xprinters
+lib/X11/xserver/C/print/Xprinters.ghostscript
 lib/X11/xserver/C/print/attributes/document
 lib/X11/xserver/C/print/attributes/job
 lib/X11/xserver/C/print/attributes/printer
 lib/X11/xserver/C/print/ddx-config/raster/pcl
 lib/X11/xserver/C/print/ddx-config/raster/postscript
+lib/X11/xserver/C/print/models/CANONBJ10E-GS/model-config
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Book.pmf
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-BookOblique.pmf
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Demi.pmf
@@ -36,7 +38,9 @@ lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-BoldItalic.pmf
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Italic.pmf
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Roman.pmf
 lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/ZapfDingbats.pmf
+lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/fonts.dir
 lib/X11/xserver/C/print/models/CANONC3200-PS/model-config
+lib/X11/xserver/C/print/models/GSdefault/model-config
 lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00051.pmf
 lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00052.pmf
 lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00053.pmf
@@ -115,6 +119,7 @@ lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-BoldItalic.pmf
 lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Italic.pmf
 lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Roman.pmf
 lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/ZapfDingbats.pmf
+lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/fonts.dir
 lib/X11/xserver/C/print/models/HPLJ4050-PS/model-config
 lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00051.pmf
 lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00052.pmf
@@ -164,6 +169,8 @@ lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.alias
 lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.dir
 lib/X11/xserver/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf
 lib/X11/xserver/C/print/models/HPLJ4family/model-config
+lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/model-config
+lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
 lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf
@@ -181,7 +188,6 @@ lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf
-lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf
@@ -194,8 +200,8 @@ lib/X11/xserver/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Italic.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Roman.pmf
 lib/X11/xserver/C/print/models/PSdefault/fonts/ZapfDingbats.pmf
+lib/X11/xserver/C/print/models/PSdefault/fonts/fonts.dir
 lib/X11/xserver/C/print/models/PSdefault/model-config
-lib/X11/xserver/C/print/models/PSspooldir/fonts
 lib/X11/xserver/C/print/models/PSspooldir/model-config
 lib/X11/xserver/C/print/models/PSspooldir/spooltodir.sh
 lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Bold.pmf
@@ -211,14 +217,12 @@ lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Bold.pmf
 lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-BoldItalic.pmf
 lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Italic.pmf
 lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Roman.pmf
+lib/X11/xserver/C/print/models/SPSPARC2/fonts/fonts.dir
 lib/X11/xserver/C/print/models/SPSPARC2/model-config
 lib/X11/xserver/POSIX
 lib/X11/xserver/README
-lib/X11/xserver/af
 lib/X11/xserver/af_ZA
 lib/X11/xserver/af_ZA.iso88591
-lib/X11/xserver/af_ZA.utf8
-lib/X11/xserver/afrikaans
 lib/X11/xserver/ar
 lib/X11/xserver/ar_AE
 lib/X11/xserver/ar_AE.iso88596
@@ -406,12 +410,7 @@ lib/X11/xserver/en_US.UTF-8
 lib/X11/xserver/en_US.iso88591
 lib/X11/xserver/en_US.iso885915
 lib/X11/xserver/en_US.utf8
-lib/X11/xserver/en_US/print/Xprinters
 lib/X11/xserver/en_US/print/attributes/document
-lib/X11/xserver/en_US/print/attributes/job
-lib/X11/xserver/en_US/print/attributes/printer
-lib/X11/xserver/en_US/print/ddx-config
-lib/X11/xserver/en_US/print/models
 lib/X11/xserver/en_ZA
 lib/X11/xserver/en_ZA.iso88591
 lib/X11/xserver/en_ZA.utf8
@@ -633,9 +632,6 @@ lib/X11/xserver/korean
 lib/X11/xserver/korean.euc
 lib/X11/xserver/kw_GB
 lib/X11/xserver/kw_GB.iso88591
-lib/X11/xserver/ky_KG
-lib/X11/xserver/ky_KG.UTF-8
-lib/X11/xserver/ky_KG.utf8
 lib/X11/xserver/lithuanian
 lib/X11/xserver/lt
 lib/X11/xserver/lt.ISO8859-13
@@ -662,7 +658,6 @@ lib/X11/xserver/mt_MT
 lib/X11/xserver/mt_MT.iso88593
 lib/X11/xserver/nb_NO
 lib/X11/xserver/nb_NO.ISO-8859-1
-lib/X11/xserver/ndebele
 lib/X11/xserver/nl
 lib/X11/xserver/nl.ISO8859-1
 lib/X11/xserver/nl.ISO8859-15
@@ -690,14 +685,6 @@ lib/X11/xserver/no_NO.ISO8859-1@nynorsk
 lib/X11/xserver/no_NO.iso88591
 lib/X11/xserver/no_NO.utf8
 lib/X11/xserver/norwegian
-lib/X11/xserver/nr
-lib/X11/xserver/nr_ZA
-lib/X11/xserver/nr_ZA.iso88591
-lib/X11/xserver/nr_ZA.utf8
-lib/X11/xserver/nso
-lib/X11/xserver/nso_ZA
-lib/X11/xserver/nso_ZA.iso885915
-lib/X11/xserver/nso_ZA.utf8
 lib/X11/xserver/oc_FR
 lib/X11/xserver/oc_FR.iso88591
 lib/X11/xserver/pa_IN.UTF-8
@@ -732,7 +719,6 @@ lib/X11/xserver/pt_PT@euro
 lib/X11/xserver/ro_RO
 lib/X11/xserver/ro_RO.ISO8859-2
 lib/X11/xserver/ro_RO.iso88592
-lib/X11/xserver/ro_RO.utf8
 lib/X11/xserver/romanian
 lib/X11/xserver/ru
 lib/X11/xserver/ru.ISO8859-5
@@ -753,9 +739,6 @@ lib/X11/xserver/ru_UA.koi8u
 lib/X11/xserver/russian
 lib/X11/xserver/se_NO
 lib/X11/xserver/se_NO.utf8
-lib/X11/xserver/sepedi
-lib/X11/xserver/sesotho
-lib/X11/xserver/setswana
 lib/X11/xserver/sh
 lib/X11/xserver/sh.ISO8859-2
 lib/X11/xserver/sh_BA.ISO8859-2@bosnia
@@ -766,7 +749,6 @@ lib/X11/xserver/si
 lib/X11/xserver/si_LK
 lib/X11/xserver/si_LK.UTF8
 lib/X11/xserver/sinhala
-lib/X11/xserver/siswati
 lib/X11/xserver/sk
 lib/X11/xserver/sk.ISO8859-2
 lib/X11/xserver/sk_SK
@@ -793,14 +775,6 @@ lib/X11/xserver/sr_YU.iso88592
 lib/X11/xserver/sr_YU.iso88595@cyrillic
 lib/X11/xserver/sr_YU.utf8
 lib/X11/xserver/sr_YU@cyrillic
-lib/X11/xserver/ss
-lib/X11/xserver/ss_ZA
-lib/X11/xserver/ss_ZA.iso88591
-lib/X11/xserver/ss_ZA.utf8
-lib/X11/xserver/st
-lib/X11/xserver/st_ZA
-lib/X11/xserver/st_ZA.iso88591
-lib/X11/xserver/st_ZA.utf8
 lib/X11/xserver/su
 lib/X11/xserver/su.ISO8859-1
 lib/X11/xserver/sv
@@ -836,22 +810,12 @@ lib/X11/xserver/th_TH.utf8
 lib/X11/xserver/thai
 lib/X11/xserver/tl_PH
 lib/X11/xserver/tl_PH.iso88591
-lib/X11/xserver/tn
-lib/X11/xserver/tn_ZA
-lib/X11/xserver/tn_ZA.iso885915
-lib/X11/xserver/tn_ZA.utf8
 lib/X11/xserver/tr
 lib/X11/xserver/tr.ISO8859-9
-lib/X11/xserver/tr_TR
 lib/X11/xserver/tr_TR.ISO8859-9
 lib/X11/xserver/tr_TR.UTF-8
 lib/X11/xserver/tr_TR.iso88599
 lib/X11/xserver/tr_TR.utf8
-lib/X11/xserver/ts
-lib/X11/xserver/ts_ZA
-lib/X11/xserver/ts_ZA.iso88591
-lib/X11/xserver/ts_ZA.utf8
-lib/X11/xserver/tsonga
 lib/X11/xserver/turkish
 lib/X11/xserver/uk_UA
 lib/X11/xserver/uk_UA.koi8u
@@ -860,10 +824,6 @@ lib/X11/xserver/ur_PK
 lib/X11/xserver/ur_PK.utf8
 lib/X11/xserver/uz_UZ
 lib/X11/xserver/uz_UZ.iso88591
-lib/X11/xserver/ve
-lib/X11/xserver/ve_ZA
-lib/X11/xserver/ve_ZA.utf8
-lib/X11/xserver/venda
 lib/X11/xserver/vi_VN
 lib/X11/xserver/vi_VN.tcvn
 lib/X11/xserver/vi_VN.utf8
@@ -871,11 +831,6 @@ lib/X11/xserver/wa_BE
 lib/X11/xserver/wa_BE.iso88591
 lib/X11/xserver/wa_BE.iso885915@euro
 lib/X11/xserver/wa_BE@euro
-lib/X11/xserver/xh
-lib/X11/xserver/xh_ZA
-lib/X11/xserver/xh_ZA.iso88591
-lib/X11/xserver/xh_ZA.utf8
-lib/X11/xserver/xhosa
 lib/X11/xserver/yi_US
 lib/X11/xserver/yi_US.cp1255
 lib/X11/xserver/zh
@@ -890,7 +845,6 @@ lib/X11/xserver/zh_CN.GB18030
 lib/X11/xserver/zh_CN.GB18030@pinyin
 lib/X11/xserver/zh_CN.GB18030@radical
 lib/X11/xserver/zh_CN.GB18030@stroke
-lib/X11/xserver/zh_CN.GBK
 lib/X11/xserver/zh_CN.GBK@pinyin
 lib/X11/xserver/zh_CN.GBK@radical
 lib/X11/xserver/zh_CN.GBK@stroke
@@ -930,31 +884,36 @@ lib/X11/xserver/zh_TW.UTF-8@zhuyin
 lib/X11/xserver/zh_TW.big5
 lib/X11/xserver/zh_TW.euctw
 lib/X11/xserver/zh_TW.utf8
-lib/X11/xserver/zu
-lib/X11/xserver/zu_ZA
-lib/X11/xserver/zu_ZA.iso88591
-lib/X11/xserver/zu_ZA.utf8
-lib/X11/xserver/zulu
-@dirrm lib/X11/xserver/C/print/attributes
-@dirrm lib/X11/xserver/C/print/ddx-config/raster
-@dirrm lib/X11/xserver/C/print/ddx-config
-@dirrm lib/X11/xserver/C/print/models/PSdefault/fonts
-@dirrm lib/X11/xserver/C/print/models/PSdefault
+lib/X11/xserver/ro_RO.utf8
+lib/X11/xserver/zh_CN.GBK
+lib/X11/xserver/tr_TR
+@dirrm lib/X11/xserver/en_US/print/attributes
+@dirrm lib/X11/xserver/en_US/print
+@dirrm lib/X11/xserver/en_US/print
+@dirrm lib/X11/xserver/en_US
 @dirrm lib/X11/xserver/C/print/models/SPSPARC2/fonts
 @dirrm lib/X11/xserver/C/print/models/SPSPARC2
+@dirrm lib/X11/xserver/C/print/models/SPSPARC2
+@dirrm lib/X11/xserver/C/print/models/PSspooldir
+@dirrm lib/X11/xserver/C/print/models/PSdefault/fonts
+@dirrm lib/X11/xserver/C/print/models/PSdefault
+@dirrm lib/X11/xserver/C/print/models/PS2PDFspooldir-GS
+@dirrm lib/X11/xserver/C/print/models/HPLJ4family/fonts
+@dirrm lib/X11/xserver/C/print/models/HPLJ4family
 @dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts
 @dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS
-@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS/fonts
-@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS
-@dirrm lib/X11/xserver/C/print/models/PSspooldir
 @dirrm lib/X11/xserver/C/print/models/HPDJ1600C/fonts
 @dirrm lib/X11/xserver/C/print/models/HPDJ1600C
-@dirrm lib/X11/xserver/C/print/models/HPLJ4family/fonts
-@dirrm lib/X11/xserver/C/print/models/HPLJ4family
+@dirrm lib/X11/xserver/C/print/models/GSdefault
+@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS/fonts
+@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS
+@dirrm lib/X11/xserver/C/print/models/CANONBJ10E-GS
 @dirrm lib/X11/xserver/C/print/models
+@dirrm lib/X11/xserver/C/print/ddx-config/raster
+@dirrm lib/X11/xserver/C/print/ddx-config
+@dirrm lib/X11/xserver/C/print/attributes
 @dirrm lib/X11/xserver/C/print
 @dirrm lib/X11/xserver/C
-@dirrm lib/X11/xserver/en_US/print/attributes
-@dirrm lib/X11/xserver/en_US/print
-@dirrm lib/X11/xserver/en_US
-@dirrmtry lib/X11/xserver
+@dirrm lib/X11/xserver
+@dirrmtry etc/X11/Xsession.d
+@dirrm etc/X11
diff --git a/x11-servers/xorg-printserver/scripts/configure b/x11-servers/xorg-printserver/scripts/configure
deleted file mode 100644
index 16aed24afb92..000000000000
--- a/x11-servers/xorg-printserver/scripts/configure
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer YES"			>> $LOCALDEF
-echo "#define BuildServersOnly YES"		>> $LOCALDEF
-echo "#define XprtServer YES"			>> $LOCALDEF
-echo "#define XnestServer NO"			>> $LOCALDEF
-echo "#define XorgServer NO"			>> $LOCALDEF
-echo "#define XVirtualFramebufferServer NO"	>> $LOCALDEF
-echo "#define XF86Server NO"			>> $LOCALDEF
-echo "#define BuildFontServer NO"		>> $LOCALDEF
-echo "#define BuildLBX NO"			>> $LOCALDEF
-echo "#define BuildXF86DRI NO"			>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
-echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-echo "#define InstallSecurityConfig NO"		>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index 38907d90fe68..6f53725843cb 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -6,91 +6,67 @@
 #
 
 PORTNAME=	xorg-server
-PORTVERSION=	6.8.99.903
+PORTVERSION=	1.2.99.903
 PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	http://xorg.freedesktop.org/snapshots/
-DISTNAME=	xorg-x11-${PORTVERSION}
+MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/:fdo \
+		${MASTER_SITE_SOURCEFORGE:S/$/:mesa/}
+MASTER_SITE_SUBDIR=mesa3d/:mesa
+DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2:fdo \
+		MesaLib-6.5.2.tar.bz2:mesa
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org X server development snapshot and related programs
+COMMENT=	X.Org X server and related programs
 
-USE_BZIP2=	yes
-.if !defined(WITH_MODULAR)
-USE_XLIB=	yes
-.else
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
-		${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		GL.1:${PORTSDIR}/x11/libGL
-BUILD_DEPENDS=	${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+RUN_DEPENDS=	${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
+
+CONFLICTS=	XFree86-Server-*
+
+XORG_CAT=	xserver
+
+USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
+		xmu xt xpm xext randrproto renderproto fixesproto damageproto \
+		xcmiscproto xextproto xproto xtrans xf86miscproto \
+		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+		resourceproto fontsproto inputproto xf86dgaproto \
+		videoproto compositeproto trapproto recordproto xineramaproto \
+		evieproto xfont fontenc xkbui
+
+USE_PERL5_BUILD=yes
+CONFIGURE_ARGS=	--with-mesa-source=${WRKDIR}/Mesa-6.5.2 \
+		--disable-dmx --disable-xvfb --disable-xnest --disable-xprint \
+		--localstatedir=/var
+
+.if !defined(WITHOUT_AIGLX)
+CONFIGURE_ARGS+=	--enable-aiglx=yes
 .endif
 
-CONFLICTS=	XFree86-Server-* xorg-server-6.[79].* xorg-server-6.8.[012]*
+.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
+CONFIGURE_ARGS+=--enable-install-setuid
+.endif
 
-SCRIPTS_ENV=	WITH_DEBUG="${WITH_DEBUG}"
 MAN1=		Xorg.1 \
-		getconfig.1 \
+		Xserver.1 \
+		cvt.1 \
 		gtf.1 \
-		kbd_mode.1 \
 		pcitweak.1 \
 		xorgcfg.1 \
 		xorgconfig.1
-MAN4=		citron.4x \
-		dmc.4x \
-		dynapro.4x \
-		elographics.4x \
-		fbdevhw.4x \
-		fpit.4x \
-		glint.4x \
-		js_x.4x \
-		kbd.4x \
-		keyboard.4x \
-		mga.4x \
-		microtouch.4x \
-		mouse.4x \
-		mutouch.4x \
-		palmax.4x \
-		penmount.4x \
-		r128.4x \
-		radeon.4x \
-		tdfx.4x \
-		tek4957.4x \
-		vga.4x \
-		void.4x \
-		wacom.4x
-MAN5=		getconfig.5 \
-		xorg.conf.5
-
-XBUILD_DIRS=	lib/font programs/Xserver
-XINCLUDE_DIRS=	lib/xtrans
-XMAN_DIRS=	programs/Xserver
-LATEST_LINK=	${PORTNAME}-snap
+MAN4=		exa.4 \
+		fbdevhw.4
+MAN5=		xorg.conf.5
 
 NOT_FOR_ARCHS=	ia64
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-
 .if ${ARCH} == alpha
 PLIST_SUB+=	ALPHA_NA="@comment "
 .else
 PLIST_SUB+=	ALPHA_NA=""
 .endif
 
-.if ${ARCH} == ia64
-PLIST_SUB+=	IA64_NA="@comment "
-.else
-PLIST_SUB+=	IA64_NA=""
-.endif
-
 .if ${ARCH} == powerpc
 PLIST_SUB+=	PPC_NA="@comment "
 MAN4+=		nv.4x
@@ -99,84 +75,20 @@ PLIST_SUB+=	PPC_NA=""
 .endif
 
 .if ${ARCH} == sparc64
-BROKEN=		Does not compile on sparc64
 PLIST_SUB+=	SPARC64=""
 PLIST_SUB+=	SPARC64_NA="@comment "
-MAN4+=		apm.4x \
-		chips.4x \
-		cirrus.4x \
-		i128.4x \
-		i740.4x \
-		i810.4x \
-		imstt.4x \
-		neomagic.4x \
-		newport.4x \
-		nv.4x \
-		rendition.4x \
-		s3virge.4x \
-		savage.4x \
-		siliconmotion.4x \
-		sunbw2.4x \
-		suncg14.4x \
-		suncg3.4x \
-		suncg6.4x \
-		sunffb.4x \
-		sunleo.4x \
-		suntcx.4x \
-		trident.4x \
-		vmware.4x
 .else
 PLIST_SUB+=	SPARC64="@comment "
 PLIST_SUB+=	SPARC64_NA=""
 .endif
 
-.if ${ARCH} != powerpc && ${ARCH} != sparc64
-MAN4+=		cirrus.4x \
-		nv.4x \
-		rendition.4x \
-		s3virge.4x \
-		savage.4x \
-		siliconmotion.4x
-.endif
-
-.if ${ARCH} != powerpc && ${ARCH} != alpha
-MAN4+=		vesa.4x
-.endif
-
-.if ${ARCH} == i386
-PLIST_SUB+=	I386=""
-MAN1+=		scanpci.1
-MAN4+=		i740.4x \
-		imstt.4x \
-		newport.4x \
-		nsc.4x \
-		via.4x
-.else
-PLIST_SUB+=	I386="@comment "
-.endif
-
 .if ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	AMD64_I386=""
-MAN4+=		apm.4x \
-		chips.4x \
-		cyrix.4x \
-		i128.4x \
-		i810.4x \
-		neomagic.4x \
-		sis.4x \
-		trident.4x \
-		tseng.4x \
-		vmware.4x
+MAN1+=		scanpci.1
 .else
 PLIST_SUB+=	AMD64_I386="@comment "
 .endif
 
-pre-everything::
-	@${ECHO_MSG} "This X Server installs with development DRI DDX drivers.  These drivers are"
-	@${ECHO_MSG} "considered insecure by their authors and may allow privilege escalation by"
-	@${ECHO_MSG} "local X clients with DRI privileges."
-	@${ECHO_MSG} ""
-
 .if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
 pre-everything::
 	@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
@@ -185,10 +97,6 @@ pre-everything::
 	@${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm,"
 	@${ECHO_MSG} "which will still run the server as root), you can cancel the build and set"
 	@${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
-
-SCRIPTS_ENV+=	SUID_XSERVER=YES
-.else
-SCRIPTS_ENV+=	SUID_XSERVER=NO
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server-snap/Makefile.inc b/x11-servers/xorg-server-snap/Makefile.inc
deleted file mode 100644
index 97d8db3bd96e..000000000000
--- a/x11-servers/xorg-server-snap/Makefile.inc
+++ /dev/null
@@ -1,94 +0,0 @@
-# Include before bsd.port.pre.mk for XFree86-4 ports which share 
-# XFree86-4-libraries's patches.
-# The purpose of this file is to reduce the duplicated code among the XFree86-4
-# ports which each do only part of a standard XFree86 build.
-#
-# XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
-#   be built in.
-# XINCLUDE_DIRS is the group of directories under ${WRKSRC} that need
-#   to be Makefilesed or included in besides XBUILD_DIRS
-# XINSTALL_DIRS is the group of directories which will have 
-#   their install targets run.
-# XMAN_DIRS is the group of directories which will have 
-#   their install.man targets run.
-
-DIST_SUBDIR?=	xorg
-WRKSRC?=	${WRKDIR}/xc
-USE_X_PREFIX?=	no
-PREFIX?=	${X11BASE}
-MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
-MTREE_FILE=	${PORTSDIR}/x11-servers/xorg-server/files/BSD.x11-xorg.dist
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/*
-
-USE_IMAKE=	YES
-.if defined(XMAN_DIRS)
-XFREE86_HTML_MAN?=	yes
-.else
-XFREE86_HTML_MAN?=	no
-.endif
-SCRIPTS_ENV+=	CC="${CC}" \
-		CXX="${CXX}" \
-		CFLAGS="${CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-
-XINSTALL_DIRS?=	${XBUILD_DIRS}
-_XINCLUDE_DIRS=	include ${XBUILD_DIRS} ${XINCLUDE_DIRS}
-
-CF_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.rules \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.tmpl \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-Library.tmpl \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.rules \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl
-
-SERVER_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-alpha_video.c \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-atimobility \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-pc98kbd \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-radeon_driver.c \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-xorgconfig.c
-
-.if !target(do-configure)
-do-configure:
-	@cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
-	@cp ${X11BASE}/lib/X11/config/date.def ${WRKSRC}/config/cf
-	@cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefile.boot
-	@for dir in ${_XINCLUDE_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${WRKSRC}/config/imake/imake \
-			-DTOPDIR=${WRKSRC} -DCURDIR=$${dir} -I${WRKSRC}/config/cf; \
-	done
-	@for dir in ${_XINCLUDE_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefiles; \
-	done
-	@for dir in ${_XINCLUDE_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} includes; \
-	done
-	@for dir in include ${XBUILD_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} depend; \
-	done
-.endif
-
-.if !target(do-build)
-do-build:
-	@for dir in ${XBUILD_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} all; \
-	done
-.endif
-
-.if !target(do-install)
-do-install:
-	@for dir in ${XINSTALL_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install; \
-	done
-	@for dir in ${XMAN_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \
-	done
-.endif
-
diff --git a/x11-servers/xorg-server-snap/distinfo b/x11-servers/xorg-server-snap/distinfo
index 84dded21b063..800ab34af858 100644
--- a/x11-servers/xorg-server-snap/distinfo
+++ b/x11-servers/xorg-server-snap/distinfo
@@ -1,3 +1,6 @@
-MD5 (xorg/xorg-x11-6.8.99.903.tar.bz2) = c4d8be6e2149906d99bb96f84ae972b4
-SHA256 (xorg/xorg-x11-6.8.99.903.tar.bz2) = 0d95e3301564cce9a391105bb86b8ac6dc562d23b9c7b932364478f6c685be0b
-SIZE (xorg/xorg-x11-6.8.99.903.tar.bz2) = 45768494
+MD5 (xorg/xserver/xorg-server-1.2.99.903.tar.bz2) = b7c61148bf5827f6a220696381bfba15
+SHA256 (xorg/xserver/xorg-server-1.2.99.903.tar.bz2) = 0fe2986a8c6659bb2b7ff9b458000be053e14667db9ee3c288db0502c6e00770
+SIZE (xorg/xserver/xorg-server-1.2.99.903.tar.bz2) = 5968830
+MD5 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = e4d894181f1859651658b3704633e10d
+SHA256 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
+SIZE (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 3295166
diff --git a/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist b/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist
deleted file mode 100644
index 5af20966bffa..000000000000
--- a/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist
+++ /dev/null
@@ -1,524 +0,0 @@
-# $FreeBSD$
-#
-# Please see the file src/etc/mtree/README before making changes to this file.
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-.
-    bin
-    ..
-    etc
-        rc.d
-        ..
-    ..
-    include
-        X11
-            PEX5
-            ..
-            Xft
-            ..
-            bitmaps
-            ..
-            pixmaps
-            ..
-        ..
-        bitmaps
-        ..
-        freetype2
-            freetype
-                cache
-                ..
-                config
-                ..
-                internal
-                ..
-            ..
-        ..
-    ..
-    info
-    ..
-    lib
-        X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
-            app-defaults
-            ..
-            etc
-            ..
-            fonts
-                local
-                ..
-            ..
-            lbxproxy
-            ..
-            xserver
-            ..
-        ..
-        aout
-        ..
-        modules
-            codeconv
-            ..
-            dri
-            ..
-        ..
-    ..
-    libdata
-        pkgconfig
-        ..
-    ..
-    libexec
-    ..
-    man
-/set uname=man
-        cat1
-        ..
-        cat2
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
-        ..
-        cat6
-        ..
-        cat7
-        ..
-        cat8
-        ..
-        cat9
-        ..
-        catl
-        ..
-        catn
-        ..
-        ja              uname=root
-            cat1
-            ..
-            cat2
-            ..
-            cat3
-            ..
-            cat4
-            ..
-            cat5
-            ..
-            cat6
-            ..
-            cat7
-            ..
-            cat8
-            ..
-            cat9
-            ..
-            catl
-            ..
-            catn
-            ..
-/set uname=root
-            man1
-            ..
-            man2
-            ..
-            man3
-            ..
-            man4
-            ..
-            man5
-            ..
-            man6
-            ..
-            man7
-            ..
-            man8
-            ..
-            man9
-            ..
-            manl
-            ..
-            mann
-            ..
-        ..
-        man1
-        ..
-        man2
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man6
-        ..
-        man7
-        ..
-        man8
-        ..
-        man9
-        ..
-        manl
-        ..
-        mann
-        ..
-    ..
-    share
-        aclocal
-        ..
-        doc
-            ja
-            ..
-        ..
-        examples
-        ..
-        locale
-            af
-                LC_MESSAGES
-                ..
-            ..
-            am
-                LC_MESSAGES
-                ..
-            ..
-            ar
-                LC_MESSAGES
-                ..
-            ..
-            az
-                LC_MESSAGES
-                ..
-            ..
-            be
-                LC_MESSAGES
-                ..
-            ..
-            bg
-                LC_MESSAGES
-                ..
-            ..
-            bn
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                LC_MESSAGES
-                ..
-            ..
-            cs
-                LC_MESSAGES
-                ..
-            ..
-            cy
-                LC_MESSAGES
-                ..
-            ..
-            da
-                LC_MESSAGES
-                ..
-            ..
-            de
-                LC_MESSAGES
-                ..
-            ..
-            de_AT
-                LC_MESSAGES
-                ..
-            ..
-            el
-                LC_MESSAGES
-                ..
-            ..
-            en
-                LC_MESSAGES
-                ..
-            ..
-            en_AU
-                LC_MESSAGES
-                ..
-            ..
-            en_CA
-                LC_MESSAGES
-                ..
-            ..
-            en_GB
-                LC_MESSAGES
-                ..
-            ..
-            eo
-                LC_MESSAGES
-                ..
-            ..
-            es
-                LC_MESSAGES
-                ..
-            ..
-            es_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                LC_MESSAGES
-                ..
-            ..
-            et
-                LC_MESSAGES
-                ..
-            ..
-            eu
-                LC_MESSAGES
-                ..
-            ..
-            fa
-                LC_MESSAGES
-                ..
-            ..
-            fa_IR
-                LC_MESSAGES
-                ..
-            ..
-            fi
-                LC_MESSAGES
-                ..
-            ..
-            fr
-                LC_MESSAGES
-                ..
-            ..
-            fr_FR
-                LC_MESSAGES
-                ..
-            ..
-            ga
-                LC_MESSAGES
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                LC_MESSAGES
-                ..
-            ..
-            mk
-                LC_MESSAGES
-                ..
-            ..
-            ml
-                LC_MESSAGES
-                ..
-            ..
-            mn
-                LC_MESSAGES
-                ..
-            ..
-            ms
-                LC_MESSAGES
-                ..
-            ..
-            mt
-                LC_MESSAGES
-                ..
-            ..
-            nb
-                LC_MESSAGES
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                LC_MESSAGES
-                ..
-            ..
-            nn
-                LC_MESSAGES
-                ..
-            ..
-            no
-                LC_MESSAGES
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            zh
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN.GB2312
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-        ..
-    ..
-..
diff --git a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf
deleted file mode 100644
index e7c983833b5a..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf
+++ /dev/null
@@ -1,90 +0,0 @@
---- config/cf/FreeBSD.cf.orig	Tue May  3 21:14:57 2005
-+++ config/cf/FreeBSD.cf	Mon May  9 15:21:48 2005
-@@ -78,6 +78,7 @@
- #define HasIssetugid		YES
- #define HasPoll			YES
- #endif
-+#define BuildHtmlManPages	NO
- 
- #if OSMajorVersion >= 4
- #define HasGetIfAddrs		YES
-@@ -116,15 +117,14 @@
- # endif
- # if (OSRelVersion < 500043)
- #  define NeedUIThrStubs	YES
--# endif
--# if (OSRelVersion >= 502102)
--#  define ThreadsLibraries	-lpthread
--# elif (OSRelVersion >= 500016)
--#  define ThreadsLibraries	-lc_r
-+#  define BuildThreadStubLibrary	YES
-+#  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
-+#  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
- # else
--#  define ThreadsLibraries	-pthread
-+#  define BuildThreadStubLibrary	NO
- # endif
--# define SystemMTDefines	-D_THREAD_SAFE
-+# define ThreadsLibraries	FreeBSDPTHREAD_LIBS
-+# define SystemMTDefines	FreeBSDPTHREAD_CFLAGS
- #endif
- 
- /* This fixes linking C programs against libGLU on FreeBSD 3.x */
-@@ -172,12 +172,14 @@
- #endif
- #endif
- 
--#ifndef CcCmd
--#define CcCmd			cc
--#endif
--#ifndef CplusplusCmd
--#define CplusplusCmd		c++
-+#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
-+#define CcCmd			$(CLIENTENVSETUP) FreeBSDCC
-+#define CplusplusCmd		$(CLIENTENVSETUP) FreeBSDCXX
-+#else
-+#define CcCmd			FreeBSDCC
-+#define CplusplusCmd		FreeBSDCXX
- #endif
-+
- #define CppCmd			/usr/bin/cpp
- #define PreProcessCmd		CppCmd
- #define StandardCppOptions	-traditional
-@@ -338,7 +340,7 @@
- #ifndef LibraryRpathLoadFlags
- # if UseRpath
- #  if UseElfFormat
--#   define LibraryRpathLoadFlags	-rpath $(USRLIBDIRPATH)
-+#   define LibraryRpathLoadFlags	-Wl,-rpath $(USRLIBDIRPATH)
- #  else
- #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
- #  endif
-@@ -446,7 +448,6 @@
- #ifdef PpcArchitecture
- #define XF86INT10_BUILD		X86INT10_STUB
- #endif
--
- #define StandardDefines	-DCSRG_BASED
- 
- #if OSMajorVersion > 1
-@@ -467,18 +468,8 @@
- #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
- #endif
- 
--/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
--#ifndef DefaultGcc2i386Opt
--#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2 GccAliasingArgs
--#endif
--#endif
--
--#ifdef i386Architecture
--# define OptimizedCDebugFlags DefaultGcc2i386Opt
--#else
--# define OptimizedCDebugFlags -O
--#endif
-+#define DefaultGcc2i386Opt
-+#define OptimizedCDebugFlags FreeBSDCFLAGS
- 
- #ifndef PreIncDir
- # define PreIncDir	/usr/include
diff --git a/x11-servers/xorg-server-snap/files/patch-Imake.rules b/x11-servers/xorg-server-snap/files/patch-Imake.rules
deleted file mode 100644
index deea1cb886a6..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-Imake.rules
+++ /dev/null
@@ -1,67 +0,0 @@
---- config/cf/Imake.rules.orig	Mon Dec  9 15:00:42 2002
-+++ config/cf/Imake.rules	Mon Oct 13 17:04:19 2003
-@@ -1406,7 +1406,7 @@
-  * this Imakefile is within the source tree.
-  */
- #ifndef RmanDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define RmanDependency() /**/
- #else
- #define RmanDependency() 						@@\
-@@ -1421,7 +1421,7 @@
- #endif /* RmanDependency */
- 
- #ifndef RmanCmdDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define RmanCmdDependency	/**/
- #else
- #define RmanCmdDependency	ProgramTargetName($(RMAN))
-@@ -1874,7 +1874,7 @@
-  * this Imakefile is within the source tree.
-  */
- #ifndef DependDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define DependDependency() /**/
- #else
- #define DependDependency() 						@@\
-@@ -1969,7 +1969,7 @@
-  * within the source tree.
-  */
- #ifndef ImakeDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define ImakeDependency(target) /**/
- #else
- #define ImakeDependency(target)						@@\
-@@ -2066,11 +2066,18 @@
-  * ProjectUnsharedLibReferences - variables for unshared libraries
-  */
- #ifndef ProjectUnsharedLibReferences
-+#if defined(UseInstalledLibraries)
-+#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir)	@@\
-+Concat3(DEP,varname,LIB) = 						@@\
-+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
-+LintLibReferences(varname,libname,libsource)
-+#else
- #define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir)	@@\
- Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname))	@@\
- Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
- LintLibReferences(varname,libname,libsource)
- #endif
-+#endif
- 
-  /*
-  * ProjectUnsharedFontLibReferences - unshared font libraries
-@@ -3126,6 +3133,9 @@
- 
- #ifdef UseInstalled
- #define ImakeSubCmdHelper $(IMAKE_CMD)
-+#elif defined(UseInstalledPrograms)
-+#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
-+			  $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
- #else
- #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
- 			  $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
diff --git a/x11-servers/xorg-server-snap/files/patch-Imake.tmpl b/x11-servers/xorg-server-snap/files/patch-Imake.tmpl
deleted file mode 100644
index 526e2e5de8a8..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-Imake.tmpl
+++ /dev/null
@@ -1,75 +0,0 @@
---- config/cf/Imake.tmpl.orig	Mon Dec  9 19:20:41 2002
-+++ config/cf/Imake.tmpl	Thu Jan  2 14:34:20 2003
-@@ -237,7 +237,8 @@
- 
- #ifndef RmanCmd
- #if BuildRman
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define RmanCmd rman
- #else
- #define RmanCmd $(TOP)/config/util/rman
-@@ -1348,7 +1349,8 @@
- #define LoaderLibPrefix /**/
- #endif
- #ifndef ImakeCmd
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define ImakeCmd imake
- #else
- #define ImakeCmd $(IMAKESRC)/imake
-@@ -1359,19 +1361,22 @@
- #endif
- #ifndef DependCmd
- #if UseGccMakeDepend
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define DependCmd gccmakedep
- #else
- #define DependCmd $(DEPENDSRC)/gccmakedep
- #endif
- #elif UseCCMakeDepend
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define DependCmd ccmakedep
- #else
- #define DependCmd $(DEPENDSRC)/ccmakedep
- #endif
- #else
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define DependCmd makedepend
- #else
- #define DependCmd $(DEPENDSRC)/makedepend
-@@ -1398,21 +1403,23 @@
- #ifndef ExportListCmd
- # ifndef ExportListGenSource
- #  define ExportListCmd		/**/
--# elif !defined(UseInstalled)
-+# elif !defined(UseInstalled) && !defined(UseInstalledPrograms)
- #  define ExportListCmd		$(CONFIGSRC)/util/exportlistgen
- # else
- #  define ExportListCmd		exportlistgen
- # endif
- #endif
- #ifndef MkdirHierCmd
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define MkdirHierCmd mkdirhier
- #else
- #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh
- #endif
- #endif
- #ifndef RevPathCmd
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define RevPathCmd revpath
- #else
- #define RevPathCmd $(CONFIGSRC)/util/revpath
diff --git a/x11-servers/xorg-server-snap/files/patch-Library.tmpl b/x11-servers/xorg-server-snap/files/patch-Library.tmpl
deleted file mode 100644
index e94aae3bfc60..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-Library.tmpl
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/cf/Library.tmpl.orig	Mon May 24 12:06:57 2004
-+++ config/cf/Library.tmpl	Fri Sep 10 21:46:00 2004
-@@ -389,7 +389,7 @@
-  */
- 
- #ifndef MakeStringsDependency
--# ifndef UseInstalled
-+# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
- #  define MakeStringsDependency						@@\
- MAKESTRS = $(CONFIGSRC)/util/makestrs					@@\
- NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf)	@@\
-@@ -399,7 +399,8 @@
- 									@@\
- includes:: HostProgramTargetName($(MAKESTRS))
- # else
--#  define MakeStringsDependency  /**/
-+#  define MakeStringsDependency						@@\
-+MAKESTRS = makestrs
- # endif
- #endif
- 
diff --git a/x11-servers/xorg-server-snap/files/patch-X11.rules b/x11-servers/xorg-server-snap/files/patch-X11.rules
deleted file mode 100644
index 052e960127fc..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-X11.rules
+++ /dev/null
@@ -1,17 +0,0 @@
---- config/cf/X11.rules.orig	Sun May 30 12:49:38 2004
-+++ config/cf/X11.rules	Sun May 30 12:50:02 2004
-@@ -23,6 +23,14 @@
- # define UseInstalledX11	YES
- #endif
- 
-+#ifndef UseInstalledPrograms
-+# define UseInstalledPrograms	NO
-+#endif
-+
-+#ifndef UseInstalledClients
-+# define UseInstalledClients	NO
-+#endif
-+
- #ifndef ImportX11
- # ifdef UseImports
- #  define ImportX11		YES
diff --git a/x11-servers/xorg-server-snap/files/patch-X11.tmpl b/x11-servers/xorg-server-snap/files/patch-X11.tmpl
deleted file mode 100644
index c27d14d8e1ec..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-X11.tmpl
+++ /dev/null
@@ -1,79 +0,0 @@
---- X11.tmpl.orig	Fri Sep  3 09:18:18 2004
-+++ config/cf/X11.tmpl	Wed Dec 29 13:42:37 2004
-@@ -616,7 +616,7 @@
- #define BuildXft1Library	BuildRenderLibrary
- #endif
- #ifndef UseFontconfig
--#define UseFontconfig		BuildXftLibrary
-+#define UseFontconfig		(BuildXftLibrary || BuildXft1Library)
- #endif
- #ifndef BuildFontconfigLibrary
- #define BuildFontconfigLibrary	(UseFontconfig && !HasFontconfig)
-@@ -773,6 +773,9 @@
- #ifndef ThreadedProject
- #define ThreadedProject ThreadedX
- #endif
-+#ifndef BuildThreadStubLibrary
-+#define BuildThreadStubLibrary	NO
-+#endif
- #ifndef NeedUIThrStubs
- #define NeedUIThrStubs		NO
- #endif
-@@ -1606,7 +1609,7 @@
- #endif
- 
- #ifndef PsWrap
--# ifndef UseInstalled
-+# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
- #  define PsWrap $(PSWRAPSRC)/pswrap
- # else
- #  define PsWrap pswrap
-@@ -1683,7 +1686,7 @@
- 
-      INSTAPPFLAGS = $(INSTDATFLAGS)	/* XXX - this should go away - XXX */
- 
--#if UseInstalledX11
-+#if UseInstalledX11 || UseInstalledClients
-               RGB = $(XBINDIR)/rgb
-             FONTC = $(XBINDIR)/bdftopcf
-       MKFONTSCALE = $(XBINDIR)/mkfontscale
-@@ -1843,6 +1846,39 @@
-       DEPXLIBONLY = $(DEPXONLYLIB)
-          XLIBONLY = $(XONLYLIB)
-      LINTXONLYLIB = $(LINTXONLY)
-+
-+#if BuildThreadStubLibrary
-+#ifndef SharedLibXThrStub
-+#define SharedLibXThrStub	YES
-+#endif
-+#ifndef NormalLibXThrStub
-+#define NormalLibXThrStub	NO
-+#endif
-+#ifndef DebugLibXThrStub
-+#define DebugLibXThrStub	NO
-+#endif
-+#ifndef ProfileLibXThrStub
-+#define ProfileLibXThrStub	NO
-+#endif
-+   XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub
-+#if SharedLibXThrStub
-+#ifndef SharedXThrStubRev
-+#define SharedXThrStubRev 6.1
-+#endif
-+SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev)
-+#else
-+ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
-+#endif
-+#else
-+#undef  SharedLibXThrStub
-+#define SharedLibXThrStub	NO
-+#undef  NormalLibXThrStub
-+#define NormalLibXThrStub	NO
-+#undef  DebugLibXThrStub
-+#define DebugLibXThrStub	NO
-+#undef  ProfileLibXThrStub
-+#define ProfileLibXThrStub	NO
-+#endif
- 
- #if BuildScreenSaverLibrary
- #ifndef SharedLibXss
diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile b/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile
deleted file mode 100644
index 5dab87bd4828..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- programs/Xserver/Imakefile.orig	Sat May 29 14:12:45 2004
-+++ programs/Xserver/Imakefile	Sat May 29 14:12:16 2004
-@@ -1095,5 +1095,3 @@
- 
- DEFAULTFONTPATH = DefaultFontPath
- EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`"
--
--InstallManPage(Xserver,$(MANDIR))
diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c b/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c
new file mode 100644
index 000000000000..5894dbb727bc
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c
@@ -0,0 +1,14 @@
+Index: programs/Xserver/Xext/xvmc.c
+diff -u -p programs/Xserver/Xext/xvmc.c.orig programs/Xserver/Xext/xvmc.c
+--- Xext/xvmc.c.orig	Sun Jul  3 17:53:36 2005
++++ Xext/xvmc.c	Thu Jan 26 14:22:20 2006
+@@ -24,8 +24,8 @@
+ 
+ #ifdef HAS_XVMCSHM
+ #ifndef Lynx
+-#include <sys/ipc.h>
+ #include <sys/types.h>
++#include <sys/ipc.h>
+ #include <sys/shm.h>
+ #else
+ #include <ipc.h>
diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c
new file mode 100644
index 000000000000..59aad379ae11
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c
@@ -0,0 +1,11 @@
+--- hw/xfree86/common/xf86Config.c.orig	Fri Jun 23 12:32:32 2006
++++ hw/xfree86/common/xf86Config.c	Fri Jun 23 12:32:46 2006
+@@ -1042,7 +1042,7 @@
+     else
+ 	xf86Info.estimateSizesAggressively = 0;
+ 
+-    xf86Info.aiglx = TRUE;
++    xf86Info.aiglx = FALSE;
+     xf86Info.aiglxFrom = X_DEFAULT;
+     if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
+ 	xf86Info.aiglx = value;
diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
new file mode 100644
index 000000000000..933742b00170
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
@@ -0,0 +1,12 @@
+Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
+diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
+--- hw/xfree86/os-support/bsd/i386_video.c.orig	Tue Oct  4 01:46:14 2005
++++ hw/xfree86/os-support/bsd/i386_video.c	Thu Jan 26 14:57:56 2006
+@@ -35,6 +35,7 @@
+ #include "xf86Priv.h"
+ 
+ #include <errno.h>
++#include <sys/types.h>
+ #include <sys/mman.h>
+ 
+ #ifdef HAS_MTRR_SUPPORT
diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c b/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c
new file mode 100644
index 000000000000..e9fb876333cc
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c
@@ -0,0 +1,12 @@
+diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
+--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
+@@ -39,7 +39,7 @@
+ # ifdef __va_copy
+ #  define va_copy __va_copy
+ # else
+-#  error "no working va_copy was found"
++#  define va_copy(dest, src) ((dest) = (src))
+ # endif
+ #endif
+     
diff --git a/x11-servers/xorg-server-snap/files/patch-at_scancode.c b/x11-servers/xorg-server-snap/files/patch-at_scancode.c
new file mode 100644
index 000000000000..68ffceb41e86
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-at_scancode.c
@@ -0,0 +1,31 @@
+--- hw/xfree86/os-support/shared/at_scancode.c.orig	Sun Jul  3 09:01:35 2005
++++ hw/xfree86/os-support/shared/at_scancode.c	Sat Oct  7 21:27:29 2006
+@@ -84,6 +84,10 @@
+        case KEY_Prefix0:
+           pKbd->scanPrefix = 0;
+           switch (*scanCode) {
++            case 0x1e:            *scanCode = KEY_AudioRaise;break;
++            case 0x1f:            *scanCode = KEY_AudioLower;break;
++            case 0x20:            *scanCode = KEY_Power;     break;
++            case 0x25:            *scanCode = KEY_Mute;      break;
+             case KEY_KP_7:        *scanCode = KEY_Home;      break;  /* curs home */
+             case KEY_KP_8:        *scanCode = KEY_Up;        break;  /* curs up */
+             case KEY_KP_9:        *scanCode = KEY_PgUp;      break;  /* curs pgup */
+@@ -104,6 +108,17 @@
+             case 0x5b:            *scanCode = KEY_LMeta;     break;
+             case 0x5c:            *scanCode = KEY_RMeta;     break;
+             case 0x5d:            *scanCode = KEY_Menu;      break;
++            case 0x5e:            *scanCode = KEY_L1;        break;  /* stop */
++            case 0x5f:            *scanCode = KEY_L2;        break;  /* again */
++            case 0x60:            *scanCode = KEY_L3;        break;  /* props */
++            case 0x61:            *scanCode = KEY_L4;        break;  /* undo */
++            case 0x62:            *scanCode = KEY_L5;        break;  /* front */
++            case 0x63:            *scanCode = KEY_L6;        break;  /* copy */
++            case 0x64:            *scanCode = KEY_L7;        break;  /* open */
++            case 0x65:            *scanCode = KEY_L8;        break;  /* paste */
++            case 0x66:            *scanCode = KEY_L9;        break;  /* find */
++            case 0x67:            *scanCode = KEY_L10;       break;  /* cut */
++            case 0x68:            *scanCode = KEY_Help;      break;
+             case KEY_F3:          *scanCode = KEY_F13;       break;
+             case KEY_F4:          *scanCode = KEY_F14;       break;
+             case KEY_F5:          *scanCode = KEY_F15;       break;
diff --git a/x11-servers/xorg-server-snap/files/patch-bsdResource.c b/x11-servers/xorg-server-snap/files/patch-bsdResource.c
new file mode 100644
index 000000000000..44388bb0a393
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-bsdResource.c
@@ -0,0 +1,68 @@
+--- hw/xfree86/os-support/bsd/bsdResource.c.orig	Fri Apr 23 21:54:07 2004
++++ hw/xfree86/os-support/bsd/bsdResource.c	Tue May 17 00:48:36 2005
+@@ -18,7 +18,7 @@
+ 
+ #ifdef INCLUDE_XF86_NO_DOMAIN
+ 
+-#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
++#if defined(__alpha__) || defined(__amd64__)
+ 
+ resPtr
+ xf86BusAccWindowsFromOS(void)
+@@ -112,7 +112,7 @@
+     return ret;
+ }
+ 
+-#elif defined(__powerpc__)
++#elif defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)
+ 
+ resPtr
+ xf86BusAccWindowsFromOS(void)
+@@ -123,7 +123,11 @@
+     RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock);
+     ret = xf86AddResToList(ret, &range, -1);
+ 
++#if defined(__sparc__) || defined(__sparc64__)
++    RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock);
++#else
+     RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock);
++#endif
+     ret = xf86AddResToList(ret, &range, -1);
+     return ret;
+ }
+@@ -137,7 +141,11 @@
+     RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock);
+     ret = xf86AddResToList(ret, &range, -1);
+ 
++#if defined(__sparc__) || defined(__sparc64__)
++    RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock);
++#else
+     RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock);
++#endif
+     ret = xf86AddResToList(ret, &range, -1);
+     return ret;
+ }
+@@ -153,7 +161,11 @@
+     RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock);
+     ret = xf86AddResToList(ret, &range, -1);
+ 
++#if defined(__sparc__) || defined(__sparc64__)         
++    RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock);
++#else
+     RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock);
++#endif
+     ret = xf86AddResToList(ret, &range, -1);
+     return ret;
+ }
+@@ -175,7 +187,11 @@
+     ret = xf86AddResToList(ret, &range, -1);
+     RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock);
+     ret = xf86AddResToList(ret, &range, -1);
++#if defined(__sparc__) || defined(__sparc64__)
++    RANGE(range, 0x00ffffff, 0x00ffffff, ResExcIoBlock);
++#else
+     RANGE(range, 0x0000ffff, 0x0000ffff, ResExcIoBlock);
++#endif
+     ret = xf86AddResToList(ret, &range, -1);
+ 
+     return ret;
diff --git a/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c b/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c
new file mode 100644
index 000000000000..a7d8cb3fdd48
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c
@@ -0,0 +1,32 @@
+--- hw/xfree86/os-support/bsd/bsd_kbd.c.orig	Mon Oct  3 18:46:14 2005
++++ hw/xfree86/os-support/bsd/bsd_kbd.c	Fri Sep 29 23:26:17 2006
+@@ -75,6 +75,17 @@
+     KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
+     int real_leds = 0;
+ 
++#if defined (SYSCONS_SUPPORT)
++    if (pKbd->sunKbd) {
++  	if (leds & 0x08) real_leds |= XLED1;
++  	if (leds & 0x04) real_leds |= XLED4;
++  	if (leds & 0x02) real_leds |= XLED3;
++  	if (leds & 0x01) real_leds |= XLED2;
++        leds = real_leds;
++        real_leds = 0;
++    }
++#endif
++
+ #ifdef LED_CAP
+     if (leds & XLED1)  real_leds |= LED_CAP;
+ #endif
+@@ -83,7 +94,11 @@
+ #endif
+ #ifdef LED_SCR
+     if (leds & XLED3)  real_leds |= LED_SCR;
++#ifdef LED_COMP
++    if (leds & XLED4)  real_leds |= LED_COMP;
++#else
+     if (leds & XLED4)  real_leds |= LED_SCR;
++#endif
+ #endif
+ 
+     switch (pKbd->consType) {
diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c
deleted file mode 100644
index 68e18f831ec7..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c
+++ /dev/null
@@ -1,231 +0,0 @@
---- lib/font/FreeType/ftfuncs.c.orig	2005-10-23 19:32:05.000000000 +0100
-+++ lib/font/FreeType/ftfuncs.c	2006-06-01 23:21:34.000000000 +0100
-@@ -54,10 +54,7 @@
- #include FT_TYPE1_TABLES_H
- #include FT_XFREE86_H
- #include FT_BBOX_H
--#include FT_INTERNAL_TRUETYPE_TYPES_H
- #include FT_TRUETYPE_TAGS_H
--#include FT_INTERNAL_SFNT_H
--#include FT_INTERNAL_STREAM_H
- /*
-  *  If you want to use FT_Outline_Get_CBox instead of 
-  *  FT_Outline_Get_BBox, define here.
-@@ -123,6 +120,46 @@
- };
- 
- 
-+/* read 2-byte value from a SFNT table */
-+static FT_UShort
-+sfnt_get_ushort( FT_Face     face,
-+                 FT_ULong    table_tag,
-+                 FT_ULong    table_offset )
-+{
-+  FT_Byte    buff[2];
-+  FT_ULong   len = sizeof(buff);
-+  FT_UShort  result = 0;
-+
-+  if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) );
-+    result = (FT_UShort)( (buff[0] << 8) | buff[1] );
-+
-+  return result;
-+}
-+
-+#define  sfnt_get_short(f,t,o)  ((FT_Short)sfnt_get_ushort((f),(t),(o)))
-+
-+
-+#if 0
-+static FT_ULong
-+sfnt_get_ulong( FT_Face   face,
-+                FT_ULong  table_tag,
-+                FT_ULong  table_offset )
-+{
-+  FT_Byte    buff[4];
-+  FT_ULong   len = sizeof(buff);
-+  FT_UShort  result = 0;
-+
-+  if  ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len );
-+    result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) |
-+             ((FT_ULong)buff[2] << 8)  |  (FT_ULong)buff[3];
-+
-+  return result;
-+}
-+#endif
-+
-+
-+
-+
- static int ftypeInitP = 0;      /* is the engine initialised? */
- FT_Library ftypeLibrary;
- 
-@@ -211,6 +248,10 @@
-         if(maxp && maxp->maxContours == 0)
-             face->bitmap = 1;
-     }
-+
-+    face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face,
-+                                                    TTAG_hhea, 34 );
-+
-     /* Insert face in hashtable and return it */
-     face->next = faceTable[bucket];
-     faceTable[bucket] = face;
-@@ -462,6 +503,29 @@
-     }
- 
-     if( FT_IS_SFNT( face->face ) ) {
-+#if 1
-+        FT_F26Dot6  tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
-+        FT_UInt     nn;
-+
-+        instance->strike_index=0xFFFFU;
-+
-+	tt_char_width  = (int)(trans->scale*(1<<6) + 0.5);
-+	tt_char_height = (int)(trans->scale*(1<<6) + 0.5);
-+
-+        tt_dim_x = ( ( tt_char_width  * trans->xres + (36+32*72) ) / 72 ) & -64;
-+        tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64;
-+
-+        for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ )
-+        {
-+          FT_Bitmap_Size*  sz = &face->face->available_sizes[nn];
-+
-+          if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem )
-+          {
-+            instance->strike_index = nn;
-+            break;
-+          }
-+        }
-+#else
- 	/* See Set_Char_Sizes() in ttdriver.c */
- 	FT_Error err;
- 	TT_Face tt_face;
-@@ -486,6 +550,7 @@
- 	sfnt   = (SFNT_Service)tt_face->sfnt;
- 	err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index);
- 	if ( err ) instance->strike_index=0xFFFFU;
-+#endif
-     }
- 
-     /* maintain a linked list of instances */
-@@ -803,31 +868,36 @@
-  * parse the htmx field in TrueType font.
-  */
- 
--/* from src/truetype/ttgload.c */
- static void
--tt_get_metrics( TT_HoriHeader*  header,
-+tt_get_metrics( FT_Face         face,
- 		FT_UInt         idx,
-+		FT_UInt         num_hmetrics,
- 		FT_Short*       bearing,
- 		FT_UShort*      advance )
--/*  Copyright 1996-2001, 2002 by                      */
--/*  David Turner, Robert Wilhelm, and Werner Lemberg. */
- {
--    TT_LongMetrics  longs_m;
--    FT_UShort       k = header->number_Of_HMetrics;
-+   /* read the metrics directly from the horizontal header, we
-+    * parse the SFNT table directly through the standard FreeType API.
-+    * this works with any version of the library and doesn't need to
-+    * peek at its internals. Maybe a bit less
-+    */
-+    FT_UInt    count = num_hmetrics;
- 
--    if ( k == 0 ) {
--	*bearing = *advance = 0;
--	return;
-+    if ( count == 0 )
-+    {
-+      *advance = 0;
-+      *bearing = 0;
-     }
-+    else if ( idx < count )
-+    {
-+      FT_ULong  offset = idx*4;
- 
--    if ( idx < (FT_UInt)k ) {
--	longs_m  = (TT_LongMetrics )header->long_metrics + idx;
--	*bearing = longs_m->bearing;
--	*advance = longs_m->advance;
-+      *advance = sfnt_get_ushort( face, TTAG_hmtx, offset );
-+      *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 );
-     }
--    else {
--	*bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
--	*advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
-+    else
-+    {
-+      *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 );
-+      *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 );
-     }
- }
- 
-@@ -835,6 +905,7 @@
- ft_get_very_lazy_bbox( FT_UInt index,
- 		       FT_Face face,
- 		       FT_Size size,
-+		       FT_UInt  num_hmetrics,
- 		       double slant,
- 		       FT_Matrix *matrix,
- 		       FT_BBox *bbox,
-@@ -842,14 +913,13 @@
- 		       FT_Long *vertAdvance)
- {
-     if ( FT_IS_SFNT( face ) ) {
--	TT_Face   ttface = (TT_Face)face;
- 	FT_Size_Metrics *smetrics = &size->metrics;
- 	FT_Short  leftBearing = 0;
- 	FT_UShort advance = 0;
- 	FT_Vector p0, p1, p2, p3;
- 
- 	/* horizontal */
--	tt_get_metrics(&ttface->horizontal, index,
-+	tt_get_metrics( face, num_hmetrics, index,
- 		       &leftBearing, &advance);
- 
- #if 0
-@@ -910,7 +980,27 @@
- 		    FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return,
- 		    int *sbitchk_incomplete_but_exist )
- {
--#if (FREETYPE_VERSION >= 2001008)
-+#if 1
-+    if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0)
-+    {
-+      FT_Error         error;
-+      FT_Bitmap_Size*  sz = &ft_face->available_sizes[strike_index];
-+
-+      error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 );
-+      if ( !error )
-+      {
-+        error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY );
-+        if ( !error )
-+        {
-+          if ( metrics_return != NULL )
-+            *metrics_return = ft_face->glyph->metrics;
-+
-+          return 0;
-+        }
-+      }
-+    }
-+    return -1;
-+#elif (FREETYPE_VERSION >= 2001008)
-     SFNT_Service       sfnt;
-     TT_Face            face;
-     FT_Error           error;
-@@ -1043,6 +1133,7 @@
- 	    if( bitmap_metrics == NULL ) {
- 		if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) {
- 		    if( ft_get_very_lazy_bbox( idx, face->face, instance->size, 
-+		                               face->num_hmetrics,
- 					       instance->ttcap.vl_slant,
- 					       &instance->transformation.matrix,
- 					       &bbox, &outline_hori_advance, 
-@@ -1221,6 +1312,7 @@
- 	if( is_outline == 1 ){
- 	    if( correct ){
- 		if( ft_get_very_lazy_bbox( idx, face->face, instance->size, 
-+		                           face->num_hmetrics,
- 					   instance->ttcap.vl_slant,
- 					   &instance->transformation.matrix,
- 					   &bbox, &outline_hori_advance, 
diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h
deleted file mode 100644
index 925263c0009e..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $
-
---- lib/font/FreeType/ftfuncs.h.orig	2005-07-07 15:59:47.000000000 +0100
-+++ lib/font/FreeType/ftfuncs.h	2006-06-01 23:21:39.000000000 +0100
-@@ -47,6 +47,7 @@
-     char *filename;
-     FT_Face face;
-     int bitmap;
-+    FT_UInt num_hmetrics;
-     struct _FTInstance *instances;
-     struct _FTInstance *active_instance;
-     struct _FTFace *next;       /* link to next face in bucket */
diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c
deleted file mode 100644
index df7c97dce67a..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $
-
---- lib/font/FreeType/ftsystem.c.orig	2005-07-09 07:36:10.000000000 +0100
-+++ lib/font/FreeType/ftsystem.c	2006-06-01 23:21:53.000000000 +0100
-@@ -35,7 +35,6 @@
- #endif
- #include <ft2build.h>
- #include FT_CONFIG_CONFIG_H
--#include FT_INTERNAL_DEBUG_H
- #include FT_SYSTEM_H
- #include FT_ERRORS_H
- #include FT_TYPES_H
diff --git a/x11-servers/xorg-server-snap/files/patch-os-Imakefile b/x11-servers/xorg-server-snap/files/patch-os-Imakefile
deleted file mode 100644
index bbedacae7a94..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-os-Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- programs/Xserver/os/Imakefile.orig	Wed Mar 23 11:58:45 2005
-+++ programs/Xserver/os/Imakefile	Sun Apr 17 08:32:03 2005
-@@ -131,7 +131,8 @@
- 		  $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES)
-        INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
- 		  -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
--		  -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes
-+		  -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes \
-+		  -I$(INCROOT)/X11
-  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
- 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
- 		  DependDefines
diff --git a/x11-servers/xorg-server-snap/files/patch-render.c b/x11-servers/xorg-server-snap/files/patch-render.c
new file mode 100644
index 000000000000..17f8b144b1a7
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-render.c
@@ -0,0 +1,11 @@
+--- render/render.c.orig	Mon May 29 09:43:15 2006
++++ render/render.c	Mon May 29 09:45:02 2006
+@@ -1340,7 +1340,7 @@
+ 	{
+ 	    if (buffer + sizeof (GlyphSet) < end)
+ 	    {
+-                memcpy(&gs, buffer, sizeof(GlyphSet));
++		gs = *(CARD32 *) buffer;
+ 		glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,
+ 								 gs,
+ 								 GlyphSetType,
diff --git a/x11-servers/xorg-server-snap/files/patch-servermd.h b/x11-servers/xorg-server-snap/files/patch-servermd.h
new file mode 100644
index 000000000000..5bbb1e4d8ab5
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-servermd.h
@@ -0,0 +1,11 @@
+--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
++++ include/servermd.h	Sun Jan  8 14:06:22 2006
+@@ -216,7 +216,7 @@
+     defined(__sparc__) || defined(__mc68000__)
+ 
+ #if defined(__sparc) || defined(__sparc__)
+-# if !defined(sparc)
++# if !defined(sparc) && !defined(__FreeBSD__)
+ #  define sparc 1
+ # endif
+ #endif
diff --git a/x11-servers/xorg-server-snap/files/patch-sparc64kbd b/x11-servers/xorg-server-snap/files/patch-sparc64kbd
deleted file mode 100644
index d4854adf9cac..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-sparc64kbd
+++ /dev/null
@@ -1,22 +0,0 @@
---- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig	Wed Feb 23 23:28:28 2005
-+++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c	Thu Feb 24 00:12:20 2005
-@@ -571,6 +571,19 @@
-      }
-   }
- 
-+#if defined(__sparc__) && defined(__FreeBSD__)
-+  /*
-+   * Taken from xf86Events.c:
-+   * I really don't know what's wrong here, but passing the real
-+   * scanCode offsets by one from XKB's point of view.
-+   *
-+   * (ecd@skynet.be, 980405)
-+   */
-+  if (pKbd->sunKbd) {
-+    scanCode--;
-+  }
-+#endif
-+
- #ifndef TERMINATE_FALLBACK
- #define TERMINATE_FALLBACK 1
- #endif
diff --git a/x11-servers/xorg-server-snap/files/patch-xf86.tmpl b/x11-servers/xorg-server-snap/files/patch-xf86.tmpl
deleted file mode 100644
index 3bf0b443d5f8..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-xf86.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
---- config/cf/xf86.tmpl.orig	Tue Dec 17 04:21:38 2002
-+++ config/cf/xf86.tmpl	Thu Jan  2 14:10:44 2003
-@@ -19,6 +19,9 @@
- #ifdef UseInstalled
-        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \
- 		   $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
-+#elif UseInstalledPrograms
-+       IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
-+		   $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
- #else
-        IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
- 		   $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
diff --git a/x11-servers/xorg-server-snap/files/patch-xf86Events.c b/x11-servers/xorg-server-snap/files/patch-xf86Events.c
index bdd5bc51c819..2d88773233b8 100644
--- a/x11-servers/xorg-server-snap/files/patch-xf86Events.c
+++ b/x11-servers/xorg-server-snap/files/patch-xf86Events.c
@@ -1,5 +1,5 @@
---- programs/Xserver/hw/xfree86/common/xf86Events.c.orig	Sun Sep 26 04:17:42 2004
-+++ programs/Xserver/hw/xfree86/common/xf86Events.c	Sun Sep 26 04:17:25 2004
+--- hw/xfree86/common/xf86Events.c.orig	Sun Sep 26 04:17:42 2004
++++ hw/xfree86/common/xf86Events.c	Sun Sep 26 04:17:25 2004
 @@ -448,7 +448,7 @@
  #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
    static Bool first_time = TRUE;
diff --git a/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile b/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile
deleted file mode 100644
index 5728d915fb48..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig	Sat Sep 11 15:11:04 2004
-+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile	Sat Sep 11 15:11:07 2004
-@@ -25,6 +25,8 @@
- SNPRINTFOBJS = snprintf.o
- #endif
- 
-+XAWLIB = -lXaw
-+
- SRCS	=\
- 	accessx.c\
- 	card-cfg.c\
diff --git a/x11-servers/xorg-server-snap/files/patch-xf86sym.c b/x11-servers/xorg-server-snap/files/patch-xf86sym.c
deleted file mode 100644
index 1372be144354..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-xf86sym.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/Xserver/hw/xfree86/loader/xf86sym.c.orig	Fri May  7 18:51:51 2004
-+++ programs/Xserver/hw/xfree86/loader/xf86sym.c	Fri May  7 18:52:02 2004
-@@ -63,7 +63,6 @@
- #include "xf86.h"
- #include "xf86Resources.h"
- #include "xf86_OSproc.h"
--#include "xf86Parser.h"
- #include "xf86Config.h"
- #ifdef XINPUT
- # include "xf86Xinput.h"
diff --git a/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp b/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp
index e21fac8d8484..04e217b8d9fe 100644
--- a/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp
+++ b/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp
@@ -1,5 +1,5 @@
---- programs/Xserver/hw/xfree86/xorgconf.cpp.orig	Fri Dec 31 14:40:27 2004
-+++ programs/Xserver/hw/xfree86/xorgconf.cpp	Fri Dec 31 14:40:28 2004
+--- hw/xfree86/xorgconf.cpp.orig	Fri Dec 31 14:40:27 2004
++++ hw/xfree86/xorgconf.cpp	Fri Dec 31 14:40:28 2004
 @@ -624,3 +624,11 @@
      InputDevice "Keyboard1" "CoreKeyboard"
  EndSection
diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist
index 4e743e9bada4..f2dd3ba937e0 100644
--- a/x11-servers/xorg-server-snap/pkg-plist
+++ b/x11-servers/xorg-server-snap/pkg-plist
@@ -1,20 +1,16 @@
 bin/X
 bin/Xorg
-bin/getconfig
-bin/getconfig.pl
+bin/cvt
 bin/gtf
 %%SPARC64_NA%%%%PPC_NA%%bin/inb
 %%SPARC64_NA%%%%PPC_NA%%bin/inl
 %%SPARC64_NA%%%%PPC_NA%%bin/inw
 %%SPARC64_NA%%%%PPC_NA%%bin/ioport
-bin/kbd_mode
-bin/mmapr
-bin/mmapw
 %%SPARC64_NA%%%%PPC_NA%%bin/outb
 %%SPARC64_NA%%%%PPC_NA%%bin/outl
 %%SPARC64_NA%%%%PPC_NA%%bin/outw
 bin/pcitweak
-%%I386%%bin/scanpci
+%%AMD64_I386%%bin/scanpci
 bin/xorgcfg
 bin/xorgconfig
 include/X11/bitmaps/card.xbm
@@ -34,179 +30,257 @@ include/X11/pixmaps/computer.xpm
 include/X11/pixmaps/keyboard.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/mouse.xpm
+include/xorg/BT.h
+include/xorg/IBM.h
+include/xorg/TI.h
+include/xorg/XIstubs.h
+include/xorg/afb.h
+include/xorg/assyntax.h
+include/xorg/atKeynames.h
+include/xorg/bstore.h
+include/xorg/bstorestr.h
+include/xorg/bt829.h
+include/xorg/cfb.h
+include/xorg/cfb16.h
+include/xorg/cfb32.h
+include/xorg/cfb8_16.h
+include/xorg/cfb8_32.h
+include/xorg/cfbmap.h
+include/xorg/cfbmskbits.h
+include/xorg/cfbunmap.h
+include/xorg/closestr.h
+include/xorg/closure.h
+include/xorg/colormap.h
+include/xorg/colormapst.h
+include/xorg/compiler.h
+include/xorg/cursor.h
+include/xorg/cursorstr.h
+include/xorg/damage.h
+include/xorg/damagestr.h
+include/xorg/dbestruct.h
+include/xorg/dgaproc.h
+include/xorg/dix.h
+include/xorg/dixevents.h
+include/xorg/dixfont.h
+include/xorg/dixfontstr.h
+include/xorg/dixgrabs.h
+include/xorg/dixstruct.h
+include/xorg/dri.h
+include/xorg/dristruct.h
+include/xorg/edid.h
+include/xorg/exa.h
+include/xorg/exevents.h
+include/xorg/extension.h
+include/xorg/extinit.h
+include/xorg/extnsionst.h
+include/xorg/fb.h
+include/xorg/fbdevhw.h
+include/xorg/fboverlay.h
+include/xorg/fbpseudocolor.h
+include/xorg/fbrop.h
+include/xorg/fi1236.h
+include/xorg/fourcc.h
+include/xorg/gc.h
+include/xorg/gcstruct.h
+include/xorg/globals.h
+include/xorg/glyphstr.h
+include/xorg/i2c_def.h
+include/xorg/input.h
+include/xorg/inputstr.h
+include/xorg/mfb.h
+include/xorg/mfbmap.h
+include/xorg/mfbunmap.h
+include/xorg/mi.h
+include/xorg/mibank.h
+include/xorg/mibstore.h
+include/xorg/micmap.h
+include/xorg/micoord.h
+include/xorg/mifillarc.h
+include/xorg/mifpoly.h
+include/xorg/migc.h
+include/xorg/miline.h
+include/xorg/mipict.h
+include/xorg/mipointer.h
+include/xorg/mipointrst.h
+include/xorg/misc.h
+include/xorg/miscstruct.h
+include/xorg/mispans.h
+include/xorg/mistruct.h
+include/xorg/miwideline.h
+include/xorg/mizerarc.h
+include/xorg/msp3430.h
+include/xorg/opaque.h
+include/xorg/os.h
+include/xorg/picture.h
+include/xorg/picturestr.h
+include/xorg/pixmap.h
+include/xorg/pixmapstr.h
+include/xorg/property.h
+include/xorg/propertyst.h
+include/xorg/randrstr.h
+include/xorg/region.h
+include/xorg/regionstr.h
+include/xorg/renderedge.h
+include/xorg/resource.h
+include/xorg/rgb.h
+include/xorg/sarea.h
+include/xorg/screenint.h
+include/xorg/scrnintstr.h
+include/xorg/selection.h
+include/xorg/servermd.h
+include/xorg/shadow.h
+include/xorg/shadowfb.h
+include/xorg/site.h
+include/xorg/swaprep.h
+include/xorg/swapreq.h
+include/xorg/tda8425.h
+include/xorg/tda9850.h
+include/xorg/tda9885.h
+include/xorg/uda1380.h
+include/xorg/validate.h
+include/xorg/vbe.h
+include/xorg/vbeModes.h
+include/xorg/vdif.h
+include/xorg/vgaHW.h
+include/xorg/window.h
+include/xorg/windowstr.h
+include/xorg/xaa.h
+include/xorg/xaaWrapper.h
+include/xorg/xaalocal.h
+include/xorg/xaarop.h
+include/xorg/xf1bpp.h
+include/xorg/xf4bpp.h
+include/xorg/xf86.h
+include/xorg/xf86Crtc.h
+include/xorg/xf86Cursor.h
+include/xorg/xf86DDC.h
+include/xorg/xf86Keymap.h
+include/xorg/xf86Modes.h
+include/xorg/xf86Module.h
+include/xorg/xf86OSKbd.h
+include/xorg/xf86OSmouse.h
+include/xorg/xf86Opt.h
+include/xorg/xf86Optrec.h
+include/xorg/xf86Parser.h
+include/xorg/xf86Pci.h
+include/xorg/xf86PciInfo.h
+include/xorg/xf86Priv.h
+include/xorg/xf86Privstr.h
+include/xorg/xf86RAC.h
+include/xorg/xf86RandR12.h
+include/xorg/xf86Rename.h
+include/xorg/xf86RamDac.h
+include/xorg/xf86Resources.h
+include/xorg/xf86Version.h
+include/xorg/xf86Xinput.h
+include/xorg/xf86_OSlib.h
+include/xorg/xf86_OSproc.h
+include/xorg/xf86_ansic.h
+include/xorg/xf86_libc.h
+include/xorg/xf86cmap.h
+include/xorg/xf86fbman.h
+include/xorg/xf86i2c.h
+include/xorg/xf86int10.h
+include/xorg/xf86sbusBus.h
+include/xorg/xf86str.h
+include/xorg/xf86xv.h
+include/xorg/xf86xvmc.h
+include/xorg/xf86xvpriv.h
+include/xorg/xisb.h
+include/xorg/xorg-server.h
+include/xorg/xorgVersion.h
+include/xorg/xvdix.h
+include/xorg/xvmcext.h
 lib/X11/Cards
 lib/X11/Options
-lib/X11/app-defaults/XOrgCfg
-lib/X11/doc/BUILD
-lib/X11/doc/BugReport
-lib/X11/doc/DESIGN
-lib/X11/doc/Install
-lib/X11/doc/LICENSE
-lib/X11/doc/OS2.Notes
-lib/X11/doc/README
-lib/X11/doc/README.DECtga
-lib/X11/doc/README.Darwin
-lib/X11/doc/README.I128
-lib/X11/doc/README.LynxOS
-lib/X11/doc/README.NetBSD
-lib/X11/doc/README.OpenBSD
-lib/X11/doc/README.SCO
-lib/X11/doc/README.SiS
-lib/X11/doc/README.Solaris
-lib/X11/doc/README.XKB-Config
-lib/X11/doc/README.XKB-Enhancing
-lib/X11/doc/README.apm
-lib/X11/doc/README.ati
-lib/X11/doc/README.chips
-lib/X11/doc/README.cyrix
-lib/X11/doc/README.dps
-lib/X11/doc/README.fonts
-lib/X11/doc/README.i740
-lib/X11/doc/README.i810
-lib/X11/doc/README.mouse
-lib/X11/doc/README.newport
-lib/X11/doc/README.r128
-lib/X11/doc/README.rapidaccess
-lib/X11/doc/README.rendition
-lib/X11/doc/README.s3virge
-lib/X11/doc/RELNOTES
-lib/X11/doc/Versions
-lib/X11/doc/VideoBoard98
-lib/X11/etc/Xinstall.sh
-lib/X11/etc/xmodmap.std
-lib/X11/getconfig/cfg.sample
-lib/X11/getconfig/xorg.cfg
-lib/X11/xorg.conf.eg
-lib/X11/xserver/SecurityPolicy
-%%ALPHA_NA%%lib/modules/drivers/apm_drv.so
-%%ALPHA_NA%%lib/modules/drivers/ark_drv.so
-lib/modules/drivers/ati_drv.so
-lib/modules/drivers/atimisc_drv.so
-%%ALPHA_NA%%lib/modules/drivers/chips_drv.so
-%%PPC_NA%%lib/modules/drivers/cirrus_alpine.so
-%%PPC_NA%%lib/modules/drivers/cirrus_drv.so
-%%PPC_NA%%lib/modules/drivers/cirrus_laguna.so
-%%AMD64_I386%%lib/modules/drivers/cyrix_drv.so
-lib/modules/drivers/dummy_drv.so
-lib/modules/drivers/glint_drv.so
-%%ALPHA_NA%%lib/modules/drivers/i128_drv.so
-%%I386%%lib/modules/drivers/i740_drv.so
-%%SPARC64%%lib/modules/drivers/i740_drv.so
-%%ALPHA_NA%%lib/modules/drivers/i810_drv.so
-%%I386%%lib/modules/drivers/imstt_drv.so
-%%SPARC64%%lib/modules/drivers/imstt_drv.so
-lib/modules/drivers/mga_drv.so
-%%ALPHA_NA%%lib/modules/drivers/neomagic_drv.so
-%%I386%%lib/modules/drivers/newport_drv.so
-%%SPARC64%%lib/modules/drivers/newport_drv.so
-%%I386%%lib/modules/drivers/nsc_drv.so
-lib/modules/drivers/nv_drv.so
-lib/modules/drivers/r128_drv.so
-lib/modules/drivers/radeon_drv.so
-%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.so
-lib/modules/drivers/riva128.so
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.so
-%%IA64_NA%%lib/modules/drivers/s3virge_drv.so
-%%IA64_NA%%lib/modules/drivers/savage_drv.so
-%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.so
-%%AMD64_I386%%lib/modules/drivers/sis_drv.so
-%%SPARC64%%lib/modules/drivers/sunbw2_drv.so
-%%SPARC64%%lib/modules/drivers/suncg14_drv.so
-%%SPARC64%%lib/modules/drivers/suncg3_drv.so
-%%SPARC64%%lib/modules/drivers/suncg6_drv.so
-%%SPARC64%%lib/modules/drivers/sunffb_drv.so
-%%SPARC64%%lib/modules/drivers/sunleo_drv.so
-%%SPARC64%%lib/modules/drivers/suntcx_drv.so
-lib/modules/drivers/tdfx_drv.so
-%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.so
-%%ALPHA_NA%%lib/modules/drivers/trident_drv.so
-%%AMD64_I386%%lib/modules/drivers/tseng_drv.so
-%%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.so
-lib/modules/drivers/vga_drv.so
-%%I386%%lib/modules/drivers/via_drv.so
-%%ALPHA_NA%%lib/modules/drivers/vmware_drv.so
-lib/modules/extensions/libGLcore.so
-lib/modules/extensions/libdbe.so
-lib/modules/extensions/libdri.so
-lib/modules/extensions/libextmod.so
-lib/modules/extensions/libglx.so
-lib/modules/extensions/librecord.so
-lib/modules/extensions/libxtrap.so
-lib/modules/fonts/libbitmap.so
-lib/modules/fonts/libfreetype.so
-lib/modules/fonts/libtype1.so
-lib/modules/freebsd/libdrm.so
-lib/modules/input/acecad_drv.so
-lib/modules/input/calcomp_drv.so
-lib/modules/input/citron_drv.so
-lib/modules/input/digitaledge_drv.so
-lib/modules/input/dmc_drv.so
-lib/modules/input/dynapro_drv.so
-lib/modules/input/elographics_drv.so
-lib/modules/input/fpit_drv.so
-lib/modules/input/hyperpen_drv.so
-lib/modules/input/js_x_drv.so
-lib/modules/input/kbd_drv.so
-lib/modules/input/keyboard_drv.so
-lib/modules/input/magellan_drv.so
-lib/modules/input/microtouch_drv.so
-lib/modules/input/mouse_drv.so
-lib/modules/input/mutouch_drv.so
-lib/modules/input/palmax_drv.so
-lib/modules/input/penmount_drv.so
-lib/modules/input/spaceorb_drv.so
-lib/modules/input/summa_drv.so
-lib/modules/input/tek4957_drv.so
-lib/modules/input/void_drv.so
-lib/modules/input/wacom_drv.so
-%%ALPHA_NA%%lib/modules/libafb.so
-lib/modules/libcfb.so
-lib/modules/libcfb16.so
-%%SPARC64%%lib/modules/libcfb24.so
-lib/modules/libcfb32.so
-lib/modules/libddc.so
-lib/modules/libexa.so
-lib/modules/libfb.so
-lib/modules/libi2c.so
-lib/modules/libint10.so
-lib/modules/liblayer.so
-lib/modules/libmfb.so
-lib/modules/libpcidata.so
-lib/modules/librac.so
-lib/modules/libramdac.so
-lib/modules/libscanpci.so
-lib/modules/libshadow.so
-lib/modules/libshadowfb.so
-lib/modules/libvbe.so
-lib/modules/libvgahw.so
-lib/modules/libxaa.so
-lib/modules/libxf1bpp.so
-lib/modules/libxf4bpp.so
-lib/modules/libxf8_16bpp.so
-lib/modules/libxf8_32bpp.so
-%%SPARC64%%lib/modules/libxf8_32wid.so
-lib/modules/multimedia/bt829_drv.so
-lib/modules/multimedia/fi1236_drv.so
-lib/modules/multimedia/msp3430_drv.so
-lib/modules/multimedia/tda8425_drv.so
-lib/modules/multimedia/tda9850_drv.so
-lib/modules/multimedia/tda9885_drv.so
-lib/modules/multimedia/theatre200_drv.so
-lib/modules/multimedia/theatre_detect_drv.so
-lib/modules/multimedia/theatre_drv.so
-lib/modules/multimedia/uda1380_drv.so
-%%PPC_NA%%lib/modules/v10002d.uc
-%%PPC_NA%%lib/modules/v20002d.uc
-@dirrm lib/modules/multimedia
-@dirrm lib/modules/internal
-@dirrm lib/modules/input
-@dirrm lib/modules/freebsd
-@dirrm lib/modules/fonts
-@dirrm lib/modules/extensions
-@dirrm lib/modules/drivers
-@dirrm lib/X11/getconfig
+lib/xorg/modules/extensions/libGLcore.la
+lib/xorg/modules/extensions/libGLcore.so
+lib/xorg/modules/extensions/libdbe.la
+lib/xorg/modules/extensions/libdbe.so
+lib/xorg/modules/extensions/libdri.la
+lib/xorg/modules/extensions/libdri.so
+lib/xorg/modules/extensions/libextmod.la
+lib/xorg/modules/extensions/libextmod.so
+lib/xorg/modules/extensions/libglx.la
+lib/xorg/modules/extensions/libglx.so
+lib/xorg/modules/extensions/librecord.la
+lib/xorg/modules/extensions/librecord.so
+lib/xorg/modules/extensions/libxtrap.la
+lib/xorg/modules/extensions/libxtrap.so
+lib/xorg/modules/fonts/libfreetype.la
+lib/xorg/modules/fonts/libfreetype.so
+lib/xorg/modules/fonts/libtype1.la
+lib/xorg/modules/fonts/libtype1.so
+%%ALPHA_NA%%lib/xorg/modules/libafb.la
+%%ALPHA_NA%%lib/xorg/modules/libafb.so
+lib/xorg/modules/libcfb.la
+lib/xorg/modules/libcfb.so
+lib/xorg/modules/libcfb32.la
+lib/xorg/modules/libcfb32.so
+lib/xorg/modules/libexa.la
+lib/xorg/modules/libexa.so
+lib/xorg/modules/libfb.la
+lib/xorg/modules/libfb.so
+lib/xorg/modules/libint10.la
+lib/xorg/modules/libint10.so
+lib/xorg/modules/libmfb.la
+lib/xorg/modules/libmfb.so
+lib/xorg/modules/libpcidata.la
+lib/xorg/modules/libpcidata.so
+lib/xorg/modules/libscanpci.la
+lib/xorg/modules/libscanpci.so
+lib/xorg/modules/libshadow.la
+lib/xorg/modules/libshadow.so
+lib/xorg/modules/libshadowfb.la
+lib/xorg/modules/libshadowfb.so
+lib/xorg/modules/libvbe.la
+lib/xorg/modules/libvbe.so
+lib/xorg/modules/libvgahw.la
+lib/xorg/modules/libvgahw.so
+lib/xorg/modules/libxaa.la
+lib/xorg/modules/libxaa.so
+lib/xorg/modules/libxf1bpp.la
+lib/xorg/modules/libxf1bpp.so
+lib/xorg/modules/libxf4bpp.la
+lib/xorg/modules/libxf4bpp.so
+lib/xorg/modules/libxf8_16bpp.la
+lib/xorg/modules/libxf8_16bpp.so
+lib/xorg/modules/libxf8_32bpp.la
+lib/xorg/modules/libxf8_32bpp.so
+lib/xorg/modules/linux/libfbdevhw.la
+lib/xorg/modules/linux/libfbdevhw.so
+lib/xorg/modules/multimedia/bt829_drv.la
+lib/xorg/modules/multimedia/bt829_drv.so
+lib/xorg/modules/multimedia/fi1236_drv.la
+lib/xorg/modules/multimedia/fi1236_drv.so
+lib/xorg/modules/multimedia/msp3430_drv.la
+lib/xorg/modules/multimedia/msp3430_drv.so
+lib/xorg/modules/multimedia/tda8425_drv.la
+lib/xorg/modules/multimedia/tda8425_drv.so
+lib/xorg/modules/multimedia/tda9850_drv.la
+lib/xorg/modules/multimedia/tda9850_drv.so
+lib/xorg/modules/multimedia/tda9885_drv.la
+lib/xorg/modules/multimedia/tda9885_drv.so
+lib/xorg/modules/multimedia/uda1380_drv.la
+lib/xorg/modules/multimedia/uda1380_drv.so
+lib/xserver/SecurityPolicy
+libdata/pkgconfig/xorg-server.pc
+share/X11/app-defaults/XOrgCfg
+share/X11/xkb/compiled/README.compiled
+share/aclocal/xorg-server.m4
+@dirrm include/xorg
+@dirrm lib/xorg/modules/fonts
+@dirrm lib/xorg/modules/extensions
+@dirrm lib/xorg/modules/linux
+@dirrm lib/xorg/modules/multimedia
+@dirrm lib/xorg/modules
+@dirrm lib/xorg
+@dirrm lib/xserver
+@dirrmtry include/X11/bitmaps
 @dirrmtry include/X11/pixmaps
 @dirrmtry lib/X11/doc
 @dirrmtry lib/X11/etc
 @dirrmtry lib/X11/xserver
-@dirrmtry lib/modules
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
+@dirrmtry share/X11/app-defaults
diff --git a/x11-servers/xorg-server-snap/scripts/configure b/x11-servers/xorg-server-snap/scripts/configure
deleted file mode 100644
index e210b56ac0be..000000000000
--- a/x11-servers/xorg-server-snap/scripts/configure
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define InstallXserverSetUID ${SUID_XSERVER}" >> $LOCALDEF
-echo "#define JoystickSupport NO"		>> $LOCALDEF
-echo "#define BuildLBX NO"			>> $LOCALDEF
-echo "#define XnestServer NO"			>> $LOCALDEF
-echo "#define BuildFontServer NO"		>> $LOCALDEF
-echo "#define XVirtualFramebufferServer NO"	>> $LOCALDEF
-echo "#define XprtServer NO"			>> $LOCALDEF
-echo "#define LibInstall NO"			>> $LOCALDEF
-echo "#define ForceNormalLib NO"		>> $LOCALDEF
-echo "#define XTrueTypeInstallCConvHeaders NO"	>> $LOCALDEF
-echo "#define BuildServer YES"			>> $LOCALDEF
-echo "#define BuildXprint NO"			>> $LOCALDEF
-echo "#define BuildLibraries NO"		>> $LOCALDEF
-echo "#define LibInstallBuild YES"		>> $LOCALDEF
-echo "#define ModInstall YES"			>> $LOCALDEF
-echo "#define XF86Server NO"			>> $LOCALDEF
-echo "#define BuildServersOnly YES"		>> $LOCALDEF
-echo "#define BuildGLXLibrary YES"		>> $LOCALDEF
-echo "#define BuildDevelDRIDrivers YES"		>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-echo "#define BuildXFree86ConfigTools YES"	>> $LOCALDEF
-echo "#define DriverManDir \$(MANSOURCEPATH)4"	>> $LOCALDEF
-echo "#define DriverManSuffix 4x"		>> $LOCALDEF
-echo "#define MiscManDir \$(MANSOURCEPATH)7"	>> $LOCALDEF
-echo "#define MiscManSuffix 7x"			>> $LOCALDEF
-
-if [ X$WITH_DEBUG != X ]; then
-	export CFLAGS="-g $CFLAGS"
-	echo "#define InstPgmFlags"		>> $LOCALDEF
-	echo "#define MakeDllModules YES"	>> $LOCALDEF
-fi
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-servers/xorg-server-snap/scripts/configure.gen b/x11-servers/xorg-server-snap/scripts/configure.gen
deleted file mode 100644
index ee7e1d88add8..000000000000
--- a/x11-servers/xorg-server-snap/scripts/configure.gen
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# This script takes some of the system's imake configuration files and munges
-# them to be used in the X.Org build, and allows port configuration located in
-# $LOCALDEF to be included in the generated host.def
-
-SYSSITE=$PREFIX/lib/X11/config/xf86site.def
-BUILDSITE=$WRKDIR/xc/config/cf/xorgsite.def
-SYSHOST=$PREFIX/lib/X11/config/host.def
-LOCALDEF=$WRKDIR/.config
-BUILDHOST=$WRKDIR/xc/config/cf/host.def
-
-# Append system xf86site.def to build's xorgsite.def.
-rm -f $BUILDSITE
-cp -f $SYSSITE $BUILDSITE
-
-# Use system host.def as initial config file, setting ProjectRoot appropriately.
-rm -f $BUILDHOST
-grep -v '#define.*ProjectRoot' $SYSHOST			>> $BUILDHOST
-echo "#define ProjectRoot $PREFIX"			>> $BUILDHOST
-
-# Add in defines that all ports will want.
-echo "#define NothingOutsideProjectRoot YES"		>> $BUILDHOST
-echo "#define FreeBSDCC	${CC}"				>> $BUILDHOST
-echo "#define FreeBSDCXX ${CXX}"			>> $BUILDHOST
-echo "#define FreeBSDPTHREAD_LIBS ${PTHREAD_LIBS}"	>> $BUILDHOST
-echo "#define FreeBSDPTHREAD_CFLAGS ${PTHREAD_CFLAGS}"	>> $BUILDHOST
-echo "#define FreeBSDCFLAGS ${CFLAGS}"			>> $BUILDHOST
-
-cat ${LOCALDEF} >> ${BUILDHOST}
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 4dab8f178c32..ed0461620aa5 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -6,96 +6,67 @@
 #
 
 PORTNAME=	xorg-server
-PORTVERSION=	6.9.0
-PORTREVISION=	6
+PORTVERSION=	1.2.0
+PORTREVISION=	2
+PORTEPOCH=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src3.tar.gz
-
-PATCHFILES=	x11r6.9.0-dbe-render.diff
-PATCH_SITES=	${MASTER_SITE_XORG}
-PATCH_SITE_SUBDIR=	X11R${PORTVERSION}/patches
-PATCH_DIST_ARGS=	-d ${PATCH_WRKSRC}/programs/Xserver --quiet
+MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/:fdo \
+		${MASTER_SITE_SOURCEFORGE:S/$/:mesa/}
+MASTER_SITE_SUBDIR=mesa3d/:mesa
+DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2:fdo \
+		MesaLib-6.5.2.tar.bz2:mesa
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X server and related programs
 
-.if !defined(WITH_MODULAR)
-USE_XLIB=	yes
-.else
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
-		${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		GL.1:${PORTSDIR}/x11/libGL
-BUILD_DEPENDS=	${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-.endif
+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+RUN_DEPENDS=	${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
 
 CONFLICTS=	XFree86-Server-*
 
-SCRIPTS_ENV=	WITH_DEBUG="${WITH_DEBUG}"
+XORG_CAT=	xserver
+
+USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
+		xmu xt xpm xext randrproto renderproto fixesproto damageproto \
+		xcmiscproto xextproto xproto xtrans xf86miscproto \
+		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+		resourceproto fontsproto inputproto xf86dgaproto \
+		videoproto compositeproto trapproto recordproto xineramaproto \
+		evieproto xfont fontenc xkbui
+
+USE_PERL5_BUILD=yes
+CONFIGURE_ARGS=	--with-mesa-source=${WRKDIR}/Mesa-6.5.2 \
+		--disable-dmx --disable-xvfb --disable-xnest --disable-xprint \
+		--localstatedir=/var
+
+.if !defined(WITHOUT_AIGLX)
+CONFIGURE_ARGS+=	--enable-aiglx=yes
+.endif
+		
+.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
+CONFIGURE_ARGS+=--enable-install-setuid
+.endif
+
 MAN1=		Xorg.1 \
-		getconfig.1 \
+		Xserver.1 \
+		cvt.1 \
 		gtf.1 \
-		kbd_mode.1 \
 		pcitweak.1 \
 		xorgcfg.1 \
 		xorgconfig.1
-MAN4=		citron.4x \
-		dmc.4x \
-		dynapro.4x \
-		elographics.4x \
-		fbdevhw.4x \
-		fpit.4x \
-		glint.4x \
-		js_x.4x \
-		kbd.4x \
-		keyboard.4x \
-		mga.4x \
-		microtouch.4x \
-		mouse.4x \
-		mutouch.4x \
-		palmax.4x \
-		penmount.4x \
-		r128.4x \
-		radeon.4x \
-		tdfx.4x \
-		tek4957.4x \
-		vga.4x \
-		void.4x \
-		wacom.4x
-MAN5=		getconfig.5 \
-		xorg.conf.5
-
-XBUILD_DIRS=	lib/font programs/Xserver
-XINCLUDE_DIRS=	lib/xtrans
-XMAN_DIRS=	programs/Xserver
+MAN4=		exa.4 \
+		fbdevhw.4
+MAN5=		xorg.conf.5
 
 NOT_FOR_ARCHS=	ia64
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-
 .if ${ARCH} == alpha
 PLIST_SUB+=	ALPHA_NA="@comment "
 .else
 PLIST_SUB+=	ALPHA_NA=""
 .endif
 
-.if ${ARCH} == ia64
-PLIST_SUB+=	IA64_NA="@comment "
-.else
-PLIST_SUB+=	IA64_NA=""
-.endif
-
 .if ${ARCH} == powerpc
 PLIST_SUB+=	PPC_NA="@comment "
 MAN4+=		nv.4x
@@ -106,53 +77,14 @@ PLIST_SUB+=	PPC_NA=""
 .if ${ARCH} == sparc64
 PLIST_SUB+=	SPARC64=""
 PLIST_SUB+=	SPARC64_NA="@comment "
-MAN4+=		sunbw2.4x \
-		suncg14.4x \
-		suncg3.4x \
-		suncg6.4x \
-		sunffb.4x \
-		sunleo.4x \
-		suntcx.4x
 .else
 PLIST_SUB+=	SPARC64="@comment "
 PLIST_SUB+=	SPARC64_NA=""
 .endif
 
-.if ${ARCH} != powerpc && ${ARCH} != sparc64
-MAN4+=		cirrus.4x \
-		nv.4x \
-		rendition.4x \
-		s3virge.4x \
-		savage.4x \
-		siliconmotion.4x
-.endif
-
-.if ${ARCH} != powerpc && ${ARCH} != alpha
-MAN4+=		vesa.4x
-.endif
-
-.if ${ARCH} == i386
-PLIST_SUB+=	I386=""
-MAN1+=		scanpci.1
-MAN4+=		i740.4x \
-		nsc.4x \
-		via.4x
-.else
-PLIST_SUB+=	I386="@comment "
-.endif
-
 .if ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	AMD64_I386=""
-MAN4+=		apm.4x \
-		chips.4x \
-		cyrix.4x \
-		i128.4x \
-		i810.4x \
-		neomagic.4x \
-		sis.4x \
-		trident.4x \
-		tseng.4x \
-		vmware.4x
+MAN1+=		scanpci.1
 .else
 PLIST_SUB+=	AMD64_I386="@comment "
 .endif
@@ -165,10 +97,6 @@ pre-everything::
 	@${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm,"
 	@${ECHO_MSG} "which will still run the server as root), you can cancel the build and set"
 	@${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
-
-SCRIPTS_ENV+=	SUID_XSERVER=YES
-.else
-SCRIPTS_ENV+=	SUID_XSERVER=NO
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc
index 104c50c4afbf..6b9286e9c814 100644
--- a/x11-servers/xorg-server/Makefile.inc
+++ b/x11-servers/xorg-server/Makefile.inc
@@ -16,7 +16,7 @@ DIST_SUBDIR?=	xorg
 WRKSRC?=	${WRKDIR}/xc
 USE_X_PREFIX?=	no
 PREFIX?=	${X11BASE}
-MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+MTREE_FILE=	${PORTSDIR}/Templates/BSD.local.dist
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/*
 
 USE_IMAKE=	YES
@@ -48,7 +48,6 @@ CF_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
 SERVER_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c \
-		${PORTSDIR}/x11-servers/xorg-server/files/patch-font-bitmap-pcfread.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-mitri.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-servermd.h \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 8aa64eb535b0..428c09bca0cf 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,9 +1,6 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
-MD5 (xorg/x11r6.9.0-dbe-render.diff) = 992f91012c2e2f4c8abdbe8bcdf7b0c4
-SHA256 (xorg/x11r6.9.0-dbe-render.diff) = c41ed0c07151bd597bc6869e6de5b369d029d3bfcc9c9401e1e6a097356843a4
-SIZE (xorg/x11r6.9.0-dbe-render.diff) = 5158
+MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6
+SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
+SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596
+MD5 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = e4d894181f1859651658b3704633e10d
+SHA256 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
+SIZE (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 3295166
diff --git a/x11-servers/xorg-server/files/patch-945GM.patch b/x11-servers/xorg-server/files/patch-945GM.patch
deleted file mode 100644
index a0fd8f94dca1..000000000000
--- a/x11-servers/xorg-server/files/patch-945GM.patch
+++ /dev/null
@@ -1,335 +0,0 @@
-#
-# Add support to Intel 945GM
-#
---- programs/Xserver/hw/xfree86/drivers/i810/common.h.orig	Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/common.h	Mon Jul 17 11:43:00 2006
-@@ -322,6 +322,11 @@
- #define PCI_CHIP_I945_G_BRIDGE 0x2770
- #endif
- 
-+#ifndef PCI_CHIP_I945_GM
-+#define PCI_CHIP_I945_GM        0x27A2
-+#define PCI_CHIP_I945_GM_BRIDGE 0x27A0
-+#endif
-+
- #define IS_I810(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I810 ||	\
- 			pI810->PciInfo->chipType == PCI_CHIP_I810_DC100 || \
- 			pI810->PciInfo->chipType == PCI_CHIP_I810_E)
-@@ -335,6 +340,7 @@
- #define IS_I915G(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I915_G || pI810->PciInfo->chipType == PCI_CHIP_E7221_G)
- #define IS_I915GM(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I915_GM)
- #define IS_I945G(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I945_G)
-+#define IS_I945GM(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I945_GM)
- 
- #define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810))
- 
---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig	Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c	Mon Jul 17 11:44:09 2006
-@@ -136,6 +136,7 @@
-    {PCI_CHIP_E7221_G,		"E7221 (i915)"},
-    {PCI_CHIP_I915_GM,		"915GM"},
-    {PCI_CHIP_I945_G,		"945G"},
-+   {PCI_CHIP_I945_GM,		"945GM"},
-    {-1,				NULL}
- };
- 
-@@ -154,6 +155,7 @@
-    {PCI_CHIP_E7221_G,		PCI_CHIP_E7221_G,	RES_SHARED_VGA},
-    {PCI_CHIP_I915_GM,		PCI_CHIP_I915_GM,	RES_SHARED_VGA},
-    {PCI_CHIP_I945_G,		PCI_CHIP_I945_G,	RES_SHARED_VGA},
-+   {PCI_CHIP_I945_GM,		PCI_CHIP_I945_GM,	RES_SHARED_VGA},
-    {-1,				-1, RES_UNDEFINED }
- };
- 
-@@ -569,6 +571,7 @@
- 	    case PCI_CHIP_E7221_G:
- 	    case PCI_CHIP_I915_GM:
- 	    case PCI_CHIP_I945_G:
-+	    case PCI_CHIP_I945_GM:
-     	       xf86SetEntitySharable(usedChips[i]);
- 
-     	       /* Allocate an entity private if necessary */		
---- programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c.orig	Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c	Mon Jul 17 11:46:20 2006
-@@ -86,7 +86,7 @@
- 
-    DPRINTF(PFX, "I830InitHWCursor\n");
-    /* Initialise the HW cursor registers, leaving the cursor hidden. */
--   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
-+   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
-       temp = INREG(CURSOR_A_CONTROL);
-       temp &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE | MCURSOR_MEM_TYPE_LOCAL |
- 		MCURSOR_PIPE_SELECT);
-@@ -308,7 +308,7 @@
-    }
- 
-    /* have to upload the base for the new position */
--   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
-       if (pI830->CursorIsARGB)
-          OUTREG(CURSOR_A_BASE, pI830->CursorMemARGB->Physical);
-       else
-@@ -339,7 +339,7 @@
- 	   pI830->CursorMemARGB->Physical, pI830->CursorMemARGB->Start);
- 
-    pI830->cursorOn = TRUE;
--   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
-+   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
-       temp = INREG(CURSOR_A_CONTROL);
-       temp &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
-       if (pI830->CursorIsARGB)
-@@ -387,7 +387,7 @@
-    DPRINTF(PFX, "I830HideCursor\n");
- 
-    pI830->cursorOn = FALSE;
--   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
-+   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
-       temp = INREG(CURSOR_A_CONTROL);
-       temp &= ~CURSOR_MODE;
-       temp |= CURSOR_MODE_DISABLE;
---- programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c.orig	Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c	Mon Jul 17 11:49:23 2006
-@@ -196,6 +196,7 @@
-    {PCI_CHIP_E7221_G,		"E7221 (i915)"},
-    {PCI_CHIP_I915_GM,		"915GM"},
-    {PCI_CHIP_I945_G,		"945G"},
-+   {PCI_CHIP_I945_GM,		"945GM"},
-    {-1,				NULL}
- };
- 
-@@ -208,6 +209,7 @@
-    {PCI_CHIP_E7221_G,		PCI_CHIP_E7221_G,	RES_SHARED_VGA},
-    {PCI_CHIP_I915_GM,		PCI_CHIP_I915_GM,	RES_SHARED_VGA},
-    {PCI_CHIP_I945_G,		PCI_CHIP_I945_G,	RES_SHARED_VGA},
-+   {PCI_CHIP_I945_GM,		PCI_CHIP_I945_GM,	RES_SHARED_VGA},
-    {-1,				-1,			RES_UNDEFINED}
- };
- 
-@@ -1323,7 +1325,7 @@
-     * The GTT varying according the the FbMapSize and the popup is 4KB */
-    range = (pI830->FbMapSize / (1024*1024)) + 4;
- 
--   if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+   if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
-       switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
-       case I855_GMCH_GMS_STOLEN_1M:
- 	 memsize = MB(1) - KB(range);
-@@ -1341,11 +1343,11 @@
- 	 memsize = MB(32) - KB(range);
- 	 break;
-       case I915G_GMCH_GMS_STOLEN_48M:
--	 if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+	 if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
- 	    memsize = MB(48) - KB(range);
- 	 break;
-       case I915G_GMCH_GMS_STOLEN_64M:
--	 if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+	 if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
- 	    memsize = MB(64) - KB(range);
- 	 break;
-       }
-@@ -2090,6 +2092,9 @@
-    case PCI_CHIP_I945_G:
-       chipname = "945G";
-       break;
-+   case PCI_CHIP_I945_GM:
-+      chipname = "945GM";
-+      break;
-    default:
-       chipname = "unknown chipset";
-       break;
-@@ -2127,7 +2132,7 @@
-       pI830->LinearAddr = pI830->pEnt->device->MemBase;
-       from = X_CONFIG;
-    } else {
--      if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+      if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- 	 pI830->LinearAddr = pI830->PciInfo->memBase[2] & 0xF0000000;
- 	 from = X_PROBED;
-       } else if (pI830->PciInfo->memBase[1] != 0) {
-@@ -2149,7 +2154,7 @@
-       pI830->MMIOAddr = pI830->pEnt->device->IOBase;
-       from = X_CONFIG;
-    } else {
--      if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+      if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- 	 pI830->MMIOAddr = pI830->PciInfo->memBase[0] & 0xFFF80000;
- 	 from = X_PROBED;
-       } else if (pI830->PciInfo->memBase[1]) {
-@@ -2194,7 +2199,7 @@
- 	 pI830->FbMapSize = 0x4000000; /* 64MB - has this been tested ?? */
-       }
-    } else {
--      if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+      if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- 	 if (pI830->PciInfo->memBase[2] & 0x08000000)
- 	    pI830->FbMapSize = 0x8000000;	/* 128MB aperture */
- 	 else
-@@ -2227,7 +2232,7 @@
-    if (pI830->PciInfo->chipType == PCI_CHIP_E7221_G)
-       pI830->availablePipes = 1;
-    else
--   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830))
-+   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
-       pI830->availablePipes = 2;
-    else
-       pI830->availablePipes = 1;
-@@ -2872,7 +2877,7 @@
-    }
- 
-    /* Check if the HW cursor needs physical address. */
--   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830))
-+   if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
-       pI830->CursorNeedsPhysical = TRUE;
-    else
-       pI830->CursorNeedsPhysical = FALSE;
---- programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c.orig	Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c	Mon Jul 17 11:51:02 2006
-@@ -1239,7 +1239,7 @@
- 
-    i830Reg->Fence[nr] = 0;
- 
--   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
-    	fence_mask = ~I915G_FENCE_START_MASK;
-    else
-    	fence_mask = ~I830_FENCE_START_MASK;
-@@ -1247,7 +1247,7 @@
-    if (start & fence_mask) {
-       xf86DrvMsg(X_WARNING, pScrn->scrnIndex,
- 		 "SetFence: %d: start (0x%08x) is not %s aligned\n",
--		 nr, start, (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) ? "1MB" : "512k");
-+		 nr, start, (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) ? "1MB" : "512k");
-       return;
-    }
- 
-@@ -1267,7 +1267,7 @@
- 
-    val = (start | FENCE_X_MAJOR | FENCE_VALID);
- 
--   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
-    	switch (size) {
- 	   case MB(1):
-       		val |= I915G_FENCE_SIZE_1M;
-@@ -1328,7 +1328,7 @@
-    	}
-    }
- 
--   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
- 	fence_pitch = pitch / 512;
-    else
- 	fence_pitch = pitch / 128;
---- programs/Xserver/hw/xfree86/drivers/i810/i830_video.c.orig	Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_video.c	Mon Jul 17 11:52:36 2006
-@@ -617,7 +617,7 @@
-    adapt->nAttributes = NUM_ATTRIBUTES;
-    if (pI830->Clone)
-       adapt->nAttributes += CLONE_ATTRIBUTES;
--   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
-       adapt->nAttributes += GAMMA_ATTRIBUTES; /* has gamma */
-    adapt->pAttributes = xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes);
-    /* Now copy the attributes */
-@@ -628,7 +628,7 @@
-       memcpy((char*)att, (char*)CloneAttributes, sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES);
-       att+=CLONE_ATTRIBUTES;
-    }
--   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
-       memcpy((char*)att, (char*)GammaAttributes, sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES);
-       att+=GAMMA_ATTRIBUTES;
-    }
-@@ -688,7 +688,7 @@
-    if (pI830->Clone)
-      xvPipe = MAKE_ATOM("XV_PIPE");
- 
--   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+   if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
-      xvGamma0 = MAKE_ATOM("XV_GAMMA0");
-      xvGamma1 = MAKE_ATOM("XV_GAMMA1");
-      xvGamma2 = MAKE_ATOM("XV_GAMMA2");
-@@ -806,7 +806,7 @@
-          overlay->OCONFIG |= OVERLAY_PIPE_B;
-       if (pPriv->overlayOK)
-          OVERLAY_UPDATE;
--   } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       /* Avoid video anomalies, so set gamma registers when overlay is off */
-       /* We also clamp the values if they are outside the ranges */
-       if (!*pI830->overlayOn) {
-@@ -815,35 +815,35 @@
- 	   pPriv->gamma1 = pPriv->gamma0 + 0x7d;
-       } else
-          return BadRequest;
--   } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       if (!*pI830->overlayOn) {
-          pPriv->gamma1 = value;
-          if (pPriv->gamma1 - pPriv->gamma0 > 0x7d)
-            pPriv->gamma0 = pPriv->gamma1 - 0x7d;
-       } else
-          return BadRequest;
--   } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       if (!*pI830->overlayOn) {
-          pPriv->gamma2 = value;
-          if (pPriv->gamma3 - pPriv->gamma2 > 0x7d)
-             pPriv->gamma3 = pPriv->gamma2 + 0x7d;
-       } else
-          return BadRequest;
--   } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       if (!*pI830->overlayOn) {
-          pPriv->gamma3 = value;
-          if (pPriv->gamma3 - pPriv->gamma2 > 0x7d)
-             pPriv->gamma2 = pPriv->gamma3 - 0x7d;
-       } else
-          return BadRequest;
--   } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       if (!*pI830->overlayOn) {
-          pPriv->gamma4 = value;
-          if (pPriv->gamma5 - pPriv->gamma4 > 0x7d)
-             pPriv->gamma5 = pPriv->gamma4 + 0x7d;
-       } else
-          return BadRequest;
--   } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       if (!*pI830->overlayOn) {
-          pPriv->gamma5 = value;
-          if (pPriv->gamma5 - pPriv->gamma4 > 0x7d)
-@@ -875,7 +875,7 @@
-         attribute == xvGamma2 ||
-         attribute == xvGamma3 ||
-         attribute == xvGamma4 ||
--        attribute == xvGamma5) && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+        attribute == xvGamma5) && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- 	I830UpdateGamma(pScrn);
-    }
- 
-@@ -895,17 +895,17 @@
-       *value = pPriv->contrast;
-    } else if (pI830->Clone && attribute == xvPipe) {
-       *value = pPriv->pipe;
--   } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       *value = pPriv->gamma0;
--   } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       *value = pPriv->gamma1;
--   } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       *value = pPriv->gamma2;
--   } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       *value = pPriv->gamma3;
--   } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       *value = pPriv->gamma4;
--   } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+   } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
-       *value = pPriv->gamma5;
-    } else if (attribute == xvColorKey) {
-       *value = pPriv->colorKey;
diff --git a/x11-servers/xorg-server/files/patch-CVE-2006-0745 b/x11-servers/xorg-server/files/patch-CVE-2006-0745
deleted file mode 100644
index afb7d4de763d..000000000000
--- a/x11-servers/xorg-server/files/patch-CVE-2006-0745
+++ /dev/null
@@ -1,20 +0,0 @@
---- programs/Xserver/hw/xfree86/common/xf86Init.c.orig	2006-03-17 23:30:10.000000000 +0200
-+++ programs/Xserver/hw/xfree86/common/xf86Init.c	2006-03-17 23:29:35.000000000 +0200
-@@ -1376,7 +1376,7 @@
-     }
-   
-   /* First the options that are only allowed for root */
--  if (getuid() == 0 || geteuid != 0)
-+  if (getuid() == 0 || geteuid() != 0)
-   {
-     if (!strcmp(argv[i], "-modulepath"))
-     {
-@@ -1679,7 +1679,7 @@
-   }
-   if (!strcmp(argv[i], "-configure"))
-   {
--    if (getuid() != 0 && geteuid == 0) {
-+    if (getuid() != 0 && geteuid() == 0) {
- 	ErrorF("The '-configure' option can only be used by root.\n");
- 	exit(1);
-     }
diff --git a/x11-servers/xorg-server/files/patch-FreeBSD.cf b/x11-servers/xorg-server/files/patch-FreeBSD.cf
deleted file mode 100644
index 9a208d778fa3..000000000000
--- a/x11-servers/xorg-server/files/patch-FreeBSD.cf
+++ /dev/null
@@ -1,93 +0,0 @@
---- config/cf/FreeBSD.cf.orig	Sun Aug 15 10:03:36 2004
-+++ config/cf/FreeBSD.cf	Sun Feb  6 03:56:59 2005
-@@ -78,6 +78,7 @@
- #define HasIssetugid		YES
- #define HasPoll			YES
- #endif
-+#define BuildHtmlManPages	NO
- 
- #if OSMajorVersion >= 4
- #define HasGetIfAddrs		YES
-@@ -116,15 +117,14 @@
- # endif
- # if (OSRelVersion < 500043)
- #  define NeedUIThrStubs	YES
--# endif
--# if (OSRelVersion >= 502102)
--#  define ThreadsLibraries	-lpthread
--# elif (OSRelVersion >= 500016)
--#  define ThreadsLibraries	-lc_r
-+#  define BuildThreadStubLibrary	YES
-+#  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
-+#  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
- # else
--#  define ThreadsLibraries	-pthread
-+#  define BuildThreadStubLibrary	NO
- # endif
--# define SystemMTDefines	-D_THREAD_SAFE
-+# define ThreadsLibraries	FreeBSDPTHREAD_LIBS
-+# define SystemMTDefines	FreeBSDPTHREAD_CFLAGS
- #endif
- 
- /* This fixes linking C programs against libGLU on FreeBSD 3.x */
-@@ -172,12 +172,14 @@
- #endif
- #endif
- 
--#ifndef CcCmd
--#define CcCmd			cc
--#endif
--#ifndef CplusplusCmd
--#define CplusplusCmd		c++
-+#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
-+#define CcCmd			$(CLIENTENVSETUP) FreeBSDCC
-+#define CplusplusCmd		$(CLIENTENVSETUP) FreeBSDCXX
-+#else
-+#define CcCmd			FreeBSDCC
-+#define CplusplusCmd		FreeBSDCXX
- #endif
-+
- #define CppCmd			/usr/bin/cpp
- #define PreProcessCmd		CppCmd
- #define StandardCppOptions	-traditional
-@@ -338,7 +340,7 @@
- #ifndef LibraryRpathLoadFlags
- # if UseRpath
- #  if UseElfFormat
--#   define LibraryRpathLoadFlags	-rpath $(USRLIBDIRPATH)
-+#   define LibraryRpathLoadFlags	-Wl,-rpath $(USRLIBDIRPATH)
- #  else
- #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
- #  endif
-@@ -442,7 +444,9 @@
- #define AsVISOption		-Av9a
- #define AsOutputArchSize	64
- #endif
--
-+#ifdef PpcArchitecture
-+#define XF86INT10_BUILD		X86INT10_STUB
-+#endif
- #define StandardDefines	-DCSRG_BASED
- 
- #if OSMajorVersion > 1
-@@ -463,18 +467,8 @@
- #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
- #endif
- 
--/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
--#ifndef DefaultGcc2i386Opt
--#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2 GccAliasingArgs
--#endif
--#endif
--
--#ifdef i386Architecture
--# define OptimizedCDebugFlags DefaultGcc2i386Opt
--#else
--# define OptimizedCDebugFlags -O
--#endif
-+#define DefaultGcc2i386Opt
-+#define OptimizedCDebugFlags FreeBSDCFLAGS
- 
- #ifndef PreIncDir
- # define PreIncDir	/usr/include
diff --git a/x11-servers/xorg-server/files/patch-Imake.rules b/x11-servers/xorg-server/files/patch-Imake.rules
deleted file mode 100644
index deea1cb886a6..000000000000
--- a/x11-servers/xorg-server/files/patch-Imake.rules
+++ /dev/null
@@ -1,67 +0,0 @@
---- config/cf/Imake.rules.orig	Mon Dec  9 15:00:42 2002
-+++ config/cf/Imake.rules	Mon Oct 13 17:04:19 2003
-@@ -1406,7 +1406,7 @@
-  * this Imakefile is within the source tree.
-  */
- #ifndef RmanDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define RmanDependency() /**/
- #else
- #define RmanDependency() 						@@\
-@@ -1421,7 +1421,7 @@
- #endif /* RmanDependency */
- 
- #ifndef RmanCmdDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define RmanCmdDependency	/**/
- #else
- #define RmanCmdDependency	ProgramTargetName($(RMAN))
-@@ -1874,7 +1874,7 @@
-  * this Imakefile is within the source tree.
-  */
- #ifndef DependDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define DependDependency() /**/
- #else
- #define DependDependency() 						@@\
-@@ -1969,7 +1969,7 @@
-  * within the source tree.
-  */
- #ifndef ImakeDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define ImakeDependency(target) /**/
- #else
- #define ImakeDependency(target)						@@\
-@@ -2066,11 +2066,18 @@
-  * ProjectUnsharedLibReferences - variables for unshared libraries
-  */
- #ifndef ProjectUnsharedLibReferences
-+#if defined(UseInstalledLibraries)
-+#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir)	@@\
-+Concat3(DEP,varname,LIB) = 						@@\
-+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
-+LintLibReferences(varname,libname,libsource)
-+#else
- #define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir)	@@\
- Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname))	@@\
- Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
- LintLibReferences(varname,libname,libsource)
- #endif
-+#endif
- 
-  /*
-  * ProjectUnsharedFontLibReferences - unshared font libraries
-@@ -3126,6 +3133,9 @@
- 
- #ifdef UseInstalled
- #define ImakeSubCmdHelper $(IMAKE_CMD)
-+#elif defined(UseInstalledPrograms)
-+#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
-+			  $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
- #else
- #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
- 			  $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
diff --git a/x11-servers/xorg-server/files/patch-Imake.tmpl b/x11-servers/xorg-server/files/patch-Imake.tmpl
deleted file mode 100644
index 526e2e5de8a8..000000000000
--- a/x11-servers/xorg-server/files/patch-Imake.tmpl
+++ /dev/null
@@ -1,75 +0,0 @@
---- config/cf/Imake.tmpl.orig	Mon Dec  9 19:20:41 2002
-+++ config/cf/Imake.tmpl	Thu Jan  2 14:34:20 2003
-@@ -237,7 +237,8 @@
- 
- #ifndef RmanCmd
- #if BuildRman
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define RmanCmd rman
- #else
- #define RmanCmd $(TOP)/config/util/rman
-@@ -1348,7 +1349,8 @@
- #define LoaderLibPrefix /**/
- #endif
- #ifndef ImakeCmd
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define ImakeCmd imake
- #else
- #define ImakeCmd $(IMAKESRC)/imake
-@@ -1359,19 +1361,22 @@
- #endif
- #ifndef DependCmd
- #if UseGccMakeDepend
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define DependCmd gccmakedep
- #else
- #define DependCmd $(DEPENDSRC)/gccmakedep
- #endif
- #elif UseCCMakeDepend
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define DependCmd ccmakedep
- #else
- #define DependCmd $(DEPENDSRC)/ccmakedep
- #endif
- #else
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define DependCmd makedepend
- #else
- #define DependCmd $(DEPENDSRC)/makedepend
-@@ -1398,21 +1403,23 @@
- #ifndef ExportListCmd
- # ifndef ExportListGenSource
- #  define ExportListCmd		/**/
--# elif !defined(UseInstalled)
-+# elif !defined(UseInstalled) && !defined(UseInstalledPrograms)
- #  define ExportListCmd		$(CONFIGSRC)/util/exportlistgen
- # else
- #  define ExportListCmd		exportlistgen
- # endif
- #endif
- #ifndef MkdirHierCmd
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define MkdirHierCmd mkdirhier
- #else
- #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh
- #endif
- #endif
- #ifndef RevPathCmd
--#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define RevPathCmd revpath
- #else
- #define RevPathCmd $(CONFIGSRC)/util/revpath
diff --git a/x11-servers/xorg-server/files/patch-Library.tmpl b/x11-servers/xorg-server/files/patch-Library.tmpl
deleted file mode 100644
index e94aae3bfc60..000000000000
--- a/x11-servers/xorg-server/files/patch-Library.tmpl
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/cf/Library.tmpl.orig	Mon May 24 12:06:57 2004
-+++ config/cf/Library.tmpl	Fri Sep 10 21:46:00 2004
-@@ -389,7 +389,7 @@
-  */
- 
- #ifndef MakeStringsDependency
--# ifndef UseInstalled
-+# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
- #  define MakeStringsDependency						@@\
- MAKESTRS = $(CONFIGSRC)/util/makestrs					@@\
- NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf)	@@\
-@@ -399,7 +399,8 @@
- 									@@\
- includes:: HostProgramTargetName($(MAKESTRS))
- # else
--#  define MakeStringsDependency  /**/
-+#  define MakeStringsDependency						@@\
-+MAKESTRS = makestrs
- # endif
- #endif
- 
diff --git a/x11-servers/xorg-server/files/patch-X11.rules b/x11-servers/xorg-server/files/patch-X11.rules
deleted file mode 100644
index 052e960127fc..000000000000
--- a/x11-servers/xorg-server/files/patch-X11.rules
+++ /dev/null
@@ -1,17 +0,0 @@
---- config/cf/X11.rules.orig	Sun May 30 12:49:38 2004
-+++ config/cf/X11.rules	Sun May 30 12:50:02 2004
-@@ -23,6 +23,14 @@
- # define UseInstalledX11	YES
- #endif
- 
-+#ifndef UseInstalledPrograms
-+# define UseInstalledPrograms	NO
-+#endif
-+
-+#ifndef UseInstalledClients
-+# define UseInstalledClients	NO
-+#endif
-+
- #ifndef ImportX11
- # ifdef UseImports
- #  define ImportX11		YES
diff --git a/x11-servers/xorg-server/files/patch-X11.tmpl b/x11-servers/xorg-server/files/patch-X11.tmpl
deleted file mode 100644
index c27d14d8e1ec..000000000000
--- a/x11-servers/xorg-server/files/patch-X11.tmpl
+++ /dev/null
@@ -1,79 +0,0 @@
---- X11.tmpl.orig	Fri Sep  3 09:18:18 2004
-+++ config/cf/X11.tmpl	Wed Dec 29 13:42:37 2004
-@@ -616,7 +616,7 @@
- #define BuildXft1Library	BuildRenderLibrary
- #endif
- #ifndef UseFontconfig
--#define UseFontconfig		BuildXftLibrary
-+#define UseFontconfig		(BuildXftLibrary || BuildXft1Library)
- #endif
- #ifndef BuildFontconfigLibrary
- #define BuildFontconfigLibrary	(UseFontconfig && !HasFontconfig)
-@@ -773,6 +773,9 @@
- #ifndef ThreadedProject
- #define ThreadedProject ThreadedX
- #endif
-+#ifndef BuildThreadStubLibrary
-+#define BuildThreadStubLibrary	NO
-+#endif
- #ifndef NeedUIThrStubs
- #define NeedUIThrStubs		NO
- #endif
-@@ -1606,7 +1609,7 @@
- #endif
- 
- #ifndef PsWrap
--# ifndef UseInstalled
-+# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
- #  define PsWrap $(PSWRAPSRC)/pswrap
- # else
- #  define PsWrap pswrap
-@@ -1683,7 +1686,7 @@
- 
-      INSTAPPFLAGS = $(INSTDATFLAGS)	/* XXX - this should go away - XXX */
- 
--#if UseInstalledX11
-+#if UseInstalledX11 || UseInstalledClients
-               RGB = $(XBINDIR)/rgb
-             FONTC = $(XBINDIR)/bdftopcf
-       MKFONTSCALE = $(XBINDIR)/mkfontscale
-@@ -1843,6 +1846,39 @@
-       DEPXLIBONLY = $(DEPXONLYLIB)
-          XLIBONLY = $(XONLYLIB)
-      LINTXONLYLIB = $(LINTXONLY)
-+
-+#if BuildThreadStubLibrary
-+#ifndef SharedLibXThrStub
-+#define SharedLibXThrStub	YES
-+#endif
-+#ifndef NormalLibXThrStub
-+#define NormalLibXThrStub	NO
-+#endif
-+#ifndef DebugLibXThrStub
-+#define DebugLibXThrStub	NO
-+#endif
-+#ifndef ProfileLibXThrStub
-+#define ProfileLibXThrStub	NO
-+#endif
-+   XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub
-+#if SharedLibXThrStub
-+#ifndef SharedXThrStubRev
-+#define SharedXThrStubRev 6.1
-+#endif
-+SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev)
-+#else
-+ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
-+#endif
-+#else
-+#undef  SharedLibXThrStub
-+#define SharedLibXThrStub	NO
-+#undef  NormalLibXThrStub
-+#define NormalLibXThrStub	NO
-+#undef  DebugLibXThrStub
-+#define DebugLibXThrStub	NO
-+#undef  ProfileLibXThrStub
-+#define ProfileLibXThrStub	NO
-+#endif
- 
- #if BuildScreenSaverLibrary
- #ifndef SharedLibXss
diff --git a/x11-servers/xorg-server/files/patch-Xext_xcmisc.c b/x11-servers/xorg-server/files/patch-Xext_xcmisc.c
new file mode 100644
index 000000000000..c3637ac038d2
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-Xext_xcmisc.c
@@ -0,0 +1,38 @@
+diff --git Xext/xcmisc.c Xext/xcmisc.c
+index f26218e..8c7a86e 100644
+--- Xext/xcmisc.c
++++ Xext/xcmisc.c
+@@ -42,6 +42,12 @@ #include "swaprep.h"
+ #include <X11/extensions/xcmiscstr.h>
+ #include "modinit.h"
+ 
++#if HAVE_STDINT_H
++#include <stdint.h>
++#elif !defined(UINT32_MAX)
++#define UINT32_MAX 0xffffffffU
++#endif
++
+ #if 0
+ static unsigned char XCMiscCode;
+ #endif
+@@ -143,7 +149,10 @@ ProcXCMiscGetXIDList(client)
+ 
+     REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
+ 
+-    pids = (XID *)ALLOCATE_LOCAL(stuff->count * sizeof(XID));
++    if (stuff->count > UINT32_MAX / sizeof(XID))
++	    return BadAlloc;
++
++    pids = (XID *)Xalloc(stuff->count * sizeof(XID));
+     if (!pids)
+     {
+ 	return BadAlloc;
+@@ -164,7 +173,7 @@ ProcXCMiscGetXIDList(client)
+     	client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
+ 	WriteSwappedDataToClient(client, count * sizeof(XID), pids);
+     }
+-    DEALLOCATE_LOCAL(pids);
++    Xfree(pids);
+     return(client->noClientException);
+ }
+ 
diff --git a/x11-servers/xorg-server/files/patch-Xserver-Imakefile b/x11-servers/xorg-server/files/patch-Xserver-Imakefile
deleted file mode 100644
index 5dab87bd4828..000000000000
--- a/x11-servers/xorg-server/files/patch-Xserver-Imakefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- programs/Xserver/Imakefile.orig	Sat May 29 14:12:45 2004
-+++ programs/Xserver/Imakefile	Sat May 29 14:12:16 2004
-@@ -1095,5 +1095,3 @@
- 
- DEFAULTFONTPATH = DefaultFontPath
- EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`"
--
--InstallManPage(Xserver,$(MANDIR))
diff --git a/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c b/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c
index 6a9380e4526a..5894dbb727bc 100644
--- a/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c
+++ b/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c
@@ -1,7 +1,7 @@
 Index: programs/Xserver/Xext/xvmc.c
 diff -u -p programs/Xserver/Xext/xvmc.c.orig programs/Xserver/Xext/xvmc.c
---- programs/Xserver/Xext/xvmc.c.orig	Sun Jul  3 17:53:36 2005
-+++ programs/Xserver/Xext/xvmc.c	Thu Jan 26 14:22:20 2006
+--- Xext/xvmc.c.orig	Sun Jul  3 17:53:36 2005
++++ Xext/xvmc.c	Thu Jan 26 14:22:20 2006
 @@ -24,8 +24,8 @@
  
  #ifdef HAS_XVMCSHM
diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
index 129b262f1365..59aad379ae11 100644
--- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
+++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
@@ -1,18 +1,11 @@
-Index: programs/Xserver/hw/xfree86/common/xf86Config.c
-diff -u -p programs/Xserver/hw/xfree86/common/xf86Config.c.orig programs/Xserver/hw/xfree86/common/xf86Config.c
---- programs/Xserver/hw/xfree86/common/xf86Config.c.orig	Wed Dec 21 07:30:50 2005
-+++ programs/Xserver/hw/xfree86/common/xf86Config.c	Thu Jan 26 15:10:39 2006
-@@ -505,8 +505,12 @@ GenerateDriverlist(char * dirname, char 
- {
- #ifdef XFree86LOADER
-     char **ret;
--    char *subdirs[] = { dirname, NULL };
-+    char *subdirs[2];
-     static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};
-+
-+    subdirs[0] = dirname;
-+    subdirs[1] = NULL;
-+
-     ret = LoaderListDirs(subdirs, patlist);
-     
-     /* fix up the probe order for video drivers */
+--- hw/xfree86/common/xf86Config.c.orig	Fri Jun 23 12:32:32 2006
++++ hw/xfree86/common/xf86Config.c	Fri Jun 23 12:32:46 2006
+@@ -1042,7 +1042,7 @@
+     else
+ 	xf86Info.estimateSizesAggressively = 0;
+ 
+-    xf86Info.aiglx = TRUE;
++    xf86Info.aiglx = FALSE;
+     xf86Info.aiglxFrom = X_DEFAULT;
+     if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
+ 	xf86Info.aiglx = value;
diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
index 8fc64d32fb67..933742b00170 100644
--- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
+++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
@@ -1,7 +1,7 @@
 Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
 diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
---- programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig	Tue Oct  4 01:46:14 2005
-+++ programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c	Thu Jan 26 14:57:56 2006
+--- hw/xfree86/os-support/bsd/i386_video.c.orig	Tue Oct  4 01:46:14 2005
++++ hw/xfree86/os-support/bsd/i386_video.c	Thu Jan 26 14:57:56 2006
 @@ -35,6 +35,7 @@
  #include "xf86Priv.h"
  
diff --git a/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c b/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
index d8f304d153f3..e9fb876333cc 100644
--- a/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
+++ b/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
@@ -1,7 +1,6 @@
-Index: programs/Xserver/os/xprintf.c
 diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
---- programs/Xserver/os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
-+++ programs/Xserver/os/xprintf.c	Thu Jan 26 12:47:37 2006
+--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
++++ os/xprintf.c	Thu Jan 26 12:47:37 2006
 @@ -39,7 +39,7 @@
  # ifdef __va_copy
  #  define va_copy __va_copy
diff --git a/x11-servers/xorg-server/files/patch-at_scancode.c b/x11-servers/xorg-server/files/patch-at_scancode.c
new file mode 100644
index 000000000000..68ffceb41e86
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-at_scancode.c
@@ -0,0 +1,31 @@
+--- hw/xfree86/os-support/shared/at_scancode.c.orig	Sun Jul  3 09:01:35 2005
++++ hw/xfree86/os-support/shared/at_scancode.c	Sat Oct  7 21:27:29 2006
+@@ -84,6 +84,10 @@
+        case KEY_Prefix0:
+           pKbd->scanPrefix = 0;
+           switch (*scanCode) {
++            case 0x1e:            *scanCode = KEY_AudioRaise;break;
++            case 0x1f:            *scanCode = KEY_AudioLower;break;
++            case 0x20:            *scanCode = KEY_Power;     break;
++            case 0x25:            *scanCode = KEY_Mute;      break;
+             case KEY_KP_7:        *scanCode = KEY_Home;      break;  /* curs home */
+             case KEY_KP_8:        *scanCode = KEY_Up;        break;  /* curs up */
+             case KEY_KP_9:        *scanCode = KEY_PgUp;      break;  /* curs pgup */
+@@ -104,6 +108,17 @@
+             case 0x5b:            *scanCode = KEY_LMeta;     break;
+             case 0x5c:            *scanCode = KEY_RMeta;     break;
+             case 0x5d:            *scanCode = KEY_Menu;      break;
++            case 0x5e:            *scanCode = KEY_L1;        break;  /* stop */
++            case 0x5f:            *scanCode = KEY_L2;        break;  /* again */
++            case 0x60:            *scanCode = KEY_L3;        break;  /* props */
++            case 0x61:            *scanCode = KEY_L4;        break;  /* undo */
++            case 0x62:            *scanCode = KEY_L5;        break;  /* front */
++            case 0x63:            *scanCode = KEY_L6;        break;  /* copy */
++            case 0x64:            *scanCode = KEY_L7;        break;  /* open */
++            case 0x65:            *scanCode = KEY_L8;        break;  /* paste */
++            case 0x66:            *scanCode = KEY_L9;        break;  /* find */
++            case 0x67:            *scanCode = KEY_L10;       break;  /* cut */
++            case 0x68:            *scanCode = KEY_Help;      break;
+             case KEY_F3:          *scanCode = KEY_F13;       break;
+             case KEY_F4:          *scanCode = KEY_F14;       break;
+             case KEY_F5:          *scanCode = KEY_F15;       break;
diff --git a/x11-servers/xorg-server/files/patch-bsdResource.c b/x11-servers/xorg-server/files/patch-bsdResource.c
index e031b2681f53..44388bb0a393 100644
--- a/x11-servers/xorg-server/files/patch-bsdResource.c
+++ b/x11-servers/xorg-server/files/patch-bsdResource.c
@@ -1,5 +1,5 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c.orig	Fri Apr 23 21:54:07 2004
-+++ programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c	Tue May 17 00:48:36 2005
+--- hw/xfree86/os-support/bsd/bsdResource.c.orig	Fri Apr 23 21:54:07 2004
++++ hw/xfree86/os-support/bsd/bsdResource.c	Tue May 17 00:48:36 2005
 @@ -18,7 +18,7 @@
  
  #ifdef INCLUDE_XF86_NO_DOMAIN
diff --git a/x11-servers/xorg-server/files/patch-bsd_kbd.c b/x11-servers/xorg-server/files/patch-bsd_kbd.c
new file mode 100644
index 000000000000..a7d8cb3fdd48
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-bsd_kbd.c
@@ -0,0 +1,32 @@
+--- hw/xfree86/os-support/bsd/bsd_kbd.c.orig	Mon Oct  3 18:46:14 2005
++++ hw/xfree86/os-support/bsd/bsd_kbd.c	Fri Sep 29 23:26:17 2006
+@@ -75,6 +75,17 @@
+     KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
+     int real_leds = 0;
+ 
++#if defined (SYSCONS_SUPPORT)
++    if (pKbd->sunKbd) {
++  	if (leds & 0x08) real_leds |= XLED1;
++  	if (leds & 0x04) real_leds |= XLED4;
++  	if (leds & 0x02) real_leds |= XLED3;
++  	if (leds & 0x01) real_leds |= XLED2;
++        leds = real_leds;
++        real_leds = 0;
++    }
++#endif
++
+ #ifdef LED_CAP
+     if (leds & XLED1)  real_leds |= LED_CAP;
+ #endif
+@@ -83,7 +94,11 @@
+ #endif
+ #ifdef LED_SCR
+     if (leds & XLED3)  real_leds |= LED_SCR;
++#ifdef LED_COMP
++    if (leds & XLED4)  real_leds |= LED_COMP;
++#else
+     if (leds & XLED4)  real_leds |= LED_SCR;
++#endif
+ #endif
+ 
+     switch (pKbd->consType) {
diff --git a/x11-servers/xorg-server/files/patch-damageext-damageext.c b/x11-servers/xorg-server/files/patch-damageext-damageext.c
new file mode 100644
index 000000000000..c732aed5e234
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-damageext-damageext.c
@@ -0,0 +1,50 @@
+commit 8274ea6aa97b06a56b7468c3908894c0ff72b687
+Author: Eric Anholt <eric@anholt.net>
+Date:   Thu Feb 1 12:15:54 2007 -0800
+
+    Set the Damage version supported in the server, instead of using damageproto.
+    
+    This was caught by distributions upgrading damageproto to 1.1, before the
+    server they had supported it.  The server then advertised the new version
+    without supporting the protocol.
+
+diff --git a/damageext/damageext.c b/damageext/damageext.c
+index ae1091e..739d20f 100755
+--- damageext/damageext.c
++++ damageext/damageext.c
+@@ -35,6 +35,13 @@ int		DamageClientPrivateIndex;
+ RESTYPE		DamageExtType;
+ RESTYPE		DamageExtWinType;
+ 
++/* Version of the damage extension supported by the server, as opposed to the
++ * DAMAGE_* defines from damageproto for what version the proto header
++ * supports.
++ */
++#define SERVER_DAMAGE_MAJOR	1
++#define SERVER_DAMAGE_MINOR	0
++
+ #define prScreen	screenInfo.screens[0]
+ 
+ static void
+@@ -143,16 +150,16 @@ ProcDamageQueryVersion(ClientPtr client)
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
+-    if (stuff->majorVersion < DAMAGE_MAJOR) {
++    if (stuff->majorVersion < SERVER_DAMAGE_MAJOR) {
+ 	rep.majorVersion = stuff->majorVersion;
+ 	rep.minorVersion = stuff->minorVersion;
+     } else {
+-	rep.majorVersion = DAMAGE_MAJOR;
+-	if (stuff->majorVersion == DAMAGE_MAJOR && 
+-	    stuff->minorVersion < DAMAGE_MINOR)
++	rep.majorVersion = SERVER_DAMAGE_MAJOR;
++	if (stuff->majorVersion == SERVER_DAMAGE_MAJOR && 
++	    stuff->minorVersion < SERVER_DAMAGE_MINOR)
+ 	    rep.minorVersion = stuff->minorVersion;
+ 	else
+-	    rep.minorVersion = DAMAGE_MINOR;
++	    rep.minorVersion = SERVER_DAMAGE_MINOR;
+     }
+     pDamageClient->major_version = rep.majorVersion;
+     pDamageClient->minor_version = rep.minorVersion;
diff --git a/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c b/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c
deleted file mode 100644
index 68e18f831ec7..000000000000
--- a/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c
+++ /dev/null
@@ -1,231 +0,0 @@
---- lib/font/FreeType/ftfuncs.c.orig	2005-10-23 19:32:05.000000000 +0100
-+++ lib/font/FreeType/ftfuncs.c	2006-06-01 23:21:34.000000000 +0100
-@@ -54,10 +54,7 @@
- #include FT_TYPE1_TABLES_H
- #include FT_XFREE86_H
- #include FT_BBOX_H
--#include FT_INTERNAL_TRUETYPE_TYPES_H
- #include FT_TRUETYPE_TAGS_H
--#include FT_INTERNAL_SFNT_H
--#include FT_INTERNAL_STREAM_H
- /*
-  *  If you want to use FT_Outline_Get_CBox instead of 
-  *  FT_Outline_Get_BBox, define here.
-@@ -123,6 +120,46 @@
- };
- 
- 
-+/* read 2-byte value from a SFNT table */
-+static FT_UShort
-+sfnt_get_ushort( FT_Face     face,
-+                 FT_ULong    table_tag,
-+                 FT_ULong    table_offset )
-+{
-+  FT_Byte    buff[2];
-+  FT_ULong   len = sizeof(buff);
-+  FT_UShort  result = 0;
-+
-+  if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) );
-+    result = (FT_UShort)( (buff[0] << 8) | buff[1] );
-+
-+  return result;
-+}
-+
-+#define  sfnt_get_short(f,t,o)  ((FT_Short)sfnt_get_ushort((f),(t),(o)))
-+
-+
-+#if 0
-+static FT_ULong
-+sfnt_get_ulong( FT_Face   face,
-+                FT_ULong  table_tag,
-+                FT_ULong  table_offset )
-+{
-+  FT_Byte    buff[4];
-+  FT_ULong   len = sizeof(buff);
-+  FT_UShort  result = 0;
-+
-+  if  ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len );
-+    result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) |
-+             ((FT_ULong)buff[2] << 8)  |  (FT_ULong)buff[3];
-+
-+  return result;
-+}
-+#endif
-+
-+
-+
-+
- static int ftypeInitP = 0;      /* is the engine initialised? */
- FT_Library ftypeLibrary;
- 
-@@ -211,6 +248,10 @@
-         if(maxp && maxp->maxContours == 0)
-             face->bitmap = 1;
-     }
-+
-+    face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face,
-+                                                    TTAG_hhea, 34 );
-+
-     /* Insert face in hashtable and return it */
-     face->next = faceTable[bucket];
-     faceTable[bucket] = face;
-@@ -462,6 +503,29 @@
-     }
- 
-     if( FT_IS_SFNT( face->face ) ) {
-+#if 1
-+        FT_F26Dot6  tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
-+        FT_UInt     nn;
-+
-+        instance->strike_index=0xFFFFU;
-+
-+	tt_char_width  = (int)(trans->scale*(1<<6) + 0.5);
-+	tt_char_height = (int)(trans->scale*(1<<6) + 0.5);
-+
-+        tt_dim_x = ( ( tt_char_width  * trans->xres + (36+32*72) ) / 72 ) & -64;
-+        tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64;
-+
-+        for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ )
-+        {
-+          FT_Bitmap_Size*  sz = &face->face->available_sizes[nn];
-+
-+          if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem )
-+          {
-+            instance->strike_index = nn;
-+            break;
-+          }
-+        }
-+#else
- 	/* See Set_Char_Sizes() in ttdriver.c */
- 	FT_Error err;
- 	TT_Face tt_face;
-@@ -486,6 +550,7 @@
- 	sfnt   = (SFNT_Service)tt_face->sfnt;
- 	err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index);
- 	if ( err ) instance->strike_index=0xFFFFU;
-+#endif
-     }
- 
-     /* maintain a linked list of instances */
-@@ -803,31 +868,36 @@
-  * parse the htmx field in TrueType font.
-  */
- 
--/* from src/truetype/ttgload.c */
- static void
--tt_get_metrics( TT_HoriHeader*  header,
-+tt_get_metrics( FT_Face         face,
- 		FT_UInt         idx,
-+		FT_UInt         num_hmetrics,
- 		FT_Short*       bearing,
- 		FT_UShort*      advance )
--/*  Copyright 1996-2001, 2002 by                      */
--/*  David Turner, Robert Wilhelm, and Werner Lemberg. */
- {
--    TT_LongMetrics  longs_m;
--    FT_UShort       k = header->number_Of_HMetrics;
-+   /* read the metrics directly from the horizontal header, we
-+    * parse the SFNT table directly through the standard FreeType API.
-+    * this works with any version of the library and doesn't need to
-+    * peek at its internals. Maybe a bit less
-+    */
-+    FT_UInt    count = num_hmetrics;
- 
--    if ( k == 0 ) {
--	*bearing = *advance = 0;
--	return;
-+    if ( count == 0 )
-+    {
-+      *advance = 0;
-+      *bearing = 0;
-     }
-+    else if ( idx < count )
-+    {
-+      FT_ULong  offset = idx*4;
- 
--    if ( idx < (FT_UInt)k ) {
--	longs_m  = (TT_LongMetrics )header->long_metrics + idx;
--	*bearing = longs_m->bearing;
--	*advance = longs_m->advance;
-+      *advance = sfnt_get_ushort( face, TTAG_hmtx, offset );
-+      *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 );
-     }
--    else {
--	*bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
--	*advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
-+    else
-+    {
-+      *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 );
-+      *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 );
-     }
- }
- 
-@@ -835,6 +905,7 @@
- ft_get_very_lazy_bbox( FT_UInt index,
- 		       FT_Face face,
- 		       FT_Size size,
-+		       FT_UInt  num_hmetrics,
- 		       double slant,
- 		       FT_Matrix *matrix,
- 		       FT_BBox *bbox,
-@@ -842,14 +913,13 @@
- 		       FT_Long *vertAdvance)
- {
-     if ( FT_IS_SFNT( face ) ) {
--	TT_Face   ttface = (TT_Face)face;
- 	FT_Size_Metrics *smetrics = &size->metrics;
- 	FT_Short  leftBearing = 0;
- 	FT_UShort advance = 0;
- 	FT_Vector p0, p1, p2, p3;
- 
- 	/* horizontal */
--	tt_get_metrics(&ttface->horizontal, index,
-+	tt_get_metrics( face, num_hmetrics, index,
- 		       &leftBearing, &advance);
- 
- #if 0
-@@ -910,7 +980,27 @@
- 		    FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return,
- 		    int *sbitchk_incomplete_but_exist )
- {
--#if (FREETYPE_VERSION >= 2001008)
-+#if 1
-+    if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0)
-+    {
-+      FT_Error         error;
-+      FT_Bitmap_Size*  sz = &ft_face->available_sizes[strike_index];
-+
-+      error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 );
-+      if ( !error )
-+      {
-+        error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY );
-+        if ( !error )
-+        {
-+          if ( metrics_return != NULL )
-+            *metrics_return = ft_face->glyph->metrics;
-+
-+          return 0;
-+        }
-+      }
-+    }
-+    return -1;
-+#elif (FREETYPE_VERSION >= 2001008)
-     SFNT_Service       sfnt;
-     TT_Face            face;
-     FT_Error           error;
-@@ -1043,6 +1133,7 @@
- 	    if( bitmap_metrics == NULL ) {
- 		if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) {
- 		    if( ft_get_very_lazy_bbox( idx, face->face, instance->size, 
-+		                               face->num_hmetrics,
- 					       instance->ttcap.vl_slant,
- 					       &instance->transformation.matrix,
- 					       &bbox, &outline_hori_advance, 
-@@ -1221,6 +1312,7 @@
- 	if( is_outline == 1 ){
- 	    if( correct ){
- 		if( ft_get_very_lazy_bbox( idx, face->face, instance->size, 
-+		                           face->num_hmetrics,
- 					   instance->ttcap.vl_slant,
- 					   &instance->transformation.matrix,
- 					   &bbox, &outline_hori_advance, 
diff --git a/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h b/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h
deleted file mode 100644
index 925263c0009e..000000000000
--- a/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $
-
---- lib/font/FreeType/ftfuncs.h.orig	2005-07-07 15:59:47.000000000 +0100
-+++ lib/font/FreeType/ftfuncs.h	2006-06-01 23:21:39.000000000 +0100
-@@ -47,6 +47,7 @@
-     char *filename;
-     FT_Face face;
-     int bitmap;
-+    FT_UInt num_hmetrics;
-     struct _FTInstance *instances;
-     struct _FTInstance *active_instance;
-     struct _FTFace *next;       /* link to next face in bucket */
diff --git a/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c b/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c
deleted file mode 100644
index df7c97dce67a..000000000000
--- a/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $
-
---- lib/font/FreeType/ftsystem.c.orig	2005-07-09 07:36:10.000000000 +0100
-+++ lib/font/FreeType/ftsystem.c	2006-06-01 23:21:53.000000000 +0100
-@@ -35,7 +35,6 @@
- #endif
- #include <ft2build.h>
- #include FT_CONFIG_CONFIG_H
--#include FT_INTERNAL_DEBUG_H
- #include FT_SYSTEM_H
- #include FT_ERRORS_H
- #include FT_TYPES_H
diff --git a/x11-servers/xorg-server/files/patch-font-bitmap-pcfread.c b/x11-servers/xorg-server/files/patch-font-bitmap-pcfread.c
deleted file mode 100644
index c676e1934de0..000000000000
--- a/x11-servers/xorg-server/files/patch-font-bitmap-pcfread.c
+++ /dev/null
@@ -1,101 +0,0 @@
---- lib/font/bitmap/pcfread.c.orig	Sat Jul  9 08:36:12 2005
-+++ lib/font/bitmap/pcfread.c	Thu Aug 24 21:56:56 2006
-@@ -45,6 +45,7 @@
- #endif
- 
- #include <stdarg.h>
-+#include <stdint.h>
- 
- void
- pcfError(const char* message, ...)
-@@ -133,6 +134,10 @@
- 	return (PCFTablePtr) NULL;
-     count = pcfGetLSB32(file);
-     if (IS_EOF(file)) return (PCFTablePtr) NULL;
-+    if (count < 0 || count > INT32_MAX / sizeof(PCFTableRec)) {
-+	pcfError("pcfReadTOC(): invalid file format\n");
-+	return NULL;
-+    }
-     tables = (PCFTablePtr) xalloc(count * sizeof(PCFTableRec));
-     if (!tables) {
-       pcfError("pcfReadTOC(): Couldn't allocate tables (%d*%d)\n", count, sizeof(PCFTableRec));
-@@ -252,6 +257,10 @@
-     if (!PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT))
- 	goto Bail;
-     nprops = pcfGetINT32(file, format);
-+    if (nprops <= 0 || nprops > INT32_MAX / sizeof(FontPropRec)) {
-+	pcfError("pcfGetProperties(): invalid nprops value (%d)\n", nprops);
-+	goto Bail;
-+    }
-     if (IS_EOF(file)) goto Bail;
-     props = (FontPropPtr) xalloc(nprops * sizeof(FontPropRec));
-     if (!props) {
-@@ -267,6 +276,13 @@
- 	props[i].name = pcfGetINT32(file, format);
- 	isStringProp[i] = pcfGetINT8(file, format);
- 	props[i].value = pcfGetINT32(file, format);
-+	if (props[i].name < 0 
-+	    || (isStringProp[i] != 0 && isStringProp[i] != 1)
-+	    || (isStringProp[i] && props[i].value < 0)) {
-+	    pcfError("pcfGetProperties(): invalid file format %d %d %d\n",
-+		     props[i].name, isStringProp[i], props[i].value);
-+	    goto Bail;
-+	}
- 	if (IS_EOF(file)) goto Bail;
-     }
-     /* pad the property array */
-@@ -282,6 +298,7 @@
-     }
-     if (IS_EOF(file)) goto Bail;
-     string_size = pcfGetINT32(file, format);
-+    if (string_size < 0) goto Bail;
-     if (IS_EOF(file)) goto Bail;
-     strings = (char *) xalloc(string_size);
-     if (!strings) {
-@@ -422,6 +439,10 @@
-     else
- 	nmetrics = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-+    if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
-+	pcfError("pcfReadFont(): invalid file format\n");
-+	goto Bail;
-+    }
-     metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
-     if (!metrics) {
-       pcfError("pcfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
-@@ -447,7 +468,7 @@
-     nbitmaps = pcfGetINT32(file, format);
-     if (nbitmaps != nmetrics || IS_EOF(file))
- 	goto Bail;
--
-+    /* nmetrics is alreadt ok, so nbitmap also is */
-     offsets = (CARD32 *) xalloc(nbitmaps * sizeof(CARD32));
-     if (!offsets) {
-       pcfError("pcfReadFont(): Couldn't allocate offsets (%d*%d)\n", nbitmaps, sizeof(CARD32));
-@@ -461,6 +482,7 @@
-     for (i = 0; i < GLYPHPADOPTIONS; i++) {
- 	bitmapSizes[i] = pcfGetINT32(file, format);
- 	if (IS_EOF(file)) goto Bail;
-+	if (bitmapSizes[i] < 0) goto Bail;
-     }
-     
-     sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX(format)];
-@@ -536,6 +558,7 @@
- 	if (IS_EOF(file)) goto Bail;
- 	if (nink_metrics != nmetrics)
- 	    goto Bail;
-+	/* nmetrics already checked */
- 	ink_metrics = (xCharInfo *) xalloc(nink_metrics * sizeof(xCharInfo));
-       if (!ink_metrics) {
-           pcfError("pcfReadFont(): Couldn't allocate ink_metrics (%d*%d)\n", nink_metrics, sizeof(xCharInfo));       
-@@ -809,6 +832,10 @@
-     else
- 	nmetrics = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-+    if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
-+	pcfError("pmfReadFont(): invalid file format\n");
-+	goto Bail;
-+    }
-     metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
-     if (!metrics) {
-       pcfError("pmfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
diff --git a/x11-servers/xorg-server/files/patch-imake.c b/x11-servers/xorg-server/files/patch-imake.c
deleted file mode 100644
index b0db655d28c5..000000000000
--- a/x11-servers/xorg-server/files/patch-imake.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- config/imake/imake.c.orig	Thu Feb 22 11:53:58 2007
-+++ config/imake/imake.c	Thu Feb 22 11:56:06 2007
-@@ -1150,34 +1150,7 @@
- static void
- get_binary_format(FILE *inFile)
- {
--  int mib[2];
--  size_t len;
--  int osrel = 0;
--  FILE *objprog = NULL;
--  int iself = 0;
--  char buf[10];
--  char cmd[PATH_MAX];
--
--  mib[0] = CTL_KERN;
--  mib[1] = KERN_OSRELDATE;
--  len = sizeof(osrel);
--  sysctl(mib, 2, &osrel, &len, NULL, 0);
--  if (CrossCompiling) {
--      strcpy (cmd, CrossCompileDir);
--      strcat (cmd, "/");
--      strcat (cmd,"objformat");
--  } else
--      strcpy (cmd, "objformat");
--
--  if (osrel >= 300004 &&
--      (objprog = popen(cmd, "r")) != NULL &&
--      fgets(buf, sizeof(buf), objprog) != NULL &&
--      strncmp(buf, "elf", 3) == 0)
--    iself = 1;
--  if (objprog)
--    pclose(objprog);
--
--  fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO");
-+  fprintf(inFile, "#define DefaultToElfFormat YES\n");
- }
- #endif
- 
diff --git a/x11-servers/xorg-server/files/patch-mitri.c b/x11-servers/xorg-server/files/patch-mitri.c
deleted file mode 100644
index 8c4ef0f57101..000000000000
--- a/x11-servers/xorg-server/files/patch-mitri.c
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: render/mitri.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/render/mitri.c,v
-retrieving revision 1.5
-diff -u -r1.5 mitri.c
---- programs/Xserver/render/mitri.c	3 Jul 2005 07:02:08 -0000	1.5
-+++ programs/Xserver/render/mitri.c	18 Apr 2006 22:34:08 -0000
-@@ -145,7 +145,7 @@
-     if (npoint < 3)
- 	return;
-     ntri = npoint - 2;
--    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
-     if (!tris)
- 	return;
-     for (tri = tris; npoint >= 3; npoint--, points++, tri++)
-@@ -177,7 +177,7 @@
-     if (npoint < 3)
- 	return;
-     ntri = npoint - 2;
--    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
-     if (!tris)
- 	return;
-     first = points++;
diff --git a/x11-servers/xorg-server/files/patch-randr.c b/x11-servers/xorg-server/files/patch-randr.c
new file mode 100644
index 000000000000..956527beeec4
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-randr.c
@@ -0,0 +1,13 @@
+--- randr/randr.c.orig	Thu Mar 15 13:21:48 2007
++++ randr/randr.c	Thu Mar 15 13:22:00 2007
+@@ -472,8 +472,8 @@
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
+-    rep.majorVersion = RANDR_MAJOR;
+-    rep.minorVersion = RANDR_MINOR;
++    rep.majorVersion = 1;
++    rep.minorVersion = 2;
+     if (client->swapped) {
+     	swaps(&rep.sequenceNumber, n);
+     	swapl(&rep.length, n);
diff --git a/x11-servers/xorg-server/files/patch-render.c b/x11-servers/xorg-server/files/patch-render.c
index 2bcd61775f36..17f8b144b1a7 100644
--- a/x11-servers/xorg-server/files/patch-render.c
+++ b/x11-servers/xorg-server/files/patch-render.c
@@ -1,5 +1,5 @@
---- programs/Xserver/render/render.c.orig	Mon May 29 09:43:15 2006
-+++ programs/Xserver/render/render.c	Mon May 29 09:45:02 2006
+--- render/render.c.orig	Mon May 29 09:43:15 2006
++++ render/render.c	Mon May 29 09:45:02 2006
 @@ -1340,7 +1340,7 @@
  	{
  	    if (buffer + sizeof (GlyphSet) < end)
diff --git a/x11-servers/xorg-server/files/patch-servermd.h b/x11-servers/xorg-server/files/patch-servermd.h
index 4315d78de44f..5bbb1e4d8ab5 100644
--- a/x11-servers/xorg-server/files/patch-servermd.h
+++ b/x11-servers/xorg-server/files/patch-servermd.h
@@ -1,5 +1,5 @@
---- programs/Xserver/include/servermd.h.orig	Sun Jan  8 14:05:55 2006
-+++ programs/Xserver/include/servermd.h	Sun Jan  8 14:06:22 2006
+--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
++++ include/servermd.h	Sun Jan  8 14:06:22 2006
 @@ -216,7 +216,7 @@
      defined(__sparc__) || defined(__mc68000__)
  
diff --git a/x11-servers/xorg-server/files/patch-sunffb-nocfb b/x11-servers/xorg-server/files/patch-sunffb-nocfb
deleted file mode 100644
index 934268ca4c99..000000000000
--- a/x11-servers/xorg-server/files/patch-sunffb-nocfb
+++ /dev/null
@@ -1,101 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c.orig	Fri Mar 31 00:22:07 2006
-+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c	Fri Mar 31 00:35:35 2006
-@@ -43,8 +43,6 @@
- #include	"ffb_rcache.h"
- #include	"ffb_loops.h"
- #include	"ffb_regs.h"
--#include	"ffb_stip.h"
--#include 	"ffb_gc.h"
- 
- int	CreatorScreenPrivateIndex;
- int	CreatorGCPrivateIndex;
---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c.orig	Fri Mar 31 00:22:07 2006
-+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c	Fri Mar 31 00:36:08 2006
-@@ -36,7 +36,6 @@
- #include "ffb_regs.h"
- #include "ffb_rcache.h"
- #include "ffb_fifo.h"
--#include "ffb_stip.h"
- #include "ffb_loops.h"
- 
- static Bool FFB_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c.orig	Fri Mar 31 00:22:07 2006
-+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c	Fri Mar 31 00:37:04 2006
-@@ -33,11 +33,6 @@
- 
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
--#define PSZ 8
--#include "cfb.h"
--#undef PSZ
--#include "cfb16.h"
--#include "cfb32.h"
- 
- #include "miline.h"
- 
---- programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile.orig	Fri Mar 31 00:22:07 2006
-+++ programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile	Fri Mar 31 00:34:27 2006
-@@ -60,16 +60,10 @@
- #define FFBsObjectRule(name)
- #endif
- 
--SRCS = ffb_driver.c ffb_accel.c ffb_attr.c ffb_stip.c ffb_bcopy.c \
--       ffb_cplane.c ffb_fspans.c ffb_point.c ffb_seg.c ffb_plygon.c \
--       ffb_line.c ffb_glyph.c ffb_frect.c ffb_circle.c ffb_checks.c \
--       ffb_stubs.c ffb_gc.c ffb_gspans.c ffb_sspans.c ffb_zeroarc.c \
--       ffb_cursor.c ffb_dga.c ffb_dac.c ffb_wid.c ffb_dbe.c $(DRISRCS)
--OBJS = ffb_driver.o ffb_accel.o ffb_attr.o ffb_stip.o ffb_bcopy.o \
--       ffb_cplane.o ffb_fspans.o ffb_point.o ffb_seg.o ffb_plygon.o \
--       ffb_line.o ffb_glyph.o ffb_frect.o ffb_circle.o ffb_checks.o \
--       ffb_stubs.o ffb_gc.o ffb_gspans.o ffb_sspans.o ffb_zeroarc.o \
--       ffb_cursor.o ffb_dga.o ffb_dac.o ffb_wid.o ffb_dbe.o $(VISOBJS) \
-+SRCS = ffb_driver.c ffb_accel.c ffb_attr.c \
-+       ffb_cursor.c ffb_dga.c ffb_dac.c ffb_wid.c $(DRISRCS)
-+OBJS = ffb_driver.o ffb_accel.o ffb_attr.o \
-+       ffb_cursor.o ffb_dga.o ffb_dac.o ffb_wid.o $(VISOBJS) \
-        $(DRIOBJS)
- 
- #if defined(XF86DriverSDK)
-@@ -107,28 +101,10 @@
- FFBCObjectRule(ffb_accel)
- FFBCObjectRule(ffb_driver)
- FFBCObjectRule(ffb_attr)
--FFBCObjectRule(ffb_stip)
--FFBCObjectRule(ffb_bcopy)
--FFBCObjectRule(ffb_cplane)
--FFBCObjectRule(ffb_fspans)
--FFBCObjectRule(ffb_point)
--FFBCObjectRule(ffb_seg)
--FFBCObjectRule(ffb_plygon)
--FFBCObjectRule(ffb_line)
--FFBCObjectRule(ffb_glyph)
--FFBCObjectRule(ffb_frect)
--FFBCObjectRule(ffb_circle)
--FFBCObjectRule(ffb_checks)
--FFBCObjectRule(ffb_stubs)
--FFBCObjectRule(ffb_gc)
--FFBCObjectRule(ffb_gspans)
--FFBCObjectRule(ffb_sspans)
--FFBCObjectRule(ffb_zeroarc)
- FFBCObjectRule(ffb_cursor)
- FFBCObjectRule(ffb_dga)
- FFBCObjectRule(ffb_dac)
- FFBCObjectRule(ffb_wid)
--FFBCObjectRule(ffb_dbe)
- FFBsObjectRule(VISmoveImage)
- FFBsObjectRule(ffb_asm)
- #if BuildXF86DRI
---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c.orig	Wed Apr 19 13:13:47 2006
-+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c	Wed Apr 19 13:14:25 2006
-@@ -411,11 +411,6 @@
- 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
-     }
-         
--    if (xf86LoadSubModule(pScrn, "xf8_32wid") == NULL) {
--	FFBFreeRec(pScrn);
--	return FALSE;
--    }
--
-     if (xf86LoadSubModule(pScrn, "fb") == NULL) {
- 	FFBFreeRec(pScrn);
- 	return FALSE;
diff --git a/x11-servers/xorg-server/files/patch-xf86.tmpl b/x11-servers/xorg-server/files/patch-xf86.tmpl
deleted file mode 100644
index 3bf0b443d5f8..000000000000
--- a/x11-servers/xorg-server/files/patch-xf86.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
---- config/cf/xf86.tmpl.orig	Tue Dec 17 04:21:38 2002
-+++ config/cf/xf86.tmpl	Thu Jan  2 14:10:44 2003
-@@ -19,6 +19,9 @@
- #ifdef UseInstalled
-        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \
- 		   $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
-+#elif UseInstalledPrograms
-+       IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
-+		   $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
- #else
-        IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
- 		   $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
diff --git a/x11-servers/xorg-server/files/patch-xf86Events.c b/x11-servers/xorg-server/files/patch-xf86Events.c
index bdd5bc51c819..2d88773233b8 100644
--- a/x11-servers/xorg-server/files/patch-xf86Events.c
+++ b/x11-servers/xorg-server/files/patch-xf86Events.c
@@ -1,5 +1,5 @@
---- programs/Xserver/hw/xfree86/common/xf86Events.c.orig	Sun Sep 26 04:17:42 2004
-+++ programs/Xserver/hw/xfree86/common/xf86Events.c	Sun Sep 26 04:17:25 2004
+--- hw/xfree86/common/xf86Events.c.orig	Sun Sep 26 04:17:42 2004
++++ hw/xfree86/common/xf86Events.c	Sun Sep 26 04:17:25 2004
 @@ -448,7 +448,7 @@
  #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
    static Bool first_time = TRUE;
diff --git a/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile b/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile
deleted file mode 100644
index 5728d915fb48..000000000000
--- a/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig	Sat Sep 11 15:11:04 2004
-+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile	Sat Sep 11 15:11:07 2004
-@@ -25,6 +25,8 @@
- SNPRINTFOBJS = snprintf.o
- #endif
- 
-+XAWLIB = -lXaw
-+
- SRCS	=\
- 	accessx.c\
- 	card-cfg.c\
diff --git a/x11-servers/xorg-server/files/patch-xf86sym.c b/x11-servers/xorg-server/files/patch-xf86sym.c
deleted file mode 100644
index 1372be144354..000000000000
--- a/x11-servers/xorg-server/files/patch-xf86sym.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/Xserver/hw/xfree86/loader/xf86sym.c.orig	Fri May  7 18:51:51 2004
-+++ programs/Xserver/hw/xfree86/loader/xf86sym.c	Fri May  7 18:52:02 2004
-@@ -63,7 +63,6 @@
- #include "xf86.h"
- #include "xf86Resources.h"
- #include "xf86_OSproc.h"
--#include "xf86Parser.h"
- #include "xf86Config.h"
- #ifdef XINPUT
- # include "xf86Xinput.h"
diff --git a/x11-servers/xorg-server/files/patch-xorgconf.cpp b/x11-servers/xorg-server/files/patch-xorgconf.cpp
index e21fac8d8484..04e217b8d9fe 100644
--- a/x11-servers/xorg-server/files/patch-xorgconf.cpp
+++ b/x11-servers/xorg-server/files/patch-xorgconf.cpp
@@ -1,5 +1,5 @@
---- programs/Xserver/hw/xfree86/xorgconf.cpp.orig	Fri Dec 31 14:40:27 2004
-+++ programs/Xserver/hw/xfree86/xorgconf.cpp	Fri Dec 31 14:40:28 2004
+--- hw/xfree86/xorgconf.cpp.orig	Fri Dec 31 14:40:27 2004
++++ hw/xfree86/xorgconf.cpp	Fri Dec 31 14:40:28 2004
 @@ -624,3 +624,11 @@
      InputDevice "Keyboard1" "CoreKeyboard"
  EndSection
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index cadb9a395ce4..c4378db9c053 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -1,20 +1,16 @@
 bin/X
 bin/Xorg
-bin/getconfig
-bin/getconfig.pl
+bin/cvt
 bin/gtf
 %%SPARC64_NA%%%%PPC_NA%%bin/inb
 %%SPARC64_NA%%%%PPC_NA%%bin/inl
 %%SPARC64_NA%%%%PPC_NA%%bin/inw
 %%SPARC64_NA%%%%PPC_NA%%bin/ioport
-bin/kbd_mode
-bin/mmapr
-bin/mmapw
 %%SPARC64_NA%%%%PPC_NA%%bin/outb
 %%SPARC64_NA%%%%PPC_NA%%bin/outl
 %%SPARC64_NA%%%%PPC_NA%%bin/outw
 bin/pcitweak
-%%I386%%bin/scanpci
+%%AMD64_I386%%bin/scanpci
 bin/xorgcfg
 bin/xorgconfig
 include/X11/bitmaps/card.xbm
@@ -34,174 +30,256 @@ include/X11/pixmaps/computer.xpm
 include/X11/pixmaps/keyboard.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/mouse.xpm
+include/xorg/BT.h
+include/xorg/IBM.h
+include/xorg/TI.h
+include/xorg/XIstubs.h
+include/xorg/afb.h
+include/xorg/assyntax.h
+include/xorg/atKeynames.h
+include/xorg/bstore.h
+include/xorg/bstorestr.h
+include/xorg/bt829.h
+include/xorg/cfb.h
+include/xorg/cfb16.h
+include/xorg/cfb32.h
+include/xorg/cfb8_16.h
+include/xorg/cfb8_32.h
+include/xorg/cfbmap.h
+include/xorg/cfbmskbits.h
+include/xorg/cfbunmap.h
+include/xorg/closestr.h
+include/xorg/closure.h
+include/xorg/colormap.h
+include/xorg/colormapst.h
+include/xorg/compiler.h
+include/xorg/cursor.h
+include/xorg/cursorstr.h
+include/xorg/damage.h
+include/xorg/damagestr.h
+include/xorg/dbestruct.h
+include/xorg/dgaproc.h
+include/xorg/dix.h
+include/xorg/dixevents.h
+include/xorg/dixfont.h
+include/xorg/dixfontstr.h
+include/xorg/dixgrabs.h
+include/xorg/dixstruct.h
+include/xorg/dri.h
+include/xorg/dristruct.h
+include/xorg/edid.h
+include/xorg/exa.h
+include/xorg/exevents.h
+include/xorg/extension.h
+include/xorg/extinit.h
+include/xorg/extnsionst.h
+include/xorg/fb.h
+include/xorg/fbdevhw.h
+include/xorg/fboverlay.h
+include/xorg/fbpseudocolor.h
+include/xorg/fbrop.h
+include/xorg/fi1236.h
+include/xorg/fourcc.h
+include/xorg/gc.h
+include/xorg/gcstruct.h
+include/xorg/globals.h
+include/xorg/glyphstr.h
+include/xorg/i2c_def.h
+include/xorg/input.h
+include/xorg/inputstr.h
+include/xorg/mfb.h
+include/xorg/mfbmap.h
+include/xorg/mfbunmap.h
+include/xorg/mi.h
+include/xorg/mibank.h
+include/xorg/mibstore.h
+include/xorg/micmap.h
+include/xorg/micoord.h
+include/xorg/mifillarc.h
+include/xorg/mifpoly.h
+include/xorg/migc.h
+include/xorg/miline.h
+include/xorg/mipict.h
+include/xorg/mipointer.h
+include/xorg/mipointrst.h
+include/xorg/misc.h
+include/xorg/miscstruct.h
+include/xorg/mispans.h
+include/xorg/mistruct.h
+include/xorg/miwideline.h
+include/xorg/mizerarc.h
+include/xorg/msp3430.h
+include/xorg/opaque.h
+include/xorg/os.h
+include/xorg/picture.h
+include/xorg/picturestr.h
+include/xorg/pixmap.h
+include/xorg/pixmapstr.h
+include/xorg/property.h
+include/xorg/propertyst.h
+include/xorg/randrstr.h
+include/xorg/region.h
+include/xorg/regionstr.h
+include/xorg/renderedge.h
+include/xorg/resource.h
+include/xorg/rgb.h
+include/xorg/sarea.h
+include/xorg/screenint.h
+include/xorg/scrnintstr.h
+include/xorg/selection.h
+include/xorg/servermd.h
+include/xorg/shadow.h
+include/xorg/shadowfb.h
+include/xorg/site.h
+include/xorg/swaprep.h
+include/xorg/swapreq.h
+include/xorg/tda8425.h
+include/xorg/tda9850.h
+include/xorg/tda9885.h
+include/xorg/uda1380.h
+include/xorg/validate.h
+include/xorg/vbe.h
+include/xorg/vbeModes.h
+include/xorg/vdif.h
+include/xorg/vgaHW.h
+include/xorg/window.h
+include/xorg/windowstr.h
+include/xorg/xaa.h
+include/xorg/xaaWrapper.h
+include/xorg/xaalocal.h
+include/xorg/xaarop.h
+include/xorg/xf1bpp.h
+include/xorg/xf4bpp.h
+include/xorg/xf86.h
+include/xorg/xf86Cursor.h
+include/xorg/xf86DDC.h
+include/xorg/xf86Module.h
+include/xorg/xf86OSKbd.h
+include/xorg/xf86OSmouse.h
+include/xorg/xf86Opt.h
+include/xorg/xf86Pci.h
+include/xorg/xf86PciInfo.h
+include/xorg/xf86Priv.h
+include/xorg/xf86Privstr.h
+include/xorg/xf86RAC.h
+include/xorg/xf86RamDac.h
+include/xorg/xf86Resources.h
+include/xorg/xf86Version.h
+include/xorg/xf86Xinput.h
+include/xorg/xf86_OSlib.h
+include/xorg/xf86_OSproc.h
+include/xorg/xf86_ansic.h
+include/xorg/xf86_libc.h
+include/xorg/xf86cmap.h
+include/xorg/xf86fbman.h
+include/xorg/xf86i2c.h
+include/xorg/xf86int10.h
+include/xorg/xf86sbusBus.h
+include/xorg/xf86str.h
+include/xorg/xf86xv.h
+include/xorg/xf86xvmc.h
+include/xorg/xf86xvpriv.h
+include/xorg/xisb.h
+include/xorg/xorg-server.h
+include/xorg/xorgVersion.h
+include/xorg/xvdix.h
+include/xorg/xvmcext.h
 lib/X11/Cards
 lib/X11/Options
-lib/X11/app-defaults/XOrgCfg
-lib/X11/doc/BUILD
-lib/X11/doc/BugReport
-lib/X11/doc/DESIGN
-lib/X11/doc/Install
-lib/X11/doc/LICENSE
-lib/X11/doc/OS2.Notes
-lib/X11/doc/README
-lib/X11/doc/README.DECtga
-lib/X11/doc/README.Darwin
-lib/X11/doc/README.I128
-lib/X11/doc/README.LynxOS
-lib/X11/doc/README.NetBSD
-lib/X11/doc/README.OpenBSD
-lib/X11/doc/README.SCO
-lib/X11/doc/README.SiS
-lib/X11/doc/README.Solaris
-lib/X11/doc/README.XKB-Config
-lib/X11/doc/README.XKB-Enhancing
-lib/X11/doc/README.apm
-lib/X11/doc/README.ati
-lib/X11/doc/README.chips
-lib/X11/doc/README.cyrix
-lib/X11/doc/README.dps
-lib/X11/doc/README.fonts
-lib/X11/doc/README.i740
-lib/X11/doc/README.i810
-lib/X11/doc/README.mouse
-lib/X11/doc/README.newport
-lib/X11/doc/README.r128
-lib/X11/doc/README.rapidaccess
-lib/X11/doc/README.rendition
-lib/X11/doc/README.s3virge
-lib/X11/doc/RELNOTES
-lib/X11/doc/Versions
-lib/X11/doc/VideoBoard98
-lib/X11/etc/Xinstall.sh
-lib/X11/etc/xmodmap.std
-lib/X11/getconfig/cfg.sample
-lib/X11/getconfig/xorg.cfg
-lib/X11/xorg.conf.eg
-lib/X11/xserver/SecurityPolicy
-%%AMD64_I386%%lib/modules/drivers/apm_drv.so
-%%AMD64_I386%%lib/modules/drivers/ark_drv.so
-lib/modules/drivers/ati_drv.so
-lib/modules/drivers/atimisc_drv.so
-%%AMD64_I386%%lib/modules/drivers/chips_drv.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_alpine.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_drv.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_laguna.so
-%%AMD64_I386%%lib/modules/drivers/cyrix_drv.so
-%%ALPHA_NA%%lib/modules/drivers/dummy_drv.so
-lib/modules/drivers/glint_drv.so
-%%AMD64_I386%%lib/modules/drivers/i128_drv.so
-%%I386%%lib/modules/drivers/i740_drv.so
-%%AMD64_I386%%lib/modules/drivers/i810_drv.so
-lib/modules/drivers/mga_drv.so
-%%AMD64_I386%%lib/modules/drivers/neomagic_drv.so
-%%I386%%lib/modules/drivers/nsc_drv.so
-%%SPARC64_NA%%lib/modules/drivers/nv_drv.so
-lib/modules/drivers/r128_drv.so
-lib/modules/drivers/radeon_drv.so
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.so
-%%SPARC64_NA%%lib/modules/drivers/riva128.so
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.so
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.so
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.so
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.so
-%%AMD64_I386%%lib/modules/drivers/sis_drv.so
-%%SPARC64%%lib/modules/drivers/sunbw2_drv.so
-%%SPARC64%%lib/modules/drivers/suncg14_drv.so
-%%SPARC64%%lib/modules/drivers/suncg3_drv.so
-%%SPARC64%%lib/modules/drivers/suncg6_drv.so
-%%SPARC64%%lib/modules/drivers/sunffb_drv.so
-%%SPARC64%%lib/modules/drivers/sunleo_drv.so
-%%SPARC64%%lib/modules/drivers/suntcx_drv.so
-lib/modules/drivers/tdfx_drv.so
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.so
-%%AMD64_I386%%lib/modules/drivers/trident_drv.so
-%%AMD64_I386%%lib/modules/drivers/tseng_drv.so
-%%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.so
-lib/modules/drivers/vga_drv.so
-%%I386%%lib/modules/drivers/via_drv.so
-%%AMD64_I386%%lib/modules/drivers/vmware_drv.so
-lib/modules/extensions/libGLcore.so
-lib/modules/extensions/libdbe.so
-lib/modules/extensions/libdri.so
-lib/modules/extensions/libextmod.so
-lib/modules/extensions/libglx.so
-lib/modules/extensions/librecord.so
-lib/modules/extensions/libxtrap.so
-lib/modules/fonts/libbitmap.so
-lib/modules/fonts/libfreetype.so
-lib/modules/fonts/libtype1.so
-lib/modules/freebsd/libdrm.so
-lib/modules/input/acecad_drv.so
-lib/modules/input/calcomp_drv.so
-lib/modules/input/citron_drv.so
-lib/modules/input/digitaledge_drv.so
-lib/modules/input/dmc_drv.so
-lib/modules/input/dynapro_drv.so
-lib/modules/input/elographics_drv.so
-lib/modules/input/fpit_drv.so
-lib/modules/input/hyperpen_drv.so
-lib/modules/input/js_x_drv.so
-lib/modules/input/kbd_drv.so
-lib/modules/input/keyboard_drv.so
-lib/modules/input/magellan_drv.so
-lib/modules/input/microtouch_drv.so
-lib/modules/input/mouse_drv.so
-lib/modules/input/mutouch_drv.so
-lib/modules/input/palmax_drv.so
-lib/modules/input/penmount_drv.so
-lib/modules/input/spaceorb_drv.so
-lib/modules/input/summa_drv.so
-lib/modules/input/tek4957_drv.so
-lib/modules/input/void_drv.so
-lib/modules/input/wacom_drv.so
-%%ALPHA_NA%%lib/modules/libafb.so
-lib/modules/libcfb.so
-lib/modules/libcfb16.so
-%%SPARC64%%lib/modules/libcfb24.so
-lib/modules/libcfb32.so
-lib/modules/libddc.so
-lib/modules/libexa.so
-lib/modules/libfb.so
-lib/modules/libi2c.so
-lib/modules/libint10.so
-lib/modules/liblayer.so
-lib/modules/libmfb.so
-lib/modules/libpcidata.so
-lib/modules/librac.so
-lib/modules/libramdac.so
-lib/modules/libscanpci.so
-lib/modules/libshadow.so
-lib/modules/libshadowfb.so
-lib/modules/libvbe.so
-lib/modules/libvgahw.so
-lib/modules/libxaa.so
-lib/modules/libxf1bpp.so
-lib/modules/libxf4bpp.so
-lib/modules/libxf8_16bpp.so
-lib/modules/libxf8_32bpp.so
-%%SPARC64%%lib/modules/libxf8_32wid.so
-lib/modules/multimedia/bt829_drv.so
-lib/modules/multimedia/fi1236_drv.so
-lib/modules/multimedia/msp3430_drv.so
-lib/modules/multimedia/tda8425_drv.so
-lib/modules/multimedia/tda9850_drv.so
-lib/modules/multimedia/tda9885_drv.so
-lib/modules/multimedia/theatre_detect_drv.so
-lib/modules/multimedia/theatre_drv.so
-lib/modules/multimedia/theatre200_drv.so
-lib/modules/multimedia/uda1380_drv.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/v10002d.uc
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/v20002d.uc
-@dirrm lib/X11/getconfig
-@dirrm lib/modules/fonts
-@dirrm lib/modules/extensions
-@dirrm lib/modules/freebsd
-@dirrm lib/modules/drivers
-@dirrm lib/modules/input
-@dirrm lib/modules/internal
-@dirrm lib/modules/multimedia
+lib/xorg/modules/extensions/libGLcore.la
+lib/xorg/modules/extensions/libGLcore.so
+lib/xorg/modules/extensions/libdbe.la
+lib/xorg/modules/extensions/libdbe.so
+lib/xorg/modules/extensions/libdri.la
+lib/xorg/modules/extensions/libdri.so
+lib/xorg/modules/extensions/libextmod.la
+lib/xorg/modules/extensions/libextmod.so
+lib/xorg/modules/extensions/libglx.la
+lib/xorg/modules/extensions/libglx.so
+lib/xorg/modules/extensions/librecord.la
+lib/xorg/modules/extensions/librecord.so
+lib/xorg/modules/extensions/libxtrap.la
+lib/xorg/modules/extensions/libxtrap.so
+lib/xorg/modules/fonts/libfreetype.la
+lib/xorg/modules/fonts/libfreetype.so
+lib/xorg/modules/fonts/libtype1.la
+lib/xorg/modules/fonts/libtype1.so
+%%ALPHA_NA%%lib/xorg/modules/libafb.la
+%%ALPHA_NA%%lib/xorg/modules/libafb.so
+lib/xorg/modules/libcfb.la
+lib/xorg/modules/libcfb.so
+lib/xorg/modules/libcfb32.la
+lib/xorg/modules/libcfb32.so
+lib/xorg/modules/libddc.la
+lib/xorg/modules/libddc.so
+lib/xorg/modules/libexa.la
+lib/xorg/modules/libexa.so
+lib/xorg/modules/libfb.la
+lib/xorg/modules/libfb.so
+lib/xorg/modules/libi2c.la
+lib/xorg/modules/libi2c.so
+lib/xorg/modules/libint10.la
+lib/xorg/modules/libint10.so
+lib/xorg/modules/libmfb.la
+lib/xorg/modules/libmfb.so
+lib/xorg/modules/libpcidata.la
+lib/xorg/modules/libpcidata.so
+lib/xorg/modules/libramdac.la
+lib/xorg/modules/libramdac.so
+lib/xorg/modules/libscanpci.la
+lib/xorg/modules/libscanpci.so
+lib/xorg/modules/libshadow.la
+lib/xorg/modules/libshadow.so
+lib/xorg/modules/libshadowfb.la
+lib/xorg/modules/libshadowfb.so
+lib/xorg/modules/libvbe.la
+lib/xorg/modules/libvbe.so
+lib/xorg/modules/libvgahw.la
+lib/xorg/modules/libvgahw.so
+lib/xorg/modules/libxaa.la
+lib/xorg/modules/libxaa.so
+lib/xorg/modules/libxf1bpp.la
+lib/xorg/modules/libxf1bpp.so
+lib/xorg/modules/libxf4bpp.la
+lib/xorg/modules/libxf4bpp.so
+lib/xorg/modules/libxf8_16bpp.la
+lib/xorg/modules/libxf8_16bpp.so
+lib/xorg/modules/libxf8_32bpp.la
+lib/xorg/modules/libxf8_32bpp.so
+lib/xorg/modules/linux/libfbdevhw.la
+lib/xorg/modules/linux/libfbdevhw.so
+lib/xorg/modules/multimedia/bt829_drv.la
+lib/xorg/modules/multimedia/bt829_drv.so
+lib/xorg/modules/multimedia/fi1236_drv.la
+lib/xorg/modules/multimedia/fi1236_drv.so
+lib/xorg/modules/multimedia/msp3430_drv.la
+lib/xorg/modules/multimedia/msp3430_drv.so
+lib/xorg/modules/multimedia/tda8425_drv.la
+lib/xorg/modules/multimedia/tda8425_drv.so
+lib/xorg/modules/multimedia/tda9850_drv.la
+lib/xorg/modules/multimedia/tda9850_drv.so
+lib/xorg/modules/multimedia/tda9885_drv.la
+lib/xorg/modules/multimedia/tda9885_drv.so
+lib/xorg/modules/multimedia/uda1380_drv.la
+lib/xorg/modules/multimedia/uda1380_drv.so
+lib/xserver/SecurityPolicy
+libdata/pkgconfig/xorg-server.pc
+share/X11/app-defaults/XOrgCfg
+share/X11/xkb/compiled/README.compiled
+share/aclocal/xorg-server.m4
+@dirrm include/xorg
+@dirrm lib/xorg/modules/fonts
+@dirrm lib/xorg/modules/extensions
+@dirrm lib/xorg/modules/linux
+@dirrm lib/xorg/modules/multimedia
+@dirrm lib/xorg/modules
+@dirrm lib/xorg
+@dirrm lib/xserver
+@dirrmtry include/X11/bitmaps
 @dirrmtry include/X11/pixmaps
 @dirrmtry lib/X11/doc
 @dirrmtry lib/X11/etc
 @dirrmtry lib/X11/xserver
-@dirrmtry lib/modules
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
+@dirrmtry share/X11/app-defaults
diff --git a/x11-servers/xorg-server/scripts/configure b/x11-servers/xorg-server/scripts/configure
deleted file mode 100644
index 84cf7bd2a731..000000000000
--- a/x11-servers/xorg-server/scripts/configure
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define InstallXserverSetUID ${SUID_XSERVER}" >> $LOCALDEF
-echo "#define JoystickSupport NO"		>> $LOCALDEF
-echo "#define BuildLBX NO"			>> $LOCALDEF
-echo "#define XnestServer NO"			>> $LOCALDEF
-echo "#define BuildFontServer NO"		>> $LOCALDEF
-echo "#define XVirtualFramebufferServer NO"	>> $LOCALDEF
-echo "#define XprtServer NO"			>> $LOCALDEF
-echo "#define LibInstall NO"			>> $LOCALDEF
-echo "#define ForceNormalLib NO"		>> $LOCALDEF
-echo "#define XTrueTypeInstallCConvHeaders NO"	>> $LOCALDEF
-echo "#define BuildServer YES"			>> $LOCALDEF
-echo "#define BuildXprint NO"			>> $LOCALDEF
-echo "#define BuildLibraries NO"		>> $LOCALDEF
-echo "#define LibInstallBuild YES"		>> $LOCALDEF
-echo "#define ModInstall YES"			>> $LOCALDEF
-echo "#define XF86Server NO"			>> $LOCALDEF
-echo "#define BuildServersOnly YES"		>> $LOCALDEF
-echo "#define BuildGLXLibrary YES"		>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-echo "#define BuildXFree86ConfigTools YES"	>> $LOCALDEF
-echo "#define DriverManDir \$(MANSOURCEPATH)4"	>> $LOCALDEF
-echo "#define DriverManSuffix 4x"		>> $LOCALDEF
-echo "#define MiscManDir \$(MANSOURCEPATH)7"	>> $LOCALDEF
-echo "#define MiscManSuffix 7x"			>> $LOCALDEF
-
-if [ X$WITH_DEBUG != X ]; then
-	export CFLAGS="-g $CFLAGS"
-	echo "#define InstPgmFlags"		>> $LOCALDEF
-	echo "#define MakeDllModules YES"	>> $LOCALDEF
-fi
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-servers/xorg-server/scripts/configure.gen b/x11-servers/xorg-server/scripts/configure.gen
deleted file mode 100644
index ee7e1d88add8..000000000000
--- a/x11-servers/xorg-server/scripts/configure.gen
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# This script takes some of the system's imake configuration files and munges
-# them to be used in the X.Org build, and allows port configuration located in
-# $LOCALDEF to be included in the generated host.def
-
-SYSSITE=$PREFIX/lib/X11/config/xf86site.def
-BUILDSITE=$WRKDIR/xc/config/cf/xorgsite.def
-SYSHOST=$PREFIX/lib/X11/config/host.def
-LOCALDEF=$WRKDIR/.config
-BUILDHOST=$WRKDIR/xc/config/cf/host.def
-
-# Append system xf86site.def to build's xorgsite.def.
-rm -f $BUILDSITE
-cp -f $SYSSITE $BUILDSITE
-
-# Use system host.def as initial config file, setting ProjectRoot appropriately.
-rm -f $BUILDHOST
-grep -v '#define.*ProjectRoot' $SYSHOST			>> $BUILDHOST
-echo "#define ProjectRoot $PREFIX"			>> $BUILDHOST
-
-# Add in defines that all ports will want.
-echo "#define NothingOutsideProjectRoot YES"		>> $BUILDHOST
-echo "#define FreeBSDCC	${CC}"				>> $BUILDHOST
-echo "#define FreeBSDCXX ${CXX}"			>> $BUILDHOST
-echo "#define FreeBSDPTHREAD_LIBS ${PTHREAD_LIBS}"	>> $BUILDHOST
-echo "#define FreeBSDPTHREAD_CFLAGS ${PTHREAD_CFLAGS}"	>> $BUILDHOST
-echo "#define FreeBSDCFLAGS ${CFLAGS}"			>> $BUILDHOST
-
-cat ${LOCALDEF} >> ${BUILDHOST}
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index 0a8439ca5751..8b1b72c7e918 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -6,34 +6,33 @@
 #
 
 PORTNAME=	xorg-vfbserver
-PORTVERSION=	6.9.0
-PORTREVISION=	2
+PORTVERSION=	1.2.0
+PORTEPOCH=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src3.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X virtual framebuffer server from X.Org
 
 CONFLICTS=	XFree86-VirtualFramebufferServer-*
 
-EXTRA_PATCHES=	${CF_PATCHES} ${SERVER_PATCHES}
+XORG_CAT=	xserver
 
-USE_XLIB=	yes
+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
+		damageproto xcmiscproto xextproto xf86miscproto \
+		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+		resourceproto fontsproto xf86dgaproto videoproto \
+		compositeproto trapproto recordproto resourceproto \
+		xineramaproto evieproto xkbfile xfont fontenc xkbui xxf86misc \
+		xxf86vm xaw7 xmu xpm xext
 
-XBUILD_DIRS=	lib/font programs/Xserver/miext/damage programs/Xserver
-XINCLUDE_DIRS=	lib/xtrans
-XMAN_DIRS=	programs/Xserver
+CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg --disable-xprint \
+		--localstatedir=/var
 
+PLIST_FILES=	bin/Xvfb
 MAN1=		Xvfb.1
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-.include <bsd.port.post.mk>
+do-install:
+	cd ${WRKSRC}/hw/vfb; ${MAKE} install
+
+.include <bsd.port.mk>
diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo
index 177370c87899..b208692af414 100644
--- a/x11-servers/xorg-vfbserver/distinfo
+++ b/x11-servers/xorg-vfbserver/distinfo
@@ -1,6 +1,3 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
+MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6
+SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
+SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596
diff --git a/x11-servers/xorg-vfbserver/pkg-plist b/x11-servers/xorg-vfbserver/pkg-plist
deleted file mode 100644
index e2d161bbca7f..000000000000
--- a/x11-servers/xorg-vfbserver/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/Xvfb
diff --git a/x11-servers/xorg-vfbserver/scripts/configure b/x11-servers/xorg-vfbserver/scripts/configure
deleted file mode 100644
index 2af13d547cf4..000000000000
--- a/x11-servers/xorg-vfbserver/scripts/configure
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer YES"			>> $LOCALDEF
-echo "#define BuildServersOnly YES"		>> $LOCALDEF
-echo "#define XprtServer NO"			>> $LOCALDEF
-echo "#define BuildXprint NO"			>> $LOCALDEF
-echo "#define XnestServer NO"			>> $LOCALDEF
-echo "#define XorgServer NO"			>> $LOCALDEF
-echo "#define XVirtualFramebufferServer YES"	>> $LOCALDEF
-echo "#define XF86Server NO"			>> $LOCALDEF
-echo "#define BuildFontServer NO"		>> $LOCALDEF
-echo "#define BuildLBX NO"			>> $LOCALDEF
-echo "#define BuildXF86DRI NO"			>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
-echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-echo "#define InstallSecurityConfig NO"		>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-themes/Makefile b/x11-themes/Makefile
index 6e83b95f2100..55af6a522567 100644
--- a/x11-themes/Makefile
+++ b/x11-themes/Makefile
@@ -40,6 +40,7 @@
     SUBDIR += e17-theme-night_bling
     SUBDIR += e17-theme-simply_white
     SUBDIR += engradient
+    SUBDIR += emerald-themes
     SUBDIR += enlightenment-theme-BlueSteel
     SUBDIR += enlightenment-theme-BrushedMetal-Tigert
     SUBDIR += enlightenment-theme-Ganymede
@@ -189,6 +190,7 @@
     SUBDIR += thinice
     SUBDIR += ubuntulooks
     SUBDIR += whistlerk
+    SUBDIR += xcursor-themes
     SUBDIR += xenophilia
     SUBDIR += xenostep
     SUBDIR += xmms-bluecurve-theme
diff --git a/x11-themes/baghira/Makefile b/x11-themes/baghira/Makefile
index 480ea3900731..cf687e38c329 100644
--- a/x11-themes/baghira/Makefile
+++ b/x11-themes/baghira/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	baghira
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-themes/beastie/Makefile b/x11-themes/beastie/Makefile
index f1839bf1ee48..23cf4f28a3b3 100644
--- a/x11-themes/beastie/Makefile
+++ b/x11-themes/beastie/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	beastie
 PORTVERSION=	06.05.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~ahze/distfiles/
diff --git a/x11-themes/bluecurve-themes/Makefile b/x11-themes/bluecurve-themes/Makefile
index f2bbe66b77e8..089b20f6490b 100644
--- a/x11-themes/bluecurve-themes/Makefile
+++ b/x11-themes/bluecurve-themes/Makefile
@@ -22,7 +22,7 @@ PORTVERSION=	1.0
 # added to the global section by someone (with the intent of bumping
 # the revisions of the slave ports) and it cannot be removed without
 # causing a version downgrade or using PORTEPOCH.
-PORTREVISION=	3
+PORTREVISION=	4
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
@@ -41,6 +41,7 @@ do-install:	# empty
 .else					# master port
 
 PORTVERSION=	5.0.11
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX:S|$|:fedora|} ${MASTER_SITE_LOCAL:S|$|:local|}
 MASTER_SITE_SUBDIR=	development/source/SRPMS/:fedora jylefort/:local
diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index f4c095feab5b..22bb7171a548 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	buffy
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	buffy02
diff --git a/x11-themes/camaelon-nesedah/Makefile b/x11-themes/camaelon-nesedah/Makefile
index 61067ffff490..f4c84cc798f4 100644
--- a/x11-themes/camaelon-nesedah/Makefile
+++ b/x11-themes/camaelon-nesedah/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nesedah
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.roard.com/gnustep/
 PKGNAMEPREFIX=	camaelon-
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index c484be97c62e..6287b7c9252f 100644
--- a/x11-themes/clean-theme-gtk/Makefile
+++ b/x11-themes/clean-theme-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clean-theme-gtk
 PORTVERSION=	1.2.x
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	clean___
diff --git a/x11-themes/clearlooks-metacity/Makefile b/x11-themes/clearlooks-metacity/Makefile
index 06fe7d35b1d5..d879f399aafd 100644
--- a/x11-themes/clearlooks-metacity/Makefile
+++ b/x11-themes/clearlooks-metacity/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	clearlooks-metacity
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.stellingwerff.com/
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-themes/clearlooks-themes-extras/Makefile b/x11-themes/clearlooks-themes-extras/Makefile
index 088a96436d25..56cc40fcdcde 100644
--- a/x11-themes/clearlooks-themes-extras/Makefile
+++ b/x11-themes/clearlooks-themes-extras/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clearlooks-themes-extras
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.kernow-webhosting.com/~bvc/theme/gtk/clearlooks/
 DISTNAME=	Clearlooks-Big_Pack-${PORTVERSION}.x
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index 836fece5ce7d..f76ba9fd8a7f 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME?=	clearlooks
 PORTVERSION=	0.6.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	clearlooks
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index 0d65c2ef8d40..1b19d441ebdf 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	colorstep
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	colorstep
diff --git a/x11-themes/cursor-dmz-aa-theme/Makefile b/x11-themes/cursor-dmz-aa-theme/Makefile
index 81b9f7fa024d..4e47e679258d 100644
--- a/x11-themes/cursor-dmz-aa-theme/Makefile
+++ b/x11-themes/cursor-dmz-aa-theme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cursor-dmz-aa-theme
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://jimmac.musichall.cz/zip/
 DISTNAME=	vanilla-dmz-aa-${PORTVERSION}
diff --git a/x11-themes/cursor-dmz-theme/Makefile b/x11-themes/cursor-dmz-theme/Makefile
index 20bd8aea9b5c..c914cc63c9a8 100644
--- a/x11-themes/cursor-dmz-theme/Makefile
+++ b/x11-themes/cursor-dmz-theme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cursor-dmz-theme
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://jimmac.musichall.cz/zip/
 DISTNAME=	vanilla-dmz-${PORTVERSION}
diff --git a/x11-themes/cursor-grounation-theme/Makefile b/x11-themes/cursor-grounation-theme/Makefile
index 8854d295fe36..dad28be56eb9 100644
--- a/x11-themes/cursor-grounation-theme/Makefile
+++ b/x11-themes/cursor-grounation-theme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cursor-grounation-theme
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	14484-Grounation-${PORTVERSION}
diff --git a/x11-themes/cursor-jimmac-theme/Makefile b/x11-themes/cursor-jimmac-theme/Makefile
index ba91988c673d..ce7469108ebd 100644
--- a/x11-themes/cursor-jimmac-theme/Makefile
+++ b/x11-themes/cursor-jimmac-theme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cursor-jimmac-theme
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	6550-Jimmac
diff --git a/x11-themes/cursor-neutral-theme/Makefile b/x11-themes/cursor-neutral-theme/Makefile
index e927b9fd8c99..8eb041ac0360 100644
--- a/x11-themes/cursor-neutral-theme/Makefile
+++ b/x11-themes/cursor-neutral-theme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cursor-neutral-theme
 DISTVERSION=	1.13a
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	28310-neutral-${DISTVERSION}
diff --git a/x11-themes/cursor-polar-theme/Makefile b/x11-themes/cursor-polar-theme/Makefile
index b7334178e7c7..0353bf626116 100644
--- a/x11-themes/cursor-polar-theme/Makefile
+++ b/x11-themes/cursor-polar-theme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	polar-theme
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	cursor-
diff --git a/x11-themes/e17-splash-azul/Makefile b/x11-themes/e17-splash-azul/Makefile
index 0dd38133fb75..b2cd198df554 100644
--- a/x11-themes/e17-splash-azul/Makefile
+++ b/x11-themes/e17-splash-azul/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	azul
 PORTVERSION=	1.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
 		${MASTER_SITE_GET_E}
diff --git a/x11-themes/e17-splash-blue/Makefile b/x11-themes/e17-splash-blue/Makefile
index 4a4bbb88774c..7f94c6faf759 100644
--- a/x11-themes/e17-splash-blue/Makefile
+++ b/x11-themes/e17-splash-blue/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blue
 PORTVERSION=	1.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
 		${MASTER_SITE_GET_E}
diff --git a/x11-themes/e17-splash-clean/Makefile b/x11-themes/e17-splash-clean/Makefile
index 11a7606abf55..79879928e3f1 100644
--- a/x11-themes/e17-splash-clean/Makefile
+++ b/x11-themes/e17-splash-clean/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clean
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
 		${MASTER_SITE_GET_E}
diff --git a/x11-themes/e17-splash-fortune/Makefile b/x11-themes/e17-splash-fortune/Makefile
index 8bf7fdf18b94..178bc9f4a179 100644
--- a/x11-themes/e17-splash-fortune/Makefile
+++ b/x11-themes/e17-splash-fortune/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	fortune
 PORTVERSION=	1.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
 		${MASTER_SITE_GET_E}
diff --git a/x11-themes/e17-splash-logo/Makefile b/x11-themes/e17-splash-logo/Makefile
index 6a6645042971..b1c39bf5cdd8 100644
--- a/x11-themes/e17-splash-logo/Makefile
+++ b/x11-themes/e17-splash-logo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	logo
 PORTVERSION=	1.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
 		${MASTER_SITE_GET_E}
diff --git a/x11-themes/e17-splash-shiny/Makefile b/x11-themes/e17-splash-shiny/Makefile
index e89205f3879a..05b7c7d7a8a6 100644
--- a/x11-themes/e17-splash-shiny/Makefile
+++ b/x11-themes/e17-splash-shiny/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	shiny
 PORTVERSION=	1.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
 		${MASTER_SITE_GET_E}
diff --git a/x11-themes/e17-splash-takara/Makefile b/x11-themes/e17-splash-takara/Makefile
index 9f1db25e3bf5..9a273e13f799 100644
--- a/x11-themes/e17-splash-takara/Makefile
+++ b/x11-themes/e17-splash-takara/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	takara
 PORTVERSION=	1.0.4
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
 		${MASTER_SITE_GET_E}
diff --git a/x11-themes/e17-theme-blue_eyed/Makefile b/x11-themes/e17-theme-blue_eyed/Makefile
index aab64fa9c08d..d9940da0aa58 100644
--- a/x11-themes/e17-theme-blue_eyed/Makefile
+++ b/x11-themes/e17-theme-blue_eyed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blue_eyed
 PORTVERSION=	0.6.5.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-themes/e17-theme-cthulhain/Makefile b/x11-themes/e17-theme-cthulhain/Makefile
index e8f9b5f4fe09..d145badde6ee 100644
--- a/x11-themes/e17-theme-cthulhain/Makefile
+++ b/x11-themes/e17-theme-cthulhain/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cthulhain
 PORTVERSION=	0.3.9
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-themes/e17-theme-dali/Makefile b/x11-themes/e17-theme-dali/Makefile
index 0f38be64efea..d8dfd51a084b 100644
--- a/x11-themes/e17-theme-dali/Makefile
+++ b/x11-themes/e17-theme-dali/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dali
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-themes/e17-theme-darkness/Makefile b/x11-themes/e17-theme-darkness/Makefile
index 51eed6d521de..8e7a97178a31 100644
--- a/x11-themes/e17-theme-darkness/Makefile
+++ b/x11-themes/e17-theme-darkness/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	darkness
 PORTVERSION=	0.99.037.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-themes/e17-theme-gant/Makefile b/x11-themes/e17-theme-gant/Makefile
index 5d29d8e5508c..0e0462a28b3e 100644
--- a/x11-themes/e17-theme-gant/Makefile
+++ b/x11-themes/e17-theme-gant/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gant
 PORTVERSION=	0.0.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
diff --git a/x11-themes/e17-theme-japan2007/Makefile b/x11-themes/e17-theme-japan2007/Makefile
index fad96506031d..730c4ffc0cd2 100644
--- a/x11-themes/e17-theme-japan2007/Makefile
+++ b/x11-themes/e17-theme-japan2007/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	japan2007
 PORTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-themes/e17-theme-kor/Makefile b/x11-themes/e17-theme-kor/Makefile
index 3f520b8fb5ba..1569911ee6bd 100644
--- a/x11-themes/e17-theme-kor/Makefile
+++ b/x11-themes/e17-theme-kor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kor
 PORTVERSION=	0.0.4.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-themes/e17-theme-milky/Makefile b/x11-themes/e17-theme-milky/Makefile
index 1f3cd83683a2..ef5568b05f8f 100644
--- a/x11-themes/e17-theme-milky/Makefile
+++ b/x11-themes/e17-theme-milky/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	milky
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-themes/e17-theme-night_bling/Makefile b/x11-themes/e17-theme-night_bling/Makefile
index 9d5498fcfdf7..72031ed90765 100644
--- a/x11-themes/e17-theme-night_bling/Makefile
+++ b/x11-themes/e17-theme-night_bling/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	night_bling
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-themes/e17-theme-simply_white/Makefile b/x11-themes/e17-theme-simply_white/Makefile
index fff4df6344b9..8faa30cd84df 100644
--- a/x11-themes/e17-theme-simply_white/Makefile
+++ b/x11-themes/e17-theme-simply_white/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	simply_white
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-themes/emerald-themes/Makefile b/x11-themes/emerald-themes/Makefile
new file mode 100644
index 000000000000..15174ed15cdb
--- /dev/null
+++ b/x11-themes/emerald-themes/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:	emerald-themes
+# Date created:				Oct 29 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	emerald-themes
+PORTVERSION=	0.2.1
+CATEGORIES=	x11-themes
+MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	flz/beryl/
+
+MAINTAINER=	rnoland@2hip.net
+COMMENT=	Themes for the Emerald Window Decorator
+
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+post-patch:
+	@${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|' \
+			${WRKSRC}/themes/import.sh
+
+.include <bsd.port.mk>
diff --git a/x11-themes/emerald-themes/distinfo b/x11-themes/emerald-themes/distinfo
new file mode 100644
index 000000000000..591969746c2e
--- /dev/null
+++ b/x11-themes/emerald-themes/distinfo
@@ -0,0 +1,3 @@
+MD5 (emerald-themes-0.2.1.tar.bz2) = 43ef8f6803afb8ce542309f46bc85885
+SHA256 (emerald-themes-0.2.1.tar.bz2) = 2c17a38ccd784d40dab361bb1369e660436237ed1cf67d94891f17d66417e79e
+SIZE (emerald-themes-0.2.1.tar.bz2) = 1381386
diff --git a/x11-themes/emerald-themes/pkg-descr b/x11-themes/emerald-themes/pkg-descr
new file mode 100644
index 000000000000..82389a56ee53
--- /dev/null
+++ b/x11-themes/emerald-themes/pkg-descr
@@ -0,0 +1,6 @@
+This package contains themes for the emerald window decorator.
+
+WWW: http://www.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-themes/emerald-themes/pkg-plist b/x11-themes/emerald-themes/pkg-plist
new file mode 100644
index 000000000000..dd46613af060
--- /dev/null
+++ b/x11-themes/emerald-themes/pkg-plist
@@ -0,0 +1,511 @@
+share/emerald/themes/Adonis_Mod/theme.screenshot.png
+share/emerald/themes/Adonis_Mod/theme.ini.bak
+share/emerald/themes/Adonis_Mod/buttons.restore.png
+share/emerald/themes/Adonis_Mod/theme.ini
+share/emerald/themes/Adonis_Mod/buttons.close.png
+share/emerald/themes/Adonis_Mod/buttons.max.png
+share/emerald/themes/Adonis_Mod/buttons.min.png
+share/emerald/themes/Beryl_Default/buttons.restore.png
+share/emerald/themes/Beryl_Default/buttons.close.png
+share/emerald/themes/Beryl_Default/buttons.min.png
+share/emerald/themes/Beryl_Default/buttons.max.png
+share/emerald/themes/Beryl_Default/theme.ini
+share/emerald/themes/Blue_Satin/theme.screenshot.png
+share/emerald/themes/Blue_Satin/buttons.restore.png
+share/emerald/themes/Blue_Satin/buttons.max.png
+share/emerald/themes/Blue_Satin/theme.ini
+share/emerald/themes/Blue_Satin/buttons.close.png
+share/emerald/themes/Blue_Satin/buttons.min.png
+share/emerald/themes/Blue_Satin/buttons.help.png
+share/emerald/themes/Blue_Satin/buttons.menu.png
+share/emerald/themes/Blue_Satin/buttons.shade.png
+share/emerald/themes/ButtonLess/theme.screenshot.png
+share/emerald/themes/ButtonLess/theme.ini
+share/emerald/themes/Canopy/theme.screenshot.png
+share/emerald/themes/Canopy/buttons.unsticky.png
+share/emerald/themes/Canopy/buttons.sticky.png
+share/emerald/themes/Canopy/buttons.unabove.png
+share/emerald/themes/Canopy/buttons.above.png
+share/emerald/themes/Canopy/buttons.unshade.png
+share/emerald/themes/Canopy/buttons.shade.png
+share/emerald/themes/Canopy/buttons.menu.png
+share/emerald/themes/Canopy/buttons.help.png
+share/emerald/themes/Canopy/theme.ini
+share/emerald/themes/Canopy/buttons.close.png
+share/emerald/themes/Canopy/buttons.min.png
+share/emerald/themes/Canopy/buttons.restore.png
+share/emerald/themes/Canopy/buttons.max.png
+share/emerald/themes/Compiz-Gilouche/theme.screenshot.png
+share/emerald/themes/Compiz-Gilouche/theme.ini.bak
+share/emerald/themes/Compiz-Gilouche/buttons.restore.png
+share/emerald/themes/Compiz-Gilouche/theme.ini
+share/emerald/themes/Compiz-Gilouche/buttons.close.png
+share/emerald/themes/Compiz-Gilouche/buttons.max.png
+share/emerald/themes/Compiz-Gilouche/buttons.min.png
+share/emerald/themes/Compiz-Gilouche/buttons.help.png
+share/emerald/themes/Crystal-ICE/theme.screenshot.png
+share/emerald/themes/Crystal-ICE/buttons.restore.png
+share/emerald/themes/Crystal-ICE/buttons.max.png
+share/emerald/themes/Crystal-ICE/theme.ini
+share/emerald/themes/Crystal-ICE/buttons.close.png
+share/emerald/themes/Crystal-ICE/buttons.min.png
+share/emerald/themes/Crystal-ICE/buttons.help.png
+share/emerald/themes/Crystal-ICE/buttons.menu.png
+share/emerald/themes/Fayal/theme.screenshot.png
+share/emerald/themes/Fayal/theme.ini
+share/emerald/themes/LimeRefresh/theme.ini.bak
+share/emerald/themes/LimeRefresh/theme.ini
+share/emerald/themes/LimeRefresh/buttons.restore.png
+share/emerald/themes/LimeRefresh/buttons.unshade.png
+share/emerald/themes/LimeRefresh/buttons.unabove.png
+share/emerald/themes/LimeRefresh/buttons.unsticky.png
+share/emerald/themes/LimeRefresh/buttons.glow.png
+share/emerald/themes/LimeRefresh/buttons.inactive_glow.png
+share/emerald/themes/LimeRefresh/buttons.max.png
+share/emerald/themes/LimeRefresh/buttons.min.png
+share/emerald/themes/LimeRefresh/buttons.shade.png
+share/emerald/themes/LimeRefresh/buttons.above.png
+share/emerald/themes/LimeRefresh/buttons.sticky.png
+share/emerald/themes/LimeRefresh/buttons.close.png
+share/emerald/themes/LimeRefresh/theme.screenshot.png
+share/emerald/themes/Minimal/theme.screenshot.png
+share/emerald/themes/Minimal/buttons.close.png
+share/emerald/themes/Minimal/buttons.restore.png
+share/emerald/themes/Minimal/theme.ini
+share/emerald/themes/Minimal/buttons.max.png
+share/emerald/themes/Minimal/buttons.min.png
+share/emerald/themes/Mirage/theme.screenshot.png
+share/emerald/themes/Mirage/buttons.restore.png
+share/emerald/themes/Mirage/buttons.min.png
+share/emerald/themes/Mirage/buttons.max.png
+share/emerald/themes/Mirage/buttons.close.png
+share/emerald/themes/Mirage/theme.ini
+share/emerald/themes/Orangeglass/theme.screenshot.png
+share/emerald/themes/Orangeglass/buttons.glow1.png
+share/emerald/themes/Orangeglass/buttons.restore.png
+share/emerald/themes/Orangeglass/theme.ini
+share/emerald/themes/Orangeglass/buttons.close.png
+share/emerald/themes/Orangeglass/buttons.max.png
+share/emerald/themes/Orangeglass/buttons.min.png
+share/emerald/themes/Orangeglass/buttons.help.png
+share/emerald/themes/Orangeglow/buttons.inactive_glow.png
+share/emerald/themes/Orangeglow/theme.screenshot.png
+share/emerald/themes/Orangeglow/buttons.glow.png
+share/emerald/themes/Orangeglow/buttons.restore.png
+share/emerald/themes/Orangeglow/theme.ini
+share/emerald/themes/Orangeglow/buttons.close.png
+share/emerald/themes/Orangeglow/buttons.max.png
+share/emerald/themes/Orangeglow/buttons.min.png
+share/emerald/themes/Paper/buttons.unsticky.png
+share/emerald/themes/Paper/buttons.menu.png
+share/emerald/themes/Paper/theme.screenshot.png
+share/emerald/themes/Paper/buttons.shade.png
+share/emerald/themes/Paper/buttons.unshade.png
+share/emerald/themes/Paper/buttons.restore.png
+share/emerald/themes/Paper/theme.ini
+share/emerald/themes/Paper/buttons.sticky.png
+share/emerald/themes/Paper/buttons.above.png
+share/emerald/themes/Paper/buttons.close.png
+share/emerald/themes/Paper/buttons.unabove.png
+share/emerald/themes/Paper/buttons.max.png
+share/emerald/themes/Paper/buttons.min.png
+share/emerald/themes/Paper/buttons.help.png
+share/emerald/themes/Pinx/theme.screenshot.png
+share/emerald/themes/Pinx/buttons.restore.png
+share/emerald/themes/Pinx/buttons.close.png
+share/emerald/themes/Pinx/buttons.max.png
+share/emerald/themes/Pinx/buttons.min.png
+share/emerald/themes/Pinx/buttons.help.png
+share/emerald/themes/Pinx/buttons.unshade.png
+share/emerald/themes/Pinx/buttons.menu.png
+share/emerald/themes/Pinx/buttons.shade.png
+share/emerald/themes/Pinx/theme.ini
+share/emerald/themes/Pinx/buttons.unabove.png
+share/emerald/themes/Pinx/buttons.above.png
+share/emerald/themes/Pinx/buttons.sticky.png
+share/emerald/themes/Pinx/buttons.unsticky.png
+share/emerald/themes/PlatinUm/pixmaps.active_bottom_left.png
+share/emerald/themes/PlatinUm/pixmaps.active_top.png
+share/emerald/themes/PlatinUm/buttons.menu.png
+share/emerald/themes/PlatinUm/theme.ini
+share/emerald/themes/PlatinUm/pixmaps.active_bottom_right.png
+share/emerald/themes/PlatinUm/pixmaps.active_top_left.png
+share/emerald/themes/PlatinUm/buttons.close.png
+share/emerald/themes/PlatinUm/buttons.max.png
+share/emerald/themes/PlatinUm/buttons.restore.png
+share/emerald/themes/PlatinUm/pixmaps.active_left.png
+share/emerald/themes/PlatinUm/buttons.min.png
+share/emerald/themes/PlatinUm/theme.screenshot.png
+share/emerald/themes/PlatinUm/pixmaps.inactive_top_right.png
+share/emerald/themes/PlatinUm/pixmaps.active_top_right.png
+share/emerald/themes/PlatinUm/pixmaps.active_right.png
+share/emerald/themes/PlatinUm/pixmaps.active_bottom.png
+share/emerald/themes/PlatinUm/pixmaps.inactive_top_left.png
+share/emerald/themes/PlatinUm/pixmaps.inactive_top.png
+share/emerald/themes/PlatinUm/pixmaps.inactive_right.png
+share/emerald/themes/PlatinUm/pixmaps.inactive_left.png
+share/emerald/themes/Red-Alice/buttons.menu.png
+share/emerald/themes/Red-Alice/pixmaps.active_bottom_left.png
+share/emerald/themes/Red-Alice/pixmaps.active_bottom.png
+share/emerald/themes/Red-Alice/theme.screenshot.png
+share/emerald/themes/Red-Alice/pixmaps.active_top.png
+share/emerald/themes/Red-Alice/theme.ini.bak
+share/emerald/themes/Red-Alice/buttons.glow.png
+share/emerald/themes/Red-Alice/pixmaps.active_right.png
+share/emerald/themes/Red-Alice/pixmaps.active_left.png
+share/emerald/themes/Red-Alice/buttons.restore.png
+share/emerald/themes/Red-Alice/theme.ini
+share/emerald/themes/Red-Alice/pixmaps.active_bottom_right.png
+share/emerald/themes/Red-Alice/buttons.inactive_glow.png
+share/emerald/themes/Red-Alice/buttons.close.png
+share/emerald/themes/Red-Alice/buttons.max.png
+share/emerald/themes/Red-Alice/buttons.min.png
+share/emerald/themes/Rezlooks-Candy-1pxb/theme.screenshot.png
+share/emerald/themes/Rezlooks-Candy-1pxb/buttons.restore.png
+share/emerald/themes/Rezlooks-Candy-1pxb/theme.ini
+share/emerald/themes/Rezlooks-Candy-1pxb/buttons.close.png
+share/emerald/themes/Rezlooks-Candy-1pxb/buttons.max.png
+share/emerald/themes/Rezlooks-Candy-1pxb/buttons.min.png
+share/emerald/themes/Rezlooks-Candy/theme.screenshot.png
+share/emerald/themes/Rezlooks-Candy/buttons.restore.png
+share/emerald/themes/Rezlooks-Candy/theme.ini
+share/emerald/themes/Rezlooks-Candy/buttons.close.png
+share/emerald/themes/Rezlooks-Candy/buttons.max.png
+share/emerald/themes/Rezlooks-Candy/buttons.min.png
+share/emerald/themes/Rezlooks-Graphite-1pxb/theme.screenshot.png
+share/emerald/themes/Rezlooks-Graphite-1pxb/buttons.restore.png
+share/emerald/themes/Rezlooks-Graphite-1pxb/theme.ini
+share/emerald/themes/Rezlooks-Graphite-1pxb/buttons.close.png
+share/emerald/themes/Rezlooks-Graphite-1pxb/buttons.max.png
+share/emerald/themes/Rezlooks-Graphite-1pxb/buttons.min.png
+share/emerald/themes/Rezlooks-Graphite/theme.screenshot.png
+share/emerald/themes/Rezlooks-Graphite/buttons.restore.png
+share/emerald/themes/Rezlooks-Graphite/theme.ini
+share/emerald/themes/Rezlooks-Graphite/buttons.close.png
+share/emerald/themes/Rezlooks-Graphite/buttons.max.png
+share/emerald/themes/Rezlooks-Graphite/buttons.min.png
+share/emerald/themes/Rezlooks-PastelGreen-1pxb/theme.screenshot.png
+share/emerald/themes/Rezlooks-PastelGreen-1pxb/buttons.restore.png
+share/emerald/themes/Rezlooks-PastelGreen-1pxb/theme.ini
+share/emerald/themes/Rezlooks-PastelGreen-1pxb/buttons.close.png
+share/emerald/themes/Rezlooks-PastelGreen-1pxb/buttons.max.png
+share/emerald/themes/Rezlooks-PastelGreen-1pxb/buttons.min.png
+share/emerald/themes/SlateHorn_Blue/buttons.inactive_glow.png
+share/emerald/themes/SlateHorn_Blue/buttons.sticky.png
+share/emerald/themes/SlateHorn_Blue/buttons.glow.png
+share/emerald/themes/SlateHorn_Blue/buttons.menu.png
+share/emerald/themes/SlateHorn_Blue/theme.screenshot.png
+share/emerald/themes/SlateHorn_Blue/buttons.restore.png
+share/emerald/themes/SlateHorn_Blue/buttons.shade.png
+share/emerald/themes/SlateHorn_Blue/theme.ini.bak
+share/emerald/themes/SlateHorn_Blue/buttons.unshade.png
+share/emerald/themes/SlateHorn_Blue/buttons.max.png
+share/emerald/themes/SlateHorn_Blue/theme.ini
+share/emerald/themes/SlateHorn_Blue/buttons.close.png
+share/emerald/themes/SlateHorn_Blue/buttons.min.png
+share/emerald/themes/SlateHorn_Blue/buttons.help.png
+share/emerald/themes/SlateHorn_Blue/buttons.unsticky.png
+share/emerald/themes/SlateHorn_Blue/buttons.above.png
+share/emerald/themes/SlateHorn_Blue/buttons.unabove.png
+share/emerald/themes/Rezlooks-PastelGreen/theme.screenshot.png
+share/emerald/themes/Rezlooks-PastelGreen/buttons.restore.png
+share/emerald/themes/Rezlooks-PastelGreen/theme.ini
+share/emerald/themes/Rezlooks-PastelGreen/buttons.close.png
+share/emerald/themes/Rezlooks-PastelGreen/buttons.max.png
+share/emerald/themes/Rezlooks-PastelGreen/buttons.min.png
+share/emerald/themes/Scaled_Black_Mod/buttons.up.png
+share/emerald/themes/Scaled_Black_Mod/buttons.sticky.png
+share/emerald/themes/Scaled_Black_Mod/buttons.unshade.png
+share/emerald/themes/Scaled_Black_Mod/buttons.close.png
+share/emerald/themes/Scaled_Black_Mod/buttons.restore.png
+share/emerald/themes/Scaled_Black_Mod/buttons.above.png
+share/emerald/themes/Scaled_Black_Mod/buttons.menu.png
+share/emerald/themes/Scaled_Black_Mod/scaledclose.png
+share/emerald/themes/Scaled_Black_Mod/scaledmenu.png
+share/emerald/themes/Scaled_Black_Mod/buttons.png
+share/emerald/themes/Scaled_Black_Mod/scaledmax.png
+share/emerald/themes/Scaled_Black_Mod/theme.screenshot.png
+share/emerald/themes/Scaled_Black_Mod/scaledmin.png
+share/emerald/themes/Scaled_Black_Mod/theme.ini
+share/emerald/themes/Scaled_Black_Mod/buttons.shade.png
+share/emerald/themes/Scaled_Black_Mod/buttons.max.png
+share/emerald/themes/Scaled_Black_Mod/buttons.min.png
+share/emerald/themes/Scaled_Black_Mod/buttons.unsticky.png
+share/emerald/themes/Scaled_Black_Mod/buttons.down.png
+share/emerald/themes/Scaled_Black_Mod/buttons.unabove.png
+share/emerald/themes/Sky/buttons.unshade.png
+share/emerald/themes/Sky/buttons.min.png
+share/emerald/themes/Sky/buttons.sticky.png
+share/emerald/themes/Sky/buttons.unsticky.png
+share/emerald/themes/Sky/theme.screenshot.png
+share/emerald/themes/Sky/buttons.shade.png
+share/emerald/themes/Sky/buttons.help.png
+share/emerald/themes/Sky/buttons.restore.png
+share/emerald/themes/Sky/theme.ini
+share/emerald/themes/Sky/buttons.close.png
+share/emerald/themes/Sky/buttons.max.png
+share/emerald/themes/Sky/buttons.menu.png
+share/emerald/themes/Sky/buttons.above.png
+share/emerald/themes/Sky/buttons.unabove.png
+share/emerald/themes/SlateHorn_Green/buttons.inactive_glow.png
+share/emerald/themes/SlateHorn_Green/theme.screenshot.png
+share/emerald/themes/SlateHorn_Green/buttons.menu.png
+share/emerald/themes/SlateHorn_Green/buttons.restore.png
+share/emerald/themes/SlateHorn_Green/buttons.shade.png
+share/emerald/themes/SlateHorn_Green/buttons.glow.png
+share/emerald/themes/SlateHorn_Green/theme.ini.bak
+share/emerald/themes/SlateHorn_Green/buttons.unshade.png
+share/emerald/themes/SlateHorn_Green/buttons.max.png
+share/emerald/themes/SlateHorn_Green/theme.ini
+share/emerald/themes/SlateHorn_Green/buttons.close.png
+share/emerald/themes/SlateHorn_Green/buttons.min.png
+share/emerald/themes/SlateHorn_Green/buttons.help.png
+share/emerald/themes/SlateHorn_Green/buttons.above.png
+share/emerald/themes/SlateHorn_Green/buttons.unabove.png
+share/emerald/themes/SlateHorn_Green/buttons.sticky.png
+share/emerald/themes/SlateHorn_Green/buttons.unsticky.png
+share/emerald/themes/SlateHorn_Red/buttons.inactive_glow.png
+share/emerald/themes/SlateHorn_Red/theme.screenshot.png
+share/emerald/themes/SlateHorn_Red/buttons.menu.png
+share/emerald/themes/SlateHorn_Red/buttons.restore.png
+share/emerald/themes/SlateHorn_Red/buttons.shade.png
+share/emerald/themes/SlateHorn_Red/buttons.glow.png
+share/emerald/themes/SlateHorn_Red/theme.ini.bak
+share/emerald/themes/SlateHorn_Red/buttons.unshade.png
+share/emerald/themes/SlateHorn_Red/buttons.max.png
+share/emerald/themes/SlateHorn_Red/theme.ini
+share/emerald/themes/SlateHorn_Red/buttons.close.png
+share/emerald/themes/SlateHorn_Red/buttons.min.png
+share/emerald/themes/SlateHorn_Red/buttons.help.png
+share/emerald/themes/SlateHorn_Red/buttons.above.png
+share/emerald/themes/SlateHorn_Red/buttons.unabove.png
+share/emerald/themes/SlateHorn_Red/buttons.sticky.png
+share/emerald/themes/SlateHorn_Red/buttons.unsticky.png
+share/emerald/themes/SlateHorn_Yellow/buttons.inactive_glow.png
+share/emerald/themes/SlateHorn_Yellow/theme.screenshot.png
+share/emerald/themes/SlateHorn_Yellow/buttons.menu.png
+share/emerald/themes/SlateHorn_Yellow/buttons.restore.png
+share/emerald/themes/SlateHorn_Yellow/buttons.shade.png
+share/emerald/themes/SlateHorn_Yellow/buttons.glow.png
+share/emerald/themes/SlateHorn_Yellow/theme.ini.bak
+share/emerald/themes/SlateHorn_Yellow/buttons.unshade.png
+share/emerald/themes/SlateHorn_Yellow/buttons.max.png
+share/emerald/themes/SlateHorn_Yellow/theme.ini
+share/emerald/themes/SlateHorn_Yellow/buttons.close.png
+share/emerald/themes/SlateHorn_Yellow/buttons.min.png
+share/emerald/themes/SlateHorn_Yellow/buttons.help.png
+share/emerald/themes/SlateHorn_Yellow/buttons.above.png
+share/emerald/themes/SlateHorn_Yellow/buttons.unabove.png
+share/emerald/themes/SlateHorn_Yellow/buttons.sticky.png
+share/emerald/themes/SlateHorn_Yellow/buttons.unsticky.png
+share/emerald/themes/SolidSlateModified/buttons.menu.png
+share/emerald/themes/SolidSlateModified/theme.screenshot.png
+share/emerald/themes/SolidSlateModified/buttons.shade.png
+share/emerald/themes/SolidSlateModified/buttons.glow.png
+share/emerald/themes/SolidSlateModified/buttons.unshade.png
+share/emerald/themes/SolidSlateModified/buttons.restore.png
+share/emerald/themes/SolidSlateModified/buttons.glow_inactive.png
+share/emerald/themes/SolidSlateModified/theme.ini
+share/emerald/themes/SolidSlateModified/buttons.inactive_glow.png
+share/emerald/themes/SolidSlateModified/buttons.close.png
+share/emerald/themes/SolidSlateModified/buttons.max.png
+share/emerald/themes/SolidSlateModified/buttons.min.png
+share/emerald/themes/SolidSlateModified/buttons.help.png
+share/emerald/themes/TiSkin_Classic/buttons.max.png
+share/emerald/themes/TiSkin_Classic/theme.ini
+share/emerald/themes/TiSkin_Classic/pixmaps.active_bottom_left.png
+share/emerald/themes/TiSkin_Classic/pixmaps.active_left.png
+share/emerald/themes/TiSkin_Classic/buttons.menu.png
+share/emerald/themes/TiSkin_Classic/pixmaps.active_bottom_right.png
+share/emerald/themes/TiSkin_Classic/pixmaps.active_top.png
+share/emerald/themes/TiSkin_Classic/pixmaps.active_top_right.png
+share/emerald/themes/TiSkin_Classic/theme.screenshot.png
+share/emerald/themes/TiSkin_Classic/pixmaps.active_top_left.png
+share/emerald/themes/TiSkin_Classic/buttons.restore.png
+share/emerald/themes/TiSkin_Classic/buttons.close.png
+share/emerald/themes/TiSkin_Classic/buttons.min.png
+share/emerald/themes/TiSkin_Classic/pixmaps.active_right.png
+share/emerald/themes/TiSkin_Classic/pixmaps.active_bottom.png
+share/emerald/themes/VRunner-Quicksilver/theme.screenshot.png
+share/emerald/themes/VRunner-Quicksilver/buttons.shade.png
+share/emerald/themes/VRunner-Quicksilver/buttons.glow.png
+share/emerald/themes/VRunner-Quicksilver/buttons.unshade.png
+share/emerald/themes/VRunner-Quicksilver/buttons.restore.png
+share/emerald/themes/VRunner-Quicksilver/theme.ini
+share/emerald/themes/VRunner-Quicksilver/buttons.inactive_glow.png
+share/emerald/themes/VRunner-Quicksilver/buttons.close.png
+share/emerald/themes/VRunner-Quicksilver/buttons.max.png
+share/emerald/themes/VRunner-Quicksilver/buttons.min.png
+share/emerald/themes/Wombat_Black/pixmaps.active_bottom_left.png
+share/emerald/themes/Wombat_Black/pixmaps.active_top.png
+share/emerald/themes/Wombat_Black/buttons.min.png
+share/emerald/themes/Wombat_Black/theme.ini
+share/emerald/themes/Wombat_Black/pixmaps.active_right.png
+share/emerald/themes/Wombat_Black/buttons.max.png
+share/emerald/themes/Wombat_Black/pixmaps.active_bottom_right.png
+share/emerald/themes/Wombat_Black/pixmaps.active_top_left.png
+share/emerald/themes/Wombat_Black/pixmaps.active_top_right.png
+share/emerald/themes/Wombat_Black/theme.screenshot.png
+share/emerald/themes/Wombat_Black/buttons.shade.png
+share/emerald/themes/Wombat_Black/theme.ini.bak
+share/emerald/themes/Wombat_Black/pixmaps.active_bottom.png
+share/emerald/themes/Wombat_Black/buttons.unshade.png
+share/emerald/themes/Wombat_Black/pixmaps.active_left.png
+share/emerald/themes/Wombat_Black/buttons.restore.png
+share/emerald/themes/Wombat_Black/buttons.close.png
+share/emerald/themes/Wombat_Black/buttons.help.png
+share/emerald/themes/Wombat_Gray/pixmaps.active_top.png
+share/emerald/themes/Wombat_Gray/buttons.min.png
+share/emerald/themes/Wombat_Gray/theme.ini
+share/emerald/themes/Wombat_Gray/pixmaps.active_bottom_left.png
+share/emerald/themes/Wombat_Gray/buttons.max.png
+share/emerald/themes/Wombat_Gray/theme.ini.bak
+share/emerald/themes/Wombat_Gray/pixmaps.active_bottom_right.png
+share/emerald/themes/Wombat_Gray/pixmaps.active_top_left.png
+share/emerald/themes/Wombat_Gray/theme.screenshot.png
+share/emerald/themes/Wombat_Gray/buttons.shade.png
+share/emerald/themes/Wombat_Gray/pixmaps.active_top_right.png
+share/emerald/themes/Wombat_Gray/pixmaps.active_bottom.png
+share/emerald/themes/Wombat_Gray/pixmaps.active_right.png
+share/emerald/themes/Wombat_Gray/buttons.unshade.png
+share/emerald/themes/Wombat_Gray/pixmaps.active_left.png
+share/emerald/themes/Wombat_Gray/buttons.restore.png
+share/emerald/themes/Wombat_Gray/buttons.close.png
+share/emerald/themes/Wombat_Gray/buttons.help.png
+share/emerald/themes/euh/buttons.unsticky.png
+share/emerald/themes/euh/buttons.menu.png
+share/emerald/themes/euh/theme.screenshot.png
+share/emerald/themes/euh/buttons.shade.png
+share/emerald/themes/euh/buttons.unshade.png
+share/emerald/themes/euh/buttons.restore.png
+share/emerald/themes/euh/theme.ini
+share/emerald/themes/euh/buttons.sticky.png
+share/emerald/themes/euh/buttons.above.png
+share/emerald/themes/euh/buttons.close.png
+share/emerald/themes/euh/buttons.unabove.png
+share/emerald/themes/euh/buttons.max.png
+share/emerald/themes/euh/buttons.min.png
+share/emerald/themes/euh/buttons.help.png
+share/emerald/themes/frame/theme.screenshot.png
+share/emerald/themes/frame/buttons.help.png
+share/emerald/themes/frame/buttons.restore.png
+share/emerald/themes/frame/theme.ini
+share/emerald/themes/frame/buttons.close.png
+share/emerald/themes/frame/buttons.max.png
+share/emerald/themes/frame/buttons.min.png
+share/emerald/themes/frame/buttons.menu.png
+share/emerald/themes/frame/buttons.shade.png
+share/emerald/themes/frame/buttons.unshade.png
+share/emerald/themes/frame/buttons.above.png
+share/emerald/themes/frame/buttons.unabove.png
+share/emerald/themes/frame/buttons.sticky.png
+share/emerald/themes/frame/buttons.unsticky.png
+share/emerald/themes/funky/theme.screenshot.png
+share/emerald/themes/funky/buttons.glow1.png
+share/emerald/themes/funky/buttons.restore.png
+share/emerald/themes/funky/theme.ini
+share/emerald/themes/funky/buttons.close.png
+share/emerald/themes/funky/buttons.max.png
+share/emerald/themes/funky/buttons.min.png
+share/emerald/themes/human-ubuntulooks/buttons.max.png
+share/emerald/themes/human-ubuntulooks/theme.ini
+share/emerald/themes/human-ubuntulooks/pixmaps.inactive_title_left.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_title.png
+share/emerald/themes/human-ubuntulooks/buttons.min.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_title_right.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_top.png
+share/emerald/themes/human-ubuntulooks/buttons.restore.png
+share/emerald/themes/human-ubuntulooks/buttons.close.png
+share/emerald/themes/human-ubuntulooks/theme.ini.bak
+share/emerald/themes/human-ubuntulooks/pixmaps.inactive_top_right.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_top_left.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_bottom_left.png
+share/emerald/themes/human-ubuntulooks/pixmaps.inactive_title.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_top_right.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_bottom_right.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_top-right.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_top-left.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_title_left.png
+share/emerald/themes/human-ubuntulooks/pixmaps.inactive_top_left.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_left.png
+share/emerald/themes/human-ubuntulooks/pixmaps.inactive_top.png
+share/emerald/themes/human-ubuntulooks/pixmaps.inactive_bottom_left.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_right.png
+share/emerald/themes/human-ubuntulooks/pixmaps.active_bottom.png
+share/emerald/themes/human-ubuntulooks/theme.screenshot.png
+share/emerald/themes/human-ubuntulooks/pixmaps.inactive_bottom_right.png
+share/emerald/themes/human-ubuntulooks/pixmaps.inactive_bottom.png
+share/emerald/themes/human-ubuntulooks/pixmaps.inactive_right.png
+share/emerald/themes/human-ubuntulooks/pixmaps.inactive_left.png
+share/emerald/themes/human-ubuntulooks/pixmaps.inactive_title_right.png
+share/emerald/themes/orangelook-colonel/buttons.inactive_glow.png
+share/emerald/themes/orangelook-colonel/theme.screenshot.png
+share/emerald/themes/orangelook-colonel/buttons.restore.png
+share/emerald/themes/orangelook-colonel/buttons.glow.png
+share/emerald/themes/orangelook-colonel/buttons.max.png
+share/emerald/themes/orangelook-colonel/theme.ini
+share/emerald/themes/orangelook-colonel/buttons.close.png
+share/emerald/themes/orangelook-colonel/buttons.min.png
+share/emerald/themes/orangelook-colonel/buttons.help.png
+share/emerald/themes/orangelook/buttons.inactive_glow.png
+share/emerald/themes/orangelook/theme.screenshot.png
+share/emerald/themes/orangelook/buttons.glow.png
+share/emerald/themes/orangelook/buttons.restore.png
+share/emerald/themes/orangelook/theme.ini
+share/emerald/themes/orangelook/buttons.close.png
+share/emerald/themes/orangelook/buttons.max.png
+share/emerald/themes/orangelook/buttons.min.png
+share/emerald/themes/Adonis/buttons.above.png
+share/emerald/themes/Adonis/theme.screenshot.png
+share/emerald/themes/Adonis/theme.ini.bak
+share/emerald/themes/Adonis/buttons.restore.png
+share/emerald/themes/Adonis/theme.ini
+share/emerald/themes/Adonis/buttons.close.png
+share/emerald/themes/Adonis/buttons.max.png
+share/emerald/themes/Adonis/buttons.min.png
+share/emerald/themes/Adonis/buttons.unabove.png
+share/emerald/themes/Adonis/buttons.sticky.png
+share/emerald/themes/Adonis/buttons.unsticky.png
+@dirrm share/emerald/themes/Adonis_Mod
+@dirrm share/emerald/themes/Beryl_Default
+@dirrm share/emerald/themes/Blue_Satin
+@dirrm share/emerald/themes/ButtonLess
+@dirrm share/emerald/themes/Canopy
+@dirrm share/emerald/themes/Compiz-Gilouche
+@dirrm share/emerald/themes/Crystal-ICE
+@dirrm share/emerald/themes/Fayal
+@dirrm share/emerald/themes/LimeRefresh
+@dirrm share/emerald/themes/Minimal
+@dirrm share/emerald/themes/Mirage
+@dirrm share/emerald/themes/Orangeglass
+@dirrm share/emerald/themes/Orangeglow
+@dirrm share/emerald/themes/Paper
+@dirrm share/emerald/themes/Pinx
+@dirrm share/emerald/themes/PlatinUm
+@dirrm share/emerald/themes/Red-Alice
+@dirrm share/emerald/themes/Rezlooks-Candy-1pxb
+@dirrm share/emerald/themes/Rezlooks-Candy
+@dirrm share/emerald/themes/Rezlooks-Graphite-1pxb
+@dirrm share/emerald/themes/Rezlooks-Graphite
+@dirrm share/emerald/themes/Rezlooks-PastelGreen-1pxb
+@dirrm share/emerald/themes/SlateHorn_Blue
+@dirrm share/emerald/themes/Rezlooks-PastelGreen
+@dirrm share/emerald/themes/Scaled_Black_Mod
+@dirrm share/emerald/themes/Sky
+@dirrm share/emerald/themes/SlateHorn_Green
+@dirrm share/emerald/themes/SlateHorn_Red
+@dirrm share/emerald/themes/SlateHorn_Yellow
+@dirrm share/emerald/themes/SolidSlateModified
+@dirrm share/emerald/themes/TiSkin_Classic
+@dirrm share/emerald/themes/VRunner-Quicksilver
+@dirrm share/emerald/themes/Wombat_Black
+@dirrm share/emerald/themes/Wombat_Gray
+@dirrm share/emerald/themes/euh
+@dirrm share/emerald/themes/frame
+@dirrm share/emerald/themes/funky
+@dirrm share/emerald/themes/human-ubuntulooks
+@dirrm share/emerald/themes/orangelook-colonel
+@dirrm share/emerald/themes/orangelook
+@dirrm share/emerald/themes/Adonis
+@dirrm share/emerald/themes
+@dirrmtry share/emerald
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index 872f84c52531..2d4947e89784 100644
--- a/x11-themes/engradient/Makefile
+++ b/x11-themes/engradient/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	engradient
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	engradient
diff --git a/x11-themes/enlightenment-theme-BlueSteel/Makefile b/x11-themes/enlightenment-theme-BlueSteel/Makefile
index 9dca46d82f84..d33a89617701 100644
--- a/x11-themes/enlightenment-theme-BlueSteel/Makefile
+++ b/x11-themes/enlightenment-theme-BlueSteel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enlightenment-theme-BlueSteel
 PORTVERSION=	0.16.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enlightenment
diff --git a/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile b/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile
index 17f1c5e1165d..53cb60938967 100644
--- a/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile
+++ b/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enlightenment-theme-BrushedMetal-Tigert
 PORTVERSION=	0.16.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enlightenment
diff --git a/x11-themes/enlightenment-theme-Ganymede/Makefile b/x11-themes/enlightenment-theme-Ganymede/Makefile
index 5d3d3214b13c..6fd373832d31 100644
--- a/x11-themes/enlightenment-theme-Ganymede/Makefile
+++ b/x11-themes/enlightenment-theme-Ganymede/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enlightenment-theme-Ganymede
 PORTVERSION=	0.16.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enlightenment
diff --git a/x11-themes/enlightenment-theme-ShinyMetal/Makefile b/x11-themes/enlightenment-theme-ShinyMetal/Makefile
index 83b252fbf4cf..21b493a9ad45 100644
--- a/x11-themes/enlightenment-theme-ShinyMetal/Makefile
+++ b/x11-themes/enlightenment-theme-ShinyMetal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enlightenment-theme-ShinyMetal
 PORTVERSION=	0.16.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enlightenment
diff --git a/x11-themes/etoile-azbackground/Makefile b/x11-themes/etoile-azbackground/Makefile
index dba0a39cd55d..51094ae360bd 100644
--- a/x11-themes/etoile-azbackground/Makefile
+++ b/x11-themes/etoile-azbackground/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	azbackground
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	x11-themes gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/x11-themes/etoile-camaelon/Makefile b/x11-themes/etoile-camaelon/Makefile
index 46763d3ba109..5155a5dcd955 100644
--- a/x11-themes/etoile-camaelon/Makefile
+++ b/x11-themes/etoile-camaelon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	camaelon
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	x11-themes gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP_CH}
 PKGNAMEPREFIX=	etoile-
diff --git a/x11-themes/etoile-etoilemenus/Makefile b/x11-themes/etoile-etoilemenus/Makefile
index eb90008c800b..3cef39bdc25f 100644
--- a/x11-themes/etoile-etoilemenus/Makefile
+++ b/x11-themes/etoile-etoilemenus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	etoilemenus
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	x11-themes gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/x11-themes/etoile-iconkit/Makefile b/x11-themes/etoile-iconkit/Makefile
index 00eb3e46a315..09dba46ce5b6 100644
--- a/x11-themes/etoile-iconkit/Makefile
+++ b/x11-themes/etoile-iconkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	iconkit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	x11-themes gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/x11-themes/etoile-wildmenus/Makefile b/x11-themes/etoile-wildmenus/Makefile
index 089328afc7e9..fb27f2117510 100644
--- a/x11-themes/etoile-wildmenus/Makefile
+++ b/x11-themes/etoile-wildmenus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wildmenus
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	x11-themes gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/x11-themes/flux-art/Makefile b/x11-themes/flux-art/Makefile
index bda70eecafd7..f70038b25737 100644
--- a/x11-themes/flux-art/Makefile
+++ b/x11-themes/flux-art/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flux-art
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.iluxa.kremenchug.net/files/
 
diff --git a/x11-themes/fluxbox-sid-pack/Makefile b/x11-themes/fluxbox-sid-pack/Makefile
index d66d83c737cb..923cc68553af 100644
--- a/x11-themes/fluxbox-sid-pack/Makefile
+++ b/x11-themes/fluxbox-sid-pack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fluxbox-sid-pack
 PORTVERSION=	20031226
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://fluxbox.org/download/themes/sid/
 DISTNAME=	sidpack
diff --git a/x11-themes/fvwm-themes/Makefile b/x11-themes/fvwm-themes/Makefile
index 813d3bf9b899..101c360253d6 100644
--- a/x11-themes/fvwm-themes/Makefile
+++ b/x11-themes/fvwm-themes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fvwm-themes
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-themes/geramik/Makefile b/x11-themes/geramik/Makefile
index 61f3d7c487c8..dc06b4df6502 100644
--- a/x11-themes/geramik/Makefile
+++ b/x11-themes/geramik/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geramik
 PORTVERSION=	0.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/ \
 		http://distfiles.towardex.com/
diff --git a/x11-themes/gnome-art/Makefile b/x11-themes/gnome-art/Makefile
index 35045feaf408..bc395e1c1f46 100644
--- a/x11-themes/gnome-art/Makefile
+++ b/x11-themes/gnome-art/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-art
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.miketech.net/gnome-art/download/
 
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index 653025cc2029..368c55a2b068 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-backgrounds
 PORTVERSION=	2.16.2
+PORTREVISION=	2
 CATEGORIES=	x11-themes graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist
index 9932a57c710d..d9a1b650751e 100644
--- a/x11-themes/gnome-backgrounds/pkg-plist
+++ b/x11-themes/gnome-backgrounds/pkg-plist
@@ -87,36 +87,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo
 @dirrm share/gnome/pixmaps/backgrounds/gnome
 @dirrm share/gnome/pixmaps/backgrounds
 @dirrmtry share/gnome/gnome-background-properties
-@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/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -125,25 +103,11 @@ share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/x11-themes/gnome-industrial-theme/Makefile b/x11-themes/gnome-industrial-theme/Makefile
index fa1ac175133d..5bc269cbf11a 100644
--- a/x11-themes/gnome-industrial-theme/Makefile
+++ b/x11-themes/gnome-industrial-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-industrial-theme
 PORTVERSION=	0.2.29
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://ftp.ximian.com/pub/xd2/redhat-9-i386/source/ \
 		${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index d67d92d723bc..9022f5101370 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-look
 PORTVERSION=	0.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-themes/gnome-splashscreen-manager/Makefile b/x11-themes/gnome-splashscreen-manager/Makefile
index d9effd64062c..ab7d27d931d2 100644
--- a/x11-themes/gnome-splashscreen-manager/Makefile
+++ b/x11-themes/gnome-splashscreen-manager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-splashscreen-manager
 PORTVERSION=	0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.miketech.net/gnome-art/download/
 DISTNAME=	gnome-art-${PORTVERSION}
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index c8bd6eab2323..467f039a9e31 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-themes-extras
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
diff --git a/x11-themes/gnome-themes-extras/pkg-plist b/x11-themes/gnome-themes-extras/pkg-plist
index 854b9393b645..564c4b58c433 100644
--- a/x11-themes/gnome-themes-extras/pkg-plist
+++ b/x11-themes/gnome-themes-extras/pkg-plist
@@ -1227,35 +1227,5 @@ share/themes/Wasp/index.theme
 @dirrm share/gnome/themes/Gorilla
 @dirrm share/gnome/themes/Amaranth/metacity-1
 @dirrm share/gnome/themes/Amaranth
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 0da113fb1b7a..6cf745e715b8 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-themes
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 52e5e6fb5bf3..26faa85ccb64 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -3026,63 +3026,25 @@ share/themes/Simple/gtk-2.0/gtkrc
 @dirrm share/gnome/themes/Glider
 @dirrm share/gnome/themes/Clearlooks/metacity-1
 @dirrm share/gnome/themes/Clearlooks
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@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/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index b482559f6b33..b8414b330bc5 100644
--- a/x11-themes/gtk-Mac2-theme/Makefile
+++ b/x11-themes/gtk-Mac2-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-Mac2-theme
 PORTVERSION=	200003050858
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	mac2
diff --git a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
index 4a8e73868d12..08aa0e9c0d41 100644
--- a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
+++ b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aluminumalloy
 PORTVERSION?=	2004.01.04
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX?=	${TYPE}-
diff --git a/x11-themes/gtk-ana-theme/Makefile b/x11-themes/gtk-ana-theme/Makefile
index cd910832e496..6f8a1cb85834 100644
--- a/x11-themes/gtk-ana-theme/Makefile
+++ b/x11-themes/gtk-ana-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ana
 PORTVERSION=	0.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://ana.netart.eu.org/
 PKGNAMEPREFIX=	${TYPE}-
diff --git a/x11-themes/gtk-aquaextremesunken-theme/Makefile b/x11-themes/gtk-aquaextremesunken-theme/Makefile
index 7e80ebeff1c5..2dce050c605d 100644
--- a/x11-themes/gtk-aquaextremesunken-theme/Makefile
+++ b/x11-themes/gtk-aquaextremesunken-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aquaextremesunken
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX?=	${TYPE}-
diff --git a/x11-themes/gtk-aqualightblue-theme/Makefile b/x11-themes/gtk-aqualightblue-theme/Makefile
index 376b1157a2c5..83a441c6545c 100644
--- a/x11-themes/gtk-aqualightblue-theme/Makefile
+++ b/x11-themes/gtk-aqualightblue-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-aqualightblue-theme
 PORTVERSION=	0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	aqualightblue-gtk2
diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index 0f0c1f444c73..69c307a958f3 100644
--- a/x11-themes/gtk-cleanice-engine/Makefile
+++ b/x11-themes/gtk-cleanice-engine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-cleanice-engine
 PORTVERSION=	2.4.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	elysium-project
diff --git a/x11-themes/gtk-digital-cream-theme/Makefile b/x11-themes/gtk-digital-cream-theme/Makefile
index 7634918c0116..a92fa830094a 100644
--- a/x11-themes/gtk-digital-cream-theme/Makefile
+++ b/x11-themes/gtk-digital-cream-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	digital-cream
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX=	${TYPE}-
diff --git a/x11-themes/gtk-digital-harmony-theme/Makefile b/x11-themes/gtk-digital-harmony-theme/Makefile
index 5ff17d233de8..d6b052846eb0 100644
--- a/x11-themes/gtk-digital-harmony-theme/Makefile
+++ b/x11-themes/gtk-digital-harmony-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	digital-harmony
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX=	${TYPE}-
diff --git a/x11-themes/gtk-engines-collection/Makefile b/x11-themes/gtk-engines-collection/Makefile
index ffe2d9f7288d..e5078045c37c 100644
--- a/x11-themes/gtk-engines-collection/Makefile
+++ b/x11-themes/gtk-engines-collection/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-engines-collection
 PORTVERSION=	1.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index 4e1a7a13bd8b..f694f8db9276 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-engines
 PORTVERSION=	0.12
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtk-engines/0.12
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 8135fe8680f3..2e780d530f9b 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtk-engines2
 PORTVERSION=	2.10.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-themes/gtk-envy-theme/Makefile b/x11-themes/gtk-envy-theme/Makefile
index 64f28361090b..2233370230b2 100644
--- a/x11-themes/gtk-envy-theme/Makefile
+++ b/x11-themes/gtk-envy-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-envy-theme
 PORTVERSION=	1.0.${SNAPSHOT}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	35093-Envy
diff --git a/x11-themes/gtk-flat-theme/Makefile b/x11-themes/gtk-flat-theme/Makefile
index 6bee43108c90..149af4b437ed 100644
--- a/x11-themes/gtk-flat-theme/Makefile
+++ b/x11-themes/gtk-flat-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-flat-theme
 PORTVERSION=	0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	flat
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index 4f1d6f459b5d..fd667d750c68 100644
--- a/x11-themes/gtk-flat-theme2/Makefile
+++ b/x11-themes/gtk-flat-theme2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-flat-theme2
 PORTVERSION=	0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	gtk2flat
diff --git a/x11-themes/gtk-gray-theme/Makefile b/x11-themes/gtk-gray-theme/Makefile
index 3c6bf3a1ffeb..18c8bc76b2cf 100644
--- a/x11-themes/gtk-gray-theme/Makefile
+++ b/x11-themes/gtk-gray-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-gray-theme
 PORTVERSION=	1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	34132-Gray
diff --git a/x11-themes/gtk-industrial-theme/Makefile b/x11-themes/gtk-industrial-theme/Makefile
index 8928ae49b7dc..fecb52eca048 100644
--- a/x11-themes/gtk-industrial-theme/Makefile
+++ b/x11-themes/gtk-industrial-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-industrial-theme
 PORTVERSION=	0.2.29
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://ftp.ximian.com/pub/xd2/redhat-9-i386/source/ \
 		${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
diff --git a/x11-themes/gtk-lila-theme-extras/Makefile b/x11-themes/gtk-lila-theme-extras/Makefile
index fc6153758125..d31cbc30895e 100644
--- a/x11-themes/gtk-lila-theme-extras/Makefile
+++ b/x11-themes/gtk-lila-theme-extras/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-lila-theme-extras
 PORTVERSION=	0.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://lila-theme.uni.cc/files/tarballs/
 DISTNAME=	lila-gtk-extras-${PORTVERSION}
diff --git a/x11-themes/gtk-lila-theme/Makefile b/x11-themes/gtk-lila-theme/Makefile
index d2224edcdc4a..523e383c2da9 100644
--- a/x11-themes/gtk-lila-theme/Makefile
+++ b/x11-themes/gtk-lila-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-lila-theme
 PORTVERSION=	0.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://lila-theme.uni.cc/files/tarballs/
 DISTNAME=	lila-gtk-${PORTVERSION}
diff --git a/x11-themes/gtk-longhorninspirat-theme/Makefile b/x11-themes/gtk-longhorninspirat-theme/Makefile
index cd00cc59f17b..7c8b0c211daa 100644
--- a/x11-themes/gtk-longhorninspirat-theme/Makefile
+++ b/x11-themes/gtk-longhorninspirat-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	longhorninspirat
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX=	${TYPE}-
diff --git a/x11-themes/gtk-milk-theme/Makefile b/x11-themes/gtk-milk-theme/Makefile
index d82f9f93e5f2..b90055f77c34 100644
--- a/x11-themes/gtk-milk-theme/Makefile
+++ b/x11-themes/gtk-milk-theme/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	milk
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX?=	${TYPE}-
diff --git a/x11-themes/gtk-murrina-aqua/Makefile b/x11-themes/gtk-murrina-aqua/Makefile
index 9bff480bab55..2640266313e0 100644
--- a/x11-themes/gtk-murrina-aqua/Makefile
+++ b/x11-themes/gtk-murrina-aqua/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-murrina-aqua
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.kernow-webhosting.com/~bvc/theme/gtk/murrine/
 DISTNAME=	Murrina-Aqua
diff --git a/x11-themes/gtk-murrina-fancy-clearlooks/Makefile b/x11-themes/gtk-murrina-fancy-clearlooks/Makefile
index 7c7061302764..306c439f2a27 100644
--- a/x11-themes/gtk-murrina-fancy-clearlooks/Makefile
+++ b/x11-themes/gtk-murrina-fancy-clearlooks/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-murrina-fancy-clearlooks
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://home.planet.nl/~bassa052/themes/
 DISTNAME=	MurrinaFancyClearlooks_v${PORTVERSION}
diff --git a/x11-themes/gtk-murrina-lightblue/Makefile b/x11-themes/gtk-murrina-lightblue/Makefile
index feb74db843b4..d7865a6dc6f5 100644
--- a/x11-themes/gtk-murrina-lightblue/Makefile
+++ b/x11-themes/gtk-murrina-lightblue/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-murrina-lightblue
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	45384-MurrinaLightBlue
diff --git a/x11-themes/gtk-murrine-engine/Makefile b/x11-themes/gtk-murrine-engine/Makefile
index 162963aacc32..283c2fca14b0 100644
--- a/x11-themes/gtk-murrine-engine/Makefile
+++ b/x11-themes/gtk-murrine-engine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-murrine-engine
 PORTVERSION=	0.52
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://cimi.netsons.org/media/download_gallery/murrie/
 DISTNAME=	murrine-${PORTVERSION}
diff --git a/x11-themes/gtk-murrine-themes/Makefile b/x11-themes/gtk-murrine-themes/Makefile
index 6bb3289851ec..5c63ea116f5f 100644
--- a/x11-themes/gtk-murrine-themes/Makefile
+++ b/x11-themes/gtk-murrine-themes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-murrine-themes
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://cimi.netsons.org/media/download_gallery/
 DISTNAME=	MurrineThemePack
diff --git a/x11-themes/gtk-qn-x11-theme/Makefile b/x11-themes/gtk-qn-x11-theme/Makefile
index 9174178b8398..1c912a846107 100644
--- a/x11-themes/gtk-qn-x11-theme/Makefile
+++ b/x11-themes/gtk-qn-x11-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-qn-x11-theme
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	qnx11__
diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index 48a0078839a5..691f71d53829 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-qt-engine
 PORTVERSION=	0.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://gtk-qt.ecs.soton.ac.uk/files/${PORTVERSION}/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/x11-themes/gtk-qt-engine/pkg-plist b/x11-themes/gtk-qt-engine/pkg-plist
index 2695c200abd7..88d96799c82a 100644
--- a/x11-themes/gtk-qt-engine/pkg-plist
+++ b/x11-themes/gtk-qt-engine/pkg-plist
@@ -14,5 +14,3 @@ share/themes/Qt/gtk-2.0/gtkrc
 @dirrm share/themes/Qt/gtk-2.0
 @dirrm share/themes/Qt
 @dirrm share/gtk-qt-engine
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index 48a0078839a5..691f71d53829 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-qt-engine
 PORTVERSION=	0.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://gtk-qt.ecs.soton.ac.uk/files/${PORTVERSION}/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/x11-themes/gtk-qt4-engine/pkg-plist b/x11-themes/gtk-qt4-engine/pkg-plist
index 2695c200abd7..88d96799c82a 100644
--- a/x11-themes/gtk-qt4-engine/pkg-plist
+++ b/x11-themes/gtk-qt4-engine/pkg-plist
@@ -14,5 +14,3 @@ share/themes/Qt/gtk-2.0/gtkrc
 @dirrm share/themes/Qt/gtk-2.0
 @dirrm share/themes/Qt
 @dirrm share/gtk-qt-engine
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
diff --git a/x11-themes/gtk-smooth-engine/Makefile b/x11-themes/gtk-smooth-engine/Makefile
index f16971285f06..d7d06d210d01 100644
--- a/x11-themes/gtk-smooth-engine/Makefile
+++ b/x11-themes/gtk-smooth-engine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-smooth-engine
 PORTVERSION=	0.6.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	smooth-engine
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index 09ed72350906..8754bd657009 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-xfce-engine
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/x11-themes/gtk-zenith-theme/Makefile b/x11-themes/gtk-zenith-theme/Makefile
index d05a9a6313ab..ff4fc098890c 100644
--- a/x11-themes/gtk-zenith-theme/Makefile
+++ b/x11-themes/gtk-zenith-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-zenith-theme
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	zenith
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index cd53928995e9..146b8b5a3e77 100644
--- a/x11-themes/gtkbe/Makefile
+++ b/x11-themes/gtkbe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkbe
 PORTVERSION=	200007091019
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	gtkbe
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index c2d2f2a26915..99a14cd3637b 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkstep-pastel
 PORTVERSION=	0.10.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	gtksteppastel
diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile
index 9134f615862b..9c45959404c3 100644
--- a/x11-themes/gtkstep/Makefile
+++ b/x11-themes/gtkstep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkstep
 PORTVERSION=	2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/g/gtk-engines-gtkstep
diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile
index 263319a993c9..775e1c95022e 100644
--- a/x11-themes/icegradient/Makefile
+++ b/x11-themes/icegradient/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	icegradient
 PORTVERSION=	200012290259
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	ftp://ftp.themes.org/pub/themes/gtk/ \
 		${MASTER_SITE_LOCAL}
diff --git a/x11-themes/icons-buuf/Makefile b/x11-themes/icons-buuf/Makefile
index 17e2bdbe827e..69fbacd8daec 100644
--- a/x11-themes/icons-buuf/Makefile
+++ b/x11-themes/icons-buuf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icons-buuf
 PORTVERSION=	1.6r2
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://ic1.deviantart.com/fs12/f/2006/266/9/0/
 DISTNAME=	Buuf_1.6-r2
diff --git a/x11-themes/icons-tango-extras/Makefile b/x11-themes/icons-tango-extras/Makefile
index d477a7709bac..eea46c224b71 100644
--- a/x11-themes/icons-tango-extras/Makefile
+++ b/x11-themes/icons-tango-extras/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icons-tango-extras
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://tango-project.org/releases/ \
 		${MASTER_SITE_GENTOO}
diff --git a/x11-themes/icons-tango/Makefile b/x11-themes/icons-tango/Makefile
index 4151174b54d9..dcad4c9df707 100644
--- a/x11-themes/icons-tango/Makefile
+++ b/x11-themes/icons-tango/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icons-tango
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://tango-project.org/releases/ \
 		${MASTER_SITE_GENTOO}
diff --git a/x11-themes/indubstrial/Makefile b/x11-themes/indubstrial/Makefile
index b3ad27c2b47c..a4809de44f04 100644
--- a/x11-themes/indubstrial/Makefile
+++ b/x11-themes/indubstrial/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	indubstrial
 PORTVERSION=	0.3.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.gnome.org/~jdub/2004/indubstrial/
 
diff --git a/x11-themes/kde-style-comix/Makefile b/x11-themes/kde-style-comix/Makefile
index 3593089f108d..06a92e9bac07 100644
--- a/x11-themes/kde-style-comix/Makefile
+++ b/x11-themes/kde-style-comix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	comix
 PORTVERSION=	1.3.8
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde-style-
diff --git a/x11-themes/kde-style-lipstik/Makefile b/x11-themes/kde-style-lipstik/Makefile
index f469c6812459..44ea30c370af 100644
--- a/x11-themes/kde-style-lipstik/Makefile
+++ b/x11-themes/kde-style-lipstik/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lipstik
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde-style-
diff --git a/x11-themes/kde-style-polyester/Makefile b/x11-themes/kde-style-polyester/Makefile
index 7835ffb9c7c3..c23b39e6480d 100644
--- a/x11-themes/kde-style-polyester/Makefile
+++ b/x11-themes/kde-style-polyester/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	polyester
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.notmart.org/files/ \
 		${MASTER_SITE_LOCAL}
diff --git a/x11-themes/kde-style-tiblit/Makefile b/x11-themes/kde-style-tiblit/Makefile
index dfc91d302261..35613fd68155 100644
--- a/x11-themes/kde-style-tiblit/Makefile
+++ b/x11-themes/kde-style-tiblit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tiblit
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde-style-
diff --git a/x11-themes/kde-windeco-activeheart/Makefile b/x11-themes/kde-windeco-activeheart/Makefile
index 93100e96192a..81905b0fb231 100644
--- a/x11-themes/kde-windeco-activeheart/Makefile
+++ b/x11-themes/kde-windeco-activeheart/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	activeheart
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde-windeco-
diff --git a/x11-themes/kde-windeco-crystal/Makefile b/x11-themes/kde-windeco-crystal/Makefile
index 09c324274fa8..978a29dddfea 100644
--- a/x11-themes/kde-windeco-crystal/Makefile
+++ b/x11-themes/kde-windeco-crystal/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	crystal
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde-windeco-
diff --git a/x11-themes/kde-windeco-knifty/Makefile b/x11-themes/kde-windeco-knifty/Makefile
index 8ee85105e5bc..1ceee488af8a 100644
--- a/x11-themes/kde-windeco-knifty/Makefile
+++ b/x11-themes/kde-windeco-knifty/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	knifty
 PORTVERSION=	0.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://kde-look.org/content/files/
 PKGNAMEPREFIX=	kde-windeco-
diff --git a/x11-themes/kde-windeco-neos/Makefile b/x11-themes/kde-windeco-neos/Makefile
index 84b4b61a8c6b..1dbf4d7760d3 100644
--- a/x11-themes/kde-windeco-neos/Makefile
+++ b/x11-themes/kde-windeco-neos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	neos
 PORTVERSION=	0.2b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://perso.orange.fr/chamayou/
 PKGNAMEPREFIX=	kde-windeco-
diff --git a/x11-themes/kde-windeco-smoothblend/Makefile b/x11-themes/kde-windeco-smoothblend/Makefile
index a06f5c1e31e5..ad0cf1ee25d7 100644
--- a/x11-themes/kde-windeco-smoothblend/Makefile
+++ b/x11-themes/kde-windeco-smoothblend/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smoothblend
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.p0z3r.org/downloads/
 PKGNAMEPREFIX=	kde-windeco-
diff --git a/x11-themes/kde4-style-polyester/Makefile b/x11-themes/kde4-style-polyester/Makefile
index 7835ffb9c7c3..c23b39e6480d 100644
--- a/x11-themes/kde4-style-polyester/Makefile
+++ b/x11-themes/kde4-style-polyester/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	polyester
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.notmart.org/files/ \
 		${MASTER_SITE_LOCAL}
diff --git a/x11-themes/kde4-windeco-crystal/Makefile b/x11-themes/kde4-windeco-crystal/Makefile
index 09c324274fa8..978a29dddfea 100644
--- a/x11-themes/kde4-windeco-crystal/Makefile
+++ b/x11-themes/kde4-windeco-crystal/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	crystal
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde-windeco-
diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index ce6720b3483a..e23964d60e93 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdeartwork
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index ce6720b3483a..e23964d60e93 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdeartwork
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11-themes/kdmtheme/Makefile b/x11-themes/kdmtheme/Makefile
index 320b61e7e125..3208bc034e73 100644
--- a/x11-themes/kdmtheme/Makefile
+++ b/x11-themes/kdmtheme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdmtheme
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://beta.smileaf.org/files/kdmtheme/ \
 		${MASTER_SITE_GENTOO:S/%SUBDIR%/distfiles/}
diff --git a/x11-themes/lila-xfwm4/Makefile b/x11-themes/lila-xfwm4/Makefile
index 79f2a2a0c00c..26051c7f2cf3 100644
--- a/x11-themes/lila-xfwm4/Makefile
+++ b/x11-themes/lila-xfwm4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Lila-xfwm4
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes xfce
 MASTER_SITES=	http://stief.tnux.net/Lila/
 DIST_SUBDIR=	xfce4
diff --git a/x11-themes/metacity-theme-microgui/Makefile b/x11-themes/metacity-theme-microgui/Makefile
index 20bc226f380e..d5221cc0fb59 100644
--- a/x11-themes/metacity-theme-microgui/Makefile
+++ b/x11-themes/metacity-theme-microgui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	microgui
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	mcitymicrogui
diff --git a/x11-themes/metacity-themes/Makefile b/x11-themes/metacity-themes/Makefile
index 7e75955fcab0..61ebfaa93ca9 100644
--- a/x11-themes/metacity-themes/Makefile
+++ b/x11-themes/metacity-themes/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	metacity-themes
 PORTVERSION=	20040306
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	# Empty
 DISTFILES=	# Empty
diff --git a/x11-themes/moodin/Makefile b/x11-themes/moodin/Makefile
index e1d1d47e4cb8..87db2b62a550 100644
--- a/x11-themes/moodin/Makefile
+++ b/x11-themes/moodin/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	moodin
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://moodwrod.com/files/
 DISTNAME=	ksplash-engine-moodin_${PORTVERSION}
diff --git a/x11-themes/murrine-configurator/Makefile b/x11-themes/murrine-configurator/Makefile
index 80b81d121d64..011d0db72b9d 100644
--- a/x11-themes/murrine-configurator/Makefile
+++ b/x11-themes/murrine-configurator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	murrine-configurator
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://cimi.netsons.org/media/download_gallery/murrine/
 DISTNAME=	murrine-configurator-${PORTVERSION}
diff --git a/x11-themes/murrine-configurator/pkg-plist b/x11-themes/murrine-configurator/pkg-plist
index fca5f48b3e15..53d60ba5de8c 100644
--- a/x11-themes/murrine-configurator/pkg-plist
+++ b/x11-themes/murrine-configurator/pkg-plist
@@ -2,4 +2,3 @@ bin/murrine-configurator
 share/pixmaps/murrine-configurator.png
 share/applications/murrine-configurator.desktop
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/x11-themes/nimbus/Makefile b/x11-themes/nimbus/Makefile
index 10d25d767db4..945e3d6c030b 100644
--- a/x11-themes/nimbus/Makefile
+++ b/x11-themes/nimbus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nimbus
 PORTVERSION=	0.0.6
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://dlc.sun.com/osol/jds/downloads/extras/
 
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index 4eb41d82ff89..ab9e9cb74a44 100644
--- a/x11-themes/notif2/Makefile
+++ b/x11-themes/notif2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	notif2
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	notif210
diff --git a/x11-themes/openbox-themes/Makefile b/x11-themes/openbox-themes/Makefile
index 938076cdfec9..8f24fdc8f299 100644
--- a/x11-themes/openbox-themes/Makefile
+++ b/x11-themes/openbox-themes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openbox-themes
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	novel
diff --git a/x11-themes/phase/Makefile b/x11-themes/phase/Makefile
index 584e9c58c395..e3b53d3c583c 100644
--- a/x11-themes/phase/Makefile
+++ b/x11-themes/phase/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	phase
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.usermode.org/code/
 
diff --git a/x11-themes/polymer/Makefile b/x11-themes/polymer/Makefile
index 1d231fd800fc..779bbb078bd3 100644
--- a/x11-themes/polymer/Makefile
+++ b/x11-themes/polymer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	polymer
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://static.int.pl/~mig21/dev/releases/polymer/ \
 		${MASTER_SITE_LOCAL}
diff --git a/x11-themes/qinx/Makefile b/x11-themes/qinx/Makefile
index 349a607b3328..5736888d3f27 100644
--- a/x11-themes/qinx/Makefile
+++ b/x11-themes/qinx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qinx
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.usermode.org/code/
 
diff --git a/x11-themes/qnxstyle/Makefile b/x11-themes/qnxstyle/Makefile
index 7f1226e0102b..68437e5a07d0 100644
--- a/x11-themes/qnxstyle/Makefile
+++ b/x11-themes/qnxstyle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qnxstyle
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 DISTNAME=	${KDELOOKITEM}-${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/rezlooks/Makefile b/x11-themes/rezlooks/Makefile
index 3a279560fde4..fcff092b88a0 100644
--- a/x11-themes/rezlooks/Makefile
+++ b/x11-themes/rezlooks/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rezlooks
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
 DISTNAME=	39179-rezlooks-${PORTVERSION}
diff --git a/x11-themes/sapphire-themes/Makefile b/x11-themes/sapphire-themes/Makefile
index 7cd7a29378cf..d68873077dd8 100644
--- a/x11-themes/sapphire-themes/Makefile
+++ b/x11-themes/sapphire-themes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sapphire-themes
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes x11-wm
 MASTER_SITES=	http://jpj.net/~trevor/${PORTNAME}/
 EXTRACT_SUFX=	.tar
diff --git a/x11-themes/sawfish-themes/Makefile b/x11-themes/sawfish-themes/Makefile
index 6b8d3edccaac..5d6ceb353534 100644
--- a/x11-themes/sawfish-themes/Makefile
+++ b/x11-themes/sawfish-themes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sawfish-themes
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://ftp.debian.org/debian/pool/main/s/${PORTNAME}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index 02993cc79f80..56162756f626 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	thinice
 PORTVERSION=	1.0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	thinice
diff --git a/x11-themes/ubuntulooks/Makefile b/x11-themes/ubuntulooks/Makefile
index aef8657f8bb7..60b8d0108bd2 100644
--- a/x11-themes/ubuntulooks/Makefile
+++ b/x11-themes/ubuntulooks/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ubuntulooks
 PORTVERSION=	0.9.12
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/main/u/ubuntulooks/
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/x11-themes/whistlerk/Makefile b/x11-themes/whistlerk/Makefile
index 743ab66da785..b19f1e4df581 100644
--- a/x11-themes/whistlerk/Makefile
+++ b/x11-themes/whistlerk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	WhistlerK
 PORTVERSION=	200010142358
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	whistlerk
diff --git a/x11-themes/xcursor-themes/Makefile b/x11-themes/xcursor-themes/Makefile
new file mode 100644
index 000000000000..927b690f52b9
--- /dev/null
+++ b/x11-themes/xcursor-themes/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xcursor-themes
+# Date Created:				Nov 2 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcursor-themes
+PORTVERSION=	1.0.1
+PORTREVISION=	1
+CATEGORIES=	x11-themes
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.org cursors themes
+
+BUILD_DEPENDS=	xcursorgen:${PORTSDIR}/x11/xcursorgen
+
+XORG_CAT=	data
+
+.include <bsd.port.mk>
diff --git a/x11-themes/xcursor-themes/distinfo b/x11-themes/xcursor-themes/distinfo
new file mode 100644
index 000000000000..2b1db89d316f
--- /dev/null
+++ b/x11-themes/xcursor-themes/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/data/xcursor-themes-1.0.1.tar.bz2) = 014bad415e64c49994679cdb71a97e37
+SHA256 (xorg/data/xcursor-themes-1.0.1.tar.bz2) = 4e7dcd402cd045ce1bd1a3de496270e78d6ead2478a0bcb3404072b33c5c9ea0
+SIZE (xorg/data/xcursor-themes-1.0.1.tar.bz2) = 2257899
diff --git a/x11-themes/xcursor-themes/pkg-descr b/x11-themes/xcursor-themes/pkg-descr
new file mode 100644
index 000000000000..f91458cfb216
--- /dev/null
+++ b/x11-themes/xcursor-themes/pkg-descr
@@ -0,0 +1 @@
+This package contains X.org cursors themes.
diff --git a/x11-themes/xcursor-themes/pkg-plist b/x11-themes/xcursor-themes/pkg-plist
new file mode 100644
index 000000000000..262e31583f29
--- /dev/null
+++ b/x11-themes/xcursor-themes/pkg-plist
@@ -0,0 +1,131 @@
+lib/X11/icons/handhelds/cursors/X_cursor
+lib/X11/icons/handhelds/cursors/based_arrow_down
+lib/X11/icons/handhelds/cursors/based_arrow_up
+lib/X11/icons/handhelds/cursors/bottom_left_corner
+lib/X11/icons/handhelds/cursors/bottom_right_corner
+lib/X11/icons/handhelds/cursors/bottom_side
+lib/X11/icons/handhelds/cursors/bottom_tee
+lib/X11/icons/handhelds/cursors/center_ptr
+lib/X11/icons/handhelds/cursors/circle
+lib/X11/icons/handhelds/cursors/cross
+lib/X11/icons/handhelds/cursors/dot
+lib/X11/icons/handhelds/cursors/dotbox
+lib/X11/icons/handhelds/cursors/double_arrow
+lib/X11/icons/handhelds/cursors/draped_box
+lib/X11/icons/handhelds/cursors/fleur
+lib/X11/icons/handhelds/cursors/gumby
+lib/X11/icons/handhelds/cursors/hand2
+lib/X11/icons/handhelds/cursors/left_ptr
+lib/X11/icons/handhelds/cursors/left_ptr_watch
+lib/X11/icons/handhelds/cursors/left_side
+lib/X11/icons/handhelds/cursors/left_tee
+lib/X11/icons/handhelds/cursors/ll_angle
+lib/X11/icons/handhelds/cursors/pencil
+lib/X11/icons/handhelds/cursors/right_ptr
+lib/X11/icons/handhelds/cursors/right_side
+lib/X11/icons/handhelds/cursors/right_tee
+lib/X11/icons/handhelds/cursors/sb_h_double_arrow
+lib/X11/icons/handhelds/cursors/sb_right_arrow
+lib/X11/icons/handhelds/cursors/sb_up_arrow
+lib/X11/icons/handhelds/cursors/sb_v_double_arrow
+lib/X11/icons/handhelds/cursors/shuttle
+lib/X11/icons/handhelds/cursors/top_left_corner
+lib/X11/icons/handhelds/cursors/top_right_corner
+lib/X11/icons/handhelds/cursors/top_side
+lib/X11/icons/handhelds/cursors/top_tee
+lib/X11/icons/handhelds/cursors/watch
+lib/X11/icons/handhelds/cursors/xterm
+lib/X11/icons/redglass/cursors/X_cursor
+lib/X11/icons/redglass/cursors/based_arrow_down
+lib/X11/icons/redglass/cursors/based_arrow_up
+lib/X11/icons/redglass/cursors/bottom_left_corner
+lib/X11/icons/redglass/cursors/bottom_right_corner
+lib/X11/icons/redglass/cursors/bottom_side
+lib/X11/icons/redglass/cursors/bottom_tee
+lib/X11/icons/redglass/cursors/center_ptr
+lib/X11/icons/redglass/cursors/circle
+lib/X11/icons/redglass/cursors/cross
+lib/X11/icons/redglass/cursors/dot
+lib/X11/icons/redglass/cursors/dotbox
+lib/X11/icons/redglass/cursors/double_arrow
+lib/X11/icons/redglass/cursors/draped_box
+lib/X11/icons/redglass/cursors/fleur
+lib/X11/icons/redglass/cursors/gumby
+lib/X11/icons/redglass/cursors/hand2
+lib/X11/icons/redglass/cursors/left_ptr
+lib/X11/icons/redglass/cursors/left_ptr_watch
+lib/X11/icons/redglass/cursors/left_side
+lib/X11/icons/redglass/cursors/left_tee
+lib/X11/icons/redglass/cursors/ll_angle
+lib/X11/icons/redglass/cursors/pencil
+lib/X11/icons/redglass/cursors/right_ptr
+lib/X11/icons/redglass/cursors/right_side
+lib/X11/icons/redglass/cursors/right_tee
+lib/X11/icons/redglass/cursors/sb_h_double_arrow
+lib/X11/icons/redglass/cursors/sb_right_arrow
+lib/X11/icons/redglass/cursors/sb_up_arrow
+lib/X11/icons/redglass/cursors/sb_v_double_arrow
+lib/X11/icons/redglass/cursors/shuttle
+lib/X11/icons/redglass/cursors/top_left_corner
+lib/X11/icons/redglass/cursors/top_right_corner
+lib/X11/icons/redglass/cursors/top_side
+lib/X11/icons/redglass/cursors/top_tee
+lib/X11/icons/redglass/cursors/xterm
+lib/X11/icons/whiteglass/cursors/X_cursor
+lib/X11/icons/whiteglass/cursors/base_arrow_down
+lib/X11/icons/whiteglass/cursors/base_arrow_up
+lib/X11/icons/whiteglass/cursors/boat
+lib/X11/icons/whiteglass/cursors/bottom_left_corner
+lib/X11/icons/whiteglass/cursors/bottom_right_corner
+lib/X11/icons/whiteglass/cursors/bottom_side
+lib/X11/icons/whiteglass/cursors/bottom_tee
+lib/X11/icons/whiteglass/cursors/center_ptr
+lib/X11/icons/whiteglass/cursors/circle
+lib/X11/icons/whiteglass/cursors/cross
+lib/X11/icons/whiteglass/cursors/dot
+lib/X11/icons/whiteglass/cursors/dot_box_mask
+lib/X11/icons/whiteglass/cursors/double_arrow
+lib/X11/icons/whiteglass/cursors/draped_box
+lib/X11/icons/whiteglass/cursors/exchange
+lib/X11/icons/whiteglass/cursors/fleur
+lib/X11/icons/whiteglass/cursors/gumby
+lib/X11/icons/whiteglass/cursors/hand1
+lib/X11/icons/whiteglass/cursors/hand2
+lib/X11/icons/whiteglass/cursors/left_ptr
+lib/X11/icons/whiteglass/cursors/left_ptr_watch
+lib/X11/icons/whiteglass/cursors/left_side
+lib/X11/icons/whiteglass/cursors/left_tee
+lib/X11/icons/whiteglass/cursors/ll_angle
+lib/X11/icons/whiteglass/cursors/lr_angle
+lib/X11/icons/whiteglass/cursors/pencil
+lib/X11/icons/whiteglass/cursors/pirate
+lib/X11/icons/whiteglass/cursors/question_arrow
+lib/X11/icons/whiteglass/cursors/right_ptr
+lib/X11/icons/whiteglass/cursors/right_side
+lib/X11/icons/whiteglass/cursors/right_tee
+lib/X11/icons/whiteglass/cursors/sailboat
+lib/X11/icons/whiteglass/cursors/sb_down_arrow
+lib/X11/icons/whiteglass/cursors/sb_h_double_arrow
+lib/X11/icons/whiteglass/cursors/sb_left_arrow
+lib/X11/icons/whiteglass/cursors/sb_right_arrow
+lib/X11/icons/whiteglass/cursors/sb_up_arrow
+lib/X11/icons/whiteglass/cursors/sb_v_double_arrow
+lib/X11/icons/whiteglass/cursors/shuttle
+lib/X11/icons/whiteglass/cursors/sizing
+lib/X11/icons/whiteglass/cursors/target
+lib/X11/icons/whiteglass/cursors/top_left_corner
+lib/X11/icons/whiteglass/cursors/top_right_corner
+lib/X11/icons/whiteglass/cursors/top_side
+lib/X11/icons/whiteglass/cursors/top_tee
+lib/X11/icons/whiteglass/cursors/trek
+lib/X11/icons/whiteglass/cursors/ul_angle
+lib/X11/icons/whiteglass/cursors/watch
+lib/X11/icons/whiteglass/cursors/ur_angle
+lib/X11/icons/whiteglass/cursors/xterm
+@dirrm lib/X11/icons/handhelds/cursors
+@dirrm lib/X11/icons/handhelds
+@dirrm lib/X11/icons/redglass/cursors
+@dirrm lib/X11/icons/redglass
+@dirrm lib/X11/icons/whiteglass/cursors
+@dirrm lib/X11/icons/whiteglass
+@dirrm lib/X11/icons
diff --git a/x11-themes/xenophilia/Makefile b/x11-themes/xenophilia/Makefile
index bfdbc08131c6..c43bda441453 100644
--- a/x11-themes/xenophilia/Makefile
+++ b/x11-themes/xenophilia/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xenophilia
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-themes/xenostep/Makefile b/x11-themes/xenostep/Makefile
index ac06a94ddf0d..ddacd2a9b07b 100644
--- a/x11-themes/xenostep/Makefile
+++ b/x11-themes/xenostep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xenostep
 PORTVERSION=	200011270836
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	xenostep
diff --git a/x11-themes/xfce4-icon-theme/Makefile b/x11-themes/xfce4-icon-theme/Makefile
index 4dca482265eb..547f57fa2515 100644
--- a/x11-themes/xfce4-icon-theme/Makefile
+++ b/x11-themes/xfce4-icon-theme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-icon-theme
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/x11-themes/xmms-eq-skins/Makefile b/x11-themes/xmms-eq-skins/Makefile
index 4e7a9e88a5fe..d50891689b28 100644
--- a/x11-themes/xmms-eq-skins/Makefile
+++ b/x11-themes/xmms-eq-skins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-eq-skins
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	equ
diff --git a/x11-themes/xmms-vumeter-skins/Makefile b/x11-themes/xmms-vumeter-skins/Makefile
index cce8b7baab5c..ec6c43757e20 100644
--- a/x11-themes/xmms-vumeter-skins/Makefile
+++ b/x11-themes/xmms-vumeter-skins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms-vumeter-skins
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://vumeterplugin.sourceforge.net/skins/
 DISTFILES=	X-skin.tar.bz2 \
diff --git a/x11-toolkits/9libs/Makefile b/x11-toolkits/9libs/Makefile
index 2004878289ba..485fa644a91a 100644
--- a/x11-toolkits/9libs/Makefile
+++ b/x11-toolkits/9libs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	9libs
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits plan9
 MASTER_SITES=	ftp://ftp.cs.yorku.ca/pub/wily/src/
 
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index 1aa10a5703ca..2d7845b22e0c 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	SoXt
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.coin3d.org/pub/coin/src/
 
diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 58812c3ccc5f..1449ee5d3cfb 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Xaw3d
 PORTVERSION=	1.5E
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.visi.com/users/hawkeyd/X/
 
diff --git a/x11-toolkits/XawPlus/Makefile b/x11-toolkits/XawPlus/Makefile
index 80b2b24e23be..329b105efcb8 100644
--- a/x11-toolkits/XawPlus/Makefile
+++ b/x11-toolkits/XawPlus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XawPlus
 PORTVERSION=	3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://people.freenet.de/kra/XawPlus/
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 3bd63404778a..f5a76653f749 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	bakery
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist
index fd4b9b8c817d..983b6f282142 100644
--- a/x11-toolkits/bakery/pkg-plist
+++ b/x11-toolkits/bakery/pkg-plist
@@ -64,21 +64,5 @@ share/locale/zh_TW/LC_MESSAGES/bakery.mo
 @dirrm include/bakery-%%API_VERSION%%/bakery/App
 @dirrm include/bakery-%%API_VERSION%%/bakery
 @dirrm include/bakery-%%API_VERSION%%
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 8d60a904f3ab..985496a476d6 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	blt
 PORTVERSION=	2.4z
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.csl.sony.co.jp/pub/kjc/ttt-libs/
diff --git a/x11-toolkits/easygtk/Makefile b/x11-toolkits/easygtk/Makefile
index 0ea1bd841aa0..12402b47b600 100644
--- a/x11-toolkits/easygtk/Makefile
+++ b/x11-toolkits/easygtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	easygtk
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	sobomax
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index f337e1cae626..2b8d69acf16f 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	eel
 PORTVERSION=	2.18.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index 9a05f910e521..cdffed51de80 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -127,61 +127,23 @@ share/locale/zh_HK/LC_MESSAGES/eel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo
 @dirrm include/eel-2/eel
 @dirrm include/eel-2
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index 052decc4e004..678e00422faf 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	efltk
 PORTVERSION=	2.0.6
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ede
diff --git a/x11-toolkits/enhance/Makefile b/x11-toolkits/enhance/Makefile
index d18a5bd0c409..05bb44e5a3a7 100644
--- a/x11-toolkits/enhance/Makefile
+++ b/x11-toolkits/enhance/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	enhance
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/x11-toolkits/etk/Makefile b/x11-toolkits/etk/Makefile
index 6a1a1038d724..9dd30019adab 100644
--- a/x11-toolkits/etk/Makefile
+++ b/x11-toolkits/etk/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	etk
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/x11-toolkits/ewl/Makefile b/x11-toolkits/ewl/Makefile
index 7442e7d8a1cb..b983551de18e 100644
--- a/x11-toolkits/ewl/Makefile
+++ b/x11-toolkits/ewl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ewl
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-toolkits/fl_editor/Makefile b/x11-toolkits/fl_editor/Makefile
index 75ab89752db8..333d53314643 100644
--- a/x11-toolkits/fl_editor/Makefile
+++ b/x11-toolkits/fl_editor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fl_editor
 PORTVERSION=	0.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://robertk.com/source/fl_editor/
 EXTRACT_SUFX=	.tgz
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 33b8d7705d29..dec53bdaa3d6 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fltk
 PORTVERSION=	${VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_EASYSW}
 MASTER_SITE_SUBDIR=	fltk/${VERSION}
diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile
index cce897cf2af6..12cd30a6aacd 100644
--- a/x11-toolkits/fltk2/Makefile
+++ b/x11-toolkits/fltk2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fltk
 PORTVERSION=	2.0.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_EASYSW}
 MASTER_SITE_SUBDIR=	fltk/snapshots
diff --git a/x11-toolkits/flu/Makefile b/x11-toolkits/flu/Makefile
index 2164fc86d09a..cc275ee7ad14 100644
--- a/x11-toolkits/flu/Makefile
+++ b/x11-toolkits/flu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flu
 PORTVERSION=	2.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.osc.edu/~jbryan/FLU/
 DISTNAME=	FLU_${PORTVERSION}
diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile
index e1b85b42598b..cacc84d9b762 100644
--- a/x11-toolkits/flvw/Makefile
+++ b/x11-toolkits/flvw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flvw
 PORTVERSION=	20000224
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/fox10/Makefile b/x11-toolkits/fox10/Makefile
index b46b0437f56b..8571c44f8dbe 100644
--- a/x11-toolkits/fox10/Makefile
+++ b/x11-toolkits/fox10/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.0.53
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile
index 27d1f08afbbb..fb52929a7450 100644
--- a/x11-toolkits/fox12/Makefile
+++ b/x11-toolkits/fox12/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	${MAJORVER}.${SHVER}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index cb482bfb6d30..de27cc5218ab 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	${MAJORVER}.${SHVER}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 766bc5afaebf..131889229c74 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	${MAJORVER}.${SHVER}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
diff --git a/x11-toolkits/fpc-forms/Makefile b/x11-toolkits/fpc-forms/Makefile
index 02dbf5bec8cd..5879fbd347c6 100644
--- a/x11-toolkits/fpc-forms/Makefile
+++ b/x11-toolkits/fpc-forms/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-forms
 
diff --git a/x11-toolkits/fpc-gnome/Makefile b/x11-toolkits/fpc-gnome/Makefile
index 1d8a72c3ede3..979312b64e1a 100644
--- a/x11-toolkits/fpc-gnome/Makefile
+++ b/x11-toolkits/fpc-gnome/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gnome
 
diff --git a/x11-toolkits/fpc-gnome1/Makefile b/x11-toolkits/fpc-gnome1/Makefile
index 1d8a72c3ede3..979312b64e1a 100644
--- a/x11-toolkits/fpc-gnome1/Makefile
+++ b/x11-toolkits/fpc-gnome1/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gnome
 
diff --git a/x11-toolkits/fpc-gtk/Makefile b/x11-toolkits/fpc-gtk/Makefile
index 0a1836442ee7..bf2262dbef7d 100644
--- a/x11-toolkits/fpc-gtk/Makefile
+++ b/x11-toolkits/fpc-gtk/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk
 
diff --git a/x11-toolkits/fpc-gtk1/Makefile b/x11-toolkits/fpc-gtk1/Makefile
index 0a1836442ee7..bf2262dbef7d 100644
--- a/x11-toolkits/fpc-gtk1/Makefile
+++ b/x11-toolkits/fpc-gtk1/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk
 
diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
index 26c2deebc40c..126830149412 100644
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ b/x11-toolkits/fpc-gtk2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk2
 
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index 02dbf5bec8cd..5879fbd347c6 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-forms
 
diff --git a/x11-toolkits/fpc-zvt/Makefile b/x11-toolkits/fpc-zvt/Makefile
index 7fbfdcb2a2bd..4df73c3372cb 100644
--- a/x11-toolkits/fpc-zvt/Makefile
+++ b/x11-toolkits/fpc-zvt/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-zvt
 
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index dd783e673b39..ba2084a74000 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fxscintilla
 PORTVERSION=	1.71
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index bc4a467e67a9..9ead80638e27 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gai
 PORTVERSION=	0.5.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 01d6cfe8c392..82f0f6d4ef80 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gal
 PORTVERSION=	0.24
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.24
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 239347f01f38..f865d412d9c8 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gal2
 PORTVERSION=	2.5.3
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile
index 39ea59d777fc..3709c5d55f2f 100644
--- a/x11-toolkits/gauche-gtk/Makefile
+++ b/x11-toolkits/gauche-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gauche
 PORTVERSION=	0.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits scheme
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gauche
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 48225ec6156b..a77b189be9fc 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gdl
 PORTVERSION=	0.7.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index c0b36edc8972..5eea5dedcd39 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -60,30 +60,10 @@ share/locale/sr@Latn/LC_MESSAGES/gdl-1.mo
 share/locale/sv/LC_MESSAGES/gdl-1.mo
 share/locale/vi/LC_MESSAGES/gdl-1.mo
 share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@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
 @dirrm share/gnome/gdl/glade
 @dirrm share/gnome/gdl
 @dirrm include/libgdl-1.0/gdl
diff --git a/x11-toolkits/gigi/Makefile b/x11-toolkits/gigi/Makefile
index 6305917260b0..9053127bc8d4 100644
--- a/x11-toolkits/gigi/Makefile
+++ b/x11-toolkits/gigi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gigi
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile
index b133f8420ec2..a9e7629b62e4 100644
--- a/x11-toolkits/gnocl/Makefile
+++ b/x11-toolkits/gnocl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnocl
 PORTVERSION=	0.9.90
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnocl
diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index d09ccf57252b..fd1ff90ecc2d 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-sharp
 PORTVERSION=	2.16.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.16
diff --git a/x11-toolkits/gnomemm/Makefile b/x11-toolkits/gnomemm/Makefile
index 220ec7bfdcc5..fa3783c92da7 100644
--- a/x11-toolkits/gnomemm/Makefile
+++ b/x11-toolkits/gnomemm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomemm
 PORTVERSION=	2.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits devel gnome
 MASTER_SITES=   # empty
 DISTFILES=      # empty
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index fd656ab475bf..ec82d88d341d 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnustep-back
 PORTVERSION=	0.11.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index a8f1dbb07a10..3ad92f47e763 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnustep-gui
 PORTVERSION=	0.11.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
diff --git a/x11-toolkits/gnustep-xdps/Makefile b/x11-toolkits/gnustep-xdps/Makefile
index 00a69a1ffd4d..ce4f1befb76a 100644
--- a/x11-toolkits/gnustep-xdps/Makefile
+++ b/x11-toolkits/gnustep-xdps/Makefile
@@ -8,6 +8,7 @@
 CATEGORIES=	x11-toolkits
 
 MAINTAINER=	dinoex@FreeBSD.org
+PORTREVISION=	1
 
 WITH_GNUSTEP_XDPS=	yes
 MASTERDIR=	${.CURDIR}/../gnustep-back
diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile
index 87ceaf5d11f9..5c75b3061be3 100644
--- a/x11-toolkits/gob/Makefile
+++ b/x11-toolkits/gob/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gob
 PORTVERSION=	1.0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gob/1.0
diff --git a/x11-toolkits/gstreamer-plugins-pango/Makefile b/x11-toolkits/gstreamer-plugins-pango/Makefile
index 99dbc514451b..aca74a40196d 100644
--- a/x11-toolkits/gstreamer-plugins-pango/Makefile
+++ b/x11-toolkits/gstreamer-plugins-pango/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 
 COMMENT=	Gstreamer pango textoverlay plugin
diff --git a/x11-toolkits/gstreamer-plugins-pango80/Makefile b/x11-toolkits/gstreamer-plugins-pango80/Makefile
index d8b1246e5acf..936bba553ad1 100644
--- a/x11-toolkits/gstreamer-plugins-pango80/Makefile
+++ b/x11-toolkits/gstreamer-plugins-pango80/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/x11-toolkits/gstreamer-plugins-pango80/Makefile,v 1.2 2006/02/25 00:40:47 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 
 COMMENT=	Gstreamer pango textoverlay plugin
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index 8d3e914384ff..67b434c83900 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtk-sharp
 PORTVERSION=	1.0.10
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://go-mono.com/sources/${PORTNAME}/
 
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index b5be7c16e195..26effff4cba6 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtk-sharp
 PORTVERSION=	2.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 005bf3fd2ec4..d7591fcb4a31 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	1.2.10
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtk+/1.2
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 71894eb73bbf..8b79e24cc61a 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	2.10.12
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index a7009f228e86..05b3430cf44f 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -618,86 +618,44 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%
 @dirrmtry lib/gtk-2.0
-@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/uz@Latn/LC_MESSAGES
 @dirrmtry share/locale/uz@Latn
-@dirrmtry share/locale/uz/LC_MESSAGES
-@dirrmtry share/locale/uz
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
-@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/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
-@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/ia/LC_MESSAGES
 @dirrmtry share/locale/ia
 @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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrmtry share/locale/az_IR/LC_MESSAGES
 @dirrmtry share/locale/az_IR
 @dirrmtry share/locale/as/LC_MESSAGES
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 71894eb73bbf..8b79e24cc61a 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	2.10.12
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index a7009f228e86..05b3430cf44f 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -618,86 +618,44 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines
 @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%
 @dirrmtry lib/gtk-2.0
-@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/uz@Latn/LC_MESSAGES
 @dirrmtry share/locale/uz@Latn
-@dirrmtry share/locale/uz/LC_MESSAGES
-@dirrmtry share/locale/uz
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
-@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/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
-@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/ia/LC_MESSAGES
 @dirrmtry share/locale/ia
 @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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrmtry share/locale/az_IR/LC_MESSAGES
 @dirrmtry share/locale/az_IR
 @dirrmtry share/locale/as/LC_MESSAGES
diff --git a/x11-toolkits/gtkada-devel/Makefile b/x11-toolkits/gtkada-devel/Makefile
index 52e2dfd64899..596aad70634b 100644
--- a/x11-toolkits/gtkada-devel/Makefile
+++ b/x11-toolkits/gtkada-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkada
 PORTVERSION=	20060615
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://sitola.fi.muni.cz/~hopet/gtkada/
 PKGNAMESUFFIX=	-devel
diff --git a/x11-toolkits/gtkada-gcc/Makefile b/x11-toolkits/gtkada-gcc/Makefile
index 8f5c990f867b..e17cb9076aaa 100644
--- a/x11-toolkits/gtkada-gcc/Makefile
+++ b/x11-toolkits/gtkada-gcc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkada
 PORTVERSION=	2.8.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnuada
diff --git a/x11-toolkits/gtkada-gps/Makefile b/x11-toolkits/gtkada-gps/Makefile
index 24f4262f35df..8d48bfcceb64 100644
--- a/x11-toolkits/gtkada-gps/Makefile
+++ b/x11-toolkits/gtkada-gps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkada-gps
 PORTVERSION=	3.1.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://libre.adacore.com/
 EXTRACT_SUFX=	-src.tgz
diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile
index 9fc2a44eb88a..b76230f92e92 100644
--- a/x11-toolkits/gtkada/Makefile
+++ b/x11-toolkits/gtkada/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkada
 PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	https://libre2.adacore.com/GtkAda/ \
 		http://libre.act-europe.fr/GtkAda/ \
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index e84188f10b53..24a8c3b21a20 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtkdatabox
 PORTVERSION=	0.1.13.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.eudoxos.de/gtk/gtkdatabox/download/
 
diff --git a/x11-toolkits/gtkdatabox2/Makefile b/x11-toolkits/gtkdatabox2/Makefile
index d676ae7e348c..a9d9a75a0478 100644
--- a/x11-toolkits/gtkdatabox2/Makefile
+++ b/x11-toolkits/gtkdatabox2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkdatabox2
 PORTVERSION=	0.2.4.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.eudoxos.de/gtk/gtkdatabox/download/
 DISTNAME=	gtkdatabox-${PORTVERSION}
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 0b3d692efa5a..254a679b178c 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkextra
 PORTVERSION=	0.99.17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtkextra.sourceforge.net/src/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 7c2fa0a4ace7..4e87d7ff4f96 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkextra
 PORTVERSION=	2.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scigraphica
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index 0289e8972a59..5c343aaa92f2 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtkglareamm
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/g/${PORTNAME}
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 359ff77b7458..de7e242f5fa4 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkglarea
 PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index 30ebe17aaee8..830737e19277 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkglarea
 PORTVERSION=	1.99.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtkglarea/1.99
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 84d0c97f061a..ccafbacc6c77 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkglext
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index 4e66480d78ff..7c8025e8d8cc 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkglextmm
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkglext
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index 4bfa08266c79..9cefa39921b5 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtkmathview
 PORTVERSION=	0.7.7
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://helm.cs.unibo.it/mml-widget/sources/
 
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 39f91e029983..fa1bf9ac89e6 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtkmm/1.2
diff --git a/x11-toolkits/gtkmm20-reference/Makefile b/x11-toolkits/gtkmm20-reference/Makefile
index 181ee815841a..28dc54492e21 100644
--- a/x11-toolkits/gtkmm20-reference/Makefile
+++ b/x11-toolkits/gtkmm20-reference/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
 
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index edecbd2b7cb6..acb65dcf3da5 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
-PORTREVISION?=	7
+PORTREVISION?=	8
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile
index 186f1f3dec97..43d98b69020a 100644
--- a/x11-toolkits/gtkmm24-reference/Makefile
+++ b/x11-toolkits/gtkmm24-reference/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24
 
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 1d5870e9c371..66ca0c037b15 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.10.10
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-toolkits/gtkmm30-reference/Makefile b/x11-toolkits/gtkmm30-reference/Makefile
index 181ee815841a..28dc54492e21 100644
--- a/x11-toolkits/gtkmm30-reference/Makefile
+++ b/x11-toolkits/gtkmm30-reference/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
 
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index edecbd2b7cb6..acb65dcf3da5 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
-PORTREVISION?=	7
+PORTREVISION?=	8
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile
index f63e7236f65b..7cbc60b76c94 100644
--- a/x11-toolkits/gtkscintilla/Makefile
+++ b/x11-toolkits/gtkscintilla/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkscintilla
 PORTVERSION=	0.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	moleskine
diff --git a/x11-toolkits/gtksourceview-sharp/Makefile b/x11-toolkits/gtksourceview-sharp/Makefile
index cf88eaa330c8..7903aca517be 100644
--- a/x11-toolkits/gtksourceview-sharp/Makefile
+++ b/x11-toolkits/gtksourceview-sharp/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtksourceview-sharp
 PORTVERSION=	0.10
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://go-mono.com/sources/gtksourceview-sharp-2.0/
 DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index f8f846e3f062..b4f7705b9694 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtksourceview
 PORTVERSION=	1.8.5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist
index c3f938617921..fc1b38d8b2bb 100644
--- a/x11-toolkits/gtksourceview/pkg-plist
+++ b/x11-toolkits/gtksourceview/pkg-plist
@@ -131,51 +131,17 @@ share/locale/zh_TW/LC_MESSAGES/gtksourceview-1.0.mo
 @dirrm share/gnome/gtksourceview-1.0
 @dirrm include/gtksourceview-1.0/gtksourceview
 @dirrm include/gtksourceview-1.0
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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-toolkits/gtkunique/Makefile b/x11-toolkits/gtkunique/Makefile
index 60c2bea28e7f..f93ae2d6b6aa 100644
--- a/x11-toolkits/gtkunique/Makefile
+++ b/x11-toolkits/gtkunique/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkunique
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav
diff --git a/x11-toolkits/gtoolkit/Makefile b/x11-toolkits/gtoolkit/Makefile
index 7b38dad1e077..2483334d020a 100644
--- a/x11-toolkits/gtoolkit/Makefile
+++ b/x11-toolkits/gtoolkit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtoolkit
 PORTVERSION=	0.9.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	ftp://ftp.inf.uos.de/pub/elmar/gtk/objc-gtoolkit/
 
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index ce31d1e5de41..d410b5277f1e 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guile-gnome
 PORTVERSION=	0.20
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-toolkits gnome scheme
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-guile/0.20
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 34b795635130..835ed251d320 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guile-gtk
 PORTVERSION=	0.41
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits scheme
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/hs-frantk/Makefile b/x11-toolkits/hs-frantk/Makefile
index fcbcbe175954..ab52084b735c 100644
--- a/x11-toolkits/hs-frantk/Makefile
+++ b/x11-toolkits/hs-frantk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	frantk
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://www.dcs.gla.ac.uk/~meurig/FranTk/
 PKGNAMEPREFIX=	hs-
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 921d72eb6b37..938c86d9219a 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk2hs
 PORTVERSION=	0.9.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/inti-gconf/Makefile b/x11-toolkits/inti-gconf/Makefile
index fe8df611e5bd..a585ff824dad 100644
--- a/x11-toolkits/inti-gconf/Makefile
+++ b/x11-toolkits/inti-gconf/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	inti-gconf
 PORTVERSION=	1.0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	inti
diff --git a/x11-toolkits/inti-gl/Makefile b/x11-toolkits/inti-gl/Makefile
index 75eea880272f..859701530eb9 100644
--- a/x11-toolkits/inti-gl/Makefile
+++ b/x11-toolkits/inti-gl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	inti-gl
 PORTVERSION=	0.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	inti
diff --git a/x11-toolkits/inti-sourceview/Makefile b/x11-toolkits/inti-sourceview/Makefile
index 86c699775697..4abf476bb162 100644
--- a/x11-toolkits/inti-sourceview/Makefile
+++ b/x11-toolkits/inti-sourceview/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	inti-sourceview
 PORTVERSION=	0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	inti
diff --git a/x11-toolkits/inti/Makefile b/x11-toolkits/inti/Makefile
index d1ea59d1ccb8..bd3f023934a8 100644
--- a/x11-toolkits/inti/Makefile
+++ b/x11-toolkits/inti/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	inti
 PORTVERSION=	1.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	inti
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index 52b283a280d4..44a6c8598212 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	irrlicht
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index e55d554d0e95..ec151f50bb79 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	itk
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index f5f188a74031..ef55de30aadb 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	iwidgets
 PORTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl
diff --git a/x11-toolkits/jdic/Makefile b/x11-toolkits/jdic/Makefile
index b24d6417a59d..d6114f73aabd 100644
--- a/x11-toolkits/jdic/Makefile
+++ b/x11-toolkits/jdic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jdic
 PORTVERSION=	20061102
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits java
 MASTER_SITES=	https://jdic.dev.java.net/files/documents/880/43269/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 51e8f0ba2337..2eb81972c75d 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lesstif
 PORTVERSION=	0.95.0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 8cb332231963..0d0329a31ed5 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -6,32 +6,15 @@
 #
 
 PORTNAME=	libXaw
-PORTVERSION=	7.0.2
+PORTVERSION=	1.0.2
+PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Athena Widgets library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
-		${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \
-		${X11BASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \
-		${X11BASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+XORG_CAT=	lib
+USE_XORG=	printproto x11 xau xext xextproto xmu xp xpm xproto xt
 
 MAN3=		Xaw.3
 
diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo
index 5ed12bcafa3a..5cec56c855bc 100644
--- a/x11-toolkits/libXaw/distinfo
+++ b/x11-toolkits/libXaw/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXaw-7.0.2.tar.bz2) = 30d569f9560c1daac184d5be8085ce37
-SHA256 (libXaw-7.0.2.tar.bz2) = 22fedd51c86f2487327601664c6e9234c015a7f14a2f637c084d77589ce3880f
-SIZE (libXaw-7.0.2.tar.bz2) = 423842
+MD5 (xorg/lib/libXaw-1.0.2.tar.bz2) = 27dc85f84ac78eb619f72a0805a323f4
+SHA256 (xorg/lib/libXaw-1.0.2.tar.bz2) = 579f332cb01c2bee5fc75bdfbf0e6b5c57ce3d1849936ae4c540564b2168556a
+SIZE (xorg/lib/libXaw-1.0.2.tar.bz2) = 524107
diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist
index c3b287571af6..75a563df538b 100644
--- a/x11-toolkits/libXaw/pkg-plist
+++ b/x11-toolkits/libXaw/pkg-plist
@@ -32,6 +32,8 @@ include/X11/Xaw/Panner.h
 include/X11/Xaw/PannerP.h
 include/X11/Xaw/Porthole.h
 include/X11/Xaw/PortholeP.h
+include/X11/Xaw/Print.h
+include/X11/Xaw/PrintSP.h
 include/X11/Xaw/Repeater.h
 include/X11/Xaw/RepeaterP.h
 include/X11/Xaw/Reports.h
@@ -49,6 +51,7 @@ include/X11/Xaw/SmeLineP.h
 include/X11/Xaw/SmeP.h
 include/X11/Xaw/StripCharP.h
 include/X11/Xaw/StripChart.h
+include/X11/Xaw/Template.c
 include/X11/Xaw/Template.h
 include/X11/Xaw/TemplateP.h
 include/X11/Xaw/Text.h
@@ -68,9 +71,24 @@ include/X11/Xaw/Viewport.h
 include/X11/Xaw/ViewportP.h
 include/X11/Xaw/XawImP.h
 include/X11/Xaw/XawInit.h
-lib/libXaw.a
-lib/libXaw.la
 lib/libXaw.so
+lib/libXaw.so.6
 lib/libXaw.so.7
-libdata/pkgconfig/xaw.pc
+lib/libXaw.so.8
+lib/libXaw6.a
+lib/libXaw6.la
+lib/libXaw6.so
+lib/libXaw6.so.6
+lib/libXaw7.a
+lib/libXaw7.la
+lib/libXaw7.so
+lib/libXaw7.so.7
+lib/libXaw8.a
+lib/libXaw8.la
+lib/libXaw8.so
+lib/libXaw8.so.8
+libdata/pkgconfig/xaw6.pc
+libdata/pkgconfig/xaw7.pc
+libdata/pkgconfig/xaw8.pc
+share/aclocal/xaw.m4
 @dirrm include/X11/Xaw
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 4381ccf00f8c..9c876068e346 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -6,27 +6,14 @@
 #
 
 PORTNAME=	libXmu
-PORTVERSION=	6.2.3
+PORTVERSION=	1.0.3
+PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Miscellaneous Utilities libraries
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
-		${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt
-BUILD_DEPENDS=	${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+XORG_CAT=	lib
+USE_XORG=	xproto:both x11 xt xext
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libXmu/distinfo b/x11-toolkits/libXmu/distinfo
index 422ee145035b..4cf9425d699e 100644
--- a/x11-toolkits/libXmu/distinfo
+++ b/x11-toolkits/libXmu/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXmu-6.2.3.tar.bz2) = 7671745bd8a1b0595847541479a327d6
-SHA256 (libXmu-6.2.3.tar.bz2) = 5f3d5b39f767cd6665f36c47391465bf44aee0f0178cce13865510471b02ea40
-SIZE (libXmu-6.2.3.tar.bz2) = 254322
+MD5 (xorg/lib/libXmu-1.0.3.tar.bz2) = b926b95b811ece3e19cd590db85ee615
+SHA256 (xorg/lib/libXmu-1.0.3.tar.bz2) = b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66
+SIZE (xorg/lib/libXmu-1.0.3.tar.bz2) = 296622
diff --git a/x11-toolkits/libXmu/files/patch-Xaw-dep.diff b/x11-toolkits/libXmu/files/patch-Xaw-dep.diff
deleted file mode 100644
index 7417469b1d7f..000000000000
--- a/x11-toolkits/libXmu/files/patch-Xaw-dep.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: EditresCom.c
-===================================================================
-RCS file: /cvs/xlibs/Xmu/EditresCom.c,v
-retrieving revision 1.23
-diff -u -r1.23 EditresCom.c
---- a/EditresCom.c	12 Apr 2004 14:37:50 -0000	1.23
-+++ b/EditresCom.c	13 May 2004 04:13:52 -0000
-@@ -40,7 +40,6 @@
- #include <X11/Xatom.h>
- #include <X11/Xos.h>		/* for strcpy declaration */
- #include <X11/Xfuncs.h>
--#include <X11/Xaw/Cardinals.h>
- #include <X11/Xmu/EditresP.h>
- #include <X11/Xmd.h>
- #include <X11/Xmu/CharSet.h>
-Index: WidgetNode.c
-===================================================================
-RCS file: /cvs/xlibs/Xmu/WidgetNode.c,v
-retrieving revision 1.14
-diff -u -r1.14 WidgetNode.c
---- a/WidgetNode.c	23 Dec 2003 04:10:32 -0000	1.14
-+++ b/WidgetNode.c	13 May 2004 04:16:59 -0000
-@@ -38,10 +38,6 @@
- #include <stdlib.h>
- #include <X11/Xos.h>
- #include <X11/IntrinsicP.h>
--/* #include <X11/Xaw/Cardinals.h> */
--#ifndef ZERO
--#define ZERO	((Cardinal)0)
--#endif
- #include <X11/Xmu/CharSet.h>
- #include <X11/Xmu/WidgetNode.h>
- 
-@@ -221,7 +217,7 @@
-     if (node->have_resources) return;
- 
-     dummy = XtCreateWidget (node->label, XmuWnClass(node), toplevel,
--			    NULL, ZERO);
-+			    NULL, ((Cardinal)0));
-     if (dummy) XtDestroyWidget (dummy);
- 
- 
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index e42cd264dd2e..56d2467cd321 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -6,28 +6,282 @@
 #
 
 PORTNAME=	libXt
-PORTVERSION=	0.1.5
+PORTVERSION=	1.0.5
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Toolkit library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
-		${X11BASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+XORG_CAT=	lib
+USE_XORG=	x11 sm xproto kbproto
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+MAN1=		makestrs.1
+MAN3=		XtNew.3 \
+		XtAddGrab.3 \
+		XtAppLock.3 \
+		XtAddActions.3 \
+		XtAddCallback.3 \
+		XtAddEventHandler.3 \
+		XtAddExposureToRegion.3 \
+		XtAddInput.3 \
+		XtAllocateGC.3 \
+		XtAppAddActionHook.3 \
+		XtAppAddActions.3 \
+		XtAppAddBlockHook.3 \
+		XtAppAddConverter.3 \
+		XtAppAddInput.3 \
+		XtAppAddSignal.3 \
+		XtAppAddTimeOut.3 \
+		XtAppAddWorkProc.3 \
+		XtAppCreateShell.3 \
+		XtAppError.3 \
+		XtAppErrorMsg.3 \
+		XtAppGetErrorDatabase.3 \
+		XtAppGetSelectionTimeout.3 \
+		XtAppInitialize.3 \
+		XtAppNextEvent.3 \
+		XtAppReleaseCacheRefs.3 \
+		XtAppSetExitFlag.3 \
+		XtAppSetFallbackResources.3 \
+		XtAppSetTypeConverter.3 \
+		XtBuildEventMask.3 \
+		XtCallAcceptFocus.3 \
+		XtCallActionProc.3 \
+		XtCallCallbacks.3 \
+		XtClass.3 \
+		XtConfigureWidget.3 \
+		XtConvert.3 \
+		XtConvertAndStore.3 \
+		XtCreateApplicationContext.3 \
+		XtCreateApplicationShell.3 \
+		XtCreatePopupShell.3 \
+		XtCreateSelectionRequest.3 \
+		XtCreateWidget.3 \
+		XtCreateWindow.3 \
+		XtDisplay.3 \
+		XtDisplayInitialize.3 \
+		XtDisplayStringConversionWarning.3 \
+		XtDisplayToApplicationContext.3 \
+		XtError.3 \
+		XtErrorMsg.3 \
+		XtFindFile.3 \
+		XtGetActionKeysym.3 \
+		XtGetActionList.3 \
+		XtGetApplicationNameAndClass.3 \
+		XtGetApplicationResources.3 \
+		XtGetClassExtension.3 \
+		XtGetDisplays.3 \
+		XtGetGC.3 \
+		XtGetErrorDatabase.3 \
+		XtGetKeyboardFocusWidget.3 \
+		XtGetKeysymTable.3 \
+		XtGetResourceList.3 \
+		XtGetSelectionParameters.3 \
+		XtGetSelectionRequest.3 \
+		XtGetSelectionTimeout.3 \
+		XtGetSelectionValue.3 \
+		XtGetSelectionValueIncremental.3 \
+		XtGetSubresources.3 \
+		XtGrabKey.3 \
+		XtHooksOfDisplay.3 \
+		XtInitialize.3 \
+		XtInitializeWidgetClass.3 \
+		XtInsertEventTypeHandler.3 \
+		XtLastEventProcessed.3 \
+		XtMakeGeometryRequest.3 \
+		XtMalloc.3 \
+		XtManageChildren.3 \
+		XtMapWidget.3 \
+		XtName.3 \
+		XtNameToWidget.3 \
+		XtNextEvent.3 \
+		XtOffset.3 \
+		XtOpenApplication.3 \
+		XtOwnSelection.3 \
+		XtParent.3 \
+		XtParseAcceleratorTable.3 \
+		XtParseTranslationTable.3 \
+		XtPopdown.3 \
+		XtPopup.3 \
+		XtProcessLock.3 \
+		XtQueryGeometry.3 \
+		XtRealizeWidget.3 \
+		XtRegisterDrawable.3 \
+		XtRegisterGrabAction.3 \
+		XtReservePropertyAtom.3 \
+		XtResolvePathname.3 \
+		XtSessionGetToken.3 \
+		XtSetArg.3 \
+		XtSetKeyTranslator.3 \
+		XtSetKeyboardFocus.3 \
+		XtSetLanguageProc.3 \
+		XtSetMultiClickTime.3 \
+		XtSetSelectionParameters.3 \
+		XtSetSensitive.3 \
+		XtSetValues.3 \
+		XtSetWMColormapWindows.3 \
+		XtStringConversionWarning.3 \
+		XtToolkitThreadInitialize.3 \
+		XtTranslateCoords.3 \
+		XtRemoveGrab.3 \
+		XtVaCreateArgsList.3 \
+		XtAddCallbacks.3 \
+		XtRemoveCallback.3 \
+		XtRemoveCallbacks.3 \
+		XtRemoveAllCallbacks.3 \
+		XtAddRawEventHandler.3 \
+		XtRemoveEventHandler.3 \
+		XtRemoveRawEventHandler.3 \
+		XtInsertEventHandler.3 \
+		XtInsertRawEventHandler.3 \
+		XtAddConverter.3 \
+		XtRemoveInput.3 \
+		XtRemoveTimeOut.3 \
+		XtRemoveWorkProc.3 \
+		XtVaAppCreateShell.3 \
+		XtAppSetErrorHandler.3 \
+		XtAppWarning.3 \
+		XtAppSetWarningHandler.3 \
+		XtAppSetErrorMsgHandler.3 \
+		XtAppSetWarningMsgHandler.3 \
+		XtAppWarningMsg.3 \
+		XtAppGetErrorDatabaseText.3 \
+		XtAppSetSelectionTimeout.3 \
+		XtAppPending.3 \
+		XtAppPeekEvent.3 \
+		XtAppProcessEvent.3 \
+		XtDispatchEvent.3 \
+		XtAppMainLoop.3 \
+		XtPending.3 \
+		XtPeekEvent.3 \
+		XtProcessEvent.3 \
+		XtMainLoop.3 \
+		XtCallCallbackList.3 \
+		XtHasCallbacks.3 \
+		XtSuperclass.3 \
+		XtIsSubclass.3 \
+		XtCheckSubclass.3 \
+		XtIsObject.3 \
+		XtIsRectObj.3 \
+		XtIsWidget.3 \
+		XtIsComposite.3 \
+		XtIsConstraint.3 \
+		XtIsShell.3 \
+		XtIsOverrideShell.3 \
+		XtIsWMShell.3 \
+		XtIsVendorShell.3 \
+		XtIsTransientShell.3 \
+		XtIsTopLevelShell.3 \
+		XtIsApplicationShell.3 \
+		XtIsSessionShell.3 \
+		XtMoveWidget.3 \
+		XtResizeWidget.3 \
+		XtDirectConvert.3 \
+		XtCallConverter.3 \
+		XtDestroyApplicationContext.3 \
+		XtWidgetToApplicationContext.3 \
+		XtToolkitInitialize.3 \
+		XtVaCreatePopupShell.3 \
+		XtVaCreateWidget.3 \
+		XtCreateManagedWidget.3 \
+		XtVaCreateManagedWidget.3 \
+		XtDestroyWidget.3 \
+		XtDisplayOfObject.3 \
+		XtScreen.3 \
+		XtScreenOfObject.3 \
+		XtWindow.3 \
+		XtWindowOfObject.3 \
+		XtOpenDisplay.3 \
+		XtCloseDisplay.3 \
+		XtDatabase.3 \
+		XtScreenDatabase.3 \
+		XtReleaseGC.3 \
+		XtGetConstraintResourceList.3 \
+		XtGetSelectionValues.3 \
+		XtVaGetSubresources.3 \
+		XtVaGetApplicationResources.3 \
+		XtMakeResizeRequest.3 \
+		XtCalloc.3 \
+		XtRealloc.3 \
+		XtFree.3 \
+		XtNewString.3 \
+		XtManageChild.3 \
+		XtUnmanageChildren.3 \
+		XtUnmanageChild.3 \
+		XtIsManaged.3 \
+		XtChangeManagedSet.3 \
+		XtSetMappedWhenManaged.3 \
+		XtUnmapWidget.3 \
+		XtWindowToWidget.3 \
+		XtOffsetOf.3 \
+		XtNumber.3 \
+		XtOwnSelectionIncremental.3 \
+		XtDisownSelection.3 \
+		XtInstallAccelerators.3 \
+		XtInstallAllAccelerators.3 \
+		XtAugmentTranslations.3 \
+		XtOverrideTranslations.3 \
+		XtUninstallTranslations.3 \
+		XtCallbackPopdown.3 \
+		MenuPopdown.3 \
+		XtPopupSpringLoaded.3 \
+		XtCallbackNone.3 \
+		XtCallbackNonexclusive.3 \
+		XtCallbackExclusive.3 \
+		MenuPopup.3 \
+		XtIsRealized.3 \
+		XtUnrealizeWidget.3 \
+		XtMergeArgLists.3 \
+		XtTranslateKeycode.3 \
+		XtRegisterCaseConverter.3 \
+		XtConvertCase.3 \
+		XtIsSensitive.3 \
+		XtVaSetValues.3 \
+		XtSetSubvalues.3 \
+		XtGetValues.3 \
+		XtVaGetValues.3 \
+		XtGetSubvalues.3 \
+		XtVaGetSubvalues.3 \
+		XtVaSetSubvalues.3 \
+		XtKeysymToKeycodeList.3 \
+		XtSetTypeConverter.3 \
+		XtRemoveActionHook.3 \
+		XtGetMultiClickTime.3 \
+		XtRemoveEventTypeHandler.3 \
+		XtRegisterExtensionSelector.3 \
+		XtSetEventDispatcher.3 \
+		XtDispatchEventToWidget.3 \
+		XtLastTimestampProcessed.3 \
+		XtNoticeSignal.3 \
+		XtRemoveSignal.3 \
+		XtAddTimeOut.3 \
+		XtAddWorkProc.3 \
+		XtRemoveBlockHook.3 \
+		XtVaAppInitialize.3 \
+		XtSessionReturnToken.3 \
+		XtSetErrorMsgHandler.3 \
+		XtSetWarningMsgHandler.3 \
+		XtWarningMsg.3 \
+		XtSetErrorHandler.3 \
+		XtWarning.3 \
+		XtSetWarningHandler.3 \
+		XtGetErrorDatabaseText.3 \
+		XtGetSelectionValuesIncremental.3 \
+		XtSetSelectionTimeout.3 \
+		XtSendSelectionRequest.3 \
+		XtCancelSelectionRequest.3 \
+		XtReleasePropertyAtom.3 \
+		XtUngrabKey.3 \
+		XtGrabKeyboard.3 \
+		XtUngrabKeyboard.3 \
+		XtGrabButton.3 \
+		XtUngrabButton.3 \
+		XtGrabPointer.3 \
+		XtUngrabPointer.3 \
+		XtUnregisterDrawable.3 \
+		XtAppGetExitFlag.3 \
+		XtAppUnlock.3 \
+		XtProcessUnlock.3 \
+		XtVaOpenApplication.3
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libXt/distinfo b/x11-toolkits/libXt/distinfo
index aeeae75f047d..5f2badbfbee2 100644
--- a/x11-toolkits/libXt/distinfo
+++ b/x11-toolkits/libXt/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXt-0.1.5.tar.bz2) = 8ff20498eeedebe2fb72f93c2d7beab1
-SHA256 (libXt-0.1.5.tar.bz2) = e99b252946e74f486bb03aa8a791a12333faeb142b62b17929da9b7d9de74f45
-SIZE (libXt-0.1.5.tar.bz2) = 415938
+MD5 (xorg/lib/libXt-1.0.5.tar.bz2) = f3bdd67785ace8cd0b23249e9d8c9975
+SHA256 (xorg/lib/libXt-1.0.5.tar.bz2) = 43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4
+SIZE (xorg/lib/libXt-1.0.5.tar.bz2) = 500502
diff --git a/x11-toolkits/libXt/pkg-plist b/x11-toolkits/libXt/pkg-plist
index 4c739344a483..0f587df53eee 100644
--- a/x11-toolkits/libXt/pkg-plist
+++ b/x11-toolkits/libXt/pkg-plist
@@ -1,3 +1,6 @@
+bin/makestrs
+include/X11/StringDefs.h
+include/X11/Shell.h
 include/X11/Composite.h
 include/X11/CompositeP.h
 include/X11/ConstrainP.h
@@ -5,18 +8,32 @@ include/X11/Constraint.h
 include/X11/Core.h
 include/X11/CoreP.h
 include/X11/Intrinsic.h
-include/X11/IntrinsicP.h
 include/X11/Object.h
+include/X11/IntrinsicP.h
 include/X11/ObjectP.h
 include/X11/RectObj.h
 include/X11/RectObjP.h
-include/X11/Shell.h
+include/X11/ResConfigP.h
 include/X11/ShellP.h
-include/X11/StringDefs.h
 include/X11/Vendor.h
 include/X11/VendorP.h
-lib/libXt.a
-lib/libXt.la
-lib/libXt.so
+include/X11/CallbackI.h
+include/X11/ConvertI.h
+include/X11/CreateI.h
+include/X11/EventI.h
+include/X11/HookObjI.h
+include/X11/InitialI.h
+include/X11/IntrinsicI.h
+include/X11/PassivGraI.h
+include/X11/ResourceI.h
+include/X11/SelectionI.h
+include/X11/ShellI.h
+include/X11/ThreadsI.h
+include/X11/TranslateI.h
+include/X11/VarargsI.h
+include/X11/Xtos.h
 lib/libXt.so.6
+lib/libXt.so
+lib/libXt.la
+lib/libXt.a
 libdata/pkgconfig/xt.pc
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index aaab24deda1c..dfc641f47583 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libbonoboui
 PORTVERSION=	2.18.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 36b12ac888dd..1349efca8b18 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -132,63 +132,25 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
 @dirrm include/libbonoboui-2.0
 @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/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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @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/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-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index 4ccf47d7dc87..da6404778222 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libbonobouimm
 PORTVERSION=	1.3.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 17326dd49060..15f6facea973 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgail-gnome
 PORTVERSION=	1.18.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index a2e6217ec5d3..5b84ea827d4d 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgdiplus
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.go-mono.com/sources/${PORTNAME}/
 
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 16b4685d54e2..6c3404fdb58c 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnomeprintui
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index cdfdffddebe6..eae47f017834 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -111,55 +111,17 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
 @dirrm %%DOCSDIR%%
 @dirrm include/libgnomeprintui-2.2/libgnomeprintui
 @dirrm include/libgnomeprintui-2.2
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index 5a28f743990f..68c67d15d22d 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomeprintuimm
 PORTVERSION=	2.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index d9e516efdfea..78d3dcdd4510 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgnomeui
 PORTVERSION=	2.18.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 5d2ce7136a13..ebd78c97d835 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -154,73 +154,33 @@ share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
 @dirrm include/libgnomeui-2.0
 @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/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
-@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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @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/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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index e1b423b4776f..85cfff1449b4 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomeuimm
 PORTVERSION=	2.0.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index f2cf6417d656..775fabe7902d 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnomeuimm
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile
index acc6fd838d7e..9343a28ee40c 100644
--- a/x11-toolkits/libgtk-java/Makefile
+++ b/x11-toolkits/libgtk-java/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgtk-java
 PORTVERSION=	2.10.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits java
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index 86873697943f..93be80f7d6c4 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgtkeditor
 PORTVERSION=	0.1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/lib//}
diff --git a/x11-toolkits/libgtksourceviewmm/Makefile b/x11-toolkits/libgtksourceviewmm/Makefile
index 11d1dbea6478..a41f62868e43 100644
--- a/x11-toolkits/libgtksourceviewmm/Makefile
+++ b/x11-toolkits/libgtksourceviewmm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgtksourceviewmm
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index e70fce38c085..530a6c8ef9b7 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libpanelappletmm
 PORTVERSION=	2.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index bf0a0a25682d..4c8f40c5a26e 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libsexy
 PORTVERSION=	0.1.10
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel
 MASTER_SITES=	http://releases.chipx86.com/libsexy/libsexy/
 
diff --git a/x11-toolkits/libsexymm/Makefile b/x11-toolkits/libsexymm/Makefile
index f6bee10602ba..b9a913388668 100644
--- a/x11-toolkits/libsexymm/Makefile
+++ b/x11-toolkits/libsexymm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libsexymm
 PORTVERSION=	0.1.9
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel
 MASTER_SITES=	http://releases.chipx86.com/libsexy/libsexymm/
 
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index f62d5bb9827f..a1e01d29ee0e 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libwnck
 PORTVERSION=	2.18.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 5e591b4d3710..2964ad3b42b3 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -96,63 +96,25 @@ share/locale/zh_HK/LC_MESSAGES/libwnck.mo
 share/locale/zh_TW/LC_MESSAGES/libwnck.mo
 @dirrm include/libwnck-1.0/libwnck
 @dirrm include/libwnck-1.0
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 8d43a8e0d8d5..0bf6a16ce9a4 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libxfce4gui
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DISTNAME=	libxfcegui4-${PORTVERSION}
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index c988964714bf..246e948c1aad 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libzvt
 PORTVERSION=	2.0.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
diff --git a/x11-toolkits/mesgui/Makefile b/x11-toolkits/mesgui/Makefile
index a4d3cd2d2cee..8bd0f0dc678a 100644
--- a/x11-toolkits/mesgui/Makefile
+++ b/x11-toolkits/mesgui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mesgui
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index 9a9b3399465c..2d178d3e0fbd 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	movingmotif
 PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile
index 4fdd3a6fd9f4..83bbb80129b5 100644
--- a/x11-toolkits/mowitz/Makefile
+++ b/x11-toolkits/mowitz/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	Mowitz
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://siag.nu/pub/mowitz/
 
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 0554967b26e3..6f0eb05f5038 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	neXtaw
 PORTVERSION=	0.15.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://siag.nu/pub/neXtaw/
 
diff --git a/x11-toolkits/ocaml-lablgtk/Makefile b/x11-toolkits/ocaml-lablgtk/Makefile
index 5f2530caed05..9b5e5e1c4d53 100644
--- a/x11-toolkits/ocaml-lablgtk/Makefile
+++ b/x11-toolkits/ocaml-lablgtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lablgtk
 PORTVERSION=	1.2.7
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
 		ftp://ftp.inria.fr/lang/caml-light/bazar-ocaml/
diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index 4a0dcbfd3276..b3d4e382b030 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	lablgtk2
 PORTVERSION=	2.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/ \
 		http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 5daa8d6559fb..0fb09258bc86 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	open-motif
 PORTVERSION=	2.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.motifzone.com/%SUBDIR%/                              
 MASTER_SITE_SUBDIR=	om${PORTVERSION}/src
@@ -25,6 +25,7 @@ USE_AUTOTOOLS=	libtool:15
 CONFLICTS=	lesstif-*
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_XORG=	xbitmaps
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI"
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/otk/Makefile b/x11-toolkits/otk/Makefile
index 8ebd04f49ac9..d486c350aa1d 100644
--- a/x11-toolkits/otk/Makefile
+++ b/x11-toolkits/otk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	otk
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_lib_${PORTVERSION}
diff --git a/x11-toolkits/p5-GdkImlib/Makefile b/x11-toolkits/p5-GdkImlib/Makefile
index 7666c5fc5641..3d045425e6d9 100644
--- a/x11-toolkits/p5-GdkImlib/Makefile
+++ b/x11-toolkits/p5-GdkImlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	GdkImlib
 PORTVERSION=	0.7009
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Gtk
diff --git a/x11-toolkits/p5-GdkPixbuf/Makefile b/x11-toolkits/p5-GdkPixbuf/Makefile
index 4d53dc8be898..949173479107 100644
--- a/x11-toolkits/p5-GdkPixbuf/Makefile
+++ b/x11-toolkits/p5-GdkPixbuf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	GdkPixbuf
 PORTVERSION=	0.7009
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits lang perl5 gnome
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Gtk
diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile
index 35021a899e05..0e67b753c87d 100644
--- a/x11-toolkits/p5-Glade2/Makefile
+++ b/x11-toolkits/p5-Glade2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Glade
 PORTVERSION=	1.006
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/T/TS/TSCH/
diff --git a/x11-toolkits/p5-Gnome/Makefile b/x11-toolkits/p5-Gnome/Makefile
index 991b574d934e..7a781a7c576c 100644
--- a/x11-toolkits/p5-Gnome/Makefile
+++ b/x11-toolkits/p5-Gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Gnome
 PORTVERSION=	0.7009
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Gtk
diff --git a/x11-toolkits/p5-Gnome2-Canvas/Makefile b/x11-toolkits/p5-Gnome2-Canvas/Makefile
index 2078d75c6acc..060172832d5b 100644
--- a/x11-toolkits/p5-Gnome2-Canvas/Makefile
+++ b/x11-toolkits/p5-Gnome2-Canvas/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	Gnome2-Canvas
 PORTVERSION=	1.002
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnome perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
 		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
diff --git a/x11-toolkits/p5-Gnome2-VFS/Makefile b/x11-toolkits/p5-Gnome2-VFS/Makefile
index ab0fd07843f3..90778479354c 100644
--- a/x11-toolkits/p5-Gnome2-VFS/Makefile
+++ b/x11-toolkits/p5-Gnome2-VFS/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	Gnome2-VFS
 PORTVERSION=	1.001
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits gnome perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	gtk2-perl
diff --git a/x11-toolkits/p5-Gnome2/Makefile b/x11-toolkits/p5-Gnome2/Makefile
index f8722206d560..135a77700ec4 100644
--- a/x11-toolkits/p5-Gnome2/Makefile
+++ b/x11-toolkits/p5-Gnome2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	Gnome2
 PORTVERSION=	1.041
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtk2-perl
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index c57e3540e4cc..beef0803d26c 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Gtk
 PORTVERSION=	0.7009
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Gtk
diff --git a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
index 89ab08186820..1c9625fdd7ba 100644
--- a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Gtk2-Ex-FormFactory
 PORTVERSION=	0.65
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
index 574cc018f5cc..bd739e9c213c 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Gtk2-Ex-PodViewer
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
index d2f1c42e4df9..ba29e9d4a3df 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Gtk2-Ex-Simple-List
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2-Html2/Makefile b/x11-toolkits/p5-Gtk2-Html2/Makefile
index 7b068b0f2857..7870a2829e8e 100644
--- a/x11-toolkits/p5-Gtk2-Html2/Makefile
+++ b/x11-toolkits/p5-Gtk2-Html2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	Gtk2-Html2
 PORTVERSION=	0.03
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	http://asofyet.org/muppet/software/gtk2-perl/
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
index 49ef3e235752..4f5596868b32 100644
--- a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
+++ b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Gtk2-TrayIcon
 PORTVERSION=	0.03
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/M/ML/MLEHMANN/
diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile
index d3f1bb81163a..16d798b4cf76 100644
--- a/x11-toolkits/p5-Gtk2/Makefile
+++ b/x11-toolkits/p5-Gtk2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Gtk2
 PORTVERSION=	1.144
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang perl5
 MASTER_SITES=	CPAN SF/gtk2-perl
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-GtkXmHTML/Makefile b/x11-toolkits/p5-GtkXmHTML/Makefile
index e1bb83ba863b..d898289c9ed7 100644
--- a/x11-toolkits/p5-GtkXmHTML/Makefile
+++ b/x11-toolkits/p5-GtkXmHTML/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	GtkXmHTML
 PORTVERSION=	0.7009
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Gtk
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index d93ca2caf321..25b11c0e56e6 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Prima
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5 graphics
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=Prima
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index 22a4bbc59cc5..c309c93a76b5 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tcl-Tk
 PORTVERSION=	0.92
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang perl5 tk82
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tcl
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index 5f03794bb8d9..78915e38e7cd 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	TclTk
 PORTVERSION=	0.75
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang perl5 tk82
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tcl
diff --git a/x11-toolkits/p5-Tk-Autoscroll/Makefile b/x11-toolkits/p5-Tk-Autoscroll/Makefile
index 3fd2a55e8fda..86679a0ea80d 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/Makefile
+++ b/x11-toolkits/p5-Tk-Autoscroll/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-Autoscroll
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/x11-toolkits/p5-Tk-ColourChooser/Makefile b/x11-toolkits/p5-Tk-ColourChooser/Makefile
index 99b04874f770..ec8b0d89b41a 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/Makefile
+++ b/x11-toolkits/p5-Tk-ColourChooser/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-ColourChooser
 PORTVERSION=	1.50
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/x11-toolkits/p5-Tk-Contrib/Makefile b/x11-toolkits/p5-Tk-Contrib/Makefile
index 693c2c7c8964..e1fabfa09a77 100644
--- a/x11-toolkits/p5-Tk-Contrib/Makefile
+++ b/x11-toolkits/p5-Tk-Contrib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-Contrib
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-DKW/Makefile b/x11-toolkits/p5-Tk-DKW/Makefile
index eea3320787d7..077518db4c72 100644
--- a/x11-toolkits/p5-Tk-DKW/Makefile
+++ b/x11-toolkits/p5-Tk-DKW/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-DKW
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Date/Makefile b/x11-toolkits/p5-Tk-Date/Makefile
index 18878bd7ed8f..b180807eabd0 100644
--- a/x11-toolkits/p5-Tk-Date/Makefile
+++ b/x11-toolkits/p5-Tk-Date/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-Date
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
index a4b70df6e43c..166b5282bb42 100644
--- a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
+++ b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-DynaTabFrame
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-Enscript/Makefile b/x11-toolkits/p5-Tk-Enscript/Makefile
index 60d4fcbdb873..23b65e4788b8 100644
--- a/x11-toolkits/p5-Tk-Enscript/Makefile
+++ b/x11-toolkits/p5-Tk-Enscript/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-Enscript
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/x11-toolkits/p5-Tk-FileDialog/Makefile b/x11-toolkits/p5-Tk-FileDialog/Makefile
index 4b2a72d64602..00ce3fa4addf 100644
--- a/x11-toolkits/p5-Tk-FileDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FileDialog/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	Tk-FileDialog
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/x11-toolkits/p5-Tk-FontDialog/Makefile b/x11-toolkits/p5-Tk-FontDialog/Makefile
index 75949ac416b7..6124e2f95172 100644
--- a/x11-toolkits/p5-Tk-FontDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FontDialog/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-FontDialog
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile
index 8daaf7ba429c..f8a726df0856 100644
--- a/x11-toolkits/p5-Tk-GBARR/Makefile
+++ b/x11-toolkits/p5-Tk-GBARR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-GBARR
 PORTVERSION=	2.07
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile
index 9dfed2fc8bca..10471a345ad2 100644
--- a/x11-toolkits/p5-Tk-Getopt/Makefile
+++ b/x11-toolkits/p5-Tk-Getopt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-Getopt
 PORTVERSION=	0.49
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/x11-toolkits/p5-Tk-HistEntry/Makefile b/x11-toolkits/p5-Tk-HistEntry/Makefile
index 628525886ef2..4c8934634a5c 100644
--- a/x11-toolkits/p5-Tk-HistEntry/Makefile
+++ b/x11-toolkits/p5-Tk-HistEntry/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-HistEntry
 PORTVERSION=	0.43
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/x11-toolkits/p5-Tk-JComboBox/Makefile b/x11-toolkits/p5-Tk-JComboBox/Makefile
index 883cfa2082d1..8844ae2984b5 100644
--- a/x11-toolkits/p5-Tk-JComboBox/Makefile
+++ b/x11-toolkits/p5-Tk-JComboBox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-JComboBox
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Tk-ResizeButton/Makefile b/x11-toolkits/p5-Tk-ResizeButton/Makefile
index f5dba40f5f2d..e5de1613ad1f 100644
--- a/x11-toolkits/p5-Tk-ResizeButton/Makefile
+++ b/x11-toolkits/p5-Tk-ResizeButton/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		Tk-ResizeButton
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=		x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=		Tk
diff --git a/x11-toolkits/p5-Tk-Splashscreen/Makefile b/x11-toolkits/p5-Tk-Splashscreen/Makefile
index 2a18ad2d88a9..22d8510c4107 100644
--- a/x11-toolkits/p5-Tk-Splashscreen/Makefile
+++ b/x11-toolkits/p5-Tk-Splashscreen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-Splashscreen
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile
index 01ac08370df6..bd761242fbb3 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/Makefile
+++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk-TableMatrix
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 6cf365874fd5..2fa59f832943 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Tk
 PORTVERSION=	804.027
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk84 perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
diff --git a/x11-toolkits/p5-qt/Makefile b/x11-toolkits/p5-qt/Makefile
index 980e5c74c4b1..5a9a4e4bea7e 100644
--- a/x11-toolkits/p5-qt/Makefile
+++ b/x11-toolkits/p5-qt/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	3.008
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
 		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 42945465e25c..07b0aa4fc601 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.16.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 		ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
@@ -34,7 +34,6 @@ USE_GNOME=	gnomehack glib20 ltverhack referencehack
 CONFIGURE_ARGS=	--with-qt=no \
 		--with-html-dir=${PREFIX}/share/doc \
 		--enable-static
-PKGINSTALL=	${WRKDIR}/pkg-install
 # Hmm.. tough one.  Found this one when I had graphics/hdf installed
 # (which installs glist.h) which is picked up before the glib-2.0
 # stuff, with Bad Results[tm]
@@ -63,13 +62,6 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 PLIST_SUB+=		X11=""
 .endif
 
-post-install:
-	@${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \
-		> ${PKGINSTALL}
-.if !defined(PACKAGE_BUILDING)
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-
 .include <bsd.port.mk>
 
 .endif
diff --git a/x11-toolkits/pango/files/pkg-install.in b/x11-toolkits/pango/files/pkg-install.in
deleted file mode 100644
index 2eefcdfcd015..000000000000
--- a/x11-toolkits/pango/files/pkg-install.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%X11BASE%%/bin
-export PATH
-
-case $2 in
-POST-INSTALL)
-    echo "Running fc-cache to build fontconfig cache..."
-    fc-cache -f -v
-    ;;
-esac
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index 6b6219208e8a..33971a7202cd 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pangoxsl
 PORTVERSION=	1.6.0.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pangopdf
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 35076b06a591..523cb0199912 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	paragui
 PORTVERSION=	1.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index 242ae31f6c40..2707166249dd 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	paragui
 PORTVERSION=	1.0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/x11-toolkits/phat/Makefile b/x11-toolkits/phat/Makefile
index 7d6f0261e4f3..69a1f361309b 100644
--- a/x11-toolkits/phat/Makefile
+++ b/x11-toolkits/phat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phat
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	phat
diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile
index 9c58a59a5679..14ac79ec00e0 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php-gtk
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtk.php.net/distributions/ \
 		http://document-root.de/mirror/php-gtk/
diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile
index 9c58a59a5679..14ac79ec00e0 100644
--- a/x11-toolkits/php-gtk2/Makefile
+++ b/x11-toolkits/php-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php-gtk
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtk.php.net/distributions/ \
 		http://document-root.de/mirror/php-gtk/
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index 46e65288726d..e3c49496f594 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	plib
 PORTVERSION=	1.8.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://plib.sourceforge.net/dist/
 
diff --git a/x11-toolkits/pmw/Makefile b/x11-toolkits/pmw/Makefile
index fd1a56af0a71..b6a922a26e48 100644
--- a/x11-toolkits/pmw/Makefile
+++ b/x11-toolkits/pmw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pmw
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index fd1a56af0a71..b6a922a26e48 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pmw
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-SciParam/Makefile b/x11-toolkits/py-SciParam/Makefile
index 8cc679c7b1ee..bcd1f986ec03 100644
--- a/x11-toolkits/py-SciParam/Makefile
+++ b/x11-toolkits/py-SciParam/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	SciParam
 PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.intevation.de/great-er/sciparam/ \
 		http://ftp.intevation.de/great-er/sciparam/ \
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index 5158e2de6156..4ee28433ef7e 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fltk
 PORTVERSION=	1.1.b3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pyfltk
diff --git a/x11-toolkits/py-fox/Makefile b/x11-toolkits/py-fox/Makefile
index 8e8ffd95b7f0..83e7fb47e079 100644
--- a/x11-toolkits/py-fox/Makefile
+++ b/x11-toolkits/py-fox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fxpy
@@ -21,6 +22,7 @@ LIB_DEPENDS=	FOX-1.0:${PORTSDIR}/x11-toolkits/fox10
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_XLIB=	yes
+USE_GL=		yes
 
 WRKSRC=		${WRKDIR}/FXPy-${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 331008880b6f..afe66097e2af 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome
 PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index b9ecb53d9259..efd2c0b6052c 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome
 PORTVERSION=	2.14.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 089a00f73d94..f5248ed9de44 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	py-gnome
 PORTVERSION=	1.4.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python/1.4
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index ddf366c5fa7d..9b339eef4f7b 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome
 PORTVERSION=	2.18.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 1972374f85dd..45b4eb4a8ab7 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	py-gtk
 PORTVERSION=	0.6.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python/1.4
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 28aa9cf6f9d9..d3333bc0f21c 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	2.10.4
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gtkextra/Makefile b/x11-toolkits/py-gtkextra/Makefile
index 449070595920..cca363ce897a 100644
--- a/x11-toolkits/py-gtkextra/Makefile
+++ b/x11-toolkits/py-gtkextra/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtkextra
 PORTVERSION=	0.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	python-${PORTNAME}
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index d738ae2a6a8c..96893f7cf345 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkglext
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkglext
diff --git a/x11-toolkits/py-gtkscintilla/Makefile b/x11-toolkits/py-gtkscintilla/Makefile
index f3d223429171..576ddbb22818 100644
--- a/x11-toolkits/py-gtkscintilla/Makefile
+++ b/x11-toolkits/py-gtkscintilla/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	py-gtkscintilla
 PORTVERSION=	0.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	moleskine
diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile
index 327c4b158636..50065ba42e85 100644
--- a/x11-toolkits/py-gui/Makefile
+++ b/x11-toolkits/py-gui/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gui
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://www.cosc.canterbury.ac.nz/~greg/python_gui/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-kde/Makefile b/x11-toolkits/py-kde/Makefile
index 1f98ad73c6aa..48e91115a57f 100644
--- a/x11-toolkits/py-kde/Makefile
+++ b/x11-toolkits/py-kde/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kde
 PORTVERSION=	3.16.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits python kde
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyKDE3/ \
diff --git a/x11-toolkits/py-kiwi/Makefile b/x11-toolkits/py-kiwi/Makefile
index 4dc2a03448fc..2d31e73a05da 100644
--- a/x11-toolkits/py-kiwi/Makefile
+++ b/x11-toolkits/py-kiwi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kiwi
 PORTVERSION=	1.9.14
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://download.gnome.org/sources/${PORTNAME}/1.9/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/x11-toolkits/py-pyxfce/Makefile b/x11-toolkits/py-pyxfce/Makefile
index 5f7ca7c7f2ec..133d6d37bd04 100644
--- a/x11-toolkits/py-pyxfce/Makefile
+++ b/x11-toolkits/py-pyxfce/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pyxfce
 PORTVERSION=	4.4.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python xfce
 MASTER_SITES=	http://pyxfce.xfce.org/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index 68c6179aad95..3f941d465d10 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	3.17.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/ \
diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile
index cc9902372879..1d448c3c4a7d 100644
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gui
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index e20911046343..3c8ae075be36 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sexy
 PORTVERSION=	0.1.9
+PORTREVISION=	1
 DISTVERSIONPREFIX=	python-
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://releases.chipx86.com/libsexy/sexy-python/ CENKES
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
index b825488c054c..2016d990a6d8 100644
--- a/x11-toolkits/py-tkinter/Makefile
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkinter
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/py-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index 172b0020e86e..176e99fb4199 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tktreectrl
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	http://klappnase.zexxo.net/TkinterTreectrl/ CENKES
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile
index eb09aa46be14..13cac0c51f9a 100644
--- a/x11-toolkits/py-vte/Makefile
+++ b/x11-toolkits/py-vte/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.1 2007/02/18 19:12:57 mezz Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/x11-toolkits/py-wax/Makefile b/x11-toolkits/py-wax/Makefile
index c735f890f638..11406b765764 100644
--- a/x11-toolkits/py-wax/Makefile
+++ b/x11-toolkits/py-wax/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wax
 PORTVERSION=	0.3.33
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}gui
diff --git a/x11-toolkits/py-wmdockapps/Makefile b/x11-toolkits/py-wmdockapps/Makefile
index 344412219e99..ac86714bd9ef 100644
--- a/x11-toolkits/py-wmdockapps/Makefile
+++ b/x11-toolkits/py-wmdockapps/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wmgeneral
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python windowmaker
 MASTER_SITES=	http://errl.info/pywmdockapps/downloads/current/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-wmgeneral/Makefile b/x11-toolkits/py-wmgeneral/Makefile
index 344412219e99..ac86714bd9ef 100644
--- a/x11-toolkits/py-wmgeneral/Makefile
+++ b/x11-toolkits/py-wmgeneral/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wmgeneral
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python windowmaker
 MASTER_SITES=	http://errl.info/pywmdockapps/downloads/current/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index fce2ab766269..6b5e99b3849c 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wxPython
 PORTVERSION=	2.4.2.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
diff --git a/x11-toolkits/py-wxPython26-common/Makefile b/x11-toolkits/py-wxPython26-common/Makefile
index 5b52f9ac2419..5e55ce89a59a 100644
--- a/x11-toolkits/py-wxPython26-common/Makefile
+++ b/x11-toolkits/py-wxPython26-common/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 
 WITH_COMMON_ONLY=	yes
 
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index f8e88766ff82..47810884e917 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wxPython
 PORTVERSION=	2.6.3.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
diff --git a/x11-toolkits/py-wxPython28-common/Makefile b/x11-toolkits/py-wxPython28-common/Makefile
index 5b52f9ac2419..5e55ce89a59a 100644
--- a/x11-toolkits/py-wxPython28-common/Makefile
+++ b/x11-toolkits/py-wxPython28-common/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 
 WITH_COMMON_ONLY=	yes
 
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index f8e88766ff82..47810884e917 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wxPython
 PORTVERSION=	2.6.3.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
diff --git a/x11-toolkits/qscintilla/Makefile b/x11-toolkits/qscintilla/Makefile
index a1b1e8163b38..20a69b57ecde 100644
--- a/x11-toolkits/qscintilla/Makefile
+++ b/x11-toolkits/qscintilla/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	qscintilla
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/QScintilla1/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index f2ba8980b880..adb96d72bf9b 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	3.3.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	x11-toolkits ipv6
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
@@ -56,7 +56,8 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
 	--exclude '${DISTNAME}/examples' --exclude '${DISTNAME}/tutorial' \
 	--exclude '${DISTNAME}/extensions/nsplugin/src/[^q]*' \
 	--exclude '${DISTNAME}/include/jri*' \
-	--exclude '${DISTNAME}/include/np*'
+	--exclude '${DISTNAME}/include/np*' \
+	--exclude '${DISTNAME}/doc/html/qmake*'
 
 OPTIONS=	CUPS "Enable CUPS support" on \
 		KDE_PATCHES "Apply KDE patches" off \
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 791dcb01a324..bbfe11057c0e 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gui
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/x11-toolkits/qtpixmap/Makefile b/x11-toolkits/qtpixmap/Makefile
index 9fb1922c3710..5bd8ae32c9d9 100644
--- a/x11-toolkits/qtpixmap/Makefile
+++ b/x11-toolkits/qtpixmap/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qtpixmap
 PORTVERSION=	0.28
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.cpdrummond.freeuk.com/
 DISTNAME=	QtPixmap-${PORTVERSION}
diff --git a/x11-toolkits/qwt-devel/Makefile b/x11-toolkits/qwt-devel/Makefile
index e2a2a44feea9..25d6a6e59710 100644
--- a/x11-toolkits/qwt-devel/Makefile
+++ b/x11-toolkits/qwt-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qwt
 PORTVERSION=	5.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
diff --git a/x11-toolkits/qwt/Makefile b/x11-toolkits/qwt/Makefile
index f700047ee033..d2e913ce6b21 100644
--- a/x11-toolkits/qwt/Makefile
+++ b/x11-toolkits/qwt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qwt
 PORTVERSION=	4.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=qwt
diff --git a/x11-toolkits/qwt4/Makefile b/x11-toolkits/qwt4/Makefile
index f700047ee033..d2e913ce6b21 100644
--- a/x11-toolkits/qwt4/Makefile
+++ b/x11-toolkits/qwt4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qwt
 PORTVERSION=	4.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=qwt
diff --git a/x11-toolkits/qwt5/Makefile b/x11-toolkits/qwt5/Makefile
index e2a2a44feea9..25d6a6e59710 100644
--- a/x11-toolkits/qwt5/Makefile
+++ b/x11-toolkits/qwt5/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qwt
 PORTVERSION=	5.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index e2a2a44feea9..25d6a6e59710 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qwt
 PORTVERSION=	5.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
diff --git a/x11-toolkits/renaissance/Makefile b/x11-toolkits/renaissance/Makefile
index 9b453341978c..c91397aa3459 100644
--- a/x11-toolkits/renaissance/Makefile
+++ b/x11-toolkits/renaissance/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	renaissance
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	http://www.gnustep.it/Renaissance/ \
 		${MASTER_SITE_GNUSTEP_CH}
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index 54715fef16ae..85cad59fdb3a 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rep-gtk
 PORTVERSION=	0.15
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/rep-gtk/0.15
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 312bc4990cb7..c8072b97e241 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rep-gtk2
 PORTVERSION=	0.18
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/ruby-fox10/Makefile b/x11-toolkits/ruby-fox10/Makefile
index db5fb0ebba1d..e9a0e3f20f13 100644
--- a/x11-toolkits/ruby-fox10/Makefile
+++ b/x11-toolkits/ruby-fox10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.0.29
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fxruby
diff --git a/x11-toolkits/ruby-fox12/Makefile b/x11-toolkits/ruby-fox12/Makefile
index 1868a4102aef..afc8e13b38cb 100644
--- a/x11-toolkits/ruby-fox12/Makefile
+++ b/x11-toolkits/ruby-fox12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	fxruby
diff --git a/x11-toolkits/ruby-gnomeprintui/Makefile b/x11-toolkits/ruby-gnomeprintui/Makefile
index b8dda18c98ab..3a8f3b73465f 100644
--- a/x11-toolkits/ruby-gnomeprintui/Makefile
+++ b/x11-toolkits/ruby-gnomeprintui/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnomeprintui
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index aa6fd4895be3..74714f8c824c 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 7f0900605f35..5729c673b753 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-gtkglext/Makefile b/x11-toolkits/ruby-gtkglext/Makefile
index 1fc3956d17ce..f4b182ef30ac 100644
--- a/x11-toolkits/ruby-gtkglext/Makefile
+++ b/x11-toolkits/ruby-gtkglext/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtkglext
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-gtksourceview/Makefile b/x11-toolkits/ruby-gtksourceview/Makefile
index 88ea0b39862e..f507f252acae 100644
--- a/x11-toolkits/ruby-gtksourceview/Makefile
+++ b/x11-toolkits/ruby-gtksourceview/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtksourceview
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-panelapplet/Makefile b/x11-toolkits/ruby-panelapplet/Makefile
index 7d7b9a8c8877..89340d1c0981 100644
--- a/x11-toolkits/ruby-panelapplet/Makefile
+++ b/x11-toolkits/ruby-panelapplet/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	panelapplet
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-pango/Makefile b/x11-toolkits/ruby-pango/Makefile
index 23ef63c69455..2ade70770e1d 100644
--- a/x11-toolkits/ruby-pango/Makefile
+++ b/x11-toolkits/ruby-pango/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index a8edaf009a14..d6e2b1a34382 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	${RUBY_PORTVERSION}
+PORTREVISION=	1
 PORTREVISION=	${RUBY_PORTREVISION}
 PORTEPOCH=	1
 CATEGORIES+=	x11-toolkits ruby tk${TK_VERSION:C/[^0-9]//g} tcl${TK_VERSION:C/[^0-9]//g}
diff --git a/x11-toolkits/ruby-wx/Makefile b/x11-toolkits/ruby-wx/Makefile
index 2badcf3ee8b4..b4ab3a6b20ca 100644
--- a/x11-toolkits/ruby-wx/Makefile
+++ b/x11-toolkits/ruby-wx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wx
 PORTVERSION=	0.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}ruby
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index f7d37e255215..9bb6278ebed8 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scintilla
 PORTVERSION=	1.73
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
diff --git a/x11-toolkits/scx/Makefile b/x11-toolkits/scx/Makefile
index d4fe0e991125..546b6ab6ffe1 100644
--- a/x11-toolkits/scx/Makefile
+++ b/x11-toolkits/scx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scx
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits scheme
 MASTER_SITES=	ftp://ftp.scsh.net/pub/scsh/packages/scx/
 
diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile
index 21aeea432c93..4aa83e216115 100644
--- a/x11-toolkits/sdl_gui/Makefile
+++ b/x11-toolkits/sdl_gui/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdl_gui
 PORTVERSION=	0.10.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.newimage.com/~rhk/SDL_gui/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/x11-toolkits/sdl_pango/Makefile b/x11-toolkits/sdl_pango/Makefile
index 9102a0ab2f45..cdf6caa49633 100644
--- a/x11-toolkits/sdl_pango/Makefile
+++ b/x11-toolkits/sdl_pango/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_pango
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sdlpango
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index 0df7d197d3c2..76299006d4a3 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slingshot
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	SlingShot${PORTVERSION}
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index b14eeefa0e3a..849551f2a8e6 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	SoQt
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.coin3d.org/coin/src/all/ \
 		ftp://ftp.coin3d.org/pub/coin/src/all/
diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile
index 6bfd90e422c2..dee3c82bd632 100644
--- a/x11-toolkits/swt-devel/Makefile
+++ b/x11-toolkits/swt-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	swt-devel
 PORTVERSION=	3.3M6
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel java
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	S-${PORTVERSION}-200703231616
diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
index 893df9207fc8..42f54ce62c35 100644
--- a/x11-toolkits/swt/Makefile
+++ b/x11-toolkits/swt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	swt
 PORTVERSION=	3.2.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel java
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200702121330
diff --git a/x11-toolkits/swt31/Makefile b/x11-toolkits/swt31/Makefile
index cd97ff2f906b..e8b394fd5ac7 100644
--- a/x11-toolkits/swt31/Makefile
+++ b/x11-toolkits/swt31/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	swt
 PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel java
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200509290840
diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile
index ee05999271d8..f0ff2fd7227c 100644
--- a/x11-toolkits/tile/Makefile
+++ b/x11-toolkits/tile/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tile
 PORTVERSION=	0.7.8
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	SF/tktable
 
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 78e7063f1c18..f0dafb9fcb74 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tix
 PORTVERSION=	8.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= tix
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index 187fdafab240..f63b226e404a 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits tk80
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_0
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 2949c0a4ae08..ff921000df0b 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.2.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-toolkits tk82
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_2
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 8e19fbb05d81..0d196cfaa272 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.3.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-toolkits tk83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 84772a68eb81..670a90df406d 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.4.14
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index 9075888f55b5..883946308381 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.5.a.6
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index 9075888f55b5..883946308381 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.5.a.6
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
diff --git a/x11-toolkits/tkdnd/Makefile b/x11-toolkits/tkdnd/Makefile
index 2fb4e0d48b26..bba2d35c01df 100644
--- a/x11-toolkits/tkdnd/Makefile
+++ b/x11-toolkits/tkdnd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkdnd
 PORTVERSION=	1.0
+PORTREVISION=	1
 DISTVERSION=	1.0.20040304
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	CENKES
diff --git a/x11-toolkits/tkshape/Makefile b/x11-toolkits/tkshape/Makefile
index 84c825a57e7d..8d4be41fdc49 100644
--- a/x11-toolkits/tkshape/Makefile
+++ b/x11-toolkits/tkshape/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		tkshape
 PORTVERSION=		0.4
+PORTREVISION=	1
 CATEGORIES=		x11-toolkits
 MASTER_SITES=		http://www.cs.man.ac.uk/~fellowsd/tcl/ \
 			http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index a045e77ecc2b..c9ee61bda87c 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkstep
 PORTVERSION=	8.0.4
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk80
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_0
diff --git a/x11-toolkits/tktable/Makefile b/x11-toolkits/tktable/Makefile
index 270861516e7c..2b3f0f890014 100644
--- a/x11-toolkits/tktable/Makefile
+++ b/x11-toolkits/tktable/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tktable
 PORTVERSION=	2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile
index e4ea09c43c26..988e2b7d86ec 100644
--- a/x11-toolkits/tktray/Makefile
+++ b/x11-toolkits/tktray/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tktray
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	http://www.sw4me.com/ CENKES
 DISTNAME=	${TKPKG}
diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile
index 6da8b262a1ac..8dbca91e3684 100644
--- a/x11-toolkits/tktreectrl/Makefile
+++ b/x11-toolkits/tktreectrl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tktreectrl
 PORTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	SF
 
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 8e63916d8cdf..77c46f16bbcf 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	v
 PORTVERSION=	1.90
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vgui
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 301ba7911afa..ce61ff0e732e 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdk
 PORTVERSION=	2.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vdklib
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 837530b8c030..522a76582545 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdkbuilder
 PORTVERSION=	2.4.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/viewkit/Makefile b/x11-toolkits/viewkit/Makefile
index a0019aa81757..25ed9f3ff2e4 100644
--- a/x11-toolkits/viewkit/Makefile
+++ b/x11-toolkits/viewkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	viewkit
 PORTVERSION=	0.00
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.hungry.com/pub/hungry/viewkit/ \
 		${MASTER_SITE_LOCAL}
diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile
index 2251428582b5..42949bb9a62b 100644
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	viewklass
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 751e90abc188..c0ef5cb3aa68 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	vte
 PORTVERSION=	0.16.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 7ef70c1607f8..29e577377645 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -103,65 +103,27 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo
 @dirrm share/gnome/vte
 @dirrm lib/vte
 @dirrm include/vte
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
diff --git a/x11-toolkits/wmapp/Makefile b/x11-toolkits/wmapp/Makefile
index 736a902db3e4..e33d3344714c 100644
--- a/x11-toolkits/wmapp/Makefile
+++ b/x11-toolkits/wmapp/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wmapp
 PORTVERSION=	0.0.4.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits windowmaker
 MASTER_SITES=	http://www.princeton.edu/~kmccarty/downloads/
 
diff --git a/x11-toolkits/wxd/Makefile b/x11-toolkits/wxd/Makefile
index feccae09ce2c..6c716d3c4753 100644
--- a/x11-toolkits/wxd/Makefile
+++ b/x11-toolkits/wxd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wxd
 PORTVERSION=	0.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/wxgtk24-contrib/Makefile b/x11-toolkits/wxgtk24-contrib/Makefile
index aff67f1b4660..ff9b69fe4c09 100644
--- a/x11-toolkits/wxgtk24-contrib/Makefile
+++ b/x11-toolkits/wxgtk24-contrib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	7
+PORTREVISION=	8
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit contributed libraries
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 1b8df0938b19..c464c493b892 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wx
 PORTVERSION=	2.4.2
-PORTREVISION?=	14
+PORTREVISION?=	15
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/wxgtk26-common/Makefile b/x11-toolkits/wxgtk26-common/Makefile
index 7ab1bc1bcae3..4bdb5bcdd269 100644
--- a/x11-toolkits/wxgtk26-common/Makefile
+++ b/x11-toolkits/wxgtk26-common/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	3
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit (common files)
diff --git a/x11-toolkits/wxgtk26-contrib-common/Makefile b/x11-toolkits/wxgtk26-contrib-common/Makefile
index c6a8b454f5fd..7aa113146b8c 100644
--- a/x11-toolkits/wxgtk26-contrib-common/Makefile
+++ b/x11-toolkits/wxgtk26-contrib-common/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit contributed libraries (common files)
diff --git a/x11-toolkits/wxgtk26-contrib/Makefile b/x11-toolkits/wxgtk26-contrib/Makefile
index 8140c66d479d..2b32010ca382 100644
--- a/x11-toolkits/wxgtk26-contrib/Makefile
+++ b/x11-toolkits/wxgtk26-contrib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit contributed libraries
diff --git a/x11-toolkits/wxgtk26-unicode-contrib/Makefile b/x11-toolkits/wxgtk26-unicode-contrib/Makefile
index 441dcac0ca36..e2d5469ec06a 100644
--- a/x11-toolkits/wxgtk26-unicode-contrib/Makefile
+++ b/x11-toolkits/wxgtk26-unicode-contrib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit contributed libraries (Unicode)
diff --git a/x11-toolkits/wxgtk26-unicode/Makefile b/x11-toolkits/wxgtk26-unicode/Makefile
index cb6c798a331a..6675b85cc168 100644
--- a/x11-toolkits/wxgtk26-unicode/Makefile
+++ b/x11-toolkits/wxgtk26-unicode/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit (Unicode)
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index c1fc72213875..9ff1e852b4f2 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -53,7 +53,7 @@ PLIST=		${.CURDIR}/pkg-plist
 WXGTK_FLAVOR?=	gtk2
 
 .if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION=	2
+PORTREVISION=	3
 CONFLICTS=	wxgtk2-contrib-devel-2.5.2*
 .endif
 
diff --git a/x11-toolkits/wxgtk28-unicode/Makefile b/x11-toolkits/wxgtk28-unicode/Makefile
index a5774af887b1..dfb0369bd91a 100644
--- a/x11-toolkits/wxgtk28-unicode/Makefile
+++ b/x11-toolkits/wxgtk28-unicode/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit (Unicode)
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 2ae1b6827a60..9bee9e204f1f 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wx
 PORTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxwindows
@@ -50,7 +51,7 @@ PLIST=		${.CURDIR}/pkg-plist
 WXGTK_FLAVOR?=	gtk2
 
 .if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 
 .if ${WXGTK_FLAVOR} != "gtk2-common"
diff --git a/x11-toolkits/wxgtk29-unicode/Makefile b/x11-toolkits/wxgtk29-unicode/Makefile
index a5774af887b1..dfb0369bd91a 100644
--- a/x11-toolkits/wxgtk29-unicode/Makefile
+++ b/x11-toolkits/wxgtk29-unicode/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit (Unicode)
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index 2ae1b6827a60..9bee9e204f1f 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wx
 PORTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxwindows
@@ -50,7 +51,7 @@ PLIST=		${.CURDIR}/pkg-plist
 WXGTK_FLAVOR?=	gtk2
 
 .if ${WXGTK_FLAVOR} == "gtk2"
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 
 .if ${WXGTK_FLAVOR} != "gtk2-common"
diff --git a/x11-toolkits/wxmozilla/Makefile b/x11-toolkits/wxmozilla/Makefile
index 17de77da8d58..9e7bc3de0bb6 100644
--- a/x11-toolkits/wxmozilla/Makefile
+++ b/x11-toolkits/wxmozilla/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	wxmozilla
 PORTVERSION=	0.5.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index d3d34df9f173..411b29edd2e3 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	Xbae
 PORTVERSION=	4.50.97
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xbae
diff --git a/x11-toolkits/xclasses/Makefile b/x11-toolkits/xclasses/Makefile
index 5e3431eab892..2755c9b09711 100644
--- a/x11-toolkits/xclasses/Makefile
+++ b/x11-toolkits/xclasses/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xclasses
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xcmail
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index 3206c2bca96a..1bc7c2480e3e 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xforms
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
@@ -33,6 +33,7 @@ PATCH_DIST_STRIP=	-p1
 .endif
 
 USE_XPM=	yes
+USE_GL=		gl
 USE_IMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/xg/Makefile b/x11-toolkits/xg/Makefile
index 770ad7c66ac7..377a19629fbe 100644
--- a/x11-toolkits/xg/Makefile
+++ b/x11-toolkits/xg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xg
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://messners.com/code/ \
 		http://www.messners.com/code/
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index b1cfa2eb7c15..d1c52f6106a5 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XmHTML
 PORTVERSION=	1.1.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits www
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index ad20e3e2d89e..74e07751d8f9 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xview-clients
 PORTVERSION=	3.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.efd.lth.se/pub/X11/ \
 		ftp://ftp.uni-heidelberg.de/pub/X11/contrib/libraries/ \
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 95e4e2ce2e23..514b392ad111 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xview
 PORTVERSION=	3.2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.efd.lth.se/pub/X11/ \
 		ftp://ftp.uni-heidelberg.de/pub/X11/contrib/libraries/ \
diff --git a/x11-wm/9wm/Makefile b/x11-wm/9wm/Makefile
index d2a9ca4fc1b1..e6b25ea6c996 100644
--- a/x11-wm/9wm/Makefile
+++ b/x11-wm/9wm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	9wm
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm plan9
 MASTER_SITES=	http://www.isc.org/sources/X/window-managers/
 
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 3187780c9b0d..fbcf2dc4bac2 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -16,16 +16,24 @@
     SUBDIR += bbconf
     SUBDIR += bbkeys
     SUBDIR += bbpager
+    SUBDIR += beryl
+    SUBDIR += beryl-core
+    SUBDIR += beryl-manager
+    SUBDIR += beryl-plugins
+    SUBDIR += beryl-settings
+    SUBDIR += beryl-settings-bindings
     SUBDIR += blackbox
     SUBDIR += blwm
     SUBDIR += boxtools
     SUBDIR += clementine
+    SUBDIR += compiz
     SUBDIR += ctwm
     SUBDIR += devilspie
     SUBDIR += dwm
     SUBDIR += e16utils
     SUBDIR += e17-utils
     SUBDIR += ede
+    SUBDIR += emerald
     SUBDIR += enlightenment
     SUBDIR += enlightenment-devel
     SUBDIR += enlightenment-docs
@@ -53,6 +61,7 @@
     SUBDIR += golem
     SUBDIR += gwm
     SUBDIR += hackedbox
+    SUBDIR += heliodor
     SUBDIR += icewm
     SUBDIR += ion
     SUBDIR += ion-2
@@ -97,6 +106,7 @@
     SUBDIR += transset-df
     SUBDIR += treewm
     SUBDIR += tvtwm
+    SUBDIR += twm
     SUBDIR += ude
     SUBDIR += uwm
     SUBDIR += vtwm
diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile
index da034bd20607..ca44b13a3c05 100644
--- a/x11-wm/aewm/Makefile
+++ b/x11-wm/aewm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aewm
 PORTVERSION=	1.2.7
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.red-bean.com/~decklin/software/aewm/
 
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index e54224ff2fc6..aec0e3d45a51 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	afterstep-i18n
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP:S/$/:afterstep/} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index d7ec03d61833..740931a07ddd 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	afterstep
 PORTVERSION=	2.2.4
+PORTREVISION=	2
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -29,7 +30,7 @@ RUN_DEPENDS=	${X11BASE}/bin/xli:${PORTSDIR}/graphics/xli
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_XPM=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--disable-ascp \
diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist
index 6d3f34891ecc..7d87488e23b4 100644
--- a/x11-wm/afterstep-stable/pkg-plist
+++ b/x11-wm/afterstep-stable/pkg-plist
@@ -1303,6 +1303,7 @@ lib/libAfterStep.a
 %%DATADIR%%/themes/Default
 %%DATADIR%%/wharf
 %%DATADIR%%/winlist
+share/gnome/wm-properties/AfterStep.desktop
 share/xsessions/AfterStep.desktop
 @dirrm share/xsessions
 @dirrm %%DATADIR%%_old
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index c04cd61d138b..1e8389571bf6 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	afterstep
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
 MASTER_SITE_SUBDIR=	archives/${PORTVERSION}
diff --git a/x11-wm/ahwm/Makefile b/x11-wm/ahwm/Makefile
index af51418db887..80a1822e9188 100644
--- a/x11-wm/ahwm/Makefile
+++ b/x11-wm/ahwm/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ahwm
 PORTVERSION=	0.90
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://people.cs.uchicago.edu/~ahiorean/ahwm/
 
diff --git a/x11-wm/alloywm/Makefile b/x11-wm/alloywm/Makefile
index 33fb4fc301fc..c138ffd43236 100644
--- a/x11-wm/alloywm/Makefile
+++ b/x11-wm/alloywm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alloywm
 PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.phatboydesigns.net/devel/
 
diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile
index 7f0b90a164bb..0ec444140e66 100644
--- a/x11-wm/amaterus/Makefile
+++ b/x11-wm/amaterus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amaterus
 PORTVERSION=	0.34.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.taiyaki.org/amaterus/src/
 
diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile
index b0895bf354b9..6c7f3e861900 100644
--- a/x11-wm/amiwm/Makefile
+++ b/x11-wm/amiwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	amiwm
 PORTVERSION=	0.20.p48
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/ \
 		http://www.plig.org/xwinman/archive/amiwm/
diff --git a/x11-wm/badwm/Makefile b/x11-wm/badwm/Makefile
index 869cd057637c..54cb257a42c5 100644
--- a/x11-wm/badwm/Makefile
+++ b/x11-wm/badwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	badwm
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile
index d072dae8642d..2f782e4267d0 100644
--- a/x11-wm/bbconf/Makefile
+++ b/x11-wm/bbconf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bbconf
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index 9b1d554a043e..2321e53964fa 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bbkeys
 PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/bbpager/Makefile b/x11-wm/bbpager/Makefile
index 0bd9b09728da..e7334ee59eb1 100644
--- a/x11-wm/bbpager/Makefile
+++ b/x11-wm/bbpager/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bbpager
 DISTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bbtools
diff --git a/x11-wm/beryl-core/Makefile b/x11-wm/beryl-core/Makefile
new file mode 100644
index 000000000000..89729140662f
--- /dev/null
+++ b/x11-wm/beryl-core/Makefile
@@ -0,0 +1,132 @@
+# New ports collection makefile for:	beryl-core
+# Date created:				Oct 29 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	beryl-core
+PORTVERSION=	0.2.1
+PORTREVISION=	1
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	flz/beryl/
+
+MAINTAINER=	rnoland@2hip.net
+COMMENT=	Beryl Composite/Window Manager
+
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+
+GNU_CONFIGURE=	yes
+USE_GL=		gl
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack glib20 gconf2
+USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--mandir="${PREFIX}/man/" --disable-berylmesa
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+USE_XORG=	xcomposite xfixes xdamage xrandr ice sm xinerama glproto
+
+MAN1=		beryl.1			\
+		beryl-xgl.1		\
+		beryl-settings-dump.1
+
+MAN3=		beryl_settings_context_new.3				\
+		beryl_settings_context_destroy.3			\
+		beryl_settings_context_find_plugin.3			\
+		beryl_settings_context_find_setting.3			\
+		beryl_settings_context_read.3				\
+		beryl_settings_context_write.3				\
+		beryl_settings_context_comp_new.3			\
+		beryl_settings_context_comp_add_plugin.3		\
+		beryl_settings_context_comp_add_option.3		\
+		beryl_settings_context_comp_get_option_value.3		\
+		beryl_settings_context_comp_set_option_value.3		\
+		beryl_settings_send_reload_signal.3			\
+		beryl_setting_reset_to_default.3			\
+		beryl_setting_list_clear.3				\
+		beryl_setting_list_append.3				\
+		beryl_setting_list_length.3				\
+		beryl_setting_list_value_index.3			\
+		beryl_setting_list_value_swap_with.3			\
+		beryl_setting_list_value_move_before.3			\
+		beryl_setting_list_value_remove.3			\
+		beryl_setting_get_primary_value.3			\
+		beryl_setting_value_get_int.3				\
+		beryl_setting_value_get_float.3				\
+		beryl_setting_value_get_bool.3				\
+		beryl_setting_value_get_string.3			\
+		beryl_setting_value_get_keysym.3			\
+		beryl_setting_value_get_keymods.3			\
+		beryl_setting_value_get_button.3			\
+		beryl_setting_value_get_buttonmods.3			\
+		beryl_setting_value_get_bell.3				\
+		beryl_setting_value_get_edgemask.3			\
+		beryl_setting_value_get_key_enabled.3			\
+		beryl_setting_get_int_min.3				\
+		beryl_setting_value_get_button_enabled.3		\
+		beryl_setting_value_get_color.3				\
+		beryl_setting_value_get_value_list.3			\
+		beryl_setting_value_set_int.3				\
+		beryl_setting_value_set_float.3				\
+		beryl_setting_value_set_bool.3				\
+		beryl_setting_value_set_string.3			\
+		beryl_setting_value_set_keysym.3			\
+		beryl_setting_value_set_keymods.3			\
+		beryl_setting_value_set_button.3			\
+		beryl_setting_value_set_buttonmods.3			\
+		beryl_setting_value_set_bell.3				\
+		beryl_setting_value_set_edgemask.3			\
+		beryl_setting_value_set_key_enabled.3			\
+		beryl_setting_value_set_button_enabled.3		\
+		beryl_setting_value_set_color.3				\
+		beryl_setting_get_can_set_key.3				\
+		beryl_setting_get_can_set_button.3			\
+		beryl_setting_get_can_set_edgemask.3			\
+		beryl_setting_get_can_set_bell.3			\
+		beryl_setting_get_allowed_strings.3			\
+		beryl_setting_get_int_max.3				\
+		beryl_setting_get_float_min.3				\
+		beryl_setting_get_float_max.3				\
+		beryl_setting_get_float_precision.3			\
+		beryl_setting_get_list_type.3				\
+		beryl_setting_get_type.3				\
+		beryl_setting_get_short_desc.3				\
+		beryl_setting_get_long_desc.3				\
+		beryl_setting_get_name.3				\
+		beryl_settings_plugin_get_short_desc.3			\
+		beryl_settings_plugin_get_long_desc.3			\
+		beryl_settings_plugin_get_name.3			\
+		beryl_settings_context_get_plugins.3			\
+		beryl_settings_plugin_get_settings.3			\
+		beryl_settings_context_get_private.3			\
+		beryl_settings_plugin_get_private.3			\
+		beryl_setting_get_private.3				\
+		beryl_settings_context_set_private.3			\
+		beryl_settings_plugin_set_private.3			\
+		beryl_setting_set_private.3				\
+		beryl_settings_set_codeset.3
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|.[(]top_srcdir[)]/mesa/lib/libGL.a |-lGL |'	\
+		-e 's|.[(]top_srcdir[)]/mesa/lib/libGL.a|-lGL|'			\
+			${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|\(Libs.*\)|\1 -lGL|' ${WRKSRC}/beryl.pc.in
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|'				\
+			${WRKSRC}/libberylsettings/main.c			\
+			${WRKSRC}/src/plugin.c					\
+			${WRKSRC}/src/display_options.c				\
+			${WRKSRC}/settings-backends/ini.c			\
+			${WRKSRC}/settings-backends/gconf.c
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl-core/distinfo b/x11-wm/beryl-core/distinfo
new file mode 100644
index 000000000000..6dee1bed24cf
--- /dev/null
+++ b/x11-wm/beryl-core/distinfo
@@ -0,0 +1,3 @@
+MD5 (beryl-core-0.2.1.tar.bz2) = 895fe727d4396f6d51ffaf73cf8460d0
+SHA256 (beryl-core-0.2.1.tar.bz2) = f59556762f7a83cb3934c9fa1b02efe4e55f954862c2769ecce5a8b7618ce6b2
+SIZE (beryl-core-0.2.1.tar.bz2) = 470173
diff --git a/x11-wm/beryl-core/pkg-descr b/x11-wm/beryl-core/pkg-descr
new file mode 100644
index 000000000000..30ce69b16cda
--- /dev/null
+++ b/x11-wm/beryl-core/pkg-descr
@@ -0,0 +1,8 @@
+This is the core package that contains all the important files 
+required for running beryl. Including headers and files required 
+for development of beryl-plugins.
+
+WWW: http://www.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/beryl-core/pkg-plist b/x11-wm/beryl-core/pkg-plist
new file mode 100644
index 000000000000..94be8cd8e7a5
--- /dev/null
+++ b/x11-wm/beryl-core/pkg-plist
@@ -0,0 +1,76 @@
+bin/beryl
+include/beryl/beryl.h
+include/beryl/beryl_helpers.h
+include/beryl/beryl_ipcs.h
+include/beryl/beryl-decoration.h
+include/beryl/beryl-settings.h
+include/beryl/beryl-settings-backend.h
+include/beryl/beryl-text.h
+lib/libberyldecoration.so.0
+lib/libberyldecoration.so
+lib/libberyldecoration.la
+lib/libberyldecoration.a
+lib/libberylsettings.so.0
+lib/libberylsettings.so
+lib/libberylsettings.la
+lib/libberylsettings.a
+lib/beryl/backends/libgconf.so
+lib/beryl/backends/libgconf.la
+lib/beryl/backends/libgconf.a
+lib/beryl/backends/libini.so
+lib/beryl/backends/libini.la
+lib/beryl/backends/libini.a
+libdata/pkgconfig/beryl.pc
+libdata/pkgconfig/berylsettings.pc
+libdata/pkgconfig/libberyldecoration.pc
+share/beryl/background.png
+share/beryl/icon.png
+@dirrmtry share/beryl
+@dirrm lib/beryl/backends
+@dirrmtry lib/beryl
+@dirrmtry include/beryl
+share/locale/ca/LC_MESSAGES/beryl-core.mo
+share/locale/cs/LC_MESSAGES/beryl-core.mo
+share/locale/de_DE/LC_MESSAGES/beryl-core.mo
+share/locale/es_AR/LC_MESSAGES/beryl-core.mo
+share/locale/es/LC_MESSAGES/beryl-core.mo
+share/locale/fr/LC_MESSAGES/beryl-core.mo
+share/locale/hu_HU/LC_MESSAGES/beryl-core.mo
+share/locale/it/LC_MESSAGES/beryl-core.mo
+share/locale/ja/LC_MESSAGES/beryl-core.mo
+share/locale/ko/LC_MESSAGES/beryl-core.mo
+share/locale/nl/LC_MESSAGES/beryl-core.mo
+share/locale/pl/LC_MESSAGES/beryl-core.mo
+share/locale/pt_BR/LC_MESSAGES/beryl-core.mo
+share/locale/pt_PT/LC_MESSAGES/beryl-core.mo
+share/locale/ru/LC_MESSAGES/beryl-core.mo
+share/locale/sv_FI/LC_MESSAGES/beryl-core.mo
+share/locale/sv_SE/LC_MESSAGES/beryl-core.mo
+share/locale/uk_UA/LC_MESSAGES/beryl-core.mo
+share/locale/zh_CN/LC_MESSAGES/beryl-core.mo
+share/locale/zh_HK/LC_MESSAGES/beryl-core.mo
+share/locale/zh_TW/LC_MESSAGES/beryl-core.mo
+@dirrmtry share/locale/ca_ES/LC_MESSAGES
+@dirrmtry share/locale/ca_ES
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/hu_HU/LC_MESSAGES
+@dirrmtry share/locale/hu_HU
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
+@dirrmtry share/locale/ru_RU/LC_MESSAGES
+@dirrmtry share/locale/ru_RU
+@dirrmtry share/locale/sv_FI/LC_MESSAGES
+@dirrmtry share/locale/sv_FI
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/uk_UA/LC_MESSAGES
+@dirrmtry share/locale/uk_UA
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
diff --git a/x11-wm/beryl-manager/Makefile b/x11-wm/beryl-manager/Makefile
new file mode 100644
index 000000000000..6c7c6188ae30
--- /dev/null
+++ b/x11-wm/beryl-manager/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	beryl-manager
+# Date created:				Oct 29 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	beryl-manager
+PORTVERSION=	0.2.1
+PORTREVISION=	1
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	flz/beryl/
+
+MAINTAINER=	rnoland@2hip.net
+COMMENT=	Manager for Beryl Composite/Window Manager
+
+GNU_CONFIGURE=		yes
+USE_GETTEXT=		yes
+USE_BZIP2=		yes
+USE_GMAKE=		yes
+USE_PERL5_BUILD=	yes
+USE_GNOME=		glib20 gtk20
+INSTALLS_ICONS=		yes
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--mandir="${PREFIX}/man"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+MAN1=		beryl-manager.1
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl-manager/distinfo b/x11-wm/beryl-manager/distinfo
new file mode 100644
index 000000000000..156e212b3d30
--- /dev/null
+++ b/x11-wm/beryl-manager/distinfo
@@ -0,0 +1,3 @@
+MD5 (beryl-manager-0.2.1.tar.bz2) = cd2b81f5af7a6438d495334d797eb088
+SHA256 (beryl-manager-0.2.1.tar.bz2) = 521439505468b2a00937bc67da8a131b3d8b8750f3df5cac9b2dcfbc2305bb2c
+SIZE (beryl-manager-0.2.1.tar.bz2) = 177433
diff --git a/x11-wm/beryl-manager/pkg-descr b/x11-wm/beryl-manager/pkg-descr
new file mode 100644
index 000000000000..2eadd05c1e4e
--- /dev/null
+++ b/x11-wm/beryl-manager/pkg-descr
@@ -0,0 +1,8 @@
+This is the manager package for beryl. It requires beryl-core 
+beryl-plugins, beryl-settings and your choice of window
+decorator such as emerald or gtk-window-decorator.
+
+WWW: http://www.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/beryl-manager/pkg-plist b/x11-wm/beryl-manager/pkg-plist
new file mode 100644
index 000000000000..e5abd06f2577
--- /dev/null
+++ b/x11-wm/beryl-manager/pkg-plist
@@ -0,0 +1,75 @@
+bin/beryl-manager
+share/applications/beryl-manager.desktop
+share/icons/hicolor/22x22/apps/beryl-manager.png
+share/icons/hicolor/24x24/apps/beryl-manager.png
+share/icons/hicolor/scalable/apps/beryl-manager.svg
+share/locale/ar_AR/LC_MESSAGES/beryl-manager.mo
+share/locale/ca/LC_MESSAGES/beryl-manager.mo
+share/locale/de_DE/LC_MESSAGES/beryl-manager.mo
+share/locale/es_AR/LC_MESSAGES/beryl-manager.mo
+share/locale/es_ES/LC_MESSAGES/beryl-manager.mo
+share/locale/fr/LC_MESSAGES/beryl-manager.mo
+share/locale/gl_ES/LC_MESSAGES/beryl-manager.mo
+share/locale/gl_GL/LC_MESSAGES/beryl-manager.mo
+share/locale/hu_HU/LC_MESSAGES/beryl-manager.mo
+share/locale/it_IT/LC_MESSAGES/beryl-manager.mo
+share/locale/ja/LC_MESSAGES/beryl-manager.mo
+share/locale/ko/LC_MESSAGES/beryl-manager.mo
+share/locale/my_MY/LC_MESSAGES/beryl-manager.mo
+share/locale/nb_NO/LC_MESSAGES/beryl-manager.mo
+share/locale/nl/LC_MESSAGES/beryl-manager.mo
+share/locale/pl/LC_MESSAGES/beryl-manager.mo
+share/locale/pt_BR/LC_MESSAGES/beryl-manager.mo
+share/locale/pt_PT/LC_MESSAGES/beryl-manager.mo
+share/locale/ru_RU/LC_MESSAGES/beryl-manager.mo
+share/locale/sk_SK/LC_MESSAGES/beryl-manager.mo
+share/locale/sv_FI/LC_MESSAGES/beryl-manager.mo
+share/locale/sv_SE/LC_MESSAGES/beryl-manager.mo
+share/locale/tr_TR/LC_MESSAGES/beryl-manager.mo
+share/locale/uk_UA/LC_MESSAGES/beryl-manager.mo
+share/locale/zh_CN/LC_MESSAGES/beryl-manager.mo
+share/locale/zh_HK/LC_MESSAGES/beryl-manager.mo
+share/locale/zh_TW/LC_MESSAGES/beryl-manager.mo
+share/pixmaps/beryl-manager.png
+share/pixmaps/fall-back-wm-select.png
+share/pixmaps/wd-select.png
+share/pixmaps/wm-select.png
+@dirrmtry share/applications
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/uk_UA/LC_MESSAGES
+@dirrmtry share/locale/uk_UA
+@dirrmtry share/locale/tr_TR/LC_MESSAGES
+@dirrmtry share/locale/tr_TR
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/sv_FI/LC_MESSAGES
+@dirrmtry share/locale/sv_FI
+@dirrmtry share/locale/sk_SK/LC_MESSAGES
+@dirrmtry share/locale/sk_SK
+@dirrmtry share/locale/ru_RU/LC_MESSAGES
+@dirrmtry share/locale/ru_RU
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/my_MY/LC_MESSAGES
+@dirrmtry share/locale/my_MY
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/hu_HU/LC_MESSAGES
+@dirrmtry share/locale/hu_HU
+@dirrmtry share/locale/gl_GL/LC_MESSAGES
+@dirrmtry share/locale/gl_GL
+@dirrmtry share/locale/gl_ES/LC_MESSAGES
+@dirrmtry share/locale/gl_ES
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/ca_ES/LC_MESSAGES
+@dirrmtry share/locale/ca_ES
+@dirrmtry share/locale/ar_AR/LC_MESSAGES
+@dirrmtry share/locale/ar_AR
diff --git a/x11-wm/beryl-plugins/Makefile b/x11-wm/beryl-plugins/Makefile
new file mode 100644
index 000000000000..fdfc9e713a16
--- /dev/null
+++ b/x11-wm/beryl-plugins/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for:	beryl-plugins
+# Date created:				Oct 29 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	beryl-plugins
+PORTVERSION=	0.2.1
+PORTREVISION=	1
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	flz/beryl/
+
+MAINTAINER=	rnoland@2hip.net
+COMMENT=	Plugins for Beryl Composite/Window Manager
+
+# XXX - Might depends on graphics/libsvg-cairo instead.
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core \
+		${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+GNU_CONFIGURE=	yes
+USE_GL=		yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	glib20 librsvg2
+USE_XORG=	glproto
+USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl-plugins/distinfo b/x11-wm/beryl-plugins/distinfo
new file mode 100644
index 000000000000..45699fd2e9de
--- /dev/null
+++ b/x11-wm/beryl-plugins/distinfo
@@ -0,0 +1,3 @@
+MD5 (beryl-plugins-0.2.1.tar.bz2) = 3d7d13dd42aea48bba5be7cfe6c7f371
+SHA256 (beryl-plugins-0.2.1.tar.bz2) = 8dcbc086db511695f29951536dfbd6d3b586f56d56027c9df6b0c53664373451
+SIZE (beryl-plugins-0.2.1.tar.bz2) = 2603366
diff --git a/x11-wm/beryl-plugins/files/patch-src-thumbnail.c b/x11-wm/beryl-plugins/files/patch-src-thumbnail.c
new file mode 100644
index 000000000000..bb5591e0eaa7
--- /dev/null
+++ b/x11-wm/beryl-plugins/files/patch-src-thumbnail.c
@@ -0,0 +1,26 @@
+--- src/thumbnail.c.orig	Wed Jan 31 18:22:05 2007
++++ src/thumbnail.c	Sat Feb 10 11:46:43 2007
+@@ -219,7 +219,10 @@
+ 		return NULL;
+ 	}
+ 
+-	retval = strndup (val, nitems);
++	if ((retval = (char *) malloc(nitems + 1)) != NULL) {
++		bzero (retval, nitems + 1);
++		strncpy (retval, val, nitems);
++	}
+ 
+ 	XFree (val);
+ 
+@@ -234,7 +237,10 @@
+ 	text.nitems = 0;
+ 	if (XGetTextProperty (d->display, id, &text, atom))
+ 	{
+-		retval = strndup ((char *)text.value,text.nitems);
++		if ((retval = (char *) malloc(text.nitems + 1)) != NULL) {
++			bzero (retval, text.nitems + 1);
++			strncpy (retval, (char *)text.value, text.nitems);
++		}
+ 		if (text.value)
+ 			XFree (text.value);
+ 	}
diff --git a/x11-wm/beryl-plugins/pkg-descr b/x11-wm/beryl-plugins/pkg-descr
new file mode 100644
index 000000000000..7c8ccf304de0
--- /dev/null
+++ b/x11-wm/beryl-plugins/pkg-descr
@@ -0,0 +1,8 @@
+This is the plugins package for beryl. Requires beryl-core 
+package to run and beryl-core development package if you 
+want to build/hack plugins.
+
+WWW: http://www.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/beryl-plugins/pkg-plist b/x11-wm/beryl-plugins/pkg-plist
new file mode 100644
index 000000000000..b4f28a41e62c
--- /dev/null
+++ b/x11-wm/beryl-plugins/pkg-plist
@@ -0,0 +1,150 @@
+lib/beryl/libcrashhandler.so
+lib/beryl/libcrashhandler.la
+lib/beryl/libcrashhandler.a
+lib/beryl/libdecoration.so
+lib/beryl/libdecoration.la
+lib/beryl/libdecoration.a
+lib/beryl/libwobbly.so
+lib/beryl/libwobbly.la
+lib/beryl/libwobbly.a
+lib/beryl/libanimation.so
+lib/beryl/libanimation.la
+lib/beryl/libanimation.a
+lib/beryl/libfade.so
+lib/beryl/libfade.la
+lib/beryl/libfade.a
+lib/beryl/libcube.so
+lib/beryl/libcube.la
+lib/beryl/libcube.a
+lib/beryl/librotate.so
+lib/beryl/librotate.la
+lib/beryl/lib3d.a
+lib/beryl/librotate.a
+lib/beryl/libinputzoom.so
+lib/beryl/libinputzoom.la
+lib/beryl/libinputzoom.a
+lib/beryl/libscale.so
+lib/beryl/libscale.la
+lib/beryl/libscale.a
+lib/beryl/libmove.so
+lib/beryl/libmove.la
+lib/beryl/libmove.a
+lib/beryl/libresize.so
+lib/beryl/libresize.la
+lib/beryl/libresize.a
+lib/beryl/libplace.so
+lib/beryl/libplace.la
+lib/beryl/libplace.a
+lib/beryl/libswitcher.so
+lib/beryl/libswitcher.la
+lib/beryl/libswitcher.a
+lib/beryl/libtext.so
+lib/beryl/libtext.la
+lib/beryl/libtext.a
+lib/beryl/libwater.so
+lib/beryl/libwater.la
+lib/beryl/libwater.a
+lib/beryl/libtrailfocus2.so
+lib/beryl/libtrailfocus2.la
+lib/beryl/libtrailfocus2.a
+lib/beryl/libneg.so
+lib/beryl/libneg.la
+lib/beryl/libneg.a
+lib/beryl/libput.so
+lib/beryl/libput.la
+lib/beryl/libput.a
+lib/beryl/libscreenshot.so
+lib/beryl/libscreenshot.la
+lib/beryl/libscreenshot.a
+lib/beryl/libstate.so
+lib/beryl/libstate.la
+lib/beryl/libstate.a
+lib/beryl/libblurfx.so
+lib/beryl/libblurfx.la
+lib/beryl/libblurfx.a
+lib/beryl/libsplash.so
+lib/beryl/libsplash.la
+lib/beryl/libsplash.a
+lib/beryl/libbench.so
+lib/beryl/libbench.la
+lib/beryl/libbench.a
+lib/beryl/libclone.so
+lib/beryl/libclone.la
+lib/beryl/libclone.a
+lib/beryl/lib3d.so
+lib/beryl/lib3d.la
+lib/beryl/libsvg.so
+lib/beryl/libsvg.la
+lib/beryl/libsvg.a
+lib/beryl/libpng.so
+lib/beryl/libpng.la
+lib/beryl/libpng.a
+lib/beryl/libopacify.so
+lib/beryl/libopacify.la
+lib/beryl/libopacify.a
+lib/beryl/libthumbnail.so
+lib/beryl/libthumbnail.la
+lib/beryl/libthumbnail.a
+lib/beryl/libsnap.so
+lib/beryl/libsnap.la
+lib/beryl/libsnap.a
+lib/beryl/libfadedesktop.so
+lib/beryl/libfadedesktop.la
+lib/beryl/libfadedesktop.a
+lib/beryl/libimgjpeg.so
+lib/beryl/libimgjpeg.la
+lib/beryl/libimgjpeg.a
+lib/beryl/libannotate.so
+lib/beryl/libannotate.la
+lib/beryl/libannotate.a
+lib/beryl/libdbus.so
+lib/beryl/libdbus.la
+lib/beryl/libdbus.a
+share/locale/es/LC_MESSAGES/beryl-plugins.mo
+share/locale/fr/LC_MESSAGES/beryl-plugins.mo
+share/locale/nl/LC_MESSAGES/beryl-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/beryl-plugins.mo
+share/locale/pt_PT/LC_MESSAGES/beryl-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/beryl-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/beryl-plugins.mo
+share/locale/ca/LC_MESSAGES/beryl-plugins.mo
+share/locale/es_AR/LC_MESSAGES/beryl-plugins.mo
+share/locale/hu_HU/LC_MESSAGES/beryl-plugins.mo
+share/locale/it_IT/LC_MESSAGES/beryl-plugins.mo
+share/locale/ja/LC_MESSAGES/beryl-plugins.mo
+share/locale/ko/LC_MESSAGES/beryl-plugins.mo
+share/locale/nb_NO/LC_MESSAGES/beryl-plugins.mo
+share/locale/pl_PL/LC_MESSAGES/beryl-plugins.mo
+share/locale/sv_FI/LC_MESSAGES/beryl-plugins.mo
+share/locale/sv_SE/LC_MESSAGES/beryl-plugins.mo
+share/locale/zh_HK/LC_MESSAGES/beryl-plugins.mo
+share/beryl/cubecaps.png
+share/beryl/emboss.png
+share/beryl/reflection_default.png
+share/beryl/splash_background.png
+share/beryl/splash_logo.png
+share/beryl/snowflake2.png
+@dirrmtry lib/beryl
+@dirrmtry share/beryl
+@dirrmtry share/locale/ca_ES/LC_MESSAGES
+@dirrmtry share/locale/ca_ES
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/hu_HU/LC_MESSAGES
+@dirrmtry share/locale/hu_HU
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
+@dirrmtry share/locale/sv_FI/LC_MESSAGES
+@dirrmtry share/locale/sv_FI
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
diff --git a/x11-wm/beryl-settings-bindings/Makefile b/x11-wm/beryl-settings-bindings/Makefile
new file mode 100644
index 000000000000..d8e295d0797a
--- /dev/null
+++ b/x11-wm/beryl-settings-bindings/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for:	beryl-settings-bindings
+# Date created:				Jan 29 2007
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	beryl-settings-bindings
+PORTVERSION=	0.2.1
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	flz/beryl/
+
+MAINTAINER=	rnoland@2hip.net
+COMMENT=	Beryl Settings Bindings
+
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/berylsettings.pc:${PORTSDIR}/x11-wm/beryl-core \
+		${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:${PORTSDIR}/devel/pyrex
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_XORG=	x11
+USE_GNOME=	glib20 gnomehack
+USE_PYTHON=	2.4+
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl-settings-bindings/distinfo b/x11-wm/beryl-settings-bindings/distinfo
new file mode 100644
index 000000000000..c248b87633bb
--- /dev/null
+++ b/x11-wm/beryl-settings-bindings/distinfo
@@ -0,0 +1,3 @@
+MD5 (beryl-settings-bindings-0.2.1.tar.bz2) = dc3d35b7d2e53cc5fa6905e26ff194f3
+SHA256 (beryl-settings-bindings-0.2.1.tar.bz2) = 13aefa74cb04bf5a8c2c8c3cb8a62e9d0f7249f66423fa008012326b219e9379
+SIZE (beryl-settings-bindings-0.2.1.tar.bz2) = 240132
diff --git a/x11-wm/beryl-settings-bindings/pkg-descr b/x11-wm/beryl-settings-bindings/pkg-descr
new file mode 100644
index 000000000000..a2508817423c
--- /dev/null
+++ b/x11-wm/beryl-settings-bindings/pkg-descr
@@ -0,0 +1,6 @@
+This is the settings bindings package for beryl.
+
+WWW: http://wiki.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/beryl-settings-bindings/pkg-plist b/x11-wm/beryl-settings-bindings/pkg-plist
new file mode 100644
index 000000000000..491834f99de2
--- /dev/null
+++ b/x11-wm/beryl-settings-bindings/pkg-plist
@@ -0,0 +1,4 @@
+%%PYTHON_SITELIBDIR%%/berylsettings.so
+%%PYTHON_SITELIBDIR%%/berylsettings.la
+%%PYTHON_SITELIBDIR%%/berylsettings.a
+libdata/pkgconfig/beryl-settings-bindings.pc
diff --git a/x11-wm/beryl-settings/Makefile b/x11-wm/beryl-settings/Makefile
new file mode 100644
index 000000000000..621631c4800a
--- /dev/null
+++ b/x11-wm/beryl-settings/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for:	beryl-settings
+# Date created:				Oct 29 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	beryl-settings
+PORTVERSION=	0.2.1
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	flz/beryl/
+
+MAINTAINER=	rnoland@2hip.net
+COMMENT=	Beryl Settings Manager
+
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core \
+		${LOCALBASE}/libdata/pkgconfig/beryl-settings-bindings.pc:${PORTSDIR}/x11-wm/beryl-settings-bindings
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+GNU_CONFIGURE=	yes
+USE_GL=		gl
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	pygtk2
+USE_GETTEXT=	yes
+USE_XORG=	glproto
+USE_PYTHON=	2.4+
+
+INSTALLS_ICONS=	yes
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--mandir="${PREFIX}/man"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl-settings/distinfo b/x11-wm/beryl-settings/distinfo
new file mode 100644
index 000000000000..cea5c05d4e31
--- /dev/null
+++ b/x11-wm/beryl-settings/distinfo
@@ -0,0 +1,3 @@
+MD5 (beryl-settings-0.2.1.tar.bz2) = 5058cf048be41998da8ddbe55c7babb6
+SHA256 (beryl-settings-0.2.1.tar.bz2) = 0601af085c4628af1aa7a6a0dafaedeff04f51475112a7a1e9c4d8508bfeb75b
+SIZE (beryl-settings-0.2.1.tar.bz2) = 355352
diff --git a/x11-wm/beryl-settings/pkg-descr b/x11-wm/beryl-settings/pkg-descr
new file mode 100644
index 000000000000..57b017e775b1
--- /dev/null
+++ b/x11-wm/beryl-settings/pkg-descr
@@ -0,0 +1,7 @@
+This is the settings package for beryl. It requires beryl-core 
+and beryl-plugins so you can configure Beryl.
+
+WWW: http://wiki.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/beryl-settings/pkg-plist b/x11-wm/beryl-settings/pkg-plist
new file mode 100644
index 000000000000..a52299b4628c
--- /dev/null
+++ b/x11-wm/beryl-settings/pkg-plist
@@ -0,0 +1,88 @@
+bin/beryl-settings
+share/applications/beryl-settings.desktop
+share/bsm/images/accessibility.svg
+share/bsm/images/beryl-settings-section-_.svg
+share/bsm/images/beryl-settings-section-3d.svg
+share/bsm/images/beryl-settings-section-addhelper.svg
+share/bsm/images/beryl-settings-section-animation.svg
+share/bsm/images/beryl-settings-section-annotate.svg
+share/bsm/images/beryl-settings-section-bench.svg
+share/bsm/images/beryl-settings-section-blurfx.svg
+share/bsm/images/beryl-settings-section-blur.svg
+share/bsm/images/beryl-settings-section-bs.svg
+share/bsm/images/beryl-settings-section-capture.svg
+share/bsm/images/beryl-settings-section-clone.svg
+share/bsm/images/beryl-settings-section-crashhandler.svg
+share/bsm/images/beryl-settings-section-cube.svg
+share/bsm/images/beryl-settings-section-dbus.svg
+share/bsm/images/beryl-settings-section-debug.svg
+share/bsm/images/beryl-settings-section-decoration.svg
+share/bsm/images/beryl-settings-section-fade.svg
+share/bsm/images/beryl-settings-section-fadeDesktop.svg
+share/bsm/images/beryl-settings-section-group.svg
+share/bsm/images/beryl-settings-section-inputzoom.svg
+share/bsm/images/beryl-settings-section-jpeg.svg
+share/bsm/images/beryl-settings-section-minimize.svg
+share/bsm/images/beryl-settings-section-miniview.svg
+share/bsm/images/beryl-settings-section-move.svg
+share/bsm/images/beryl-settings-section-neg.svg
+share/bsm/images/beryl-settings-section-opacify.svg
+share/bsm/images/beryl-settings-section-place.svg
+share/bsm/images/beryl-settings-section-plane.svg
+share/bsm/images/beryl-settings-section-png.svg
+share/bsm/images/beryl-settings-section-put.svg
+share/bsm/images/beryl-settings-section-reflection.svg
+share/bsm/images/beryl-settings-section-resize.svg
+share/bsm/images/beryl-settings-section-rotate.svg
+share/bsm/images/beryl-settings-section-scale.svg
+share/bsm/images/beryl-settings-section-screenshot.svg
+share/bsm/images/beryl-settings-section-showdesktop.svg
+share/bsm/images/beryl-settings-section-snap.svg
+share/bsm/images/beryl-settings-section-snow.svg
+share/bsm/images/beryl-settings-section-splash.svg
+share/bsm/images/beryl-settings-section-state.svg
+share/bsm/images/beryl-settings-section-svg.svg
+share/bsm/images/beryl-settings-section-switcher.svg
+share/bsm/images/beryl-settings-section-text.svg
+share/bsm/images/beryl-settings-section-thumbnail.svg
+share/bsm/images/beryl-settings-section-tile.svg
+share/bsm/images/beryl-settings-section-trailfocus2.svg
+share/bsm/images/beryl-settings-section-wall.svg
+share/bsm/images/beryl-settings-section-water.svg
+share/bsm/images/beryl-settings-section-wobbly.svg
+share/bsm/images/beryl-settings-section-zoom.svg
+share/bsm/images/desktop.svg
+share/bsm/images/development.svg
+share/bsm/images/extras.svg
+share/bsm/images/general-settings.svg
+share/bsm/images/images.svg
+share/bsm/images/profile-backends.svg
+share/bsm/images/shortcuts.svg
+share/bsm/images/visual-effects.svg
+share/bsm/images/window-management.svg
+share/icons/hicolor/scalable/apps/beryl-settings.svg
+share/locale/ca/LC_MESSAGES/beryl-settings.mo
+share/locale/es/LC_MESSAGES/beryl-settings.mo
+share/locale/es_AR/LC_MESSAGES/beryl-settings.mo
+share/locale/fr/LC_MESSAGES/beryl-settings.mo
+share/locale/hu_HU/LC_MESSAGES/beryl-settings.mo
+share/locale/it/LC_MESSAGES/beryl-settings.mo
+share/locale/ja/LC_MESSAGES/beryl-settings.mo
+share/locale/ko/LC_MESSAGES/beryl-settings.mo
+share/locale/pl/LC_MESSAGES/beryl-settings.mo
+share/locale/pt_PT/LC_MESSAGES/beryl-settings.mo
+share/locale/nl/LC_MESSAGES/beryl-settings.mo
+share/locale/zh_CN/LC_MESSAGES/beryl-settings.mo
+share/locale/zh_HK/LC_MESSAGES/beryl-settings.mo
+share/locale/zh_TW/LC_MESSAGES/beryl-settings.mo
+@dirrm share/bsm/images
+@dirrm share/bsm
+@dirrm share/applications
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
+@dirrm share/locale/nl/LC_MESSAGES
+@dirrm share/locale/nl
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/ca_ES/LC_MESSAGES
+@dirrm share/locale/ca_ES
diff --git a/x11-wm/beryl/Makefile b/x11-wm/beryl/Makefile
new file mode 100644
index 000000000000..c9ecbfc0a8ec
--- /dev/null
+++ b/x11-wm/beryl/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for:    beryl
+# Date created:				Nov 27 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	beryl
+PORTVERSION=	0.2.1
+CATEGORIES=	x11-wm
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
+
+MAINTAINER=	rnoland@2hip.net
+COMMENT=	Beryl Composite/Window Manager meta-port
+
+NO_BUILD=	yes
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/beryl:${PORTSDIR}/x11-wm/beryl-core			\
+		${LOCALBASE}/bin/beryl-manager:${PORTSDIR}/x11-wm/beryl-manager		\
+		${LOCALBASE}/lib/beryl/libanimation.so:${PORTSDIR}/x11-wm/beryl-plugins	\
+		${LOCALBASE}/bin/beryl-settings:${PORTSDIR}/x11-wm/beryl-settings	\
+		${LOCALBASE}/bin/emerald:${PORTSDIR}/x11-wm/emerald			\
+		${LOCALBASE}/share/emerald/themes/Adonis_Mod/theme.screenshot.png:${PORTSDIR}/x11-themes/emerald-themes
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+do-install:	# empty
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl/pkg-descr b/x11-wm/beryl/pkg-descr
new file mode 100644
index 000000000000..496d12bdfe4d
--- /dev/null
+++ b/x11-wm/beryl/pkg-descr
@@ -0,0 +1,7 @@
+This is the beryl meta-port. It installs all beryl components
+(plugins, settings manager, window decorator, themes, ...).
+
+WWW: http://www.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index d707117f1ffb..a4c2cce14de7 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	blackbox
 PORTVERSION=	0.70.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	blackboxwm
diff --git a/x11-wm/blwm/Makefile b/x11-wm/blwm/Makefile
index eea6477ab494..f921330c1582 100644
--- a/x11-wm/blwm/Makefile
+++ b/x11-wm/blwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blwm
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm portuguese
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
@@ -17,30 +17,20 @@ COMMENT=	Portuguese derivative of qvwm, simplified to conserve resources
 
 RUN_DEPENDS=	xsetbg:${PORTSDIR}/x11/xloadimage
 
-USE_AUTOTOOLS=	automake:14 autoconf:213
 USE_PERL5_BUILD=yes
-GNU_CONFIGURE=	yes
 MAN1=		blwm.1x
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
+MAKEFILE=	Makefile.std
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 DOCS=		AUTHORS BUGS COPYING CREDITS FreeBSD INSTALAR LEIAME TODO
 
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-
-do-patch:
+post-patch:
 	${PERL} -pi -e "s:wmsetbg:xsetbg:g ; \
 		s:/usr/local/lib/blwm:${PREFIX}/lib/blwm:g" \
 		${WRKSRC}/rc/*
 
-pre-configure:
-	cd ${WRKSRC} && \
-		${ACLOCAL} && \
-		${AUTOHEADER} && \
-		${AUTOCONF} && \
-		${AUTOMAKE}
-
 pre-install:
 	${ECHO_CMD} bin/blwm > ${PLIST}
 .if !defined(NOPORTDOCS)
diff --git a/x11-wm/blwm/files/patch-Makefile.std b/x11-wm/blwm/files/patch-Makefile.std
new file mode 100644
index 000000000000..93729e357be3
--- /dev/null
+++ b/x11-wm/blwm/files/patch-Makefile.std
@@ -0,0 +1,31 @@
+--- Makefile.std.orig	Thu Mar 22 15:16:18 2007
++++ Makefile.std	Thu Mar 22 15:21:47 2007
+@@ -9,7 +9,7 @@
+ #
+ # Directory of X Window System
+ #
+-XDIR = /usr/X11R6
++XDIR = $(X11BASE)
+ 
+ #
+ # Directory where you install blwm binary
+@@ -127,7 +127,7 @@
+ #
+ INSTALL = install -c
+ #INSTALL = cp
+-MKDIRHIER = mkdirhier
++MKDIRHIER = $(MKDIR)
+ #MKDIRHIER = make -p
+ MV = mv
+ RM = rm -f
+@@ -138,7 +138,9 @@
+ SUBDIRS = src images man rc themes
+ 
+ MAKE = make
+-MFLAGS = BINDIR=$(BINDIR) CONFDIR=$(CONFDIR) MANDIR=$(MANDIR) MANSUFFIX=$(MANSUFFIX) INCDIR=$(INCDIR) LIBDIR=$(LIBDIR) BLWMDIR=$(BLWMDIR) IMGDIR=$(IMGDIR) PATH_RM=$(PATH_RM) CXX="$(CXX)" CXXDEFINES="$(CXXDEFINES)" YACC="$(YACC)" YFLAGS="$(YFLAGS)" LEX="$(LEX)" LEXLIB="$(LEXLIB)" XPG4_LIB=$(XPG4_LIB) IMAGE_LIBS=$(IMAGE_LIBS) INSTALL="$(INSTALL)" MKDIRHIER="$(MKDIRHIER)" MV="$(MV)" RM="$(RM)" -f Makefile.std
++MFLAGS = BINDIR=$(BINDIR) CONFDIR=$(CONFDIR) MANDIR=$(MANDIR) MANSUFFIX=$(MANSUFFIX) INCDIR=$(INCDIR) LIBDIR=$(LIBDIR) BLWMDIR=$(BLWMDIR) IMGDIR=$(IMGDIR) THEMEDIR=$(THEMEDIR) PATH_RM=$(PATH_RM) CXX="$(CXX)" CXXDEFINES="$(CXXDEFINES)" YACC="$(YACC)" YFLAGS="$(YFLAGS)" LEX="$(LEX)" LEXLIB="$(LEXLIB)" XPG4_LIB=$(XPG4_LIB) IMAGE_LIBS=$(IMAGE_LIBS) INSTALL="$(INSTALL)" MKDIRHIER="$(MKDIRHIER)" MV="$(MV)" RM="$(RM)" -f Makefile.std
++
++.PHONY: install
+ 
+ all:
+ 	@for flag in ${MAKEFLAGS} ''; do \
diff --git a/x11-wm/boxtools/Makefile b/x11-wm/boxtools/Makefile
index d4235389447a..7bc9577c8f8e 100644
--- a/x11-wm/boxtools/Makefile
+++ b/x11-wm/boxtools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	boxtools
 PORTVERSION=	0.70.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	blackboxwm
diff --git a/x11-wm/clementine/Makefile b/x11-wm/clementine/Makefile
index cdf7411e7a89..eb008cf03b90 100644
--- a/x11-wm/clementine/Makefile
+++ b/x11-wm/clementine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clementine
 PORTVERSION=	0.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
new file mode 100644
index 000000000000..7f0e5a755582
--- /dev/null
+++ b/x11-wm/compiz/Makefile
@@ -0,0 +1,109 @@
+# New ports collection makefile for:	compiz
+# Date created:				Dec 20 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	compiz
+PORTVERSION=	0.5.0
+#PORTREVISION=	1
+CATEGORIES=	x11-wm
+
+MAINTAINER=	rnoland@2hip.net
+COMMENT=	Compiz Composite/Window Manager
+
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+XORG_CAT=	app
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GL=		glu
+USE_GNOME=	gnomehack gnomeprefix gconf2
+USE_XORG=	xcomposite xfixes xdamage xrandr xrender ice sm xinerama glproto
+USE_LDCONFIG=	yes
+GCONF_SCHEMAS=	compiz.schemas gwd.schemas
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+OPTIONS=	RSVG "Enable librsvg2 support" on \
+		GTK "Enable gtk2 support" on \
+		METACITY "Enable Metacity support" on \
+		GNOME "Enable Gnome support" on \
+		DBUS "Enable DBUS support" on \
+		FUSEFS "Enable fusefs support" off
+
+# No KDE support for now...
+CONFIGURE_ARGS=	--disable-kde
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_RSVG)
+CONFIGURE_ARGS+=	--enable-librsvg
+USE_GNOME+=		librsvg2
+PLIST_SUB+=		RSVG=""
+.else
+CONFIGURE_ARGS+=	--disable-librsvg
+PLIST_SUB+=		RSVG="@comment "
+.endif
+
+.if defined(WITH_METACITY) || defined(WITH_GTK) || defined(WITH_GNOME)
+CONFIGURE_ARGS+=	--enable-gtk
+USE_GNOME+=	 glib20 libwnck
+PLIST_SUB+=	GTK=""
+.else
+CONFIGURE_ARGS+=	--disable-gtk
+PLIST_SUB+=	GTK="@comment "
+.endif
+
+.if defined(WITH_METACITY) || defined(WITH_GNOME)
+CONFIGURE_ARGS+=	--enable-metacity
+USE_GNOME+=	metacity
+.else
+CONFIGURE_ARGS+=	--disable-metacity
+.endif
+
+.if defined(WITH_GNOME)
+CONFIGURE_ARGS+=	--enable-gnome
+USE_GNOME+=	 gnomecontrolcenter2
+WINDOWSETTINGSDATADIR=	\
+		`pkg-config --variable=prefix gnome-window-settings-2.0`
+WINDOWSETTINGSLIBDIR=	\
+		`pkg-config --variable=libdir gnome-window-settings-2.0`
+PLIST_SUB+=	GNOME="" \
+		WINDOWSETTINGSDATADIR="${WINDOWSETTINGSDATADIR}" \
+		WINDOWSETTINGSLIBDIR="${WINDOWSETTINGSLIBDIR}"
+.else
+CONFIGURE_ARGS+=	--disable-gnome
+PLIST_SUB+=	GNOME="@comment "
+.endif
+
+.if defined(WITH_DBUS)
+CONFIGURE_ARGS+=	--enable-dbus
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
+.if defined(WITH_GTK) || defined(WITH_GNOME)
+CONFIGURE_ARGS+=	--enable-dbus-glib
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
+.endif
+PLIST_SUB+=	DBUS=""
+.else
+CONFIGURE_ARGS+=	--disable-dbus --disable-dbus-glib
+PLIST_SUB+=	DBUS="@comment "
+.endif
+
+.if defined(WITH_FUSEFS)
+CONFIGURE_ARGS+=	--enable-fuse
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fuse.pc:${PORTSDIR}/sysutils/fusefs-libs
+PLIST_SUB+=		FUSEFS=""
+.else
+CONFIGURE_ARGS+=	--disable-fuse
+PLIST_SUB+=		FUSEFS="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-wm/compiz/distinfo b/x11-wm/compiz/distinfo
new file mode 100644
index 000000000000..965c0099259d
--- /dev/null
+++ b/x11-wm/compiz/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/compiz-0.5.0.tar.bz2) = 7a35a9f52155b945aa195f826d3d607a
+SHA256 (xorg/app/compiz-0.5.0.tar.bz2) = 4191745d86bec37de4cdc79bf0031afde1d28079eac2e3fc29aed18cd7a2a4e6
+SIZE (xorg/app/compiz-0.5.0.tar.bz2) = 926090
diff --git a/x11-wm/compiz/files/patch-plugins_fuse.c b/x11-wm/compiz/files/patch-plugins_fuse.c
new file mode 100644
index 000000000000..48a0a68b9287
--- /dev/null
+++ b/x11-wm/compiz/files/patch-plugins_fuse.c
@@ -0,0 +1,11 @@
+--- plugins/fuse.c.orig	Mon Apr  2 14:15:28 2007
++++ plugins/fuse.c	Mon May  7 20:07:09 2007
+@@ -28,6 +28,8 @@
+ #include <errno.h>
+ #include <poll.h>
+ #include <signal.h>
++#include <sys/types.h>
++#include <sys/param.h>
+ #include <sys/mount.h>
+ #include <fuse.h>
+ #include <fuse_lowlevel.h>
diff --git a/x11-wm/compiz/pkg-descr b/x11-wm/compiz/pkg-descr
new file mode 100644
index 000000000000..d654cfa1b0e1
--- /dev/null
+++ b/x11-wm/compiz/pkg-descr
@@ -0,0 +1,8 @@
+Compiz is an OpenGL compositing manager that use GLX_EXT_texture_from_pixmap
+for binding redirected top-level windows to texture objects. It has a flexible
+plug-in system and it is designed to run well on most graphics hardware. 
+
+WWW: http://www.go-compiz.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist
new file mode 100644
index 000000000000..866e7bd38ed2
--- /dev/null
+++ b/x11-wm/compiz/pkg-plist
@@ -0,0 +1,166 @@
+@comment $FreeBSD$
+bin/compiz
+%%GTK%%bin/gtk-window-decorator
+include/compiz/compiz.h
+include/compiz/decoration.h
+lib/libdecoration.so.0
+lib/libdecoration.so
+lib/libdecoration.la
+lib/libdecoration.a
+lib/compiz/libgconf.so
+lib/compiz/libgconf.la
+lib/compiz/libgconf.a
+lib/compiz/libdecoration.so
+lib/compiz/libdecoration.la
+lib/compiz/libdecoration.a
+lib/compiz/libwobbly.so
+lib/compiz/libwobbly.la
+lib/compiz/libwobbly.a
+lib/compiz/libfade.so
+lib/compiz/libfade.la
+lib/compiz/libfade.a
+%%FUSEFS%%lib/compiz/libfs.so
+%%FUSEFS%%lib/compiz/libfs.la
+%%FUSEFS%%lib/compiz/libfs.a
+lib/compiz/libminimize.so
+lib/compiz/libminimize.la
+lib/compiz/libminimize.a
+lib/compiz/libcube.so
+lib/compiz/libcube.la
+lib/compiz/libcube.a
+lib/compiz/librotate.so
+lib/compiz/librotate.la
+lib/compiz/librotate.a
+lib/compiz/libzoom.so
+lib/compiz/libzoom.la
+lib/compiz/libzoom.a
+lib/compiz/libscale.so
+lib/compiz/libscale.la
+lib/compiz/libscale.a
+lib/compiz/libmove.so
+lib/compiz/libmove.la
+lib/compiz/libmove.a
+lib/compiz/libresize.so
+lib/compiz/libresize.la
+lib/compiz/libresize.a
+lib/compiz/libplace.so
+lib/compiz/libplace.la
+lib/compiz/libplace.a
+%%DBUS%%lib/compiz/libdbus.so
+%%DBUS%%lib/compiz/libdbus.la
+%%DBUS%%lib/compiz/libdbus.a
+lib/compiz/libswitcher.so
+lib/compiz/libswitcher.la
+lib/compiz/libswitcher.a
+lib/compiz/libwater.so
+lib/compiz/libwater.la
+lib/compiz/libwater.a
+lib/compiz/libscreenshot.so
+lib/compiz/libscreenshot.la
+lib/compiz/libscreenshot.a
+lib/compiz/libplane.so
+lib/compiz/libplane.la
+lib/compiz/libplane.a
+lib/compiz/libclone.so
+lib/compiz/libclone.la
+lib/compiz/libclone.a
+lib/compiz/libpng.so
+lib/compiz/libpng.la
+lib/compiz/libpng.a
+lib/compiz/libblur.so
+lib/compiz/libblur.la
+lib/compiz/libblur.a
+lib/compiz/libregex.so
+lib/compiz/libregex.la
+lib/compiz/libregex.a
+lib/compiz/libvideo.so
+lib/compiz/libvideo.la
+lib/compiz/libvideo.a
+lib/compiz/libini.so
+lib/compiz/libini.la
+lib/compiz/libini.a
+%%RSVG%%lib/compiz/libsvg.so
+%%RSVG%%lib/compiz/libsvg.la
+%%RSVG%%lib/compiz/libsvg.a
+lib/compiz/libannotate.so
+lib/compiz/libannotate.la
+lib/compiz/libannotate.a
+libdata/pkgconfig/libdecoration.pc
+libdata/pkgconfig/compiz.pc
+share/gnome/compiz/icon.png
+share/gnome/compiz/freedesktop.png
+%%GNOME%%@cwd %%WINDOWSETTINGSDATADIR%%
+%%GNOME%%share/gnome/wm-properties/compiz.desktop
+%%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%%
+%%GNOME%%window-manager-settings/libcompiz.so
+%%GNOME%%window-manager-settings/libcompiz.la
+%%GNOME%%window-manager-settings/libcompiz.a
+%%GNOME%%@cwd
+share/locale/af/LC_MESSAGES/compiz.mo
+share/locale/ar/LC_MESSAGES/compiz.mo
+share/locale/bg/LC_MESSAGES/compiz.mo
+share/locale/bn/LC_MESSAGES/compiz.mo
+share/locale/bs/LC_MESSAGES/compiz.mo
+share/locale/ca/LC_MESSAGES/compiz.mo
+share/locale/cs/LC_MESSAGES/compiz.mo
+share/locale/cy/LC_MESSAGES/compiz.mo
+share/locale/da/LC_MESSAGES/compiz.mo
+share/locale/de/LC_MESSAGES/compiz.mo
+share/locale/el/LC_MESSAGES/compiz.mo
+share/locale/en_GB/LC_MESSAGES/compiz.mo
+share/locale/es/LC_MESSAGES/compiz.mo
+share/locale/et/LC_MESSAGES/compiz.mo
+share/locale/fi/LC_MESSAGES/compiz.mo
+share/locale/fr/LC_MESSAGES/compiz.mo
+share/locale/gl/LC_MESSAGES/compiz.mo
+share/locale/gu/LC_MESSAGES/compiz.mo
+share/locale/he/LC_MESSAGES/compiz.mo
+share/locale/hi/LC_MESSAGES/compiz.mo
+share/locale/hr/LC_MESSAGES/compiz.mo
+share/locale/hu/LC_MESSAGES/compiz.mo
+share/locale/id/LC_MESSAGES/compiz.mo
+share/locale/it/LC_MESSAGES/compiz.mo
+share/locale/ja/LC_MESSAGES/compiz.mo
+share/locale/ka/LC_MESSAGES/compiz.mo
+share/locale/ko/LC_MESSAGES/compiz.mo
+share/locale/lt/LC_MESSAGES/compiz.mo
+share/locale/mk/LC_MESSAGES/compiz.mo
+share/locale/nb/LC_MESSAGES/compiz.mo
+share/locale/nl/LC_MESSAGES/compiz.mo
+share/locale/pa/LC_MESSAGES/compiz.mo
+share/locale/pl/LC_MESSAGES/compiz.mo
+share/locale/pt/LC_MESSAGES/compiz.mo
+share/locale/pt_BR/LC_MESSAGES/compiz.mo
+share/locale/ro/LC_MESSAGES/compiz.mo
+share/locale/ru/LC_MESSAGES/compiz.mo
+share/locale/sk/LC_MESSAGES/compiz.mo
+share/locale/sl/LC_MESSAGES/compiz.mo
+share/locale/sr/LC_MESSAGES/compiz.mo
+share/locale/sv/LC_MESSAGES/compiz.mo
+share/locale/ta/LC_MESSAGES/compiz.mo
+share/locale/tr/LC_MESSAGES/compiz.mo
+share/locale/uk/LC_MESSAGES/compiz.mo
+share/locale/vi/LC_MESSAGES/compiz.mo
+share/locale/zh_CN/LC_MESSAGES/compiz.mo
+share/locale/zh_TW/LC_MESSAGES/compiz.mo
+share/locale/en_US/LC_MESSAGES/compiz.mo
+share/locale/km/LC_MESSAGES/compiz.mo
+share/locale/lo/LC_MESSAGES/compiz.mo
+share/locale/mr/LC_MESSAGES/compiz.mo
+share/locale/xh/LC_MESSAGES/compiz.mo
+share/locale/zu/LC_MESSAGES/compiz.mo
+@dirrmtry share/locale/lo/LC_MESSAGES
+@dirrmtry share/locale/lo
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/gnome/compiz
+@dirrmtry lib/compiz
+@dirrmtry include/compiz
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index f39b9a777b1f..1cbedcbce56d 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ctwm
 PORTVERSION=	3.8a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://ctwm.free.lp.se/dist/ \
 		http://www.centralmiss.com/~matt/distfiles/
diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index 6d43578206b1..f768de275e8d 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	devilspie
 PORTVERSION=	0.20.2
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.burtonini.com/computing/
 
diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile
index 6b36e2e7f54d..b1a5b1f6a7d6 100644
--- a/x11-wm/dwm/Makefile
+++ b/x11-wm/dwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dwm
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.suckless.org/download/ \
 		http://schot.a-eskwadraat.nl/files/
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index df07fb92fa82..3e3df59e71f1 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enlightenment
 PORTVERSION=	0.16.8.6
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,6 +22,7 @@ LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2 \
 DATADIR=	${PREFIX}/share/e16
 
 USE_X_PREFIX=	yes
+USE_XORG=	xbitmaps
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index 0f11274c2aac..acd7677dac11 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	e16utils
 PORTVERSION=	0.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://public.planetmirror.com/pub/enlightenment/e16utils/
diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile
index 0b0dfcbc44c0..72323396da12 100644
--- a/x11-wm/e17-module-calendar/Makefile
+++ b/x11-wm/e17-module-calendar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	calendar
 PORTVERSION=	20060926
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index e8d1947ec084..f6e16b1af42b 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cpu
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile
index 6737fb2fa962..dae67ad0b679 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	deskshow
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index d519978d532c..278fe318b88c 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flame
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-flame/pkg-plist b/x11-wm/e17-module-flame/pkg-plist
index 81497b3558fb..6651443c6b32 100644
--- a/x11-wm/e17-module-flame/pkg-plist
+++ b/x11-wm/e17-module-flame/pkg-plist
@@ -7,8 +7,6 @@ lib/enlightenment/modules/flame/module.edj
 %%NLS%%share/locale/fi/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/it/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/flame.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/flame/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/flame
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index 8aa1a785a725..8107c559daaf 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	language
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index 80231798718e..2e61a02d11ef 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mail
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index e4429d12de3a..e2c7d3e74d4b 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mem
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-mem/pkg-plist b/x11-wm/e17-module-mem/pkg-plist
index aae66c519dca..e6d9793970a2 100644
--- a/x11-wm/e17-module-mem/pkg-plist
+++ b/x11-wm/e17-module-mem/pkg-plist
@@ -11,8 +11,6 @@ lib/enlightenment/modules/mem/module_icon.png
 %%NLS%%share/locale/ja/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/mem.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/mem/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mem
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-mixer/Makefile b/x11-wm/e17-module-mixer/Makefile
index 383d88e5b9ec..f18221d40a69 100644
--- a/x11-wm/e17-module-mixer/Makefile
+++ b/x11-wm/e17-module-mixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mixer
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index afd824050568..01eee6b51d99 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moon
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 749f7c611194..155c65f629b1 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rain
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-rain/pkg-plist b/x11-wm/e17-module-rain/pkg-plist
index f9c08552a331..3b4f45a09cfc 100644
--- a/x11-wm/e17-module-rain/pkg-plist
+++ b/x11-wm/e17-module-rain/pkg-plist
@@ -13,8 +13,6 @@ lib/enlightenment/modules/rain/module.edj
 %%NLS%%share/locale/it/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/rain.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/rain/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/rain
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index e81eef644530..405edd0fda9f 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	screenshot
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-screenshot/pkg-plist b/x11-wm/e17-module-screenshot/pkg-plist
index 190a2187bff1..bf1d4b69764d 100644
--- a/x11-wm/e17-module-screenshot/pkg-plist
+++ b/x11-wm/e17-module-screenshot/pkg-plist
@@ -12,8 +12,6 @@ lib/enlightenment/modules/screenshot/screenshot.edj
 %%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/screenshot
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index 7689744ff0e3..ad25dcef43df 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slideshow
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-slideshow/pkg-plist b/x11-wm/e17-module-slideshow/pkg-plist
index de126aa1c465..fb0ceadcb818 100644
--- a/x11-wm/e17-module-slideshow/pkg-plist
+++ b/x11-wm/e17-module-slideshow/pkg-plist
@@ -11,8 +11,6 @@ lib/enlightenment/modules/slideshow/slideshow.edj
 %%NLS%%share/locale/it/LC_MESSAGES/slideshow.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/slideshow.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/slideshow.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/slideshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/slideshow
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index 5ac1467b5ce1..b79c8a7dd8c2 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snow
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-snow/pkg-plist b/x11-wm/e17-module-snow/pkg-plist
index c1752aa10628..31ad449eeda5 100644
--- a/x11-wm/e17-module-snow/pkg-plist
+++ b/x11-wm/e17-module-snow/pkg-plist
@@ -13,8 +13,6 @@ lib/enlightenment/modules/snow/tree.png
 %%NLS%%share/locale/it/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/snow.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/snow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/snow
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index 1cb0635f052f..41f7cb1d2e4e 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uptime
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-uptime/pkg-plist b/x11-wm/e17-module-uptime/pkg-plist
index 2d2960917bac..37f9e851da0e 100644
--- a/x11-wm/e17-module-uptime/pkg-plist
+++ b/x11-wm/e17-module-uptime/pkg-plist
@@ -13,8 +13,6 @@ share/locale/ja/LC_MESSAGES/uptime.mo
 share/locale/sv/LC_MESSAGES/uptime.mo
 share/nls/POSIX
 share/nls/en_US.US-ASCII
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrmtry lib/enlightenment/modules/uptime/%%E17_ARCH%%
 @dirrmtry lib/enlightenment/modules/uptime
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index 600f766a78b0..376696b84436 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	weather
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile
index 60053eb75610..485bf032a019 100644
--- a/x11-wm/e17-module-winselector/Makefile
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	winselector
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-utils/Makefile b/x11-wm/e17-utils/Makefile
index 6ac2e659b61e..297e3b60d87e 100644
--- a/x11-wm/e17-utils/Makefile
+++ b/x11-wm/e17-utils/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	utils
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index 2fec5cc28460..bfbe8bdd47ca 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ede
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ede
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
new file mode 100644
index 000000000000..0aa06b018402
--- /dev/null
+++ b/x11-wm/emerald/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for:	emerald
+# Date created:				Oct 29 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	emerald
+PORTVERSION=	0.2.1
+PORTREVISION=	1
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	flz/beryl/
+
+MAINTAINER=	rnoland@2hip.net
+COMMENT=	Emerald Window Decorator
+
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+
+INSTALLS_ICONS=	yes
+GNU_CONFIGURE=	yes
+USE_GL=		gl
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gtk20 libwnck pango gnomehack
+USE_XORG=	xrender
+USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
+
+MAN1=		emerald.1 \
+		emerald-theme-manager.1
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--mandir="${PREFIX}/man"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+# XXX - might want to change that
+post-patch:
+	@${REINPLACE_CMD} 's|icons/gnome|icons/hicolor|' ${WRKSRC}/misc/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/x11-wm/emerald/distinfo b/x11-wm/emerald/distinfo
new file mode 100644
index 000000000000..873bbb8f0a47
--- /dev/null
+++ b/x11-wm/emerald/distinfo
@@ -0,0 +1,3 @@
+MD5 (emerald-0.2.1.tar.bz2) = dde0e2b5cbe405961a350e6d47d2445f
+SHA256 (emerald-0.2.1.tar.bz2) = 43e4fb81fa1bcada42058c9aa8a27c6e09ed7b3cbf0ed1b65578ccb958b64cba
+SIZE (emerald-0.2.1.tar.bz2) = 502243
diff --git a/x11-wm/emerald/files/patch-themer_main.c b/x11-wm/emerald/files/patch-themer_main.c
new file mode 100644
index 000000000000..3a434eb47adc
--- /dev/null
+++ b/x11-wm/emerald/files/patch-themer_main.c
@@ -0,0 +1,106 @@
+--- themer/main.c.orig	Sun Oct 29 18:57:14 2006
++++ themer/main.c	Sun Oct 29 23:09:37 2006
+@@ -7,6 +7,103 @@
+ #include <emerald.h>
+ #include <engine.h>
+ 
++/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
++           fractional parts, S_Z: idem but with leading Zeroes only */
++#define S_N    0x0
++#define S_I    0x4
++#define S_F    0x8
++#define S_Z    0xC
++
++/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
++#define CMP    2
++#define LEN    3
++
++
++/* ISDIGIT differs from isdigit, as follows:
++   - Its arg may be any int or unsigned int; it need not be an unsigned char.
++   - It's guaranteed to evaluate its argument exactly once.
++   - It's typically faster.
++   Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
++   only '0' through '9' are digits.  Prefer ISDIGIT to isdigit unless
++   it's important to use the locale's definition of `digit' even when the
++   host does not conform to Posix.  */
++#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
++
++/* Compare S1 and S2 as strings holding indices/version numbers,
++   returning less than, equal to or greater than zero if S1 is less than,
++   equal to or greater than S2 (for more info, see the texinfo doc).
++*/
++
++int
++strverscmp (const char *s1, const char *s2)
++{
++  const unsigned char *p1 = (const unsigned char *) s1;
++  const unsigned char *p2 = (const unsigned char *) s2;
++  unsigned char c1, c2;
++  int state;
++  int diff;
++
++  /* Symbol(s)    0       [1-9]   others  (padding)
++     Transition   (10) 0  (01) d  (00) x  (11) -   */
++  static const unsigned int next_state[] =
++  {
++      /* state    x    d    0    - */
++      /* S_N */  S_N, S_I, S_Z, S_N,
++      /* S_I */  S_N, S_I, S_I, S_I,
++      /* S_F */  S_N, S_F, S_F, S_F,
++      /* S_Z */  S_N, S_F, S_Z, S_Z
++  };
++
++  static const int result_type[] =
++  {
++      /* state   x/x  x/d  x/0  x/-  d/x  d/d  d/0  d/-
++                 0/x  0/d  0/0  0/-  -/x  -/d  -/0  -/- */
++
++      /* S_N */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
++                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
++      /* S_I */  CMP, -1,  -1,  CMP,  1,  LEN, LEN, CMP,
++                  1,  LEN, LEN, CMP, CMP, CMP, CMP, CMP,
++      /* S_F */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
++                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
++      /* S_Z */  CMP,  1,   1,  CMP, -1,  CMP, CMP, CMP,
++                 -1,  CMP, CMP, CMP
++  };
++
++  if (p1 == p2)
++    return 0;
++
++  c1 = *p1++;
++  c2 = *p2++;
++  /* Hint: '0' is a digit too.  */
++  state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0));
++
++  while ((diff = c1 - c2) == 0 && c1 != '\0')
++    {
++      state = next_state[state];
++      c1 = *p1++;
++      c2 = *p2++;
++      state |= (c1 == '0') + (ISDIGIT (c1) != 0);
++    }
++
++  state = result_type[state << 2 | ((c2 == '0') + (ISDIGIT (c2) != 0))];
++
++  switch (state)
++    {
++    case CMP:
++      return diff;
++
++    case LEN:
++      while (ISDIGIT (*p1++))
++	if (!ISDIGIT (*p2++))
++	  return 1;
++
++      return ISDIGIT (*p2) ? -1 : diff;
++
++    default:
++      return state;
++    }
++}
++
+ #define LAST_COMPAT_VER "0.1.0"
+ 
+ typedef struct _FetcherInfo
diff --git a/x11-wm/emerald/pkg-descr b/x11-wm/emerald/pkg-descr
new file mode 100644
index 000000000000..c9d35bf6ae83
--- /dev/null
+++ b/x11-wm/emerald/pkg-descr
@@ -0,0 +1,8 @@
+Emerald is a window decorator for beryl. It comes with a
+themes editor called emerald-theme-manager and the decorator. 
+You need beryl to use emerald.
+
+WWW: http://www.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/emerald/pkg-plist b/x11-wm/emerald/pkg-plist
new file mode 100644
index 000000000000..37cc50ec208a
--- /dev/null
+++ b/x11-wm/emerald/pkg-plist
@@ -0,0 +1,106 @@
+bin/emerald
+bin/emerald-theme-manager
+include/emerald/emerald.h
+include/emerald/engine.h
+include/emerald/libengine.h
+include/emerald/titlebar.h
+lib/libemeraldengine.a
+lib/libemeraldengine.la
+lib/libemeraldengine.so
+lib/libemeraldengine.so.0
+lib/emerald/engines/liblegacy.so
+lib/emerald/engines/liblegacy.la
+lib/emerald/engines/liblegacy.a
+lib/emerald/engines/libvrunner.so
+lib/emerald/engines/libvrunner.la
+lib/emerald/engines/libvrunner.a
+lib/emerald/engines/libtruglass.so
+lib/emerald/engines/libtruglass.la
+lib/emerald/engines/libtruglass.a
+lib/emerald/engines/liboxygen.so
+lib/emerald/engines/liboxygen.la
+lib/emerald/engines/liboxygen.a
+lib/emerald/engines/libpixmap.so
+lib/emerald/engines/libpixmap.la
+lib/emerald/engines/libpixmap.a
+lib/emerald/engines/libzootreeves.so
+lib/emerald/engines/libzootreeves.la
+lib/emerald/engines/libzootreeves.a
+libdata/pkgconfig/emeraldengine.pc
+share/applications/emerald-theme-manager.desktop
+share/icons/hicolor/48x48/mimetypes/application-x-emerald-theme.png
+share/mime/packages/emerald.xml
+share/mime-info/emerald.mime
+%%DATADIR%%/settings.ini
+%%DATADIR%%/theme/buttons.above.png
+%%DATADIR%%/theme/buttons.close.png
+%%DATADIR%%/theme/buttons.glow.png
+%%DATADIR%%/theme/buttons.help.png
+%%DATADIR%%/theme/buttons.inactive_glow.png
+%%DATADIR%%/theme/buttons.max.png
+%%DATADIR%%/theme/buttons.menu.png
+%%DATADIR%%/theme/buttons.min.png
+%%DATADIR%%/theme/buttons.restore.png
+%%DATADIR%%/theme/buttons.shade.png
+%%DATADIR%%/theme/buttons.sticky.png
+%%DATADIR%%/theme/buttons.unabove.png
+%%DATADIR%%/theme/buttons.unshade.png
+%%DATADIR%%/theme/buttons.unsticky.png
+%%DATADIR%%/theme/theme.screenshot.png
+%%DATADIR%%/theme/theme.ini
+share/locale/ca/LC_MESSAGES/emerald.mo
+share/locale/cs/LC_MESSAGES/emerald.mo
+share/locale/de_DE/LC_MESSAGES/emerald.mo
+share/locale/en_GB/LC_MESSAGES/emerald.mo
+share/locale/es_AR/LC_MESSAGES/emerald.mo
+share/locale/es_ES/LC_MESSAGES/emerald.mo
+share/locale/fr_FR/LC_MESSAGES/emerald.mo
+share/locale/gu_IN/LC_MESSAGES/emerald.mo
+share/locale/hu_HU/LC_MESSAGES/emerald.mo
+share/locale/it/LC_MESSAGES/emerald.mo
+share/locale/ja/LC_MESSAGES/emerald.mo
+share/locale/ko_KR/LC_MESSAGES/emerald.mo
+share/locale/nb_NO/LC_MESSAGES/emerald.mo
+share/locale/nl/LC_MESSAGES/emerald.mo
+share/locale/pt_BR/LC_MESSAGES/emerald.mo
+share/locale/pt_PT/LC_MESSAGES/emerald.mo
+share/locale/sv_FI/LC_MESSAGES/emerald.mo
+share/locale/sv_SE/LC_MESSAGES/emerald.mo
+share/locale/tr_TR/LC_MESSAGES/emerald.mo
+share/locale/zh_CN/LC_MESSAGES/emerald.mo
+share/locale/zh_HK/LC_MESSAGES/emerald.mo
+share/locale/zh_TW/LC_MESSAGES/emerald.mo
+share/pixmaps/emerald-theme-manager-icon.png
+@dirrmtry share/mime-info
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/tr_TR/LC_MESSAGES
+@dirrmtry share/locale/tr_TR
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/sv_FI/LC_MESSAGES
+@dirrmtry share/locale/sv_FI
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/hu_HU/LC_MESSAGES
+@dirrmtry share/locale/hu_HU
+@dirrmtry share/locale/gu_IN/LC_MESSAGES
+@dirrmtry share/locale/gu_IN
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/ca_ES/LC_MESSAGES
+@dirrmtry share/locale/ca_ES
+@dirrmtry %%DATADIR%%/theme
+@dirrmtry %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry lib/emerald/engines
+@dirrmtry lib/emerald
+@dirrmtry include/emerald
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index a1434fdd68b1..4f1fc0300d1e 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enlightenment
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/enlightenment-devel/pkg-plist b/x11-wm/enlightenment-devel/pkg-plist
index ce5703e3181e..da82d2defcaf 100644
--- a/x11-wm/enlightenment-devel/pkg-plist
+++ b/x11-wm/enlightenment-devel/pkg-plist
@@ -274,24 +274,6 @@ share/locale/ru/LC_MESSAGES/enlightenment.mo
 share/locale/sl/LC_MESSAGES/enlightenment.mo
 share/xsessions/enlightenment.desktop
 @dirrmtry share/xsessions
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@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/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/data/themes
 @dirrm %%DATADIR%%/data/other
diff --git a/x11-wm/enlightenment-docs/Makefile b/x11-wm/enlightenment-docs/Makefile
index 6499d8d09d7c..c1d98985a806 100644
--- a/x11-wm/enlightenment-docs/Makefile
+++ b/x11-wm/enlightenment-docs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enlightenment-docs
 PORTVERSION=	0.16.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enlightenment
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index df07fb92fa82..3e3df59e71f1 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enlightenment
 PORTVERSION=	0.16.8.6
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,6 +22,7 @@ LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2 \
 DATADIR=	${PREFIX}/share/e16
 
 USE_X_PREFIX=	yes
+USE_XORG=	xbitmaps
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/epiwm/Makefile b/x11-wm/epiwm/Makefile
index 78b03c8f1b92..edccfc39f832 100644
--- a/x11-wm/epiwm/Makefile
+++ b/x11-wm/epiwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	epiwm
 PORTVERSION=	0.5.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.nongnu.org/epiwm/download/
 
@@ -23,48 +23,14 @@ LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib \
 CONFIG=		icons key menu start style window workspace
 DOCS=		AUTHORS BUGS COPYING ChangeLog EPIwm-0.5.6.lsm INSTALL NEWS \
 		README TODO
-PLIST=		${WRKDIR}/pkg-plist
-USE_AUTOTOOLS=	automake:14:env autoconf:213
+GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 
-post-extract:
-# Avoid having to read this file.
-	${RM} ${WRKSRC}/configure
-
-do-patch:
-	${CP} -p ${WRKSRC}/configure.in ${WRKSRC}/configure.in.orig
-	${SED} -e 's|/etc/X11/epiwm|${PREFIX}/etc/epiwm|' \
-		< ${WRKSRC}/configure.in.orig > ${WRKSRC}/configure.in
-
-pre-configure:
-	cd ${WRKSRC} && automake14 -i && autoconf213
-
-pre-install:
-	${RM} -f ${PLIST}
-.for ii in epiwm logoepiwm epiwm.inst
-	${ECHO_CMD} bin/${ii} >> ${PLIST}
-.endfor
-.for ii in ${CONFIG}
-	${ECHO_CMD} etc/epiwm/${ii} >> ${PLIST}
-.endfor
-.if !defined(NOPORTDOCS)
-.for ii in ${DOCS}
-	${ECHO_CMD} share/doc/epiwm/${ii} >> ${PLIST}
-.endfor
-.for ii in etc share/doc
-	${ECHO_CMD} @dirrm ${ii}/epiwm >> ${PLIST}
-.endfor
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/epiwm \
-		${WRKSRC}/modules/logoepiwm/logoepiwm ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/epiwm.inst ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc/epiwm
-.for ii in ${CONFIG}
-	${INSTALL_DATA} ${WRKSRC}/config/${ii} ${PREFIX}/etc/epiwm
-.endfor
+post-patch:
+	${REINPLACE_CMD} 's|/etc/X11/epiwm|${PREFIX}/etc/epiwm|' \
+	    ${WRKSRC}/configure
 
+post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for ii in ${DOCS}
diff --git a/x11-wm/epiwm/pkg-plist b/x11-wm/epiwm/pkg-plist
new file mode 100644
index 000000000000..65f676598055
--- /dev/null
+++ b/x11-wm/epiwm/pkg-plist
@@ -0,0 +1,21 @@
+bin/epiwm
+bin/epiwm.inst
+bin/logoepiwm
+etc/epiwm/icons
+etc/epiwm/key
+etc/epiwm/menu
+etc/epiwm/start
+etc/epiwm/style
+etc/epiwm/window
+etc/epiwm/workspace
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/EPIwm-0.5.6.lsm
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/epiwm
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 9178fba7595a..c48ab3bd957b 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	epplets
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enlightenment
diff --git a/x11-wm/etoile-azalea/Makefile b/x11-wm/etoile-azalea/Makefile
index 7971d51090da..a318ff39165e 100644
--- a/x11-wm/etoile-azalea/Makefile
+++ b/x11-wm/etoile-azalea/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	azalea
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	x11-wm gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/x11-wm/etoile-azdock/Makefile b/x11-wm/etoile-azdock/Makefile
index a8e241289024..1e315aa10765 100644
--- a/x11-wm/etoile-azdock/Makefile
+++ b/x11-wm/etoile-azdock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	azdock
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	x11-wm gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index 03d2ea404752..565f0373c42d 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	evilwm
 PORTVERSION=	0.99.25
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.6809.org.uk/evilwm/
 
diff --git a/x11-wm/expocity/Makefile b/x11-wm/expocity/Makefile
index 54c65a736a6e..8ec35c2f3dfb 100644
--- a/x11-wm/expocity/Makefile
+++ b/x11-wm/expocity/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	expocity
 PORTVERSION=	2.6.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.pycage.de/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
diff --git a/x11-wm/fbcmd/Makefile b/x11-wm/fbcmd/Makefile
index 5148071d6f8c..176eab416cf5 100644
--- a/x11-wm/fbcmd/Makefile
+++ b/x11-wm/fbcmd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fbcmd
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://darkshed.feuersenger.net/files/c_cpp/fbcmd/
 
diff --git a/x11-wm/fbpager/Makefile b/x11-wm/fbpager/Makefile
index 27da828b22da..59c584ead4b3 100644
--- a/x11-wm/fbpager/Makefile
+++ b/x11-wm/fbpager/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fbpager
 PORTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.fluxbox.org/download/
 
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 76f82e485341..896a4fceea07 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	1.0rc3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile
index 8ab2d1162958..6f5acb5b3e13 100644
--- a/x11-wm/fluxconf/Makefile
+++ b/x11-wm/fluxconf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fluxconf
 PORTVERSION=	0.9.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://devaux.fabien.free.fr/flux/
 
diff --git a/x11-wm/fluxspace/Makefile b/x11-wm/fluxspace/Makefile
index 145df29143fd..a5dab4b52705 100644
--- a/x11-wm/fluxspace/Makefile
+++ b/x11-wm/fluxspace/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fluxspace
 PORTVERSION=	0.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.isomedia.com/homes/stevencooper/files/
 
diff --git a/x11-wm/fluxter/Makefile b/x11-wm/fluxter/Makefile
index b97f88cf752d..ac39ccfbb569 100644
--- a/x11-wm/fluxter/Makefile
+++ b/x11-wm/fluxter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fluxter
 PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://benedict.isomedia.com/homes/stevencooper/files/
 
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index b8626c7ac87d..66e10bf8c113 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flwm
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	gj
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index 9a95231ee1aa..797085e206b6 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fvwm
 PORTVERSION=	1.24r
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-1/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/1.x/
@@ -18,6 +18,7 @@ COMMENT=	The fvwm window manager
 NO_LATEST_LINK=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
+USE_XORG=	xbitmaps
 # must overwrite the default from bsd.port.mk
 XMKMF=		xmkmf
 ALL_TARGET=	Makefiles all
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 19a1242c06d5..f4411d92abad 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fvwm
 PORTVERSION=	2.5.21
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 02ba8287f413..f9a72c9faa6a 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fvwm
 PORTVERSION=	2.4.20
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 02ba8287f413..f9a72c9faa6a 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fvwm
 PORTVERSION=	2.4.20
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index a8447979b6c7..0616af300155 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fvwm95-i18n
 PORTVERSION=	2.0.43a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fvwm95
@@ -28,6 +28,7 @@ RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
 EXTRACT_ONLY=	${DISTNAME}.tgz ${PORTNAME}-${PORTVERSION}-portKit-19981123.tgz
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_XORG=	xbitmaps
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--x-includes=${X11BASE}/include \
 		--mandir=${MANPREFIX}/man \
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index c7fa24ba0118..a42f17b1e446 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fvwm95
 PORTVERSION=	2.0.43a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,6 +22,7 @@ RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_XORG=	xbitmaps
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${LOCALBASE}/include \
 		--libdir=${LOCALBASE}/lib
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index b6e6924df247..494d81f2825c 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcompmgr
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gcompmgr
diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile
index d84be9f7124a..bd42ec6a2beb 100644
--- a/x11-wm/golem/Makefile
+++ b/x11-wm/golem/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	golem
 PORTVERSION=	0.0.5
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index e52d11296782..63a0f4218165 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gwm
 PORTVERSION=	1.8d
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://koala.ilog.fr/ftp/pub/gwm/
 EXTRACT_SUFX=	.tgz
diff --git a/x11-wm/hackedbox/Makefile b/x11-wm/hackedbox/Makefile
index 0b2531a8cdfa..3dfc2f907491 100644
--- a/x11-wm/hackedbox/Makefile
+++ b/x11-wm/hackedbox/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	hackedbox
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://scrudgeware.org/downloads/hackedbox/
 
diff --git a/x11-wm/heliodor/Makefile b/x11-wm/heliodor/Makefile
new file mode 100644
index 000000000000..f7cf79e9fed8
--- /dev/null
+++ b/x11-wm/heliodor/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	heliodor
+# Date created:				2007-02-05
+# Whom:					Robert Noland <rnoland@2hip.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	heliodor
+PORTVERSION=	0.2.1
+#PORTREVISION=	0
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://releases.beryl-project.org/${PORTVERSION}/
+
+MAINTAINER=	rnoland@2hip.net
+COMMENT=	Heliodor Window Decorator
+
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack gnomecontrolcenter2 libwnck
+
+WINDOWSETTINGSDATADIR=	\
+	`pkg-config --variable=prefix gnome-window-settings-2.0`
+WINDOWSETTINGSLIBDIR=	\
+	`pkg-config --variable=libdir gnome-window-settings-2.0`
+
+PLIST_SUB+=	WINDOWSETTINGSDATADIR="${WINDOWSETTINGSDATADIR}" \
+		WINDOWSETTINGSLIBDIR="${WINDOWSETTINGSLIBDIR}"
+
+.include <bsd.port.pre.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/heliodor/distinfo b/x11-wm/heliodor/distinfo
new file mode 100644
index 000000000000..bd485caa8a07
--- /dev/null
+++ b/x11-wm/heliodor/distinfo
@@ -0,0 +1,3 @@
+MD5 (heliodor-0.2.1.tar.bz2) = 7bd2538a16994b81eabc44b362ebda8c
+SHA256 (heliodor-0.2.1.tar.bz2) = 0dc1cd70bbb2213c616a38a11dd8d11336a4625f9af1d0db139cdf3be43535ef
+SIZE (heliodor-0.2.1.tar.bz2) = 252950
diff --git a/x11-wm/heliodor/pkg-descr b/x11-wm/heliodor/pkg-descr
new file mode 100644
index 000000000000..18f426db725e
--- /dev/null
+++ b/x11-wm/heliodor/pkg-descr
@@ -0,0 +1,5 @@
+Heliodor is a window decorator for Beryl that uses the native Metacity window
+decorations. This way, users can keep their native window decorations that they
+use in GNOME with Beryl.
+
+WWW:	http://www.beryl-project.org/
diff --git a/x11-wm/heliodor/pkg-plist b/x11-wm/heliodor/pkg-plist
new file mode 100644
index 000000000000..a6cb89e18a3a
--- /dev/null
+++ b/x11-wm/heliodor/pkg-plist
@@ -0,0 +1,8 @@
+@comment $FreeBSD$
+bin/heliodor
+@cwd %%WINDOWSETTINGSDATADIR%%
+share/gnome/wm-properties/beryl.desktop
+@cwd %%WINDOWSETTINGSLIBDIR%%
+window-manager-settings/libberyl.a
+window-manager-settings/libberyl.la
+window-manager-settings/libberyl.so
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 3d6022907938..e4968f624049 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	icewm
 PORTVERSION=	1.2.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile
index 78c347efdb97..7f140e932064 100644
--- a/x11-wm/ion-2/Makefile
+++ b/x11-wm/ion-2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ion-2
 PORTVERSION=	20040729
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
 
diff --git a/x11-wm/ion-3/Makefile b/x11-wm/ion-3/Makefile
index 846b06e1bc14..e41d9ff08e5e 100644
--- a/x11-wm/ion-3/Makefile
+++ b/x11-wm/ion-3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ion-3ds
 PORTVERSION=	20070318
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
 
diff --git a/x11-wm/ion-3ds/Makefile b/x11-wm/ion-3ds/Makefile
index 846b06e1bc14..e41d9ff08e5e 100644
--- a/x11-wm/ion-3ds/Makefile
+++ b/x11-wm/ion-3ds/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ion-3ds
 PORTVERSION=	20070318
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
 
diff --git a/x11-wm/ion/Makefile b/x11-wm/ion/Makefile
index 56b1e561fad0..e1b6e19eea67 100644
--- a/x11-wm/ion/Makefile
+++ b/x11-wm/ion/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ion
 PORTVERSION=	20020207
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.cs.tut.fi/~tuomov/dl/
 
diff --git a/x11-wm/ion3/Makefile b/x11-wm/ion3/Makefile
index 78c347efdb97..7f140e932064 100644
--- a/x11-wm/ion3/Makefile
+++ b/x11-wm/ion3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ion-2
 PORTVERSION=	20040729
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
 
diff --git a/x11-wm/jewel/Makefile b/x11-wm/jewel/Makefile
index 624d41a6fced..26dacbd6f286 100644
--- a/x11-wm/jewel/Makefile
+++ b/x11-wm/jewel/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jewel
 PORTVERSION=	0.12.41
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://mjr.towers.org.uk/comp/
 
diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 33fd40c6c722..c41deb285706 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jwm
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://joewing.net/programs/
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index 5c57ef8821d8..3cfe2003d8e0 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kahakai
 PORTVERSION=	0.6.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/kappdock/Makefile b/x11-wm/kappdock/Makefile
index 11bdb2626830..cd9791dda42b 100644
--- a/x11-wm/kappdock/Makefile
+++ b/x11-wm/kappdock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kappdock
 PORTVERSION=	0.46.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm kde
 MASTER_SITES=	http://www.Informatik.Uni-Oldenburg.DE/~bigboss/kappdock/
 DISTNAME=	${PORTNAME}-0.46-1
diff --git a/x11-wm/kompmgr/Makefile b/x11-wm/kompmgr/Makefile
index d2fae3ee85c8..5ced34db32bf 100644
--- a/x11-wm/kompmgr/Makefile
+++ b/x11-wm/kompmgr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kompmgr
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-wm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11-wm/larswm/Makefile b/x11-wm/larswm/Makefile
index 2f14342e386c..a2dfa1cb2eb5 100644
--- a/x11-wm/larswm/Makefile
+++ b/x11-wm/larswm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	larswm
 PORTVERSION=	7.5.3
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://home.earthlink.net/~lab1701/larswm/
 
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 938cea0ff49c..6d32099ae804 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdockapp
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/
 
diff --git a/x11-wm/lwm/Makefile b/x11-wm/lwm/Makefile
index 0247a3c3e891..07f70069b02f 100644
--- a/x11-wm/lwm/Makefile
+++ b/x11-wm/lwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lwm
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.jfc.org.uk/files/lwm/
 
diff --git a/x11-wm/matchbox/Makefile b/x11-wm/matchbox/Makefile
index f1a1e095d6cf..d0dc9eac368b 100644
--- a/x11-wm/matchbox/Makefile
+++ b/x11-wm/matchbox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	matchbox
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 3979144705da..0aceb7400b7f 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	metacity
 PORTVERSION=	2.18.2
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 4a2c523cdd7d..d24bd8719dec 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -213,61 +213,23 @@ share/locale/zh_TW/LC_MESSAGES/metacity.mo
 @dirrm share/gnome/metacity
 @dirrm include/metacity-1/metacity-private
 @dirrm include/metacity-1
-@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/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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index bce560d06e07..14ca8f7dc59f 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mlvwm
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www2u.biglobe.ne.jp/~y-miyata/mlvwm/
 DISTNAME=	mlvwm091
diff --git a/x11-wm/novawm/Makefile b/x11-wm/novawm/Makefile
index ae8b74f902cd..9b5a737103f6 100644
--- a/x11-wm/novawm/Makefile
+++ b/x11-wm/novawm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	novawm
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index b6d44ef8f08d..f4123c6f4ba5 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	obconf
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://tr.openmonkey.com/files/obconf/
 
diff --git a/x11-wm/obtuner/Makefile b/x11-wm/obtuner/Makefile
index 8fcd643f1b80..92ff2130666c 100644
--- a/x11-wm/obtuner/Makefile
+++ b/x11-wm/obtuner/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	obtuner
 PORTVERSION=	0.3
-PORTREVISION=	1	
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index edd556f1356e..96ece32dc424 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	olvwm
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		${MASTER_SITE_XCONTRIB}
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index df125bd95f36..70e7f58a6c32 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	openbox
 PORTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://offload1.icculus.org/openbox/releases/
 
diff --git a/x11-wm/orion/Makefile b/x11-wm/orion/Makefile
index 7ecd62ca226f..0206b624d3ad 100644
--- a/x11-wm/orion/Makefile
+++ b/x11-wm/orion/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	orion
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	x11-wm scheme
 MASTER_SITES=	ftp://ftp.scsh.net/pub/scsh/packages/orion-wm/
 
diff --git a/x11-wm/oroborus/Makefile b/x11-wm/oroborus/Makefile
index cf80c56e31fb..7f480915d50b 100644
--- a/x11-wm/oroborus/Makefile
+++ b/x11-wm/oroborus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oroborus
 PORTVERSION=	2.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.oroborus.org/debian/dists/sid/main/source/x11/ \
 		http://matt.peterson.org/FreeBSD/ports/
diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile
index 05624ea18b8b..5a20c65442d2 100644
--- a/x11-wm/pager/Makefile
+++ b/x11-wm/pager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pager
 PORTVERSION=	0.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		http://mirror2.unixfreunde.de/
diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile
index d26b2861f33b..a432c9ad73e2 100644
--- a/x11-wm/pawm/Makefile
+++ b/x11-wm/pawm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pawm
 PORTVERSION=	2.2.9
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.pleyades.net/pawm/files/
 
diff --git a/x11-wm/peksystray/Makefile b/x11-wm/peksystray/Makefile
index 1a09eb410362..07297689d306 100644
--- a/x11-wm/peksystray/Makefile
+++ b/x11-wm/peksystray/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	peksystray
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index 04bf848a5cd3..902a574b31ee 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pekwm
 PORTVERSION=	20060417
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://bsd-unix.org/downloads/ \
 		http://pekwm.org/files/
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index 7e5703e3cb5c..4da060145c22 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	phluid
 PORTVERSION=	0.0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phluid
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index 9a213846e871..0110cfdedcf4 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	piewm
 PORTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.crynwr.com/piewm/
 
@@ -16,6 +17,7 @@ COMMENT=	A tvtwm with pie (circular) menus
 DISABLE_SIZE=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
+USE_XORG=	xbitmaps
 MAN1=		piewm.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/pwm/Makefile b/x11-wm/pwm/Makefile
index 48e1cb33873e..7a3423b70731 100644
--- a/x11-wm/pwm/Makefile
+++ b/x11-wm/pwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pwm
 PORTVERSION=	2006.05.17
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/x11-wm/qlwm/Makefile b/x11-wm/qlwm/Makefile
index b851b69ad3ad..185d8242733b 100644
--- a/x11-wm/qlwm/Makefile
+++ b/x11-wm/qlwm/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	qlwm
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.alinden.mynetcologne.de/qlwm/
 
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index 9d60d6c7a348..36750c02c204 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qvwm
 PORTVERSION=	1.1.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \
 		ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/
diff --git a/x11-wm/ratmenu/Makefile b/x11-wm/ratmenu/Makefile
index d91a858cb340..3a0c64f6bd54 100644
--- a/x11-wm/ratmenu/Makefile
+++ b/x11-wm/ratmenu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ratmenu
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.mired.org/downloads/
 
diff --git a/x11-wm/ratpoison/Makefile b/x11-wm/ratpoison/Makefile
index 8e677891a6fd..98095b4370ca 100644
--- a/x11-wm/ratpoison/Makefile
+++ b/x11-wm/ratpoison/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ratpoison
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile
index 60727ec6fa60..a30994be9dec 100644
--- a/x11-wm/sapphire/Makefile
+++ b/x11-wm/sapphire/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sapphire
 PORTVERSION=	0.15.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 5f82052270d5..3a24404c0ad1 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sawfish
 PORTVERSION=	1.3
-PORTREVISION=	13
+PORTREVISION=	14
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 49a6645e91aa..5dfcd8ffc5df 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -680,37 +680,3 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo
 @dirrm libexec/sawfish/%%VERSION%%
 @dirrm libexec/sawfish
 @dirrm libexec/rep/%%GNUHOST%%/sawfish
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11-wm/selectwm/Makefile b/x11-wm/selectwm/Makefile
index f171d13b95e6..b5e853a47141 100644
--- a/x11-wm/selectwm/Makefile
+++ b/x11-wm/selectwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	selectwm
 PORTVERSION=	0.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://ordiluc.net/selectwm/
 
diff --git a/x11-wm/skippy-xd/Makefile b/x11-wm/skippy-xd/Makefile
index f88eb593b931..f35616804fcf 100644
--- a/x11-wm/skippy-xd/Makefile
+++ b/x11-wm/skippy-xd/Makefile
@@ -7,16 +7,18 @@
 
 PORTNAME=	skippy-xd
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://thegraveyard.org/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A full-screen X11 task-switcher like Apple's Expose
 
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
+USE_XORG=	x11 xft xcomposite xdamage xfixes xrender xinerama xext xmu
 PLIST_FILES=	bin/skippy-xd \
 		%%DATADIR%%/skippy-xd.rc-default
 PLIST_DIRS=	%%DATADIR%%
diff --git a/x11-wm/skippy/Makefile b/x11-wm/skippy/Makefile
index fc9c837a80a9..b86acf9abd7e 100644
--- a/x11-wm/skippy/Makefile
+++ b/x11-wm/skippy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skippy
 PORTVERSION=	0.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://thegraveyard.org/files/
 
diff --git a/x11-wm/swm/Makefile b/x11-wm/swm/Makefile
index 9cba929b34cc..1a880d23b425 100644
--- a/x11-wm/swm/Makefile
+++ b/x11-wm/swm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	swm
 PORTVERSION=	1.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www2.informatik.hu-berlin.de/~sperling/prog/
 EXTRACT_SUFX=	c-src.tgz
diff --git a/x11-wm/tinywm/Makefile b/x11-wm/tinywm/Makefile
index 1d8ae3eb485e..2bac671b5951 100644
--- a/x11-wm/tinywm/Makefile
+++ b/x11-wm/tinywm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tinywm
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://incise.org/files/dev/
 EXTRACT_SUFX=	.tgz
diff --git a/x11-wm/transset-df/Makefile b/x11-wm/transset-df/Makefile
index 9df0efa700e9..b9398704b5ec 100644
--- a/x11-wm/transset-df/Makefile
+++ b/x11-wm/transset-df/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	transset-df
 PORTVERSION=	5
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://forchheimer.se/transset-df/
 
diff --git a/x11-wm/treewm/Makefile b/x11-wm/treewm/Makefile
index 977be8a8fb6e..b6952647cb49 100644
--- a/x11-wm/treewm/Makefile
+++ b/x11-wm/treewm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	treewm
 PORTVERSION=	0.4.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index f4db55a0ae8b..48732b78a7a5 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tvtwm
 PORTVERSION=	pl11
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	window_managers
@@ -18,6 +19,7 @@ COMMENT=	Twm with a virtual desktop
 WRKSRC=		${WRKDIR}/tvtwm
 USE_IMAKE=	yes
 USE_XPM=	yes
+USE_XORG=	xbitmaps
 MAN1=		tvtwm.1
 MANCOMPRESSED=	no
 PLIST_FILES=	bin/tvtwm
diff --git a/x11-wm/twm/Makefile b/x11-wm/twm/Makefile
new file mode 100644
index 000000000000..764a923d533a
--- /dev/null
+++ b/x11-wm/twm/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	twm
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	twm
+PORTVERSION=	1.0.3
+PORTREVISION=	3
+CATEGORIES=	x11-wm
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Tab Window Manager for the X Window System
+
+XORG_CAT=	app
+USE_XORG=	x11 xext xt xmu
+
+MAN1=		twm.1
+
+.include <bsd.port.mk>
diff --git a/x11-wm/twm/distinfo b/x11-wm/twm/distinfo
new file mode 100644
index 000000000000..a6184713af64
--- /dev/null
+++ b/x11-wm/twm/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/twm-1.0.3.tar.bz2) = a56b71dc40249195b32b304633c28a3e
+SHA256 (xorg/app/twm-1.0.3.tar.bz2) = 5b41550477a893bf2b82ab73fc7fb6c839ba52d0deac059be1a473dd7bb92a4e
+SIZE (xorg/app/twm-1.0.3.tar.bz2) = 238448
diff --git a/x11-wm/twm/pkg-descr b/x11-wm/twm/pkg-descr
new file mode 100644
index 000000000000..1d43548efaa1
--- /dev/null
+++ b/x11-wm/twm/pkg-descr
@@ -0,0 +1,4 @@
+This package contains twm, a Window Manager for the X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-wm/twm/pkg-plist b/x11-wm/twm/pkg-plist
new file mode 100644
index 000000000000..4a6d628373c1
--- /dev/null
+++ b/x11-wm/twm/pkg-plist
@@ -0,0 +1,3 @@
+bin/twm
+share/X11/twm/system.twmrc
+@dirrm share/X11/twm
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index 866e91d7a5b9..0d0fc78243ee 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ude
 PORTVERSION=	0.2.9b
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	udeproject
diff --git a/x11-wm/uwm/Makefile b/x11-wm/uwm/Makefile
index a092518c75e8..f6908f014158 100644
--- a/x11-wm/uwm/Makefile
+++ b/x11-wm/uwm/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	uwm
 PORTVERSION=	19881027
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	X.V11R3uwm
diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile
index 23c767924513..7ec054066dfb 100644
--- a/x11-wm/vtwm/Makefile
+++ b/x11-wm/vtwm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vtwm
 PORTVERSION=	5.4.7
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.vtwm.org/downloads/
 
diff --git a/x11-wm/w9wm/Makefile b/x11-wm/w9wm/Makefile
index 1038abf9caef..eb9d4f89536a 100644
--- a/x11-wm/w9wm/Makefile
+++ b/x11-wm/w9wm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	w9wm
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.grassouille.org/code/w9wm/src/
 
diff --git a/x11-wm/waimea-devel/Makefile b/x11-wm/waimea-devel/Makefile
index 3f44fbb26863..93e376e86f49 100644
--- a/x11-wm/waimea-devel/Makefile
+++ b/x11-wm/waimea-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	waimea
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://dev.gentoo.org/~nixphoeni/ \
 		${MASTER_SITE_LOCAL}
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index 489ce87800f7..d41ebe97b984 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	waimea
 PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	waimea
diff --git a/x11-wm/wampager/Makefile b/x11-wm/wampager/Makefile
index 2ebf477b562d..416e64cf70b5 100644
--- a/x11-wm/wampager/Makefile
+++ b/x11-wm/wampager/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wampager
 PORTVERSION=	0.9.3.20041204
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.ijs.si/~lesi/waimea/ \
 		http://www.daemon.li/distfiles/
diff --git a/x11-wm/weewm/Makefile b/x11-wm/weewm/Makefile
index 938b97944d2a..0dd4ee00bbb3 100644
--- a/x11-wm/weewm/Makefile
+++ b/x11-wm/weewm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	weewm
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://weewm.flashtux.org/download/
diff --git a/x11-wm/windowlab/Makefile b/x11-wm/windowlab/Makefile
index 0ba8b014d4a6..2bcde91cd4d0 100644
--- a/x11-wm/windowlab/Makefile
+++ b/x11-wm/windowlab/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	windowlab
 PORTVERSION=	1.33
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.nickgravgaard.com/windowlab/
 EXTRACT_SUFX=	.tar
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index e07861801413..9fa3e753274f 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	windowmaker
 PORTVERSION=	0.92.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
 		http://dougbarton.us/Downloads/
diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index 1d581e18895c..8ad102ee0c3b 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wm2
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.all-day-breakfast.com/wm2/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
diff --git a/x11-wm/wmDeskGuide/Makefile b/x11-wm/wmDeskGuide/Makefile
index ba67fcb6047a..3bcc0ccc5a0a 100644
--- a/x11-wm/wmDeskGuide/Makefile
+++ b/x11-wm/wmDeskGuide/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmDeskGuide
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://charybda.icm.edu.pl/~jarwyp/data/own/wmDeskGuide/build/
 
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index e49d432c0d58..d1da84747e76 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	wmakerconf
 PORTVERSION=	2.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.starplot.org/wmakerconf/
 
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index c0be3080b1eb..d910165c2b01 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmanager
 PORTVERSION=	0.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile
index ac4d7cd802c8..e5a1a30e001c 100644
--- a/x11-wm/wmcp/Makefile
+++ b/x11-wm/wmcp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmcp
 PORTVERSION=	1.2.8
+PORTREVISION=	1
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
 
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index 944ef131ecb3..3635142cd74a 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmg
 PORTVERSION=	0.15.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm gnome
 MASTER_SITES=	http://ductape.net/~reeve/downloads/
 DISTNAME=	wmG-${PORTVERSION}
diff --git a/x11-wm/wmii-devel/Makefile b/x11-wm/wmii-devel/Makefile
index 892a543764e6..f119374d9237 100644
--- a/x11-wm/wmii-devel/Makefile
+++ b/x11-wm/wmii-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmii
 PORTVERSION=	3.5.${CHANGESET}
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	CENKES
 
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index 1ea973662a3c..b102d163d19c 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmii
 DISTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.suckless.org/download/ CENKES
 
diff --git a/x11-wm/wmthemeinstall/Makefile b/x11-wm/wmthemeinstall/Makefile
index 46f587965be8..d88f52f230dc 100644
--- a/x11-wm/wmthemeinstall/Makefile
+++ b/x11-wm/wmthemeinstall/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmthemeinstall
 PORTVERSION=	0.62
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.jeremias.net/wmthemeinstall/download/
 
diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile
index 5badea72e61a..255f3d6b6320 100644
--- a/x11-wm/xcompmgr/Makefile
+++ b/x11-wm/xcompmgr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcompmgr
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://xapps.freedesktop.org/release/
 
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index aa5dcc4d4946..92351b092260 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce
 PORTVERSION=	3.8.18
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/xfce/pkg-plist b/x11-wm/xfce/pkg-plist
index 6852e129079b..2aa984e566b7 100644
--- a/x11-wm/xfce/pkg-plist
+++ b/x11-wm/xfce/pkg-plist
@@ -659,23 +659,3 @@ share/xfce/textures/stripe.xpm
 @dirrm share/xfce/backdrops
 @dirrm share/xfce
 @dirrm etc/xfce
-@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/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 0e3459c7d77c..1b9974dcaff7 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-desktop
 PORTVERSION=	4.4.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DISTNAME=	xfdesktop-${PORTVERSION}
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index a25e4c9556e3..8279b0fa3bbc 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-panel
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index b85b5d3e2ada..d757d709f449 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-session
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index f7258e11673c..d1d3b482d546 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-wm
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DISTNAME=	xfwm4-${PORTVERSION}
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index d21df53e535c..8d315acf6753 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/x11-wm/yawm/Makefile b/x11-wm/yawm/Makefile
index 46caa04dfadf..85e1f89bc687 100644
--- a/x11-wm/yawm/Makefile
+++ b/x11-wm/yawm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yawm
 PORTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.sai.msu.su/pub/X11/win_man/
 DISTNAME=	yawm-0.0.1-a4
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index 5cac9f7eaf14..199e58308c16 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	3ddesktop
 PORTVERSION=	0.2.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	desk3d
diff --git a/x11/9box/Makefile b/x11/9box/Makefile
index dab866808cec..6e97349b015b 100644
--- a/x11/9box/Makefile
+++ b/x11/9box/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	9box
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry
@@ -19,6 +19,7 @@ PLIST_FILES=	bin/9box
 USE_XLIB=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_XORG=	xbitmaps
 
 BUILD_WRKSRC=	${WRKSRC}/src
 
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index fade6b153f12..0bcca303ff19 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	9menu
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	x11 plan9
 MASTER_SITES=	ftp://freefriends.org/arnold/Source/ \
 		${MASTER_SITE_NETBSD}
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 52d687512324..6d77e7854666 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	9term
 PORTVERSION=	1.6.3
+PORTREVISION=	1
 CATEGORIES=	x11 plan9
 MASTER_SITES=	ftp://ftp.cs.usyd.edu.au/matty/unicode/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
diff --git a/x11/Makefile b/x11/Makefile
index c7c654f0f3e1..e4fd89a372cf 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -15,13 +15,17 @@
     SUBDIR += XFree86-4-manuals
     SUBDIR += accessx
     SUBDIR += alltray
+    SUBDIR += appres
     SUBDIR += apwal
     SUBDIR += aterm
     SUBDIR += bbappconf
     SUBDIR += bbdock
     SUBDIR += bbrun
     SUBDIR += bbuname
+    SUBDIR += beforelight
     SUBDIR += bgrot
+    SUBDIR += bigreqsproto
+    SUBDIR += bitmap
     SUBDIR += blast
     SUBDIR += bricons
     SUBDIR += brightside
@@ -29,11 +33,14 @@
     SUBDIR += chameleon
     SUBDIR += cnslock
     SUBDIR += compositeext
+    SUBDIR += compositeproto
     SUBDIR += damageext
+    SUBDIR += damageproto
     SUBDIR += decurs
     SUBDIR += deskmenu
     SUBDIR += dgs
     SUBDIR += dmenu
+    SUBDIR += dmxproto
     SUBDIR += docker
     SUBDIR += dxpc
     SUBDIR += dynamag
@@ -58,6 +65,7 @@
     SUBDIR += e17-module-winselector
     SUBDIR += ebuttons
     SUBDIR += ecore
+    SUBDIR += editres
     SUBDIR += electricsheep
     SUBDIR += elicit
     SUBDIR += emu
@@ -68,6 +76,7 @@
     SUBDIR += etoile
     SUBDIR += etoile-iterm
     SUBDIR += etoile-xwindowserverkit
+    SUBDIR += evieext
     SUBDIR += examine
     SUBDIR += fast-user-switch-applet
     SUBDIR += fbdesk
@@ -75,14 +84,17 @@
     SUBDIR += fbsd-icons
     SUBDIR += fireflies
     SUBDIR += fixesext
+    SUBDIR += fixesproto
     SUBDIR += fluxbg
     SUBDIR += fpc-x11
+    SUBDIR += fstobdf
     SUBDIR += gcb
     SUBDIR += gcursor
     SUBDIR += gdesklets-tasklist
     SUBDIR += gdkxft
     SUBDIR += gdm
     SUBDIR += ggiterm
+    SUBDIR += glproto
     SUBDIR += gmessage
     SUBDIR += gmrun
     SUBDIR += gnome-applets
@@ -115,11 +127,15 @@
     SUBDIR += gtkterm2
     SUBDIR += gtstarter
     SUBDIR += gxset
+    SUBDIR += iceauth
+    SUBDIR += ico
     SUBDIR += idesk
     SUBDIR += imwheel
     SUBDIR += innerspace
+    SUBDIR += inputproto
     SUBDIR += ipager
     SUBDIR += kb2mb2
+    SUBDIR += kbproto
     SUBDIR += kde-lite
     SUBDIR += kde3
     SUBDIR += kde3-apireference
@@ -128,29 +144,38 @@
     SUBDIR += kdelibs3-nocups
     SUBDIR += keylaunch
     SUBDIR += kxgenerator
-    SUBDIR += libGL
     SUBDIR += libICE
     SUBDIR += libSM
     SUBDIR += libX11
+    SUBDIR += libXScrnSaver
+    SUBDIR += libXTrap
     SUBDIR += libXau
     SUBDIR += libXcomposite
     SUBDIR += libXcursor
     SUBDIR += libXdamage
     SUBDIR += libXdmcp
+    SUBDIR += libXevie
     SUBDIR += libXext
     SUBDIR += libXfixes
-    SUBDIR += libXfont
     SUBDIR += libXi
     SUBDIR += libXinerama
     SUBDIR += libXp
     SUBDIR += libXpm
+    SUBDIR += libXprintAppUtil
+    SUBDIR += libXprintUtil
     SUBDIR += libXrandr
     SUBDIR += libXrender
     SUBDIR += libXres
     SUBDIR += libXtrans
+    SUBDIR += libXtst
     SUBDIR += libXv
+    SUBDIR += libXvMC
     SUBDIR += libXxf86
+    SUBDIR += libXxf86dga
+    SUBDIR += libXxf86misc
+    SUBDIR += libXxf86vm
     SUBDIR += libcapplet
+    SUBDIR += libdmx
     SUBDIR += libdnd
     SUBDIR += libexo
     SUBDIR += libgnome
@@ -159,17 +184,22 @@
     SUBDIR += libgnomekbd
     SUBDIR += libgnomemm
     SUBDIR += libgnomemm26
+    SUBDIR += liboldX
     SUBDIR += libsx
     SUBDIR += libsynaptics
     SUBDIR += libxcb
     SUBDIR += libxfce4mcs
     SUBDIR += libxfce4util
     SUBDIR += libxkbfile
+    SUBDIR += libxkbui
     SUBDIR += libxklavier
     SUBDIR += linux-xorg-libs
+    SUBDIR += listres
+    SUBDIR += luit
     SUBDIR += lupe
     SUBDIR += lxpanel
     SUBDIR += mgapdesk
+    SUBDIR += mkcomposecache
     SUBDIR += mlterm
     SUBDIR += mrxvt
     SUBDIR += mrxvt-devel
@@ -182,6 +212,7 @@
     SUBDIR += nvidia-driver-9631
     SUBDIR += nvidia-settings
     SUBDIR += nvidia-xconfig
+    SUBDIR += oclock
     SUBDIR += oooqs
     SUBDIR += oooqs2
     SUBDIR += p5-Clipboard
@@ -194,18 +225,25 @@
     SUBDIR += portoseguro
     SUBDIR += powershell
     SUBDIR += printext
+    SUBDIR += printproto
     SUBDIR += props
     SUBDIR += py-qt4-opengl
     SUBDIR += qrash
     SUBDIR += qt4-inputmethods
     SUBDIR += qt4-opengl
     SUBDIR += randrext
+    SUBDIR += randrproto
+    SUBDIR += recordproto
     SUBDIR += rendercheck
     SUBDIR += renderext
+    SUBDIR += renderproto
     SUBDIR += resourceext
+    SUBDIR += resourceproto
+    SUBDIR += rgb
     SUBDIR += rox-wallpaper
     SUBDIR += roxbg
     SUBDIR += rsibreak
+    SUBDIR += rstart
     SUBDIR += ruby-X11
     SUBDIR += ruby-gnome2
     SUBDIR += ruby-gnome2-all
@@ -213,11 +251,16 @@
     SUBDIR += rxvt
     SUBDIR += rxvt-devel
     SUBDIR += rxvt-unicode
+    SUBDIR += scripts
+    SUBDIR += scrnsaverproto
+    SUBDIR += sessreg
     SUBDIR += settitle
+    SUBDIR += setxkbmap
     SUBDIR += silo
     SUBDIR += sisctrl
     SUBDIR += slim
     SUBDIR += slock
+    SUBDIR += smproxy
     SUBDIR += stalonetray
     SUBDIR += startup-notification
     SUBDIR += sxpc
@@ -227,9 +270,12 @@
     SUBDIR += tilda
     SUBDIR += tkXwin
     SUBDIR += tkgoodstuff
+    SUBDIR += trapproto
     SUBDIR += trayer
     SUBDIR += tycoon
     SUBDIR += vdesk
+    SUBDIR += videoproto
+    SUBDIR += viewres
     SUBDIR += wbar
     SUBDIR += wdm
     SUBDIR += widgetfactory
@@ -248,55 +294,104 @@
     SUBDIR += workrave
     SUBDIR += wrapper
     SUBDIR += wterm
+    SUBDIR += x11perf
     SUBDIR += x3270
     SUBDIR += xaniroc
     SUBDIR += xantfarm
+    SUBDIR += xauth
     SUBDIR += xautolock
     SUBDIR += xautomation
     SUBDIR += xballoon
     SUBDIR += xbanner
     SUBDIR += xbelld
+    SUBDIR += xbiff
     SUBDIR += xbindkeys
     SUBDIR += xbindkeys_config
+    SUBDIR += xbitmaps
+    SUBDIR += xcalc
     SUBDIR += xcalib
     SUBDIR += xcb
     SUBDIR += xcb-proto
     SUBDIR += xclick
     SUBDIR += xclip
+    SUBDIR += xclipboard
+    SUBDIR += xclock
     SUBDIR += xcmd
+    SUBDIR += xcmiscproto
+    SUBDIR += xcmsdb
     SUBDIR += xco
     SUBDIR += xcoloredit
     SUBDIR += xcolors
     SUBDIR += xcolorsel
+    SUBDIR += xconsole
     SUBDIR += xcurs
+    SUBDIR += xcursorgen
     SUBDIR += xcut
+    SUBDIR += xdbedizzy
     SUBDIR += xdialog
+    SUBDIR += xditview
+    SUBDIR += xdm
+    SUBDIR += xdpyinfo
+    SUBDIR += xdriinfo
     SUBDIR += xdtm
+    SUBDIR += xedit
+    SUBDIR += xev
     SUBDIR += xextensions
+    SUBDIR += xextproto
+    SUBDIR += xeyes
+    SUBDIR += xf86dga
+    SUBDIR += xf86dgaproto
+    SUBDIR += xf86driproto
     SUBDIR += xf86ext
+    SUBDIR += xf86miscproto
+    SUBDIR += xf86rushproto
+    SUBDIR += xf86vidmodeproto
     SUBDIR += xfce4-clipman-plugin
     SUBDIR += xfce4-quicklauncher-plugin
     SUBDIR += xfce4-screenshooter-plugin
     SUBDIR += xfce4-taskmanager
     SUBDIR += xfce4-xfapplet-plugin
+    SUBDIR += xfd
+    SUBDIR += xfindproxy
     SUBDIR += xfishtank
     SUBDIR += xfree86_xkb_xml
+    SUBDIR += xfwp
+    SUBDIR += xgamma
+    SUBDIR += xgc
     SUBDIR += xgrab
+    SUBDIR += xhost
     SUBDIR += xidle
+    SUBDIR += xineramaproto
+    SUBDIR += xinit
     SUBDIR += xinput
+    SUBDIR += xkbcomp
     SUBDIR += xkbctrl
+    SUBDIR += xkbevd
+    SUBDIR += xkbprint
     SUBDIR += xkbset
+    SUBDIR += xkbutils
+    SUBDIR += xkeyboard-config
     SUBDIR += xkeycaps
     SUBDIR += xkeywrap
-    SUBDIR += xlibs
+    SUBDIR += xkill
+    SUBDIR += xload
     SUBDIR += xloadimage
     SUBDIR += xlockmore
+    SUBDIR += xlogo
     SUBDIR += xlogout
+    SUBDIR += xlsatoms
+    SUBDIR += xlsclients
     SUBDIR += xlupe
+    SUBDIR += xmag
+    SUBDIR += xman
     SUBDIR += xmangekyou
     SUBDIR += xmascot
+    SUBDIR += xmessage
+    SUBDIR += xmh
+    SUBDIR += xmodmap
     SUBDIR += xmold
     SUBDIR += xmon
+    SUBDIR += xmore
     SUBDIR += xmotd
     SUBDIR += xmove
     SUBDIR += xmsg
@@ -304,26 +399,43 @@
     SUBDIR += xnee
     SUBDIR += xnodecor
     SUBDIR += xorg
-    SUBDIR += xorg-clients
-    SUBDIR += xorg-documents
+    SUBDIR += xorg-apps
+    SUBDIR += xorg-cf-files
+    SUBDIR += xorg-docs
     SUBDIR += xorg-edit
     SUBDIR += xorg-libraries
-    SUBDIR += xorg-manpages
+    SUBDIR += xorg-protos
+    SUBDIR += xphelloworld
+    SUBDIR += xplsprinters
+    SUBDIR += xpr
+    SUBDIR += xprehashprinterlist
     SUBDIR += xprompt
+    SUBDIR += xprop
     SUBDIR += xproto
+    SUBDIR += xproxymanagementprotocol
+    SUBDIR += xrandr
+    SUBDIR += xrdb
+    SUBDIR += xrefresh
     SUBDIR += xrestop
     SUBDIR += xrootconsole
     SUBDIR += xrsh
     SUBDIR += xrsi
+    SUBDIR += xrx
     SUBDIR += xscreensaver
     SUBDIR += xscreensaver-gnome
     SUBDIR += xscreensaver-gnome-hacks
     SUBDIR += xscreensaver-kde
     SUBDIR += xscreensaver.app
     SUBDIR += xsel
+    SUBDIR += xset
+    SUBDIR += xsetmode
+    SUBDIR += xsetpointer
+    SUBDIR += xsetroot
     SUBDIR += xskyroot
+    SUBDIR += xsm
     SUBDIR += xsnow
     SUBDIR += xstarroll
+    SUBDIR += xstdcmap
     SUBDIR += xstroke
     SUBDIR += xtacy
     SUBDIR += xtattr
@@ -332,12 +444,19 @@
     SUBDIR += xtermset
     SUBDIR += xtestpicture
     SUBDIR += xtoolwait
+    SUBDIR += xtrans
+    SUBDIR += xtrap
     SUBDIR += xtrlock
     SUBDIR += xtset
     SUBDIR += xvattr
+    SUBDIR += xvidtune
+    SUBDIR += xvinfo
     SUBDIR += xvkbd
     SUBDIR += xwatchwin
+    SUBDIR += xwd
+    SUBDIR += xwininfo
     SUBDIR += xwit
+    SUBDIR += xwud
     SUBDIR += xxkb
     SUBDIR += xzoom
     SUBDIR += yakuake
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 821154bc75eb..605416813e24 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Terminal
 PORTVERSION=	0.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index df3599687e8e..dc83fd7c0b0d 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -125,7 +125,6 @@ share/locale/uk/LC_MESSAGES/Terminal.mo
 share/locale/zh_CN/LC_MESSAGES/Terminal.mo
 share/locale/zh_TW/LC_MESSAGES/Terminal.mo
 share/pixmaps/terminal.xpm
-@dirrmtry share/pixmaps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/24x24/stock/navigation
 @dirrmtry share/icons/hicolor/24x24/stock
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 43dca7f5761c..1d7ac13361a7 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clients
 PORTVERSION=	4.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR= ${PORTVERSION}
diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index 9021cb691f65..e70fa16fb0cc 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	documents
 PORTVERSION=	4.5.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 6a5664750ace..e7df1a8d6181 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libraries
 PORTVERSION=	4.5.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -34,7 +35,7 @@ CONFLICTS=	Mesa-[0-9]* libX11-[0-9]* libGL-[0-9]* libGLU-[0-9]* \
 
 USE_X_PREFIX=		no
 PREFIX?=		${X11BASE}
-MTREE_FILE=		/etc/mtree/BSD.x11-4.dist
+MTREE_FILE=		${PORTSDIR}/Templates/BSD.local.dist
 INSTALLS_SHLIB=		yes
 SCRIPTS_ENV=		DebuggableLibraries=${DebuggableLibraries}
 MAN3=			FontCacheChangeCacheSettings.3 \
diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile
index 0a72856ae9a4..148345523265 100644
--- a/x11/XFree86-4-manuals/Makefile
+++ b/x11/XFree86-4-manuals/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	manuals
 PORTVERSION=	4.5.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 7566259bd886..1f04cc7c7f99 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XFree86
 PORTVERSION=	4.5.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	# none
diff --git a/x11/accessx/Makefile b/x11/accessx/Makefile
index 7c9829e5710a..6a0e5890210d 100644
--- a/x11/accessx/Makefile
+++ b/x11/accessx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	accessx
 PORTVERSION=	0.951
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 accessibility
 MASTER_SITES=	http://www.disability.uiuc.edu/accessx/software/
 DISTNAME=	accessx${PORTVERSION:S/.//g}
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index 5c8603b8e65b..8390958579e8 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alltray
 PORTVERSION=	0.69
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/alltray/pkg-plist b/x11/alltray/pkg-plist
index 7c01a3423e78..c17fd0f3e0f9 100644
--- a/x11/alltray/pkg-plist
+++ b/x11/alltray/pkg-plist
@@ -5,4 +5,3 @@ lib/liballtray.so.0
 share/applications/alltray.desktop
 share/pixmaps/alltray.png
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/x11/appres/Makefile b/x11/appres/Makefile
new file mode 100644
index 000000000000..bc9a32721fdb
--- /dev/null
+++ b/x11/appres/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	appres
+# Date Created:				15 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	appres
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Program to list application's resources
+
+XORG_CAT=	app
+USE_XORG=	x11 xt
+
+MAN1=		appres.1
+PLIST_FILES=	bin/appres
+
+.include <bsd.port.mk>
diff --git a/x11/appres/distinfo b/x11/appres/distinfo
new file mode 100644
index 000000000000..fef58715f111
--- /dev/null
+++ b/x11/appres/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/appres-1.0.1.tar.bz2) = 420e6cdf38bb771ec8b00228bf09e8ff
+SHA256 (xorg/app/appres-1.0.1.tar.bz2) = 15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962
+SIZE (xorg/app/appres-1.0.1.tar.bz2) = 85320
diff --git a/x11/appres/pkg-descr b/x11/appres/pkg-descr
new file mode 100644
index 000000000000..6a5b906d2e75
--- /dev/null
+++ b/x11/appres/pkg-descr
@@ -0,0 +1,4 @@
+The appres program prints the resources seen by an application (or
+subhierarchy of an application) with the specified class and instance
+names.  It can be used to determine which resources a particular
+program will load.
diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile
index 0e96e21a634a..711b8e5ff415 100644
--- a/x11/apwal/Makefile
+++ b/x11/apwal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apwal
 PORTVERSION=	0.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://apwal.free.fr/download/
 
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 860abe42fe6e..caa26b0377c6 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aterm
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	x11	# `+=' is for slave ports
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/bbappconf/Makefile b/x11/bbappconf/Makefile
index 9c896fed7926..69a816b25d1c 100644
--- a/x11/bbappconf/Makefile
+++ b/x11/bbappconf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bbappconf
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://bbtools.windsofstorm.net/sources/
 
diff --git a/x11/bbdock/Makefile b/x11/bbdock/Makefile
index d9ff4b73ddd0..c9fed00f405e 100644
--- a/x11/bbdock/Makefile
+++ b/x11/bbdock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		bbdock
 PORTVERSION=		0.2.8
+PORTREVISION=	1
 CATEGORIES=		x11
 MASTER_SITES=		http://bbdock.nethence.com/download/
 
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index bc292676bfe5..63841ab25b11 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bbrun
 PORTVERSION=	1.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://www.bsd-geek.de/FreeBSD/distfiles/
 
diff --git a/x11/bbuname/Makefile b/x11/bbuname/Makefile
index 42cb43084bfe..8eb5d2a39d4b 100644
--- a/x11/bbuname/Makefile
+++ b/x11/bbuname/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bbuname
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://spiritisdigital.com/download/linux/bbuname/
 
diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile
new file mode 100644
index 000000000000..f79b5def73d5
--- /dev/null
+++ b/x11/beforelight/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	beforelight
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	beforelight
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	A sample screen saver for X
+
+XORG_CAT=	app
+USE_XORG=	x11 xscrnsaver xt xaw7 xt
+
+MAN1=		beforelight.1
+
+.include <bsd.port.mk>
diff --git a/x11/beforelight/distinfo b/x11/beforelight/distinfo
new file mode 100644
index 000000000000..06c9a62d2edd
--- /dev/null
+++ b/x11/beforelight/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/beforelight-1.0.2.tar.bz2) = 8bc2e35cdcd2e6a80eab1b77c41f2a46
+SHA256 (xorg/app/beforelight-1.0.2.tar.bz2) = 00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7
+SIZE (xorg/app/beforelight-1.0.2.tar.bz2) = 85526
diff --git a/x11/beforelight/pkg-descr b/x11/beforelight/pkg-descr
new file mode 100644
index 000000000000..75c2de6b27ab
--- /dev/null
+++ b/x11/beforelight/pkg-descr
@@ -0,0 +1,5 @@
+This package contains a sample screen saver for the X Window System called
+"beforelight".
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/beforelight/pkg-plist b/x11/beforelight/pkg-plist
new file mode 100644
index 000000000000..e1a775c5b7fa
--- /dev/null
+++ b/x11/beforelight/pkg-plist
@@ -0,0 +1,3 @@
+bin/beforelight
+share/X11/app-defaults/Beforelight
+@dirrmtry share/X11/app-defaults
diff --git a/x11/bgrot/Makefile b/x11/bgrot/Makefile
index b3fb94f70987..4cf2ae1c8e6a 100644
--- a/x11/bgrot/Makefile
+++ b/x11/bgrot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bgrot
 PORTVERSION=	1.30
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.over-yonder.net/~fullermd/projects/bgrot/ \
 		http://www.centralmiss.com/~matt/distfiles/
diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile
new file mode 100644
index 000000000000..b1d7036899f8
--- /dev/null
+++ b/x11/bigreqsproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	bigreqsproto
+# Date Created:				07 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	bigreqsproto
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	BigReqs extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/bigreqsproto/distinfo b/x11/bigreqsproto/distinfo
new file mode 100644
index 000000000000..b1c8a2736651
--- /dev/null
+++ b/x11/bigreqsproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 95c29d9d10bf2868996c0c47a3b9a8dc
+SHA256 (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee
+SIZE (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 36676
diff --git a/x11/bigreqsproto/pkg-descr b/x11/bigreqsproto/pkg-descr
new file mode 100644
index 000000000000..8d54a8f300f0
--- /dev/null
+++ b/x11/bigreqsproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org BigReqs extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/bigreqsproto/pkg-plist b/x11/bigreqsproto/pkg-plist
new file mode 100644
index 000000000000..1a1af677b0cd
--- /dev/null
+++ b/x11/bigreqsproto/pkg-plist
@@ -0,0 +1,3 @@
+include/X11/extensions/bigreqstr.h
+libdata/pkgconfig/bigreqsproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
new file mode 100644
index 000000000000..5e750fc2ffc0
--- /dev/null
+++ b/x11/bitmap/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	bitmap
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	bitmap
+PORTVERSION=	1.0.3
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Bitmap editor and converter utilities for X
+
+XORG_CAT=	app
+USE_XORG=	x11 xmu x11 xbitmaps xt xaw xbitmaps
+MAN1=		atobm.1 bitmap.1 bmtoa.1
+
+.include <bsd.port.mk>
diff --git a/x11/bitmap/distinfo b/x11/bitmap/distinfo
new file mode 100644
index 000000000000..f6dee763e9f8
--- /dev/null
+++ b/x11/bitmap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/bitmap-1.0.3.tar.bz2) = 98200c358e5401d648b980564d9ae39d
+SHA256 (xorg/app/bitmap-1.0.3.tar.bz2) = 863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41
+SIZE (xorg/app/bitmap-1.0.3.tar.bz2) = 129364
diff --git a/x11/bitmap/pkg-descr b/x11/bitmap/pkg-descr
new file mode 100644
index 000000000000..fcb5245535ce
--- /dev/null
+++ b/x11/bitmap/pkg-descr
@@ -0,0 +1,5 @@
+This package contains bitmap, which is a tool for creating or editing
+rectangual images made up of 1's and 0's.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/bitmap/pkg-plist b/x11/bitmap/pkg-plist
new file mode 100644
index 000000000000..f9dfe747269b
--- /dev/null
+++ b/x11/bitmap/pkg-plist
@@ -0,0 +1,20 @@
+bin/atobm
+bin/bitmap
+bin/bmtoa
+include/X11/bitmaps/Dashes
+include/X11/bitmaps/Down
+include/X11/bitmaps/Excl
+include/X11/bitmaps/FlipHoriz
+include/X11/bitmaps/FlipVert
+include/X11/bitmaps/Fold
+include/X11/bitmaps/Left
+include/X11/bitmaps/Right
+include/X11/bitmaps/RotateLeft
+include/X11/bitmaps/RotateRight
+include/X11/bitmaps/Stipple
+include/X11/bitmaps/Term
+include/X11/bitmaps/Up
+share/X11/app-defaults/Bitmap
+share/X11/app-defaults/Bitmap-color
+share/X11/app-defaults/Bitmap-nocase
+@dirrmtry share/X11/app-defaults
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index ab4f3bb66e08..2e7333e5983b 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	blast
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/b/blast
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index 5346068baa55..d6be0fa327db 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bricons
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index cfe6f657ff68..9bd61f528d3f 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	brightside
 PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://files.catmur.co.uk/brightside/
 
diff --git a/x11/buttonbox/Makefile b/x11/buttonbox/Makefile
index 5b52c4433579..3dac8044c74a 100644
--- a/x11/buttonbox/Makefile
+++ b/x11/buttonbox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	buttonbox
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
diff --git a/x11/chameleon/Makefile b/x11/chameleon/Makefile
index 3580a29b06c8..c19456eae8c8 100644
--- a/x11/chameleon/Makefile
+++ b/x11/chameleon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chameleon
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://ftp.us.debian.org/debian/pool/main/c/chameleon/ \
 		ftp://carroll.aset.psu.edu/pub/linux/distributions/debian/pool/main/c/chameleon/ \
diff --git a/x11/cnslock/Makefile b/x11/cnslock/Makefile
index 26e55732283f..f5b3f95e3fe3 100644
--- a/x11/cnslock/Makefile
+++ b/x11/cnslock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cnslock
 PORTVERSION=	1.02
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://www.dockapps.com/files/123/181/ \
 		http://freebsd.nsu.ru/distfiles/
diff --git a/x11/compositeext/Makefile b/x11/compositeext/Makefile
index 326b32b1af80..5ffc5df336ca 100644
--- a/x11/compositeext/Makefile
+++ b/x11/compositeext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	compositeext
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile
new file mode 100644
index 000000000000..75e6a6a203ed
--- /dev/null
+++ b/x11/compositeproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	compositeproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	compositeproto
+PORTVERSION=	0.3.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Composite extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo
new file mode 100644
index 000000000000..1a4c5e25086f
--- /dev/null
+++ b/x11/compositeproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/compositeproto-0.3.1.tar.bz2) = 54f1fbd567f57093df054f8440a60a5e
+SHA256 (xorg/proto/compositeproto-0.3.1.tar.bz2) = c7608611a7e42604777bdf7db20d17e7f4b62da98f154da762d12c735812e0cf
+SIZE (xorg/proto/compositeproto-0.3.1.tar.bz2) = 37322
diff --git a/x11/compositeproto/pkg-descr b/x11/compositeproto/pkg-descr
new file mode 100644
index 000000000000..9ce26903ea4d
--- /dev/null
+++ b/x11/compositeproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Composite extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/compositeproto/pkg-plist b/x11/compositeproto/pkg-plist
new file mode 100644
index 000000000000..22845d18c4b8
--- /dev/null
+++ b/x11/compositeproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/composite.h
+include/X11/extensions/compositeproto.h
+libdata/pkgconfig/compositeproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/damageext/Makefile b/x11/damageext/Makefile
index 702b4cc237e6..52ef3d2c95db 100644
--- a/x11/damageext/Makefile
+++ b/x11/damageext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	damageext
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile
new file mode 100644
index 000000000000..13fbd41b7039
--- /dev/null
+++ b/x11/damageproto/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	damageproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	damageproto
+PORTVERSION=	1.1.0
+PORTREVISION=	2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Damage extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/damageproto/distinfo b/x11/damageproto/distinfo
new file mode 100644
index 000000000000..94794a9b8037
--- /dev/null
+++ b/x11/damageproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/damageproto-1.1.0.tar.bz2) = 33ee591e0b1ca5ad7902934541db7d24
+SHA256 (xorg/proto/damageproto-1.1.0.tar.bz2) = 9d2684fac835e9cdf78befff2a58292f54db90094acbfb9f2ed5316fa30d641d
+SIZE (xorg/proto/damageproto-1.1.0.tar.bz2) = 41449
diff --git a/x11/damageproto/pkg-descr b/x11/damageproto/pkg-descr
new file mode 100644
index 000000000000..9ba4ce9c9d65
--- /dev/null
+++ b/x11/damageproto/pkg-descr
@@ -0,0 +1,5 @@
+This package contains X.Org Damage extension protocol specification
+and header files.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/damageproto/pkg-plist b/x11/damageproto/pkg-plist
new file mode 100644
index 000000000000..66a230ae830d
--- /dev/null
+++ b/x11/damageproto/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/extensions/damageproto.h
+include/X11/extensions/damagewire.h
+libdata/pkgconfig/damageproto.pc
+share/doc/damageproto/damageproto.txt
+@dirrm share/doc/damageproto
+@dirrmtry include/X11/extensions
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index ea0807a37534..d0bbdf5c1555 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	decurs
 PORTVERSION=	0.55.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	http://varg.dyndns.org/psi/files/
 
diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile
index dc87c1fb33a1..48a5cfa2623e 100644
--- a/x11/deskmenu/Makefile
+++ b/x11/deskmenu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	deskmenu
 PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://matt.peterson.org/FreeBSD/ports/ \
 		http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index a235202eb580..88d7c07bf131 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dgs
 PORTVERSION=	0.5.9.1
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	dgs
@@ -52,7 +52,7 @@ post-patch:
 
 .if ${X_WINDOW_SYSTEM:L} == xorg
 INSTALLDIRS+=	DPS/clients/makepsres DPS/clients/pswrap DPS/demos/texteroids \
-		DPS/lib/dpstk DPS/lib/psres
+		DPS/lib/dpstk DPS/lib/psres DPS/lib/dps DPS/include/DPS
 MANN+=		makepsres.man
 PLIST_SUB+=	WITH_XFREE4=""
 .else
diff --git a/x11/dgs/pkg-plist b/x11/dgs/pkg-plist
index d92e10bc038f..141e7e9d3f54 100644
--- a/x11/dgs/pkg-plist
+++ b/x11/dgs/pkg-plist
@@ -6,6 +6,36 @@ bin/dpsnx.agent
 %%WITH_XFREE4%%bin/pswrap
 %%WITH_XFREE4%%bin/texteroids
 bin/xepsf
+%%WITH_XFREE4%%include/DPS/ColorSB.h
+%%WITH_XFREE4%%include/DPS/ColorSBP.h
+%%WITH_XFREE4%%include/DPS/DPSScrollW.h
+%%WITH_XFREE4%%include/DPS/DPSScrollWP.h
+%%WITH_XFREE4%%include/DPS/FontCreatP.h
+%%WITH_XFREE4%%include/DPS/FontCreato.h
+%%WITH_XFREE4%%include/DPS/FontSB.h
+%%WITH_XFREE4%%include/DPS/FontSBP.h
+%%WITH_XFREE4%%include/DPS/FontSamplP.h
+%%WITH_XFREE4%%include/DPS/FontSample.h
+%%WITH_XFREE4%%include/DPS/PSres.h
+%%WITH_XFREE4%%include/DPS/XDPS.h
+%%WITH_XFREE4%%include/DPS/XDPSlib.h
+%%WITH_XFREE4%%include/DPS/XDPSproto.h
+%%WITH_XFREE4%%include/DPS/dpsNXargs.h
+%%WITH_XFREE4%%include/DPS/dpsXclient.h
+%%WITH_XFREE4%%include/DPS/dpsXcommon.h
+%%WITH_XFREE4%%include/DPS/dpsXpreview.h
+%%WITH_XFREE4%%include/DPS/dpsXshare.h
+%%WITH_XFREE4%%include/DPS/dpsXuserpath.h
+%%WITH_XFREE4%%include/DPS/dpsclient.h
+%%WITH_XFREE4%%include/DPS/dpsconfig.h
+%%WITH_XFREE4%%include/DPS/dpsexcept.h
+%%WITH_XFREE4%%include/DPS/dpsfriends.h
+%%WITH_XFREE4%%include/DPS/dpsops.h
+%%WITH_XFREE4%%include/DPS/psops.h
+%%WITH_XFREE4%%lib/libdps.a
+%%WITH_XFREE4%%lib/libdps.la
+%%WITH_XFREE4%%lib/libdps.so
+%%WITH_XFREE4%%lib/libdps.so.0
 %%WITH_XFREE4%%lib/libdpstk.a
 %%WITH_XFREE4%%lib/libdpstk.la
 %%WITH_XFREE4%%lib/libdpstk.so
@@ -84,6 +114,7 @@ share/ghostscript/5.50/gs_typ32.ps
 share/ghostscript/5.50/gs_typ42.ps
 share/ghostscript/5.50/gs_type1.ps
 share/ghostscript/5.50/gs_wan_e.ps
+%%WITH_XFREE4%%@dirrm include/DPS
 @dirrmtry share/ghostscript/5.50/doc
 @dirrmtry share/ghostscript/5.50/examples
 @dirrmtry share/ghostscript/5.50
diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile
index 8cf8e2d754d8..771fd228a7bc 100644
--- a/x11/dmenu/Makefile
+++ b/x11/dmenu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dmenu
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.suckless.org/download/ \
 		http://schot.a-eskwadraat.nl/files/
diff --git a/x11/dmxproto/Makefile b/x11/dmxproto/Makefile
new file mode 100644
index 000000000000..a568291d4cf1
--- /dev/null
+++ b/x11/dmxproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	dmxproto
+# Date Created:				06 Feb 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	dmxproto
+PORTVERSION=	2.2.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	DMX extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/dmxproto/distinfo b/x11/dmxproto/distinfo
new file mode 100644
index 000000000000..9c74d443d02e
--- /dev/null
+++ b/x11/dmxproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/dmxproto-2.2.2.tar.bz2) = d80acad88411e7944b9b085463d53302
+SHA256 (xorg/proto/dmxproto-2.2.2.tar.bz2) = aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2
+SIZE (xorg/proto/dmxproto-2.2.2.tar.bz2) = 39380
diff --git a/x11/dmxproto/pkg-descr b/x11/dmxproto/pkg-descr
new file mode 100644
index 000000000000..32c1fea20bec
--- /dev/null
+++ b/x11/dmxproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org DMXProto protocol headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/dmxproto/pkg-plist b/x11/dmxproto/pkg-plist
new file mode 100644
index 000000000000..6a6ab38e4e10
--- /dev/null
+++ b/x11/dmxproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/dmxext.h
+include/X11/extensions/dmxproto.h
+libdata/pkgconfig/dmxproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/docker/Makefile b/x11/docker/Makefile
index 8d0b31cf6f69..0320b72b5c37 100644
--- a/x11/docker/Makefile
+++ b/x11/docker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	docker
 PORTVERSION=	1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://www.kerneled.org/files/FreeBSD-ports/ \
 		http://icculus.org/openbox/2/docker/
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index b01a9d7e6a4e..004b3f4600b1 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dxpc
 PORTVERSION=	3.9.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.vigor.nu/dxpc/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11/dynamag/Makefile b/x11/dynamag/Makefile
index eaab4f00152e..e0691f4e7370 100644
--- a/x11/dynamag/Makefile
+++ b/x11/dynamag/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dynamag
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11 accessibility
 MASTER_SITES=	ftp://trace.wisc.edu/pub/access_utils/unix/
 DISTNAME=	unwindows
diff --git a/x11/e17-module-calendar/Makefile b/x11/e17-module-calendar/Makefile
index 0b0dfcbc44c0..72323396da12 100644
--- a/x11/e17-module-calendar/Makefile
+++ b/x11/e17-module-calendar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	calendar
 PORTVERSION=	20060926
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
diff --git a/x11/e17-module-cpu/Makefile b/x11/e17-module-cpu/Makefile
index e8d1947ec084..f6e16b1af42b 100644
--- a/x11/e17-module-cpu/Makefile
+++ b/x11/e17-module-cpu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cpu
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-deskshow/Makefile b/x11/e17-module-deskshow/Makefile
index 6737fb2fa962..dae67ad0b679 100644
--- a/x11/e17-module-deskshow/Makefile
+++ b/x11/e17-module-deskshow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	deskshow
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-devian/Makefile b/x11/e17-module-devian/Makefile
index 2a3a8639abc4..a1f97faa7568 100644
--- a/x11/e17-module-devian/Makefile
+++ b/x11/e17-module-devian/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	devian
 PORTVERSION=	20060926
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
diff --git a/x11/e17-module-engage/Makefile b/x11/e17-module-engage/Makefile
index a7ef92b84a7b..2901f7dbbf26 100644
--- a/x11/e17-module-engage/Makefile
+++ b/x11/e17-module-engage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	engage
 PORTVERSION=	20060719
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://mbsd.msk.ru/dist/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-eveil/Makefile b/x11/e17-module-eveil/Makefile
index 9b4cdf15164c..bfae868c09cc 100644
--- a/x11/e17-module-eveil/Makefile
+++ b/x11/e17-module-eveil/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eveil
 PORTVERSION=	20060926
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-flame/Makefile b/x11/e17-module-flame/Makefile
index d519978d532c..278fe318b88c 100644
--- a/x11/e17-module-flame/Makefile
+++ b/x11/e17-module-flame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flame
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-flame/pkg-plist b/x11/e17-module-flame/pkg-plist
index 81497b3558fb..6651443c6b32 100644
--- a/x11/e17-module-flame/pkg-plist
+++ b/x11/e17-module-flame/pkg-plist
@@ -7,8 +7,6 @@ lib/enlightenment/modules/flame/module.edj
 %%NLS%%share/locale/fi/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/it/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/flame.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/flame/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/flame
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-language/Makefile b/x11/e17-module-language/Makefile
index 8aa1a785a725..8107c559daaf 100644
--- a/x11/e17-module-language/Makefile
+++ b/x11/e17-module-language/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	language
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-mail/Makefile b/x11/e17-module-mail/Makefile
index 80231798718e..2e61a02d11ef 100644
--- a/x11/e17-module-mail/Makefile
+++ b/x11/e17-module-mail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mail
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-mem/Makefile b/x11/e17-module-mem/Makefile
index e4429d12de3a..e2c7d3e74d4b 100644
--- a/x11/e17-module-mem/Makefile
+++ b/x11/e17-module-mem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mem
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/e17-module-mem/pkg-plist b/x11/e17-module-mem/pkg-plist
index aae66c519dca..e6d9793970a2 100644
--- a/x11/e17-module-mem/pkg-plist
+++ b/x11/e17-module-mem/pkg-plist
@@ -11,8 +11,6 @@ lib/enlightenment/modules/mem/module_icon.png
 %%NLS%%share/locale/ja/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/mem.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/mem/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mem
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-mixer/Makefile b/x11/e17-module-mixer/Makefile
index 383d88e5b9ec..f18221d40a69 100644
--- a/x11/e17-module-mixer/Makefile
+++ b/x11/e17-module-mixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mixer
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-moon/Makefile b/x11/e17-module-moon/Makefile
index afd824050568..01eee6b51d99 100644
--- a/x11/e17-module-moon/Makefile
+++ b/x11/e17-module-moon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moon
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/e17-module-rain/Makefile b/x11/e17-module-rain/Makefile
index 749f7c611194..155c65f629b1 100644
--- a/x11/e17-module-rain/Makefile
+++ b/x11/e17-module-rain/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rain
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-rain/pkg-plist b/x11/e17-module-rain/pkg-plist
index f9c08552a331..3b4f45a09cfc 100644
--- a/x11/e17-module-rain/pkg-plist
+++ b/x11/e17-module-rain/pkg-plist
@@ -13,8 +13,6 @@ lib/enlightenment/modules/rain/module.edj
 %%NLS%%share/locale/it/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/rain.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/rain/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/rain
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-screenshot/Makefile b/x11/e17-module-screenshot/Makefile
index e81eef644530..405edd0fda9f 100644
--- a/x11/e17-module-screenshot/Makefile
+++ b/x11/e17-module-screenshot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	screenshot
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-screenshot/pkg-plist b/x11/e17-module-screenshot/pkg-plist
index 190a2187bff1..bf1d4b69764d 100644
--- a/x11/e17-module-screenshot/pkg-plist
+++ b/x11/e17-module-screenshot/pkg-plist
@@ -12,8 +12,6 @@ lib/enlightenment/modules/screenshot/screenshot.edj
 %%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/screenshot
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-slideshow/Makefile b/x11/e17-module-slideshow/Makefile
index 7689744ff0e3..ad25dcef43df 100644
--- a/x11/e17-module-slideshow/Makefile
+++ b/x11/e17-module-slideshow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slideshow
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-slideshow/pkg-plist b/x11/e17-module-slideshow/pkg-plist
index de126aa1c465..fb0ceadcb818 100644
--- a/x11/e17-module-slideshow/pkg-plist
+++ b/x11/e17-module-slideshow/pkg-plist
@@ -11,8 +11,6 @@ lib/enlightenment/modules/slideshow/slideshow.edj
 %%NLS%%share/locale/it/LC_MESSAGES/slideshow.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/slideshow.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/slideshow.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/slideshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/slideshow
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-snow/Makefile b/x11/e17-module-snow/Makefile
index 5ac1467b5ce1..b79c8a7dd8c2 100644
--- a/x11/e17-module-snow/Makefile
+++ b/x11/e17-module-snow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snow
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-snow/pkg-plist b/x11/e17-module-snow/pkg-plist
index c1752aa10628..31ad449eeda5 100644
--- a/x11/e17-module-snow/pkg-plist
+++ b/x11/e17-module-snow/pkg-plist
@@ -13,8 +13,6 @@ lib/enlightenment/modules/snow/tree.png
 %%NLS%%share/locale/it/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/snow.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
 @dirrm lib/enlightenment/modules/snow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/snow
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-uptime/Makefile b/x11/e17-module-uptime/Makefile
index 1cb0635f052f..41f7cb1d2e4e 100644
--- a/x11/e17-module-uptime/Makefile
+++ b/x11/e17-module-uptime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uptime
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-uptime/pkg-plist b/x11/e17-module-uptime/pkg-plist
index 2d2960917bac..37f9e851da0e 100644
--- a/x11/e17-module-uptime/pkg-plist
+++ b/x11/e17-module-uptime/pkg-plist
@@ -13,8 +13,6 @@ share/locale/ja/LC_MESSAGES/uptime.mo
 share/locale/sv/LC_MESSAGES/uptime.mo
 share/nls/POSIX
 share/nls/en_US.US-ASCII
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
 @dirrmtry lib/enlightenment/modules/uptime/%%E17_ARCH%%
 @dirrmtry lib/enlightenment/modules/uptime
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-weather/Makefile b/x11/e17-module-weather/Makefile
index 600f766a78b0..376696b84436 100644
--- a/x11/e17-module-weather/Makefile
+++ b/x11/e17-module-weather/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	weather
 PORTVERSION=	20070223
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/e17-module-winselector/Makefile b/x11/e17-module-winselector/Makefile
index 60053eb75610..485bf032a019 100644
--- a/x11/e17-module-winselector/Makefile
+++ b/x11/e17-module-winselector/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	winselector
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/ebuttons/Makefile b/x11/ebuttons/Makefile
index 7e2258dc1089..ec7be06191eb 100644
--- a/x11/ebuttons/Makefile
+++ b/x11/ebuttons/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	E-buttons
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		http://mirror2.unixfreunde.de/
diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
index 3f28e3ec9304..cbf530616cce 100644
--- a/x11/ecore/Makefile
+++ b/x11/ecore/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ecore
 PORTVERSION=	20070223
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
new file mode 100644
index 000000000000..e1306e904635
--- /dev/null
+++ b/x11/editres/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	editres
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	editres
+PORTVERSION=	1.0.3
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Dynamic resource editor for X Toolkit Applications
+
+XORG_CAT=	app
+USE_XORG=	x11 xt xmu xaw
+
+MAN1=		editres.1
+
+.include <bsd.port.mk>
diff --git a/x11/editres/distinfo b/x11/editres/distinfo
new file mode 100644
index 000000000000..7c38b72c4e1e
--- /dev/null
+++ b/x11/editres/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/editres-1.0.3.tar.bz2) = a25f931cc6c8d03daaed434f5db5df2d
+SHA256 (xorg/app/editres-1.0.3.tar.bz2) = a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae
+SIZE (xorg/app/editres-1.0.3.tar.bz2) = 127231
diff --git a/x11/editres/pkg-descr b/x11/editres/pkg-descr
new file mode 100644
index 000000000000..484a780e362f
--- /dev/null
+++ b/x11/editres/pkg-descr
@@ -0,0 +1,5 @@
+This package contains editres, a dynamic resource editor for X Toolkit
+Applications.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/editres/pkg-plist b/x11/editres/pkg-plist
new file mode 100644
index 000000000000..485085d2767f
--- /dev/null
+++ b/x11/editres/pkg-plist
@@ -0,0 +1,4 @@
+bin/editres
+share/X11/app-defaults/Editres-color
+share/X11/app-defaults/Editres
+@dirrmtry share/X11/app-defaults
diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile
index 19cb88b55ea8..18e960934893 100644
--- a/x11/electricsheep/Makefile
+++ b/x11/electricsheep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	electricsheep
 PORTVERSION=	2.6.8
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://electricsheep.org/
diff --git a/x11/elicit/Makefile b/x11/elicit/Makefile
index 924d92801a02..4b8ca6638738 100644
--- a/x11/elicit/Makefile
+++ b/x11/elicit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	elicit
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/x11/emu/Makefile b/x11/emu/Makefile
index 4e67cd6cd501..40801ef47941 100644
--- a/x11/emu/Makefile
+++ b/x11/emu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emu
 PORTVERSION=	1.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
@@ -18,12 +18,9 @@ COMMENT=	A terminal emulator for the X Window System
 BUILD_DEPENDS=	xrdb:${X_CLIENTS_PORT}
 RUN_DEPENDS=	xrdb:${X_CLIENTS_PORT}
 
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.endif
-
 USE_IMAKE=	yes
+USE_DISPLAY=	yes
+
 WRKSRC=		${WRKDIR}/emu
 
 .if (!defined(DISPLAY) || ${DISPLAY} == "") && !defined(PACKAGE_BUILDING)
diff --git a/x11/enity/Makefile b/x11/enity/Makefile
index a8019d1fd56a..644c7d07f164 100644
--- a/x11/enity/Makefile
+++ b/x11/enity/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	enity
 PORTVERSION=	20070223
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/x11/enterminus/Makefile b/x11/enterminus/Makefile
index 1e1b76d34d3f..97829af1a7a8 100644
--- a/x11/enterminus/Makefile
+++ b/x11/enterminus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	enterminus
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index 3b335d6d53ca..149b11252fb0 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	E-Run
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kbyanc
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 0afa5dcc88c5..ef0c52d8db27 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eterm
 PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/etoile-iterm/Makefile b/x11/etoile-iterm/Makefile
index 9d080e55b268..0f7476fbb6b2 100644
--- a/x11/etoile-iterm/Makefile
+++ b/x11/etoile-iterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iterm
 PORTVERSION=	0.1.${SNAPSHOT}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/x11/etoile-xwindowserverkit/Makefile b/x11/etoile-xwindowserverkit/Makefile
index 99d739b3554d..5303ab399bb8 100644
--- a/x11/etoile-xwindowserverkit/Makefile
+++ b/x11/etoile-xwindowserverkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xwindowserverkit
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
diff --git a/x11/etoile/Makefile b/x11/etoile/Makefile
index 28b43eeff8b6..e8331f7fc71d 100644
--- a/x11/etoile/Makefile
+++ b/x11/etoile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etoile
 PORTVERSION=	0.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/x11/evieext/Makefile b/x11/evieext/Makefile
new file mode 100644
index 000000000000..ef8cde3d8614
--- /dev/null
+++ b/x11/evieext/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	evieext
+# Date Created:				25 Apr 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	evieext
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XEVIE extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/evieext/distinfo b/x11/evieext/distinfo
new file mode 100644
index 000000000000..6e3bafd63156
--- /dev/null
+++ b/x11/evieext/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/evieext-1.0.2.tar.bz2) = 2507b5d0f4b2848147fbddd155aa6cfe
+SHA256 (xorg/proto/evieext-1.0.2.tar.bz2) = 0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125
+SIZE (xorg/proto/evieext-1.0.2.tar.bz2) = 37534
diff --git a/x11/evieext/pkg-descr b/x11/evieext/pkg-descr
new file mode 100644
index 000000000000..6ddfde63eccd
--- /dev/null
+++ b/x11/evieext/pkg-descr
@@ -0,0 +1,4 @@
+This package contains evieext, a collection of XEVIE extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/evieext/pkg-plist b/x11/evieext/pkg-plist
new file mode 100644
index 000000000000..b10aee8e8811
--- /dev/null
+++ b/x11/evieext/pkg-plist
@@ -0,0 +1,3 @@
+include/X11/extensions/Xeviestr.h
+libdata/pkgconfig/evieproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/examine/Makefile b/x11/examine/Makefile
index e19c84d04bf9..d3c195da1644 100644
--- a/x11/examine/Makefile
+++ b/x11/examine/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	examine
 PORTVERSION=	20070223
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index d0cebbe31467..3eb4f29c792d 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fast-user-switch-applet
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist
index ab453477e9d0..eba6ee79cf16 100644
--- a/x11/fast-user-switch-applet/pkg-plist
+++ b/x11/fast-user-switch-applet/pkg-plist
@@ -119,46 +119,16 @@ share/locale/vi/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/zh_CN/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/zh_HK/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo
-@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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
 @dirrm share/gnome/omf/fast-user-switch-applet
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 7e6ac5faa0f2..5f56498058a4 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fbdesk
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://fluxbox.sourceforge.net/download/ \
 		${MASTER_SITE_GENTOO} \
diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index f4d70fabc461..15e2ff0057a9 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fbpanel
 PORTVERSION=	4.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile
index 8a07053f322d..aba9aeb95d85 100644
--- a/x11/fbsd-icons/Makefile
+++ b/x11/fbsd-icons/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fbsd-icons
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile
index ffae78f2a1a8..dfb0c56b559d 100644
--- a/x11/fireflies/Makefile
+++ b/x11/fireflies/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fireflies
 PORTVERSION=	2.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://somewhere.fscked.org/fireflies/
 
diff --git a/x11/fixesext/Makefile b/x11/fixesext/Makefile
index bed51efc8ba6..29074347c343 100644
--- a/x11/fixesext/Makefile
+++ b/x11/fixesext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fixesext
 PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
diff --git a/x11/fixesproto/Makefile b/x11/fixesproto/Makefile
new file mode 100644
index 000000000000..3ea2a4e24ebf
--- /dev/null
+++ b/x11/fixesproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	fixesproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fixesproto
+PORTVERSION=	4.0
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Fixes extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/fixesproto/distinfo b/x11/fixesproto/distinfo
new file mode 100644
index 000000000000..9bca631147e5
--- /dev/null
+++ b/x11/fixesproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/fixesproto-4.0.tar.bz2) = 8b298cc3424597f8138c7faf7763dce9
+SHA256 (xorg/proto/fixesproto-4.0.tar.bz2) = b3fe971ccc8152db6c78da7117c31fc4cd2fcb2b6a4df3db0f8fed13d4ceb08f
+SIZE (xorg/proto/fixesproto-4.0.tar.bz2) = 38550
diff --git a/x11/fixesproto/pkg-descr b/x11/fixesproto/pkg-descr
new file mode 100644
index 000000000000..5e2d9367eadd
--- /dev/null
+++ b/x11/fixesproto/pkg-descr
@@ -0,0 +1,5 @@
+This package contains X.Org Fixes extension protocol specification
+and header files.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/fixesproto/pkg-plist b/x11/fixesproto/pkg-plist
new file mode 100644
index 000000000000..f1bec6c8e826
--- /dev/null
+++ b/x11/fixesproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/xfixesproto.h
+include/X11/extensions/xfixeswire.h
+libdata/pkgconfig/fixesproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile
index fd33cd2aed6a..ad5f380ed89a 100644
--- a/x11/fluxbg/Makefile
+++ b/x11/fluxbg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fluxbg
 PORTVERSION=	0.7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile
index 240e3705c17a..d43e06dd61c8 100644
--- a/x11/fpc-x11/Makefile
+++ b/x11/fpc-x11/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 lang
 PKGNAMESUFFIX=	-x11
 
diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile
new file mode 100644
index 000000000000..868ad2b5c237
--- /dev/null
+++ b/x11/fstobdf/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	fstobdf
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fstobdf
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Generate BDF font from X font server
+
+XORG_CAT=	app
+USE_XORG=	x11 libfs
+
+PLIST_FILES=	bin/fstobdf
+
+MAN1=		fstobdf.1
+
+.include <bsd.port.mk>
diff --git a/x11/fstobdf/distinfo b/x11/fstobdf/distinfo
new file mode 100644
index 000000000000..56ea2a179e6d
--- /dev/null
+++ b/x11/fstobdf/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/fstobdf-1.0.2.tar.bz2) = 99144743ab3cbb9cf37090fdc9e747db
+SHA256 (xorg/app/fstobdf-1.0.2.tar.bz2) = 690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22
+SIZE (xorg/app/fstobdf-1.0.2.tar.bz2) = 82861
diff --git a/x11/fstobdf/pkg-descr b/x11/fstobdf/pkg-descr
new file mode 100644
index 000000000000..5c95299bfed0
--- /dev/null
+++ b/x11/fstobdf/pkg-descr
@@ -0,0 +1,5 @@
+This package contains fstobdf, a program for generating BDF fonts from
+an X font server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/gcb/Makefile b/x11/gcb/Makefile
index 1cf8e16e9bb2..0d756182581b 100644
--- a/x11/gcb/Makefile
+++ b/x11/gcb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcb
 PORTVERSION=	0.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://freebsd.flatrate.ru/distfiles/ \
 		http://ccbsd9.csie.nctu.edu.tw/~cp76/gcb/
diff --git a/x11/gcb/pkg-plist b/x11/gcb/pkg-plist
index c3bb4941d0b1..ac3ea91ade93 100644
--- a/x11/gcb/pkg-plist
+++ b/x11/gcb/pkg-plist
@@ -2,6 +2,5 @@ bin/gcb
 share/applications/gcb.desktop
 share/icons/gcb.png
 share/pixmaps/gcb.png
-@dirrmtry share/pixmaps
 @dirrmtry share/icons
 @dirrmtry share/applications
diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile
index b535b53a2884..e81e6775e462 100644
--- a/x11/gcursor/Makefile
+++ b/x11/gcursor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcursor
 PORTVERSION=	0.061
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://download.qballcow.nl/programs/gcursor/
 
diff --git a/x11/gdesklets-tasklist/Makefile b/x11/gdesklets-tasklist/Makefile
index 2d1625a29709..ed3412021bdb 100644
--- a/x11/gdesklets-tasklist/Makefile
+++ b/x11/gdesklets-tasklist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tasklist
 PORTVERSION=	0.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://gdesklets.zencomputer.ca/
 PKGNAMEPREFIX=	gdesklets-
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index aedf75af2e2c..e7c412168f94 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdkxft
 PORTVERSION=	1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 2d36c7197025..990697915578 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gdm
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 4bcfd78dceac..a8aa3704f874 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -270,36 +270,14 @@ share/locale/zu/LC_MESSAGES/gdm.mo
 @unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
 @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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
@@ -308,25 +286,11 @@ share/locale/zu/LC_MESSAGES/gdm.mo
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index 8d92d53cf58d..b60d87f3fe82 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ggiterm
 PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggiterm
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
new file mode 100644
index 000000000000..14edaf1fda84
--- /dev/null
+++ b/x11/glproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	glproto
+# Date Created:				06 Feb 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	glproto
+PORTVERSION=	1.4.8
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	GLX extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
new file mode 100644
index 000000000000..e35b268fe67f
--- /dev/null
+++ b/x11/glproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/glproto-1.4.8.tar.bz2) = 3dfbd17203c0c88b94b6f579f24c11cc
+SHA256 (xorg/proto/glproto-1.4.8.tar.bz2) = 2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c
+SIZE (xorg/proto/glproto-1.4.8.tar.bz2) = 53852
diff --git a/x11/glproto/pkg-descr b/x11/glproto/pkg-descr
new file mode 100644
index 000000000000..489e9639f47e
--- /dev/null
+++ b/x11/glproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org GLX extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/glproto/pkg-plist b/x11/glproto/pkg-plist
new file mode 100644
index 000000000000..da73d63a3e9e
--- /dev/null
+++ b/x11/glproto/pkg-plist
@@ -0,0 +1,9 @@
+include/GL/glxint.h
+include/GL/glxmd.h
+include/GL/glxproto.h
+include/GL/glxtokens.h
+include/GL/internal/glcore.h
+libdata/pkgconfig/glproto.pc
+@dirrmtry include/GL/internal
+@dirrmtry include/GL
+@dirrmtry include/X11/extensions
diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile
index f5633b219c49..f77b76399910 100644
--- a/x11/gmessage/Makefile
+++ b/x11/gmessage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmessage
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://www.brettnacher.org/users/dominik/FreeBSD/
 
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index fab20169776f..09165d296fab 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmrun
 PORTVERSION=	0.9.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 775bbe206a48..bb4a0bba0163 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-applets
 PORTVERSION=	2.18.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 27a5b8657f87..02cd5e783662 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1383,36 +1383,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 %%COMMANDER%%@dirrm libexec/gnome-applets
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest
 @dirrm include/libgweather
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -1421,14 +1399,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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/es_VE/LC_MESSAGES
 @dirrmtry share/locale/es_VE
 @dirrmtry share/locale/es_UY/LC_MESSAGES
@@ -1459,15 +1431,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrmtry share/locale/es_CL
 @dirrmtry share/locale/es_AR/LC_MESSAGES
 @dirrmtry share/locale/es_AR
-@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/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index b1a68d698ebf..d23a71c23713 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-clipboard-daemon
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://members.chello.nl/~h.lai/gnome-clipboard-daemon/
 
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 1624e6fdb207..16db7aa7f8be 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-desktop
 PORTVERSION=	2.18.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index c907b2cdf9a5..1ca51a48adf3 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -233,12 +233,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
 @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/yo/LC_MESSAGES
 @dirrmtry share/locale/yo
 @dirrmtry share/locale/yi/LC_MESSAGES
@@ -247,68 +243,32 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @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/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrm share/gnome/omf/lgpl
 @dirrm share/gnome/omf/gpl
 @dirrm share/gnome/omf/fdl
diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile
index 33799cb89b8d..9466123c42dd 100644
--- a/x11/gnome-launch-box/Makefile
+++ b/x11/gnome-launch-box/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-launch-box
 PORTVERSION=	20060112
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jylefort
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index a315b25e438e..f67e9b38520e 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-libs
 PORTVERSION=	1.4.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-libs/1.4
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index f9c1f0cd0613..bf413271bf18 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -562,39 +562,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 @dirrm include/gnome-1.0/libgnome
 @dirrm include/gnome-1.0/libart_lgpl
 @dirrm include/gnome-1.0/gtk-xmhtml
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@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/sp/LC_MESSAGES
 @dirrmtry share/locale/sp
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index bde46e8025cc..fc500290adaa 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-menus
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 59cea97cb008..c5f6edf41e3c 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -112,38 +112,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @dirrm include/gnome-menus
 @dirrmtry etc/xdg/menus
 @dirrmtry etc/xdg
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -152,27 +130,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/gn/LC_MESSAGES
 @dirrmtry share/locale/gn
-@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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 0b38b6cca56f..f2354cb8abcb 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.18.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index bde2dc76b40d..a6b299c8b894 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -546,73 +546,35 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm include/panel-2.0
 @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/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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @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/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index cadd0e989c8c..d1b76b1b0d48 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index a60b97fdcef7..d889c87f5524 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -89,43 +89,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
 @dirrm share/gnome/pixmaps/backgrounds
 @dirrm share/gnome/gnome-screensaver
 @dirrm libexec/gnome-screensaver
-@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/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/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 0d18d2cfbfbd..981c0b161299 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-session
 PORTVERSION=	2.18.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://www.marcuscom.com/downloads/:local
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 470ddc9c9d62..fd8033cb0deb 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -114,38 +114,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
 @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/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/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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
@@ -154,23 +130,9 @@ share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile
index bc25aa21306b..1e0197417784 100644
--- a/x11/gnome-swallow/Makefile
+++ b/x11/gnome-swallow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-swallow
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://interreality.org/~tetron/technology/swallow/
 
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index d2ffb54683ca..af1e59f928b8 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-terminal
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 30f3fb1b1463..52ee380fe050 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -173,57 +173,21 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm share/gnome/help/gnome-terminal
 @dirrm share/gnome/gnome-terminal/glade
 @dirrm share/gnome/gnome-terminal
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@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/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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @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/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index ecf2baf57b09..bea450fc2199 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.83 2007/04/03 01:14:24 ahze Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 PKGNAMESUFFIX=	-fifth-toe
 
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index c30e821ce096..ec2c74773e1f 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/x11/gnome2-lite/Makefile,v 1.54 2007/03/02 15:38:59 ahze Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 PKGNAMESUFFIX=	-lite
 
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 3572e8356e81..1fc6f8a05bd9 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.76 2007/03/14 21:39:31 marcus Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 PKGNAMESUFFIX=	-power-tools
 
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index b046bdd2d73b..639b909e0c15 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome2
 PORTVERSION=	2.18.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/x11/gnustep-app/Makefile b/x11/gnustep-app/Makefile
index a72ff3309a59..61f4d63f8dc6 100644
--- a/x11/gnustep-app/Makefile
+++ b/x11/gnustep-app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnustep-app
 PORTVERSION=	1.13.0
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/x11/gpctool/Makefile b/x11/gpctool/Makefile
index d714c4ceeed6..b1c01a737229 100644
--- a/x11/gpctool/Makefile
+++ b/x11/gpctool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpctool
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	x11 math graphics
 MASTER_SITES=	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
 DISTNAME=	gpct${PORTVERSION:S/.//g}
diff --git a/x11/grabc/Makefile b/x11/grabc/Makefile
index a463f80b416a..131619d5753e 100644
--- a/x11/grabc/Makefile
+++ b/x11/grabc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	grabc
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://muquit.com/muquit/software/grabc/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index c32999578676..5ca94b995913 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gromit
 PORTVERSION=	20041213
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.home.unix-ag.org/simon/gromit/
 
diff --git a/x11/gskrab/Makefile b/x11/gskrab/Makefile
index f11861800334..d2f57554faac 100644
--- a/x11/gskrab/Makefile
+++ b/x11/gskrab/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gskrab
 PORTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	http://organact.mine.nu/~wolfgang/gskrab/
 DISTNAME=	GSKrab-${PORTVERSION}
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index e62d02178704..ef788af1e779 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gsynaptics
 PORTVERSION=	0.9.9
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	gsynaptics/21527
@@ -16,7 +16,6 @@ MAINTAINER=	nork@FreeBSD.org
 COMMENT=	GNOME Synaptics Touchpad setting tool
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-RUN_DEPENDS=	${X11BASE}/lib/modules/input/synaptics_drv.o:${PORTSDIR}/x11-servers/synaptics
 
 USE_GNOME=	lthack intlhack intltool pkgconfig gtk20 libgnome libglade2 libgnomeui
 USE_ICONV=	yes
@@ -33,4 +32,13 @@ MAN1=		gsynaptics.1 gsynaptics-init.1
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM} == "xorg"
+RUN_DEPENDS+=	${X11BASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-servers/synaptics
+.else
+RUN_DEPENDS+=	${X11BASE}/lib/modules/input/synaptics_drv.o:${PORTSDIR}/x11-servers/synaptics
+.endif
+
+
+.include <bsd.port.post.mk>
diff --git a/x11/gsynaptics/pkg-plist b/x11/gsynaptics/pkg-plist
index 9a546777e9d0..055dee05dfe9 100644
--- a/x11/gsynaptics/pkg-plist
+++ b/x11/gsynaptics/pkg-plist
@@ -11,9 +11,4 @@ share/locale/zh_TW/LC_MESSAGES/gsynaptics.mo
 share/pixmaps/touchpad.png
 @dirrmtry share/gnome/autostart
 @dirrmtry share/applications
-@dirrmtry share/pixmaps
 @dirrm share/gsynaptics
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
diff --git a/x11/gtk-launch/Makefile b/x11/gtk-launch/Makefile
index 20a86506c0fd..d0e384e9ca0e 100644
--- a/x11/gtk-launch/Makefile
+++ b/x11/gtk-launch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-launch
 DISTVERSION=	1.1b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://pierric.descamps.free.fr/pierric/downloads/ \
 		http://critical.ch/distfiles/ \
diff --git a/x11/gtk-theme-switch/Makefile b/x11/gtk-theme-switch/Makefile
index 9b99d19dc7d3..8a38635d2868 100644
--- a/x11/gtk-theme-switch/Makefile
+++ b/x11/gtk-theme-switch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-theme-switch
 PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://www.muhri.net/
 
diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile
index 9b99d19dc7d3..8a38635d2868 100644
--- a/x11/gtk-theme-switch2/Makefile
+++ b/x11/gtk-theme-switch2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-theme-switch
 PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://www.muhri.net/
 
diff --git a/x11/gtk-themepreview/Makefile b/x11/gtk-themepreview/Makefile
index 2378bd132f9c..cf33fd9aad22 100644
--- a/x11/gtk-themepreview/Makefile
+++ b/x11/gtk-themepreview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-themepreview
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_LOCAL}	# http://www.users.monornet.hu/linux/files/
 MASTER_SITE_SUBDIR=	danfe
diff --git a/x11/gtkchtheme/Makefile b/x11/gtkchtheme/Makefile
index 6c42b5cb493f..3201461099e6 100644
--- a/x11/gtkchtheme/Makefile
+++ b/x11/gtkchtheme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkchtheme
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://plasmasturm.org/code/gtk-chtheme/
 DISTNAME=	gtk-chtheme-${PORTVERSION}
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index d27e69729d74..c62f89dee232 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkterm2
 PORTVERSION=	0.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	gtkterm
diff --git a/x11/gtstarter/Makefile b/x11/gtstarter/Makefile
index 5c518b978dc4..2f9d41d63b5f 100644
--- a/x11/gtstarter/Makefile
+++ b/x11/gtstarter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtstarter
 PORTVERSION=	0.4.6.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://webonaut.com/distfiles/${PORTNAME}/
 
diff --git a/x11/gxset/Makefile b/x11/gxset/Makefile
index e515c44f8872..b5c7db7833d6 100644
--- a/x11/gxset/Makefile
+++ b/x11/gxset/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxset
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	petef
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
new file mode 100644
index 000000000000..105d797ee050
--- /dev/null
+++ b/x11/iceauth/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	iceauth
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	iceauth
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	ICE authority file utility for X
+
+XORG_CAT=	app
+USE_XORG=	xproto ice
+
+PLIST_FILES=	bin/iceauth
+
+MAN1=		iceauth.1
+
+.include <bsd.port.mk>
diff --git a/x11/iceauth/distinfo b/x11/iceauth/distinfo
new file mode 100644
index 000000000000..126b13043954
--- /dev/null
+++ b/x11/iceauth/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/iceauth-1.0.1.tar.bz2) = 50df9a5718b3cb6544a1c9f38b392b09
+SHA256 (xorg/app/iceauth-1.0.1.tar.bz2) = 23e2c701493c26470506f2aaffac9ddc9ac79fb8bbcbefb21dbeb67bb72185d6
+SIZE (xorg/app/iceauth-1.0.1.tar.bz2) = 84339
diff --git a/x11/iceauth/pkg-descr b/x11/iceauth/pkg-descr
new file mode 100644
index 000000000000..e412c393288f
--- /dev/null
+++ b/x11/iceauth/pkg-descr
@@ -0,0 +1,5 @@
+This package contains iceauth, an ICE authority file utility for the X
+Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/ico/Makefile b/x11/ico/Makefile
new file mode 100644
index 000000000000..bfa14ba7087b
--- /dev/null
+++ b/x11/ico/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	ico
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	ico
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Displays a wire-frame rotating plyhedron
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+PLIST_FILES=	bin/ico
+
+MAN1=		ico.1
+
+.include <bsd.port.mk>
diff --git a/x11/ico/distinfo b/x11/ico/distinfo
new file mode 100644
index 000000000000..5b12495fe46b
--- /dev/null
+++ b/x11/ico/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/ico-1.0.1.tar.bz2) = 8c04178b7f78014567b6b8b2b7d7a10f
+SHA256 (xorg/app/ico-1.0.1.tar.bz2) = 13bd6c3f40a4f27ccfd34a101a179fb15c783be20f7ba8001b1ead1161b399f8
+SIZE (xorg/app/ico-1.0.1.tar.bz2) = 85723
diff --git a/x11/ico/pkg-descr b/x11/ico/pkg-descr
new file mode 100644
index 000000000000..cdef9f01c8d6
--- /dev/null
+++ b/x11/ico/pkg-descr
@@ -0,0 +1,5 @@
+This package contains ico, an appliction used for displaying wire-framed
+rotating polyhedrons.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index d5ac58488c93..d2a7beb92876 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	idesk
 PORTVERSION=	0.7.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}/
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index 4f474fccdb3e..34797b63bbf3 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imwheel
 PORTVERSION=	1.0.0.p12
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://jcatki.no-ip.org/pub/imwheel/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/x11/innerspace/Makefile b/x11/innerspace/Makefile
index c28b629ad6eb..038557ec2bea 100644
--- a/x11/innerspace/Makefile
+++ b/x11/innerspace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	innerspace
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	http://download.savannah.nongnu.org/releases/gap/
 
diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile
new file mode 100644
index 000000000000..e6e406237ebb
--- /dev/null
+++ b/x11/inputproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	inputproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	inputproto
+PORTVERSION=	1.3.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Input extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo
new file mode 100644
index 000000000000..8e57a7d57c11
--- /dev/null
+++ b/x11/inputproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/inputproto-1.3.2.tar.bz2) = e0b7df0fc69f0712aa7f2161faa94e1d
+SHA256 (xorg/proto/inputproto-1.3.2.tar.bz2) = af6323d63fb5715bc9928d787f09795d875271f40636e031919372f185a51298
+SIZE (xorg/proto/inputproto-1.3.2.tar.bz2) = 46502
diff --git a/x11/inputproto/pkg-descr b/x11/inputproto/pkg-descr
new file mode 100644
index 000000000000..56ac85360439
--- /dev/null
+++ b/x11/inputproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Input extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/inputproto/pkg-plist b/x11/inputproto/pkg-plist
new file mode 100644
index 000000000000..7f234dc66b02
--- /dev/null
+++ b/x11/inputproto/pkg-plist
@@ -0,0 +1,5 @@
+include/X11/extensions/XI.h
+include/X11/extensions/XInput.h
+include/X11/extensions/XIproto.h
+libdata/pkgconfig/inputproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/ipager/Makefile b/x11/ipager/Makefile
index 522ad0a77887..a129829d9561 100644
--- a/x11/ipager/Makefile
+++ b/x11/ipager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ipager
 PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://useperl.ru/ipager/src/
 DISTNAME=	ipager-${PORTVERSION}
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index ac9cf95b5121..e071004f115d 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kb2mb2
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 
diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile
new file mode 100644
index 000000000000..ba1da4fb0d31
--- /dev/null
+++ b/x11/kbproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	kbproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	kbproto
+PORTVERSION=	1.0.3
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	KB extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/kbproto/distinfo b/x11/kbproto/distinfo
new file mode 100644
index 000000000000..8d4d2db92fc7
--- /dev/null
+++ b/x11/kbproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/kbproto-1.0.3.tar.bz2) = 6092cdb0a1225f95356ddbe6c2abaad5
+SHA256 (xorg/proto/kbproto-1.0.3.tar.bz2) = 7000005ebbd07a28a71477d72bcb76c47064e043a4ead26fcf4d5af394ce19df
+SIZE (xorg/proto/kbproto-1.0.3.tar.bz2) = 57440
diff --git a/x11/kbproto/pkg-descr b/x11/kbproto/pkg-descr
new file mode 100644
index 000000000000..fe7caeb39b70
--- /dev/null
+++ b/x11/kbproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org KB extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/kbproto/pkg-plist b/x11/kbproto/pkg-plist
new file mode 100644
index 000000000000..ee0808e94469
--- /dev/null
+++ b/x11/kbproto/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/extensions/XKB.h
+include/X11/extensions/XKBgeom.h
+include/X11/extensions/XKBproto.h
+include/X11/extensions/XKBsrv.h
+include/X11/extensions/XKBstr.h
+libdata/pkgconfig/kbproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index 31f547d1ba0b..1a414af493ea 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME?=	kde
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 31f547d1ba0b..1a414af493ea 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME?=	kde
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index ae053ee1e061..927d80a791f7 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index ae053ee1e061..927d80a791f7 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index 397308e79a4f..6a29f27dfdf5 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	keylaunch
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.mired.org/downloads/
 
diff --git a/x11/kxgenerator/Makefile b/x11/kxgenerator/Makefile
index bdae80d6aaaa..97ed7b15e1f0 100644
--- a/x11/kxgenerator/Makefile
+++ b/x11/kxgenerator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kxgenerator
 PORTVERSION=	0.3.7
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	http://dp0154.debowypark.waw.pl/kxgenerator/data/download/
 
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index cd85ba58dd6a..a27bb99da059 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -6,26 +6,14 @@
 #
 
 PORTNAME=	libICE
-PORTVERSION=	6.3.3
+PORTVERSION=	1.0.3
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Inter Client Exchange library for X11
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
-		${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/libXtrans
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+XORG_CAT=	lib
+USE_XORG=	xproto xtrans
 
 .include <bsd.port.mk>
diff --git a/x11/libICE/distinfo b/x11/libICE/distinfo
index f4bb6fb29df0..b513b8104f38 100644
--- a/x11/libICE/distinfo
+++ b/x11/libICE/distinfo
@@ -1,3 +1,3 @@
-MD5 (libICE-6.3.3.tar.bz2) = e67d98bebfabf884e58501e44b7efd35
-SHA256 (libICE-6.3.3.tar.bz2) = db79f1e14c6815da48b8fa6d556bed0f7aac3692ce4eb5ab8e541377eea6b27a
-SIZE (libICE-6.3.3.tar.bz2) = 222005
+MD5 (xorg/lib/libICE-1.0.3.tar.bz2) = 071f96648ac25c8e87a3de11a7de2d8a
+SHA256 (xorg/lib/libICE-1.0.3.tar.bz2) = ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d
+SIZE (xorg/lib/libICE-1.0.3.tar.bz2) = 246976
diff --git a/x11/libICE/pkg-plist b/x11/libICE/pkg-plist
index 6ca157c05f4e..465b985306fb 100644
--- a/x11/libICE/pkg-plist
+++ b/x11/libICE/pkg-plist
@@ -3,7 +3,6 @@ include/X11/ICE/ICEconn.h
 include/X11/ICE/ICElib.h
 include/X11/ICE/ICEmsg.h
 include/X11/ICE/ICEproto.h
-include/X11/ICE/ICEtrans.h
 include/X11/ICE/ICEutil.h
 lib/libICE.a
 lib/libICE.la
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 6726adf36579..c0339eda1343 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -6,26 +6,14 @@
 #
 
 PORTNAME=	libSM
-PORTVERSION=	6.0.3
+PORTVERSION=	1.0.2
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Session Management library for X11
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+XORG_CAT=	lib
+USE_XORG=	ice xproto:both xtrans
 
 .include <bsd.port.mk>
diff --git a/x11/libSM/distinfo b/x11/libSM/distinfo
index 27cb08840e79..62891b66c8a4 100644
--- a/x11/libSM/distinfo
+++ b/x11/libSM/distinfo
@@ -1,3 +1,3 @@
-MD5 (libSM-6.0.3.tar.bz2) = e01ec6568ad17c5df8f56828e34a0b2b
-SHA256 (libSM-6.0.3.tar.bz2) = c1d90d075970e5d22a099ef73b31ecce8d070f7ee850f65b8d49a8924ef105d3
-SIZE (libSM-6.0.3.tar.bz2) = 200225
+MD5 (xorg/lib/libSM-1.0.2.tar.bz2) = a254771550c01db372e88d1a1dc2e13a
+SHA256 (xorg/lib/libSM-1.0.2.tar.bz2) = e290614797bd626c1b92bac8f83e8954b99bd66e6ecdaa1e935e176df099eba8
+SIZE (xorg/lib/libSM-1.0.2.tar.bz2) = 244146
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 5b29ff81d12f..cba2f780bb21 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -6,31 +6,29 @@
 #
 
 PORTNAME=	libX11
-PORTVERSION=	6.2.1
-PORTREVISION=	3
+PORTVERSION=	1.1.1
+PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \
-		${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
-		${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/libXtrans \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+.if defined(WITH_XCB)
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb
+RUN_DEPENDS=	${BUILD_DEPENDS}
+CONFIGURE_ARGS= --with-xcb=yes
+PLIST_SUB+=	XCB=""
+.else
+CONFIGURE_ARGS= --with-xcb=no
+PLIST_SUB+=	XCB="@comment "
+.endif
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
+XORG_CAT=	lib
+USE_XORG=	bigreqsproto xau xdmcp xextproto xtrans xcmiscproto kbproto:both \
+		inputproto:both xf86bigfontproto xproto:both
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CONFIGURE_ARGS+= --enable-xdmauth
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
+CONFIGURE_ARGS+=	--enable-xdmauth
 
+.include "${.CURDIR}/manpages"
 .include <bsd.port.mk>
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index dcb2669f24ef..6b9af7b0f53e 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,3 +1,3 @@
-MD5 (libX11-6.2.1.tar.bz2) = 59b6fa7cd6fe7ee1da92fd1b56d1cee3
-SHA256 (libX11-6.2.1.tar.bz2) = 32f7cb9dd3e72c557c37be337828ddeec036de55ce1e32b6866a010d3794b78d
-SIZE (libX11-6.2.1.tar.bz2) = 1047586
+MD5 (xorg/lib/libX11-1.1.1.tar.bz2) = 848b80f77b20ae1fa5c882bbfa531ebc
+SHA256 (xorg/lib/libX11-1.1.1.tar.bz2) = 5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541
+SIZE (xorg/lib/libX11-1.1.1.tar.bz2) = 1426405
diff --git a/x11/libX11/files/patch-src_ImUtil.c b/x11/libX11/files/patch-src_ImUtil.c
new file mode 100644
index 000000000000..2579201bad8b
--- /dev/null
+++ b/x11/libX11/files/patch-src_ImUtil.c
@@ -0,0 +1,87 @@
+diff --git src/ImUtil.c src/ImUtil.c
+index 83fd030..9e667bb 100644
+--- src/ImUtil.c
++++ src/ImUtil.c
+@@ -327,12 +327,13 @@ XImage *XCreateImage (dpy, visual, depth
+ {
+ 	register XImage *image;
+ 	int bits_per_pixel = 1;
++	int min_bytes_per_line;
+ 
+ 	if (depth == 0 || depth > 32 ||
+ 	    (format != XYBitmap && format != XYPixmap && format != ZPixmap) ||
+ 	    (format == XYBitmap && depth != 1) ||
+ 	    (xpad != 8 && xpad != 16 && xpad != 32) ||
+-	    offset < 0 || image_bytes_per_line < 0)
++	    offset < 0)
+ 	    return (XImage *) NULL;
+ 	if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL)
+ 	    return (XImage *) NULL;
+@@ -363,16 +364,21 @@ XImage *XCreateImage (dpy, visual, depth
+ 	/*
+ 	 * compute per line accelerator.
+ 	 */
+-	if (image_bytes_per_line == 0)
+ 	{
+ 	if (format == ZPixmap)
+-	    image->bytes_per_line = 
++	    min_bytes_per_line = 
+ 	       ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
+ 	else
+-	    image->bytes_per_line =
++	    min_bytes_per_line =
+ 	        ROUNDUP((width + offset), image->bitmap_pad);
+ 	}
+-	else image->bytes_per_line = image_bytes_per_line;
++	if (image_bytes_per_line == 0) {
++	    image->bytes_per_line = min_bytes_per_line;
++	} else if (image_bytes_per_line < min_bytes_per_line) {
++	    return 0;
++	} else {
++	    image->bytes_per_line = image_bytes_per_line;
++	}
+ 
+ 	image->bits_per_pixel = bits_per_pixel;
+ 	image->obdata = NULL;
+@@ -384,7 +390,11 @@ XImage *XCreateImage (dpy, visual, depth
+ Status XInitImage (image)
+     XImage *image;
+ {
++	int min_bytes_per_line;
++
+ 	if (image->depth == 0 || image->depth > 32 ||
++	    image->bits_per_pixel > 32 || image->bitmap_unit > 32 ||
++	    image->bits_per_pixel < 0 || image->bitmap_unit < 0 ||
+ 	    (image->format != XYBitmap &&
+ 	     image->format != XYPixmap &&
+ 	     image->format != ZPixmap) ||
+@@ -392,21 +402,24 @@ Status XInitImage (image)
+ 	    (image->bitmap_pad != 8 &&
+ 	     image->bitmap_pad != 16 &&
+ 	     image->bitmap_pad != 32) ||
+-	    image->xoffset < 0 || image->bytes_per_line < 0)
++	    image->xoffset < 0)
+ 	    return 0;
+ 
+ 	/*
+ 	 * compute per line accelerator.
+ 	 */
+-	if (image->bytes_per_line == 0)
+-	{
+ 	if (image->format == ZPixmap)
+-	    image->bytes_per_line = 
++	    min_bytes_per_line = 
+ 	       ROUNDUP((image->bits_per_pixel * image->width),
+ 		       image->bitmap_pad);
+ 	else
+-	    image->bytes_per_line =
++	    min_bytes_per_line =
+ 	        ROUNDUP((image->width + image->xoffset), image->bitmap_pad);
++
++	if (image->bytes_per_line == 0) {
++	    image->bytes_per_line = min_bytes_per_line;
++	} else if (image->bytes_per_line < min_bytes_per_line) {
++	    return 0;
+ 	}
+ 
+ 	_XInitImageFuncPtrs (image);
diff --git a/x11/libX11/manpages b/x11/libX11/manpages
new file mode 100644
index 000000000000..d018aca79868
--- /dev/null
+++ b/x11/libX11/manpages
@@ -0,0 +1,614 @@
+MAN3= \
+AllPlanes.3 \
+BitmapBitOrder.3 \
+BitmapPad.3 \
+BitmapUnit.3 \
+BlackPixel.3 \
+BlackPixelOfScreen.3 \
+CellsOfScreen.3 \
+ClientWhitePointOfCCC.3 \
+ConnectionNumber.3 \
+DefaultColormap.3 \
+DefaultColormapOfScreen.3 \
+DefaultDepth.3 \
+DefaultDepthOfScreen.3 \
+DefaultGC.3 \
+DefaultGCOfScreen.3 \
+DefaultRootWindow.3 \
+DefaultScreen.3 \
+DefaultScreenOfDisplay.3 \
+DefaultVisual.3 \
+DefaultVisualOfScreen.3 \
+DisplayCells.3 \
+DisplayHeight.3 \
+DisplayHeightMM.3 \
+DisplayOfCCC.3 \
+DisplayOfScreen.3 \
+DisplayPlanes.3 \
+DisplayString.3 \
+DisplayWidth.3 \
+DisplayWidthMM.3 \
+DoesBackingStore.3 \
+DoesSaveUnders.3 \
+EventMaskOfScreen.3 \
+HeightMMOfScreen.3 \
+HeightOfScreen.3 \
+ImageByteOrder.3 \
+IsCursorKey.3 \
+IsFunctionKey.3 \
+IsKeypadKey.3 \
+IsMiscFunctionKey.3 \
+IsModifierKey.3 \
+IsPFKey.3 \
+IsPrivateKeypadKey.3 \
+LastKnownRequestProcessed.3 \
+MaxCmapsOfScreen.3 \
+MinCmapsOfScreen.3 \
+NextRequest.3 \
+PlanesOfScreen.3 \
+ProtocolRevision.3 \
+ProtocolVersion.3 \
+QLength.3 \
+RootWindow.3 \
+RootWindowOfScreen.3 \
+ScreenCount.3 \
+ScreenNumberOfCCC.3 \
+ScreenOfDisplay.3 \
+ScreenWhitePointOfCCC.3 \
+ServerVendor.3 \
+VendorRelease.3 \
+VisualOfCCC.3 \
+WhitePixel.3 \
+WhitePixelOfScreen.3 \
+WidthMMOfScreen.3 \
+WidthOfScreen.3 \
+XActivateScreenSaver.3 \
+XAddConnectionWatch.3 \
+XAddHost.3 \
+XAddHosts.3 \
+XAddPixel.3 \
+XAddToSaveSet.3 \
+XAllocClassHint.3 \
+XAllocColor.3 \
+XAllocColorCells.3 \
+XAllocColorPlanes.3 \
+XAllocIconSize.3 \
+XAllocNamedColor.3 \
+XAllocSizeHints.3 \
+XAllocStandardColormap.3 \
+XAllocWMHints.3 \
+XAllowEvents.3 \
+XAnyEvent.3 \
+XArc.3 \
+XAutoRepeatOff.3 \
+XAutoRepeatOn.3 \
+XBaseFontNameListOfFontSet.3 \
+XBell.3 \
+XButtonEvent.3 \
+XChangeActivePointerGrab.3 \
+XChangeGC.3 \
+XChangeKeyboardControl.3 \
+XChangeKeyboardMapping.3 \
+XChangePointerControl.3 \
+XChangeProperty.3 \
+XChangeSaveSet.3 \
+XChangeWindowAttributes.3 \
+XChar2b.3 \
+XCharStruct.3 \
+XCheckIfEvent.3 \
+XCheckMaskEvent.3 \
+XCheckTypedEvent.3 \
+XCheckTypedWindowEvent.3 \
+XCheckWindowEvent.3 \
+XCirculateEvent.3 \
+XCirculateRequestEvent.3 \
+XCirculateSubwindows.3 \
+XCirculateSubwindowsDown.3 \
+XCirculateSubwindowsUp.3 \
+XClassHint.3 \
+XClearArea.3 \
+XClearWindow.3 \
+XClientMessageEvent.3 \
+XClipBox.3 \
+XCloseDisplay.3 \
+XCloseIM.3 \
+XCloseOM.3 \
+XColor.3 \
+XColormapEvent.3 \
+XConfigureEvent.3 \
+XConfigureRequestEvent.3 \
+XConfigureWindow.3 \
+XContextDependentDrawing.3 \
+XContextualDrawing.3 \
+XConvertCase.3 \
+XConvertSelection.3 \
+XCopyArea.3 \
+XCopyColormapAndFree.3 \
+XCopyGC.3 \
+XCopyPlane.3 \
+XCreateBitmapFromData.3 \
+XCreateColormap.3 \
+XCreateFontCursor.3 \
+XCreateFontSet.3 \
+XCreateGC.3 \
+XCreateGlyphCursor.3 \
+XCreateIC.3 \
+XCreateImage.3 \
+XCreateOC.3 \
+XCreatePixmap.3 \
+XCreatePixmapCursor.3 \
+XCreatePixmapFromBitmapData.3 \
+XCreateRegion.3 \
+XCreateSimpleWindow.3 \
+XCreateWindow.3 \
+XCreateWindowEvent.3 \
+XCrossingEvent.3 \
+XDefaultString.3 \
+XDefineCursor.3 \
+XDeleteContext.3 \
+XDeleteModifiermapEntry.3 \
+XDeleteProperty.3 \
+XDestroyIC.3 \
+XDestroyImage.3 \
+XDestroyOC.3 \
+XDestroyRegion.3 \
+XDestroySubwindows.3 \
+XDestroyWindow.3 \
+XDestroyWindowEvent.3 \
+XDirectionalDependentDrawing.3 \
+XDisableAccessControl.3 \
+XDisplayKeycodes.3 \
+XDisplayMotionBufferSize.3 \
+XDisplayName.3 \
+XDisplayOfIM.3 \
+XDisplayOfOM.3 \
+XDrawArc.3 \
+XDrawArcs.3 \
+XDrawImageString.3 \
+XDrawImageString16.3 \
+XDrawLine.3 \
+XDrawLines.3 \
+XDrawPoint.3 \
+XDrawPoints.3 \
+XDrawRectangle.3 \
+XDrawRectangles.3 \
+XDrawSegments.3 \
+XDrawString.3 \
+XDrawString16.3 \
+XDrawText.3 \
+XDrawText16.3 \
+XEmptyRegion.3 \
+XEnableAccessControl.3 \
+XEqualRegion.3 \
+XErrorEvent.3 \
+XEvent.3 \
+XEventsQueued.3 \
+XExposeEvent.3 \
+XExtendedMaxRequestSize.3 \
+XExtentsOfFontSet.3 \
+XFetchBuffer.3 \
+XFetchBytes.3 \
+XFetchName.3 \
+XFillArc.3 \
+XFillArcs.3 \
+XFillPolygon.3 \
+XFillRectangle.3 \
+XFillRectangles.3 \
+XFilterEvent.3 \
+XFindContext.3 \
+XFlush.3 \
+XFocusChangeEvent.3 \
+XFontProp.3 \
+XFontSetExtents.3 \
+XFontStruct.3 \
+XFontsOfFontSet.3 \
+XForceScreenSaver.3 \
+XFree.3 \
+XFreeColormap.3 \
+XFreeColors.3 \
+XFreeCursor.3 \
+XFreeExtensionList.3 \
+XFreeFont.3 \
+XFreeFontInfo.3 \
+XFreeFontNames.3 \
+XFreeFontPath.3 \
+XFreeFontSet.3 \
+XFreeGC.3 \
+XFreeModifierMap.3 \
+XFreePixmap.3 \
+XFreeStringList.3 \
+XGCValues.3 \
+XGContextFromGC.3 \
+XGetAtomName.3 \
+XGetAtomNames.3 \
+XGetClassHint.3 \
+XGetCommand.3 \
+XGetErrorDatabaseText.3 \
+XGetErrorText.3 \
+XGetFontPath.3 \
+XGetFontProperty.3 \
+XGetGCValues.3 \
+XGetGeometry.3 \
+XGetICValues.3 \
+XGetIMValues.3 \
+XGetIconName.3 \
+XGetIconSizes.3 \
+XGetImage.3 \
+XGetInputFocus.3 \
+XGetKeyboardControl.3 \
+XGetKeyboardMapping.3 \
+XGetModifierMapping.3 \
+XGetMotionEvents.3 \
+XGetOCValues.3 \
+XGetOMValues.3 \
+XGetPixel.3 \
+XGetPointerControl.3 \
+XGetPointerMapping.3 \
+XGetRGBColormaps.3 \
+XGetScreenSaver.3 \
+XGetSelectionOwner.3 \
+XSetEventQueueOwner.3 \
+XGetSubImage.3 \
+XGetTextProperty.3 \
+XGetTransientForHint.3 \
+XGetVisualInfo.3 \
+XGetWMClientMachine.3 \
+XGetWMColormapWindows.3 \
+XGetWMHints.3 \
+XGetWMIconName.3 \
+XGetWMName.3 \
+XGetWMNormalHints.3 \
+XGetWMProtocols.3 \
+XGetWMSizeHints.3 \
+XGetWindowAttributes.3 \
+XGetWindowProperty.3 \
+XGetXCBConnection.3 \
+XGrabButton.3 \
+XGrabKey.3 \
+XGrabKeyboard.3 \
+XGrabPointer.3 \
+XGrabServer.3 \
+XGraphicsExposeEvent.3 \
+XGravityEvent.3 \
+XHostAddress.3 \
+XIMOfIC.3 \
+XIconSize.3 \
+XIconifyWindow.3 \
+XIfEvent.3 \
+XInitImage.3 \
+XInitThreads.3 \
+XInsertModifiermapEntry.3 \
+XInstallColormap.3 \
+XInternAtom.3 \
+XInternAtoms.3 \
+XInternalConnectionNumbers.3 \
+XIntersectRegion.3 \
+XKeyEvent.3 \
+XKeyboardControl.3 \
+XKeycodeToKeysym.3 \
+XKeymapEvent.3 \
+XKeysymToKeycode.3 \
+XKeysymToString.3 \
+XKillClient.3 \
+XListDepths.3 \
+XListExtensions.3 \
+XListFonts.3 \
+XListFontsWithInfo.3 \
+XListHosts.3 \
+XListInstalledColormaps.3 \
+XListPixmapFormats.3 \
+XListProperties.3 \
+XLoadFont.3 \
+XLoadQueryFont.3 \
+XLocaleOfFontSet.3 \
+XLocaleOfIM.3 \
+XLocaleOfOM.3 \
+XLockDisplay.3 \
+XLookupColor.3 \
+XLookupKeysym.3 \
+XLookupString.3 \
+XLowerWindow.3 \
+XMapEvent.3 \
+XMapRaised.3 \
+XMapRequestEvent.3 \
+XMapSubwindows.3 \
+XMapWindow.3 \
+XMappingEvent.3 \
+XMaskEvent.3 \
+XMatchVisualInfo.3 \
+XMaxRequestSize.3 \
+XModifierKeymap.3 \
+XMotionEvent.3 \
+XMoveResizeWindow.3 \
+XMoveWindow.3 \
+XNewModifiermap.3 \
+XNextEvent.3 \
+XNoExposeEvent.3 \
+XNoOp.3 \
+XOMOfOC.3 \
+XOffsetRegion.3 \
+XOpenDisplay.3 \
+XOpenIM.3 \
+XOpenOM.3 \
+XParseColor.3 \
+XParseGeometry.3 \
+XPeekEvent.3 \
+XPeekIfEvent.3 \
+XPending.3 \
+XPixmapFormatValues.3 \
+XPoint.3 \
+XPointInRegion.3 \
+XPolygonRegion.3 \
+XProcessInternalConnection.3 \
+XPropertyEvent.3 \
+XPutBackEvent.3 \
+XPutImage.3 \
+XPutPixel.3 \
+XQueryBestCursor.3 \
+XQueryBestSize.3 \
+XQueryBestStipple.3 \
+XQueryBestTile.3 \
+XQueryColor.3 \
+XQueryColors.3 \
+XQueryExtension.3 \
+XQueryFont.3 \
+XQueryKeymap.3 \
+XQueryPointer.3 \
+XQueryTextExtents.3 \
+XQueryTextExtents16.3 \
+XQueryTree.3 \
+XRaiseWindow.3 \
+XReadBitmapFile.3 \
+XReadBitmapFileData.3 \
+XRebindKeysym.3 \
+XRecolorCursor.3 \
+XReconfigureWMWindow.3 \
+XRectInRegion.3 \
+XRectangle.3 \
+XRefreshKeyboardMapping.3 \
+XRegisterIMInstantiateCallback.3 \
+XRemoveConnectionWatch.3 \
+XRemoveFromSaveSet.3 \
+XRemoveHost.3 \
+XRemoveHosts.3 \
+XReparentEvent.3 \
+XReparentWindow.3 \
+XResetScreenSaver.3 \
+XResizeRequestEvent.3 \
+XResizeWindow.3 \
+XResourceManagerString.3 \
+XRestackWindows.3 \
+XRotateBuffers.3 \
+XRotateWindowProperties.3 \
+XSaveContext.3 \
+XScreenNumberOfScreen.3 \
+XScreenResourceString.3 \
+XSegment.3 \
+XSelectInput.3 \
+XSelectionClearEvent.3 \
+XSelectionEvent.3 \
+XSelectionRequestEvent.3 \
+XSendEvent.3 \
+XSetAccessControl.3 \
+XSetAfterFunction.3 \
+XSetArcMode.3 \
+XSetBackground.3 \
+XSetClassHint.3 \
+XSetClipMask.3 \
+XSetClipOrigin.3 \
+XSetClipRectangles.3 \
+XSetCloseDownMode.3 \
+XSetCommand.3 \
+XSetDashes.3 \
+XSetErrorHandler.3 \
+XSetFillRule.3 \
+XSetFillStyle.3 \
+XSetFont.3 \
+XSetFontPath.3 \
+XSetForeground.3 \
+XSetFunction.3 \
+XSetGraphicsExposure.3 \
+XSetICFocus.3 \
+XSetICValues.3 \
+XSetIMValues.3 \
+XSetIOErrorHandler.3 \
+XSetIconName.3 \
+XSetIconSizes.3 \
+XSetInputFocus.3 \
+XSetLineAttributes.3 \
+XSetLocaleModifiers.3 \
+XSetModifierMapping.3 \
+XSetOCValues.3 \
+XSetOMValues.3 \
+XSetPlaneMask.3 \
+XSetPointerMapping.3 \
+XSetRGBColormaps.3 \
+XSetRegion.3 \
+XSetScreenSaver.3 \
+XSetSelectionOwner.3 \
+XSetState.3 \
+XSetStipple.3 \
+XSetSubwindowMode.3 \
+XSetTSOrigin.3 \
+XSetTextProperty.3 \
+XSetTile.3 \
+XSetTransientForHint.3 \
+XSetWMClientMachine.3 \
+XSetWMColormapWindows.3 \
+XSetWMHints.3 \
+XSetWMIconName.3 \
+XSetWMName.3 \
+XSetWMNormalHints.3 \
+XSetWMProperties.3 \
+XSetWMProtocols.3 \
+XSetWMSizeHints.3 \
+XSetWindowAttributes.3 \
+XSetWindowBackground.3 \
+XSetWindowBackgroundPixmap.3 \
+XSetWindowBorder.3 \
+XSetWindowBorderPixmap.3 \
+XSetWindowBorderWidth.3 \
+XSetWindowColormap.3 \
+XShrinkRegion.3 \
+XSizeHints.3 \
+XStandardColormap.3 \
+XStoreBuffer.3 \
+XStoreBytes.3 \
+XStoreColor.3 \
+XStoreColors.3 \
+XStoreName.3 \
+XStoreNamedColor.3 \
+XStringListToTextProperty.3 \
+XStringToKeysym.3 \
+XSubImage.3 \
+XSubtractRegion.3 \
+XSupportsLocale.3 \
+XSync.3 \
+XSynchronize.3 \
+XTextExtents.3 \
+XTextExtents16.3 \
+XTextItem.3 \
+XTextItem16.3 \
+XTextProperty.3 \
+XTextPropertyToStringList.3 \
+XTextWidth.3 \
+XTextWidth16.3 \
+XTimeCoord.3 \
+XTranslateCoordinates.3 \
+XUndefineCursor.3 \
+XUngrabButton.3 \
+XUngrabKey.3 \
+XUngrabKeyboard.3 \
+XUngrabPointer.3 \
+XUngrabServer.3 \
+XUninstallColormap.3 \
+XUnionRectWithRegion.3 \
+XUnionRegion.3 \
+XUniqueContext.3 \
+XUnloadFont.3 \
+XUnlockDisplay.3 \
+XUnmapEvent.3 \
+XUnmapSubwindows.3 \
+XUnmapWindow.3 \
+XUnregisterIMInstantiateCallback.3 \
+XUnsetICFocus.3 \
+XVaCreateNestedList.3 \
+XVisibilityEvent.3 \
+XVisualIDFromVisual.3 \
+XVisualInfo.3 \
+XWMGeometry.3 \
+XWMHints.3 \
+XWarpPointer.3 \
+XWindowAttributes.3 \
+XWindowChanges.3 \
+XWindowEvent.3 \
+XWithdrawWindow.3 \
+XWriteBitmapFile.3 \
+XXorRegion.3 \
+XcmsAllocColor.3 \
+XcmsAllocNamedColor.3 \
+XcmsCCCOfColormap.3 \
+XcmsCIELab.3 \
+XcmsCIELabQueryMaxC.3 \
+XcmsCIELabQueryMaxL.3 \
+XcmsCIELabQueryMaxLC.3 \
+XcmsCIELabQueryMinL.3 \
+XcmsCIELuv.3 \
+XcmsCIELuvQueryMaxC.3 \
+XcmsCIELuvQueryMaxL.3 \
+XcmsCIELuvQueryMaxLC.3 \
+XcmsCIELuvQueryMinL.3 \
+XcmsCIEXYZ.3 \
+XcmsCIEuvY.3 \
+XcmsCIExyY.3 \
+XcmsColor.3 \
+XcmsConvertColors.3 \
+XcmsCreateCCC.3 \
+XcmsDefaultCCC.3 \
+XcmsFreeCCC.3 \
+XcmsLookupColor.3 \
+XcmsPad.3 \
+XcmsQueryBlack.3 \
+XcmsQueryBlue.3 \
+XcmsQueryColor.3 \
+XcmsQueryColors.3 \
+XcmsQueryGreen.3 \
+XcmsQueryRed.3 \
+XcmsQueryWhite.3 \
+XcmsRGB.3 \
+XcmsRGBi.3 \
+XcmsSetCCCOfColormap.3 \
+XcmsSetWhiteAdjustProc.3 \
+XcmsSetWhitePoint.3 \
+XcmsStoreColor.3 \
+XcmsStoreColors.3 \
+XcmsTekHVC.3 \
+XcmsTekHVCQueryMaxC.3 \
+XcmsTekHVCQueryMaxV.3 \
+XcmsTekHVCQueryMaxVC.3 \
+XcmsTekHVCQueryMaxVSamples.3 \
+XcmsTekHVCQueryMinV.3 \
+XmbDrawImageString.3 \
+XmbDrawString.3 \
+XmbDrawText.3 \
+XmbLookupString.3 \
+XmbResetIC.3 \
+XmbSetWMProperties.3 \
+XmbTextEscapement.3 \
+XmbTextExtents.3 \
+XmbTextListToTextProperty.3 \
+XmbTextPerCharExtents.3 \
+XmbTextPropertyToTextList.3 \
+XrmCombineDatabase.3 \
+XrmCombineFileDatabase.3 \
+XrmDestroyDatabase.3 \
+XrmEnumerateDatabase.3 \
+XrmGetDatabase.3 \
+XrmGetFileDatabase.3 \
+XrmGetResource.3 \
+XrmGetStringDatabase.3 \
+XrmInitialize.3 \
+XrmLocaleOfDatabase.3 \
+XrmMergeDatabases.3 \
+XrmOptionDescRec.3 \
+XrmOptionKind.3 \
+XrmParseCommand.3 \
+XrmPermStringToQuark.3 \
+XrmPutFileDatabase.3 \
+XrmPutLineResource.3 \
+XrmPutResource.3 \
+XrmPutStringResource.3 \
+XrmQGetResource.3 \
+XrmQGetSearchList.3 \
+XrmQGetSearchResource.3 \
+XrmQPutResource.3 \
+XrmQPutStringResource.3 \
+XrmQuarkToString.3 \
+XrmSetDatabase.3 \
+XrmStringToBindingQuarkList.3 \
+XrmStringToQuark.3 \
+XrmStringToQuarkList.3 \
+XrmUniqueQuark.3 \
+XrmValue.3 \
+Xutf8DrawImageString.3 \
+Xutf8DrawString.3 \
+Xutf8DrawText.3 \
+Xutf8LookupString.3 \
+Xutf8ResetIC.3 \
+Xutf8SetWMProperties.3 \
+Xutf8TextEscapement.3 \
+Xutf8TextExtents.3 \
+Xutf8TextListToTextProperty.3 \
+Xutf8TextPerCharExtents.3 \
+Xutf8TextPropertyToTextList.3 \
+XwcDrawImageString.3 \
+XwcDrawString.3 \
+XwcDrawText.3 \
+XwcFreeStringList.3 \
+XwcLookupString.3 \
+XwcResetIC.3 \
+XwcTextEscapement.3 \
+XwcTextExtents.3 \
+XwcTextListToTextProperty.3 \
+XwcTextPerCharExtents.3 \
+XwcTextPropertyToTextList.3
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index a934f8fd4812..f7f69cceda36 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -2,179 +2,257 @@ include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
 include/X11/Xlib.h
+%%XCB%%include/X11/Xlib-xcb.h
+include/X11/XlibConf.h
 include/X11/Xlibint.h
 include/X11/Xlocale.h
+include/X11/Xregion.h
 include/X11/Xresource.h
 include/X11/Xutil.h
 include/X11/cursorfont.h
-include/X11/region.h
+lib/X11/Xcms.txt
 lib/libX11.a
 lib/libX11.la
 lib/libX11.so
 lib/libX11.so.6
+%%XCB%%lib/libX11-xcb.a
+%%XCB%%lib/libX11-xcb.la
+%%XCB%%lib/libX11-xcb.so
+%%XCB%%lib/libX11-xcb.so.1
 libdata/pkgconfig/x11.pc
+%%XCB%%libdata/pkgconfig/x11-xcb.pc
 share/X11/XErrorDB
 share/X11/XKeysymDB
-share/X11/locale/C/XI18N_OBJS
-share/X11/locale/C/XLC_LOCALE
 share/X11/locale/armscii-8/XI18N_OBJS
 share/X11/locale/armscii-8/XLC_LOCALE
-share/X11/locale/compose.dir
+share/X11/locale/armscii-8/Compose
+share/X11/locale/C/XI18N_OBJS
+share/X11/locale/C/XLC_LOCALE
+share/X11/locale/C/Compose
+share/X11/locale/el_GR.UTF-8/XI18N_OBJS
+share/X11/locale/el_GR.UTF-8/XLC_LOCALE
+share/X11/locale/el_GR.UTF-8/Compose
 share/X11/locale/en_US.UTF-8/XI18N_OBJS
 share/X11/locale/en_US.UTF-8/XLC_LOCALE
+share/X11/locale/en_US.UTF-8/Compose
 share/X11/locale/georgian-academy/XI18N_OBJS
 share/X11/locale/georgian-academy/XLC_LOCALE
+share/X11/locale/georgian-academy/Compose
 share/X11/locale/georgian-ps/XI18N_OBJS
 share/X11/locale/georgian-ps/XLC_LOCALE
+share/X11/locale/georgian-ps/Compose
 share/X11/locale/ibm-cp1133/XI18N_OBJS
 share/X11/locale/ibm-cp1133/XLC_LOCALE
+share/X11/locale/ibm-cp1133/Compose
 share/X11/locale/iscii-dev/XI18N_OBJS
 share/X11/locale/iscii-dev/XLC_LOCALE
+share/X11/locale/iscii-dev/Compose
 share/X11/locale/isiri-3342/XI18N_OBJS
 share/X11/locale/isiri-3342/XLC_LOCALE
+share/X11/locale/isiri-3342/Compose
 share/X11/locale/iso8859-1/XI18N_OBJS
 share/X11/locale/iso8859-1/XLC_LOCALE
+share/X11/locale/iso8859-1/Compose
 share/X11/locale/iso8859-10/XI18N_OBJS
 share/X11/locale/iso8859-10/XLC_LOCALE
+share/X11/locale/iso8859-10/Compose
 share/X11/locale/iso8859-11/XI18N_OBJS
 share/X11/locale/iso8859-11/XLC_LOCALE
+share/X11/locale/iso8859-11/Compose
 share/X11/locale/iso8859-13/XI18N_OBJS
 share/X11/locale/iso8859-13/XLC_LOCALE
+share/X11/locale/iso8859-13/Compose
 share/X11/locale/iso8859-14/XI18N_OBJS
 share/X11/locale/iso8859-14/XLC_LOCALE
+share/X11/locale/iso8859-14/Compose
 share/X11/locale/iso8859-15/XI18N_OBJS
 share/X11/locale/iso8859-15/XLC_LOCALE
+share/X11/locale/iso8859-15/Compose
 share/X11/locale/iso8859-2/XI18N_OBJS
 share/X11/locale/iso8859-2/XLC_LOCALE
+share/X11/locale/iso8859-2/Compose
 share/X11/locale/iso8859-3/XI18N_OBJS
 share/X11/locale/iso8859-3/XLC_LOCALE
+share/X11/locale/iso8859-3/Compose
 share/X11/locale/iso8859-4/XI18N_OBJS
 share/X11/locale/iso8859-4/XLC_LOCALE
+share/X11/locale/iso8859-4/Compose
 share/X11/locale/iso8859-5/XI18N_OBJS
 share/X11/locale/iso8859-5/XLC_LOCALE
+share/X11/locale/iso8859-5/Compose
 share/X11/locale/iso8859-6/XI18N_OBJS
 share/X11/locale/iso8859-6/XLC_LOCALE
+share/X11/locale/iso8859-6/Compose
 share/X11/locale/iso8859-7/XI18N_OBJS
 share/X11/locale/iso8859-7/XLC_LOCALE
+share/X11/locale/iso8859-7/Compose
 share/X11/locale/iso8859-8/XI18N_OBJS
 share/X11/locale/iso8859-8/XLC_LOCALE
+share/X11/locale/iso8859-8/Compose
 share/X11/locale/iso8859-9/XI18N_OBJS
 share/X11/locale/iso8859-9/XLC_LOCALE
+share/X11/locale/iso8859-9/Compose
 share/X11/locale/iso8859-9e/XI18N_OBJS
 share/X11/locale/iso8859-9e/XLC_LOCALE
+share/X11/locale/iso8859-9e/Compose
+share/X11/locale/ja/XI18N_OBJS
+share/X11/locale/ja/XLC_LOCALE
+share/X11/locale/ja/Compose
 share/X11/locale/ja.JIS/XI18N_OBJS
 share/X11/locale/ja.JIS/XLC_LOCALE
+share/X11/locale/ja.JIS/Compose
+share/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+share/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+share/X11/locale/ja_JP.UTF-8/Compose
 share/X11/locale/ja.S90/XI18N_OBJS
 share/X11/locale/ja.S90/XLC_LOCALE
+share/X11/locale/ja.S90/Compose
 share/X11/locale/ja.SJIS/XI18N_OBJS
 share/X11/locale/ja.SJIS/XLC_LOCALE
+share/X11/locale/ja.SJIS/Compose
 share/X11/locale/ja.U90/XI18N_OBJS
 share/X11/locale/ja.U90/XLC_LOCALE
-share/X11/locale/ja/XI18N_OBJS
-share/X11/locale/ja/XLC_LOCALE
-share/X11/locale/ja_JP.UTF-8/XI18N_OBJS
-share/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+share/X11/locale/ja.U90/Compose
 share/X11/locale/ko/XI18N_OBJS
 share/X11/locale/ko/XLC_LOCALE
-share/X11/locale/ko_KR.UTF-8/XI18N_OBJS
-share/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+share/X11/locale/ko/Compose
 share/X11/locale/koi8-c/XI18N_OBJS
 share/X11/locale/koi8-c/XLC_LOCALE
+share/X11/locale/koi8-c/Compose
 share/X11/locale/koi8-r/XI18N_OBJS
 share/X11/locale/koi8-r/XLC_LOCALE
+share/X11/locale/koi8-r/Compose
 share/X11/locale/koi8-u/XI18N_OBJS
 share/X11/locale/koi8-u/XLC_LOCALE
-share/X11/locale/locale.alias
-share/X11/locale/locale.dir
+share/X11/locale/koi8-u/Compose
+share/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+share/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+share/X11/locale/ko_KR.UTF-8/Compose
 share/X11/locale/microsoft-cp1251/XI18N_OBJS
 share/X11/locale/microsoft-cp1251/XLC_LOCALE
+share/X11/locale/microsoft-cp1251/Compose
 share/X11/locale/microsoft-cp1255/XI18N_OBJS
 share/X11/locale/microsoft-cp1255/XLC_LOCALE
+share/X11/locale/microsoft-cp1255/Compose
 share/X11/locale/microsoft-cp1256/XI18N_OBJS
 share/X11/locale/microsoft-cp1256/XLC_LOCALE
+share/X11/locale/microsoft-cp1256/Compose
 share/X11/locale/mulelao-1/XI18N_OBJS
 share/X11/locale/mulelao-1/XLC_LOCALE
+share/X11/locale/mulelao-1/Compose
 share/X11/locale/nokhchi-1/XI18N_OBJS
 share/X11/locale/nokhchi-1/XLC_LOCALE
+share/X11/locale/nokhchi-1/Compose
+share/X11/locale/pt_BR.UTF-8/XI18N_OBJS
+share/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+share/X11/locale/pt_BR.UTF-8/Compose
 share/X11/locale/tatar-cyr/XI18N_OBJS
 share/X11/locale/tatar-cyr/XLC_LOCALE
-share/X11/locale/th_TH.UTF-8/XI18N_OBJS
-share/X11/locale/th_TH.UTF-8/XLC_LOCALE
+share/X11/locale/tatar-cyr/Compose
 share/X11/locale/th_TH/XI18N_OBJS
 share/X11/locale/th_TH/XLC_LOCALE
+share/X11/locale/th_TH/Compose
+share/X11/locale/th_TH.UTF-8/XI18N_OBJS
+share/X11/locale/th_TH.UTF-8/XLC_LOCALE
+share/X11/locale/th_TH.UTF-8/Compose
 share/X11/locale/tscii-0/XI18N_OBJS
 share/X11/locale/tscii-0/XLC_LOCALE
+share/X11/locale/tscii-0/Compose
 share/X11/locale/vi_VN.tcvn/XI18N_OBJS
 share/X11/locale/vi_VN.tcvn/XLC_LOCALE
+share/X11/locale/vi_VN.tcvn/Compose
 share/X11/locale/vi_VN.viscii/XI18N_OBJS
 share/X11/locale/vi_VN.viscii/XLC_LOCALE
-share/X11/locale/zh_CN.UTF-8/XI18N_OBJS
-share/X11/locale/zh_CN.UTF-8/XLC_LOCALE
-share/X11/locale/zh_CN.gbk/XI18N_OBJS
-share/X11/locale/zh_CN.gbk/XLC_LOCALE
+share/X11/locale/vi_VN.viscii/Compose
 share/X11/locale/zh_CN/XI18N_OBJS
 share/X11/locale/zh_CN/XLC_LOCALE
+share/X11/locale/zh_CN/Compose
+share/X11/locale/zh_CN.gb18030/XI18N_OBJS
+share/X11/locale/zh_CN.gb18030/XLC_LOCALE
+share/X11/locale/zh_CN.gb18030/Compose
+share/X11/locale/zh_CN.gbk/XI18N_OBJS
+share/X11/locale/zh_CN.gbk/XLC_LOCALE
+share/X11/locale/zh_CN.gbk/Compose
+share/X11/locale/zh_TW/XI18N_OBJS
+share/X11/locale/zh_TW/XLC_LOCALE
+share/X11/locale/zh_TW/Compose
+share/X11/locale/zh_CN.UTF-8/XI18N_OBJS
+share/X11/locale/zh_CN.UTF-8/XLC_LOCALE
+share/X11/locale/zh_CN.UTF-8/Compose
+share/X11/locale/zh_HK.big5/XI18N_OBJS
 share/X11/locale/zh_HK.big5/XLC_LOCALE
+share/X11/locale/zh_HK.big5/Compose
 share/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
 share/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
-share/X11/locale/zh_TW.UTF-8/XI18N_OBJS
-share/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+share/X11/locale/zh_HK.big5hkscs/Compose
+share/X11/locale/zh_HK.UTF-8/XI18N_OBJS
+share/X11/locale/zh_HK.UTF-8/XLC_LOCALE
+share/X11/locale/zh_HK.UTF-8/Compose
 share/X11/locale/zh_TW.big5/XI18N_OBJS
 share/X11/locale/zh_TW.big5/XLC_LOCALE
-share/X11/locale/zh_TW/XI18N_OBJS
-share/X11/locale/zh_TW/XLC_LOCALE
-@dirrm share/X11/locale/C
-@dirrm share/X11/locale/armscii-8
-@dirrm share/X11/locale/georgian-academy
-@dirrm share/X11/locale/georgian-ps
-@dirrm share/X11/locale/ibm-cp1133
-@dirrm share/X11/locale/iscii-dev
-@dirrm share/X11/locale/isiri-3342
-@dirrm share/X11/locale/iso8859-1
-@dirrm share/X11/locale/iso8859-2
-@dirrm share/X11/locale/iso8859-3
-@dirrm share/X11/locale/iso8859-4
-@dirrm share/X11/locale/iso8859-5
-@dirrm share/X11/locale/iso8859-6
-@dirrm share/X11/locale/iso8859-7
-@dirrm share/X11/locale/iso8859-8
-@dirrm share/X11/locale/iso8859-9
-@dirrm share/X11/locale/iso8859-10
-@dirrm share/X11/locale/iso8859-11
-@dirrm share/X11/locale/iso8859-13
-@dirrm share/X11/locale/iso8859-14
-@dirrm share/X11/locale/iso8859-15
-@dirrm share/X11/locale/iso8859-9e
-@dirrm share/X11/locale/ja
-@dirrm share/X11/locale/ja.JIS
-@dirrm share/X11/locale/ja.S90
-@dirrm share/X11/locale/ja.SJIS
-@dirrm share/X11/locale/ja.U90
-@dirrm share/X11/locale/ko
-@dirrm share/X11/locale/koi8-r
-@dirrm share/X11/locale/koi8-u
-@dirrm share/X11/locale/koi8-c
-@dirrm share/X11/locale/microsoft-cp1251
-@dirrm share/X11/locale/microsoft-cp1255
-@dirrm share/X11/locale/microsoft-cp1256
-@dirrm share/X11/locale/mulelao-1
-@dirrm share/X11/locale/nokhchi-1
-@dirrm share/X11/locale/tatar-cyr
-@dirrm share/X11/locale/tscii-0
-@dirrm share/X11/locale/vi_VN.tcvn
-@dirrm share/X11/locale/vi_VN.viscii
-@dirrm share/X11/locale/zh_CN
-@dirrm share/X11/locale/zh_CN.gbk
-@dirrm share/X11/locale/zh_CN.UTF-8
+share/X11/locale/zh_TW.big5/Compose
+share/X11/locale/zh_TW.UTF-8/XI18N_OBJS
+share/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+share/X11/locale/zh_TW.UTF-8/Compose
+share/X11/locale/locale.alias
+share/X11/locale/locale.dir
+share/X11/locale/compose.dir
+@dirrm share/X11/locale/zh_TW.UTF-8
+@dirrm share/X11/locale/zh_TW.big5
+@dirrm share/X11/locale/zh_HK.UTF-8
 @dirrm share/X11/locale/zh_HK.big5hkscs
+@dirrm share/X11/locale/zh_HK.big5
+@dirrm share/X11/locale/zh_CN.UTF-8
 @dirrm share/X11/locale/zh_TW
-@dirrm share/X11/locale/zh_TW.big5
+@dirrm share/X11/locale/zh_CN.gbk
+@dirrm share/X11/locale/zh_CN.gb18030
+@dirrm share/X11/locale/zh_CN
+@dirrm share/X11/locale/vi_VN.viscii
+@dirrm share/X11/locale/vi_VN.tcvn
+@dirrm share/X11/locale/tscii-0
+@dirrm share/X11/locale/th_TH.UTF-8
 @dirrm share/X11/locale/th_TH
-@dirrm share/X11/locale/en_US.UTF-8
-@dirrm share/X11/locale/ja_JP.UTF-8
+@dirrm share/X11/locale/tatar-cyr
+@dirrm share/X11/locale/pt_BR.UTF-8
+@dirrm share/X11/locale/nokhchi-1
+@dirrm share/X11/locale/mulelao-1
+@dirrm share/X11/locale/microsoft-cp1256
+@dirrm share/X11/locale/microsoft-cp1255
+@dirrm share/X11/locale/microsoft-cp1251
 @dirrm share/X11/locale/ko_KR.UTF-8
-@dirrm share/X11/locale/th_TH.UTF-8
-@dirrm share/X11/locale/zh_TW.UTF-8
-@dirrm share/X11/locale/zh_HK.big5
+@dirrm share/X11/locale/koi8-u
+@dirrm share/X11/locale/koi8-r
+@dirrm share/X11/locale/koi8-c
+@dirrm share/X11/locale/ko
+@dirrm share/X11/locale/ja.U90
+@dirrm share/X11/locale/ja.SJIS
+@dirrm share/X11/locale/ja.S90
+@dirrm share/X11/locale/ja_JP.UTF-8
+@dirrm share/X11/locale/ja.JIS
+@dirrm share/X11/locale/ja
+@dirrm share/X11/locale/iso8859-9e
+@dirrm share/X11/locale/iso8859-9
+@dirrm share/X11/locale/iso8859-8
+@dirrm share/X11/locale/iso8859-7
+@dirrm share/X11/locale/iso8859-6
+@dirrm share/X11/locale/iso8859-5
+@dirrm share/X11/locale/iso8859-4
+@dirrm share/X11/locale/iso8859-3
+@dirrm share/X11/locale/iso8859-2
+@dirrm share/X11/locale/iso8859-15
+@dirrm share/X11/locale/iso8859-14
+@dirrm share/X11/locale/iso8859-13
+@dirrm share/X11/locale/iso8859-11
+@dirrm share/X11/locale/iso8859-10
+@dirrm share/X11/locale/iso8859-1
+@dirrm share/X11/locale/isiri-3342
+@dirrm share/X11/locale/iscii-dev
+@dirrm share/X11/locale/ibm-cp1133
+@dirrm share/X11/locale/georgian-ps
+@dirrm share/X11/locale/georgian-academy
+@dirrm share/X11/locale/en_US.UTF-8
+@dirrm share/X11/locale/el_GR.UTF-8
+@dirrm share/X11/locale/C
+@dirrm share/X11/locale/armscii-8
 @dirrm share/X11/locale
-@unexec rmdir %D/share/X11
+@dirrm share/X11
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
new file mode 100644
index 000000000000..d0bf8314a38b
--- /dev/null
+++ b/x11/libXScrnSaver/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for:	libXScrnSaver
+# Date Created:				15 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libXScrnSaver
+PORTVERSION=	1.1.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	The XScrnSaver library
+
+XORG_CAT=	lib
+USE_XORG=	x11 xext xextproto scrnsaverproto:both
+
+MAN3=		Xss.3 \
+		XScreenSaverAllocInfo.3 \
+		XScreenSaverGetRegistered.3 \
+		XScreenSaverQueryExtension.3 \
+		XScreenSaverQueryInfo.3 \
+		XScreenSaverQueryVersion.3 \
+		XScreenSaverRegister.3 \
+		XScreenSaverSelectInput.3 \
+		XScreenSaverSetAttributes.3 \
+		XScreenSaverSuspend.3 \
+		XScreenSaverUnregister.3 \
+		XScreenSaverUnsetAttributes.3
+
+.include <bsd.port.mk>
diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo
new file mode 100644
index 000000000000..ee971b219267
--- /dev/null
+++ b/x11/libXScrnSaver/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = ac2d697dd02f51e5c15f7104f4be5328
+SHA256 (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = 6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67
+SIZE (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = 219728
diff --git a/x11/libXScrnSaver/pkg-descr b/x11/libXScrnSaver/pkg-descr
new file mode 100644
index 000000000000..3e2398c91789
--- /dev/null
+++ b/x11/libXScrnSaver/pkg-descr
@@ -0,0 +1,5 @@
+This package contains libXScrnSaver, the X11 Screen Saver extension
+client library.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/libXScrnSaver/pkg-plist b/x11/libXScrnSaver/pkg-plist
new file mode 100644
index 000000000000..508ec72f3e26
--- /dev/null
+++ b/x11/libXScrnSaver/pkg-plist
@@ -0,0 +1,5 @@
+lib/libXss.so.1
+lib/libXss.so
+lib/libXss.la
+lib/libXss.a
+libdata/pkgconfig/xscrnsaver.pc
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
new file mode 100644
index 000000000000..76c578b9986b
--- /dev/null
+++ b/x11/libXTrap/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	libXTrap
+# Date Created:				21 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libXTrap
+PORTVERSION=	1.0.0
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	The XTrap library
+
+XORG_CAT=	lib
+USE_XORG=	trapproto:both x11 xext xextproto xt
+USE_AUTOTOOLS=	libtool:15
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11/libXTrap/distinfo b/x11/libXTrap/distinfo
new file mode 100644
index 000000000000..a901870b8f10
--- /dev/null
+++ b/x11/libXTrap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXTrap-1.0.0.tar.bz2) = 1e2d966b5b2b89910e418bb0f78e10de
+SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
+SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
diff --git a/x11/libXTrap/pkg-descr b/x11/libXTrap/pkg-descr
new file mode 100644
index 000000000000..22dcef586f24
--- /dev/null
+++ b/x11/libXTrap/pkg-descr
@@ -0,0 +1,4 @@
+This package contains libXTrap, the The X.Org XTrap library.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/libXTrap/pkg-plist b/x11/libXTrap/pkg-plist
new file mode 100644
index 000000000000..0822c92809fd
--- /dev/null
+++ b/x11/libXTrap/pkg-plist
@@ -0,0 +1,5 @@
+lib/libXTrap.so.6
+lib/libXTrap.so
+lib/libXTrap.la
+lib/libXTrap.a
+libdata/pkgconfig/xtrap.pc
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 0319868a2301..03efb67c84a6 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -6,26 +6,21 @@
 #
 
 PORTNAME=	libXau
-PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTVERSION=	1.0.3
+PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Authentication Protocol library for X11
 
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
+XORG_CAT=	lib
+USE_XORG=	xproto:both
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
+MAN3=		Xau.3 XauDisposeAuth.3 XauFileName.3 XauGetAuthByAddr.3 \
+		XauGetBestAuthByAddr.3 XauLockAuth.3 XauReadAuth.3 \
+		XauUnlockAuth.3 XauWriteAuth.3
 
-USE_AUTOTOOLS=	libtool:15
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack pkgconfig
-
-INSTALLS_SHLIB=	yes
+post-install:
+	${LN} -sf ${PREFIX}/lib/libXau.so.6 ${PREFIX}/lib/libXau.so.0
 
 .include <bsd.port.mk>
diff --git a/x11/libXau/distinfo b/x11/libXau/distinfo
index 5abb952db066..bc2977594ca8 100644
--- a/x11/libXau/distinfo
+++ b/x11/libXau/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXau-0.1.1.tar.bz2) = 3d747ada4a7d17538fa21c62d5608656
-SHA256 (libXau-0.1.1.tar.bz2) = d7c42725a17ffd7c343fa1631b1c9f4899c26f971de5c8892d56af88cf54a4c4
-SIZE (libXau-0.1.1.tar.bz2) = 186745
+MD5 (xorg/lib/libXau-1.0.3.tar.bz2) = 75a9f2b85cd1617b5ca98c9095323853
+SHA256 (xorg/lib/libXau-1.0.3.tar.bz2) = d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b
+SIZE (xorg/lib/libXau-1.0.3.tar.bz2) = 229619
diff --git a/x11/libXau/pkg-plist b/x11/libXau/pkg-plist
index d06cf4784b64..f46f0a86cf15 100644
--- a/x11/libXau/pkg-plist
+++ b/x11/libXau/pkg-plist
@@ -3,4 +3,5 @@ lib/libXau.a
 lib/libXau.la
 lib/libXau.so
 lib/libXau.so.0
+lib/libXau.so.6
 libdata/pkgconfig/xau.pc
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index ca2b41000b78..7fb89636f85d 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -6,27 +6,14 @@
 #
 
 PORTNAME=	libXcomposite
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	0.3.1
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://xlibs.freedesktop.org/release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Composite extension library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/compositeext.pc:${PORTSDIR}/x11/compositeext \
-		${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+XORG_CAT=	lib
+USE_XORG=	compositeproto:both x11 xfixes xext fixesproto xproto:both
 
 .include <bsd.port.mk>
diff --git a/x11/libXcomposite/distinfo b/x11/libXcomposite/distinfo
index fdbc7590d368..f4138b7653de 100644
--- a/x11/libXcomposite/distinfo
+++ b/x11/libXcomposite/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXcomposite-1.0.1.tar.bz2) = 6d5eb91ab7023fbc5cad3e410fe126df
-SHA256 (libXcomposite-1.0.1.tar.bz2) = ea26fb4714277a9b82dc2c3da37657da2e6ff83c451167a6bed9a9f5cdca71de
-SIZE (libXcomposite-1.0.1.tar.bz2) = 181910
+MD5 (xorg/lib/libXcomposite-0.3.1.tar.bz2) = a80650d660486ea7bb2e5fd84a83799a
+SHA256 (xorg/lib/libXcomposite-0.3.1.tar.bz2) = d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b
+SIZE (xorg/lib/libXcomposite-0.3.1.tar.bz2) = 221073
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index f1de917e799e..1f84ddbbbcad 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -6,32 +6,18 @@
 #
 
 PORTNAME=	libXcursor
-PORTVERSION=	1.1.2
-PORTREVISION=	3
+PORTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://xlibs.freedesktop.org/release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X client-side cursor loading library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
-		${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \
-		${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${X11BASE}/libdata/pkgconfig/render.pc:${PORTSDIR}/x11/renderext \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+XORG_CAT=	lib
+USE_XORG=	xrender x11 xfixes renderproto fixesproto xproto:both
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
+CONFIGURE_ARGS=	--with-icondir=${PREFIX}/lib/X11/icons
 
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 MAN3=		Xcursor.3
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11/libXcursor/distinfo b/x11/libXcursor/distinfo
index d1ddadfe2d2f..3c8e7874d4d1 100644
--- a/x11/libXcursor/distinfo
+++ b/x11/libXcursor/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXcursor-1.1.2.tar.bz2) = cc38e1e1a144f828e6ad216c4ebb876b
-SHA256 (libXcursor-1.1.2.tar.bz2) = 3331d125b093f99e05ccb41df802573b8a679f4941f16e14ba7e6877fc08a4fa
-SIZE (libXcursor-1.1.2.tar.bz2) = 211989
+MD5 (xorg/lib/libXcursor-1.1.8.tar.bz2) = ec2acd10a7736a85dd1e1ed9ea5bec96
+SHA256 (xorg/lib/libXcursor-1.1.8.tar.bz2) = 8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377
+SIZE (xorg/lib/libXcursor-1.1.8.tar.bz2) = 251641
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index a30b32ea0eeb..9b11eb0ff0de 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -6,27 +6,13 @@
 #
 
 PORTNAME=	libXdamage
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.1.1
 CATEGORIES=	x11
-MASTER_SITES=	http://xlibs.freedesktop.org/release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Damage extension library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/damageext.pc:${PORTSDIR}/x11/damageext \
-		${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+XORG_CAT=	lib
+USE_XORG=	x11 damageproto:both xfixes fixesproto xextproto xproto:both
 
 .include <bsd.port.mk>
diff --git a/x11/libXdamage/distinfo b/x11/libXdamage/distinfo
index c70f21acf981..de3ea7517055 100644
--- a/x11/libXdamage/distinfo
+++ b/x11/libXdamage/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXdamage-1.0.1.tar.bz2) = ee4d344ac70117b6c5d840e543ce5d26
-SHA256 (libXdamage-1.0.1.tar.bz2) = 619a1e03ff74f6ac623a65965431502f75b251d9d015050349eb06bf36214596
-SIZE (libXdamage-1.0.1.tar.bz2) = 182389
+MD5 (xorg/lib/libXdamage-1.1.1.tar.bz2) = ac0ce6b0063a9858c8f24ddb4c60487d
+SHA256 (xorg/lib/libXdamage-1.1.1.tar.bz2) = 0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e
+SIZE (xorg/lib/libXdamage-1.1.1.tar.bz2) = 201096
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 550ca30867c5..2c63d7709e76 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -6,34 +6,13 @@
 #
 
 PORTNAME=	libXdmcp
-PORTVERSION=	0.1.3
+PORTVERSION=	1.0.2
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/:fdo \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	anholt/:local
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:fdo \
-		Wraphelp2.gz:local
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Display Manager Control Protocol library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
-BUILD_DEPENDS=	${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_AUTOTOOLS=	libtool:15
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
-
-post-extract:
-	${GUNZIP_CMD} -c ${DISTDIR}/Wraphelp2.gz > ${WRKSRC}/Wraphelp.c
+XORG_CAT=	lib
+USE_XORG=	xproto
 
 .include <bsd.port.mk>
diff --git a/x11/libXdmcp/distinfo b/x11/libXdmcp/distinfo
index bd27087318a9..65cc796890cf 100644
--- a/x11/libXdmcp/distinfo
+++ b/x11/libXdmcp/distinfo
@@ -1,6 +1,3 @@
-MD5 (libXdmcp-0.1.3.tar.bz2) = b2d945d5f8399605426ba6410223b8de
-SHA256 (libXdmcp-0.1.3.tar.bz2) = addb7c6dee29fafb163ea0242e0fb32f180edf20587670e3cd8dd62734366ef7
-SIZE (libXdmcp-0.1.3.tar.bz2) = 207281
-MD5 (Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-SHA256 (Wraphelp2.gz) = dafdafebe454806d19ec32536f8da71f3eee95fd249cd34eacb676c95e54dee5
-SIZE (Wraphelp2.gz) = 3376
+MD5 (xorg/lib/libXdmcp-1.0.2.tar.bz2) = 10facf2bc7cbd5e5c1a698b8a210a582
+SHA256 (xorg/lib/libXdmcp-1.0.2.tar.bz2) = f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8
+SIZE (xorg/lib/libXdmcp-1.0.2.tar.bz2) = 220946
diff --git a/x11/libXdmcp/pkg-plist b/x11/libXdmcp/pkg-plist
index 3bad9a020fd7..bb8bf3bf2f61 100644
--- a/x11/libXdmcp/pkg-plist
+++ b/x11/libXdmcp/pkg-plist
@@ -1,7 +1,6 @@
 include/X11/Xdmcp.h
-include/X11/Xdmcpconf.h
 lib/libXdmcp.a
 lib/libXdmcp.la
 lib/libXdmcp.so
-lib/libXdmcp.so.0
+lib/libXdmcp.so.6
 libdata/pkgconfig/xdmcp.pc
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
new file mode 100644
index 000000000000..c57f370e6692
--- /dev/null
+++ b/x11/libXevie/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	libXevie
+# Date Created:				21 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libXevie
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	The Xevie library
+
+XORG_CAT=	lib
+USE_XORG=	evieproto x11 xext xextproto xproto:both
+
+MAN3=		Xevie.3 \
+		XevieEnd.3 \
+		XevieQueryVersion.3 \
+		XevieSelectInput.3 \
+		XevieSendEvent.3 \
+		XevieStart.3
+
+.include <bsd.port.mk>
diff --git a/x11/libXevie/distinfo b/x11/libXevie/distinfo
new file mode 100644
index 000000000000..841df862454f
--- /dev/null
+++ b/x11/libXevie/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXevie-1.0.2.tar.bz2) = 88e9bf535364e7c821ef4014fb1ca2dd
+SHA256 (xorg/lib/libXevie-1.0.2.tar.bz2) = ff70b81ad145932db2d206735cefcb698dadad241001df7ba6b97e8081d174da
+SIZE (xorg/lib/libXevie-1.0.2.tar.bz2) = 227721
diff --git a/x11/libXevie/pkg-descr b/x11/libXevie/pkg-descr
new file mode 100644
index 000000000000..a43d9c9d6a03
--- /dev/null
+++ b/x11/libXevie/pkg-descr
@@ -0,0 +1,4 @@
+This package contains libXevie, the X.Org Xevie library.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/libXevie/pkg-plist b/x11/libXevie/pkg-plist
new file mode 100644
index 000000000000..7bea8757d158
--- /dev/null
+++ b/x11/libXevie/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/extensions/Xevie.h
+lib/libXevie.so.1
+lib/libXevie.so
+lib/libXevie.la
+lib/libXevie.a
+libdata/pkgconfig/xevie.pc
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 8f9c9ec87ec8..eae965a1947f 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -6,27 +6,76 @@
 #
 
 PORTNAME=	libXext
-PORTVERSION=	6.4.3
+PORTVERSION=	1.0.3
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 Extension library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
-		${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
-BUILD_DEPENDS=	${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+XORG_CAT=	lib
+USE_XORG=	xproto x11 xextproto:both xau
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+MAN3=		DBE.3 \
+		DPMSCapable.3 \
+		DPMSDisable.3 \
+		DPMSEnable.3 \
+		DPMSForceLevel.3 \
+		DPMSGetTimeouts.3 \
+		DPMSGetVersion.3 \
+		DPMSInfo.3 \
+		DPMSQueryExtension.3 \
+		DPMSSetTimeouts.3 \
+		XShape.3 \
+		XShapeCombineMask.3 \
+		XShapeCombineRectangles.3 \
+		XShapeCombineRegion.3 \
+		XShapeCombineShape.3 \
+		XShapeGetRectangles.3 \
+		XShapeInputSelected.3 \
+		XShapeOffsetShape.3 \
+		XShapeQueryExtension.3 \
+		XShapeQueryExtents.3 \
+		XShapeQueryVersion.3 \
+		XShapeSelectInput.3 \
+		XcupGetReservedColormapEntries.3 \
+		XcupQueryVersion.3 \
+		XcupStoreColors.3 \
+		XdbeAllocateBackBufferName.3 \
+		XdbeBeginIdiom.3 \
+		XdbeDeallocateBackBufferName.3 \
+		XdbeEndIdiom.3 \
+		XdbeFreeVisualInfo.3 \
+		XdbeGetBackBufferAttributes.3 \
+		XdbeGetVisualInfo.3 \
+		XdbeQueryExtension.3 \
+		XdbeSwapBuffers.3 \
+		Xevi.3 \
+		XeviGetVisualInfo.3 \
+		XeviQueryExtension.3 \
+		XeviQueryVersion.3 \
+		Xmbuf.3 \
+		XmbufChangeBufferAttributes.3 \
+		XmbufChangeWindowAttributes.3 \
+		XmbufCreateBuffers.3 \
+		XmbufCreateStereoWindow.3 \
+		XmbufDestroyBuffers.3 \
+		XmbufDisplayBuffers.3 \
+		XmbufGetBufferAttributes.3 \
+		XmbufGetScreenInfo.3 \
+		XmbufGetVersion.3 \
+		XmbufGetWindowAttributes.3 \
+		XmbufQueryExtension.3 \
+		XShm.3 \
+		XShmAttach.3 \
+		XShmCreateImage.3 \
+		XShmCreatePixmap.3 \
+		XShmDetach.3 \
+		XShmGetEventBase.3 \
+		XShmGetImage.3 \
+		XShmPixmapFormat.3 \
+		XShmPutImage.3 \
+		XShmQueryExtension.3 \
+		XShmQueryVersion.3
 
 .include <bsd.port.mk>
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index 08576db81621..5f63d025110a 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXext-6.4.3.tar.bz2) = b7117194e69867905da9701dff56f3ee
-SHA256 (libXext-6.4.3.tar.bz2) = 04e6ed9b13b215814db0713c02f9f33d38e7761ffb9d80c637fa18d8e39dfb56
-SIZE (libXext-6.4.3.tar.bz2) = 216253
+MD5 (xorg/lib/libXext-1.0.3.tar.bz2) = 1bf6fa1c26f9957d7cc0bd90b038dfa6
+SHA256 (xorg/lib/libXext-1.0.3.tar.bz2) = 2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0
+SIZE (xorg/lib/libXext-1.0.3.tar.bz2) = 262116
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index c0f65487f807..cd0b4029a3ba 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -6,27 +6,15 @@
 #
 
 PORTNAME=	libXfixes
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	4.0.3
 CATEGORIES=	x11
-MASTER_SITES=	http://xlibs.freedesktop.org/release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Fixes extension library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/fixesext.pc:${PORTSDIR}/x11/fixesext \
-		${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+XORG_CAT=	lib
+USE_XORG=	x11 fixesproto:both xproto xextproto
 
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+MAN3=		Xfixes.3
 
 .include <bsd.port.mk>
diff --git a/x11/libXfixes/distinfo b/x11/libXfixes/distinfo
index 73f0debbab59..7c852b9d00ab 100644
--- a/x11/libXfixes/distinfo
+++ b/x11/libXfixes/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXfixes-2.0.1.tar.bz2) = 89559cae2035b7e640c13075bea63e5e
-SHA256 (libXfixes-2.0.1.tar.bz2) = 8589df5613863557b26f872170f99f2ca3b0d01adbd33030fbd0ee2c3a1843c2
-SIZE (libXfixes-2.0.1.tar.bz2) = 186336
+MD5 (xorg/lib/libXfixes-4.0.3.tar.bz2) = 1990d19725a3c7f32290037f02d3737f
+SHA256 (xorg/lib/libXfixes-4.0.3.tar.bz2) = 547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd
+SIZE (xorg/lib/libXfixes-4.0.3.tar.bz2) = 214287
diff --git a/x11/libXfixes/pkg-plist b/x11/libXfixes/pkg-plist
index fd7568ce3ace..f8e8b57a030d 100644
--- a/x11/libXfixes/pkg-plist
+++ b/x11/libXfixes/pkg-plist
@@ -2,5 +2,5 @@ include/X11/extensions/Xfixes.h
 lib/libXfixes.a
 lib/libXfixes.la
 lib/libXfixes.so
-lib/libXfixes.so.1
+lib/libXfixes.so.3
 libdata/pkgconfig/xfixes.pc
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 517a414ae6c6..2f984bbaf3f6 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -6,29 +6,52 @@
 #
 
 PORTNAME=	libXi
-PORTVERSION=	6.0.1
-PORTREVISION=	2
+PORTVERSION=	1.0.2
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Input extension library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
-		${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+XORG_CAT=	lib
+USE_XORG=	xproto x11 xext xextproto inputproto:both
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+MAN3=		XAllowDeviceEvents.3 \
+		XChangeDeviceControl.3 \
+		XChangeDeviceDontPropagateList.3 \
+		XChangeDeviceKeyMapping.3 \
+		XChangeFeedbackControl.3 \
+		XChangeKeyboardDevice.3 \
+		XChangePointerDevice.3 \
+		XCloseDevice.3 \
+		XDeviceBell.3 \
+		XDeviceTimeCoord.3 \
+		XFreeDeviceList.3 \
+		XGetDeviceControl.3 \
+		XGetDeviceKeyMapping.3 \
+		XGetDeviceModifierMapping.3 \
+		XGetDeviceMotionEvents.3 \
+		XGetExtensionVersion.3 \
+		XGetFeedbackControl.3 \
+		XGetDeviceButtonMapping.3 \
+		XGetDeviceDontPropagateList.3 \
+		XGetDeviceFocus.3 \
+		XGetSelectedExtensionEvents.3 \
+		XGrabDevice.3 \
+		XGrabDeviceButton.3 \
+		XGrabDeviceKey.3 \
+		XListInputDevices.3 \
+		XOpenDevice.3 \
+		XQueryDeviceState.3 \
+		XSelectExtensionEvent.3 \
+		XSendExtensionEvent.3 \
+		XSetDeviceButtonMapping.3 \
+		XSetDeviceFocus.3 \
+		XSetDeviceMode.3 \
+		XSetDeviceModifierMapping.3 \
+		XSetDeviceValuators.3 \
+		XUngrabDeviceButton.3 \
+		XUngrabDeviceKey.3 \
+		XUngrabDevice.3 \
 
 .include <bsd.port.mk>
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index 20580d81eb92..54f273204622 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXi-6.0.1.tar.bz2) = 7e935a42428d63a387b3c048be0f2756
-SHA256 (libXi-6.0.1.tar.bz2) = 4e7ac30437bc038bc31642230d133c3c6ac9fc71f9afb657c6d6ac60572ecebd
-SIZE (libXi-6.0.1.tar.bz2) = 209914
+MD5 (xorg/lib/libXi-1.0.2.tar.bz2) = 4a5207a29a6b220e5462129854689844
+SHA256 (xorg/lib/libXi-1.0.2.tar.bz2) = 7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f
+SIZE (xorg/lib/libXi-1.0.2.tar.bz2) = 244920
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index b3a1d500e2f7..abdecb7159d9 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -6,27 +6,17 @@
 #
 
 PORTNAME=	libXinerama
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.1
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 Xinerama library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
-		${X11BASE}/libdata/pkgconfig/panoramixext.pc:${PORTSDIR}/x11/panoramixext
-BUILD_DEPENDS=	${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+XORG_CAT=	lib
+USE_XORG=	x11 xext xextproto xineramaproto:both
+USE_AUTOTOOLS=	libtool:15
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/x11/libXinerama/distinfo b/x11/libXinerama/distinfo
index 40d1d516042d..65c4dc415f1b 100644
--- a/x11/libXinerama/distinfo
+++ b/x11/libXinerama/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXinerama-1.0.2.tar.bz2) = 637b2c5758d2de558670428d33178174
-SHA256 (libXinerama-1.0.2.tar.bz2) = 9a54a848503979665eecbaf51edf7175b82155a66e024ebf06be8c8a5477a9ea
-SIZE (libXinerama-1.0.2.tar.bz2) = 194913
+MD5 (xorg/lib/libXinerama-1.0.1.tar.bz2) = eae38dd6017dca95a756553995467aac
+SHA256 (xorg/lib/libXinerama-1.0.1.tar.bz2) = f242da28a517f810d454afc98289e52c52719e53822364a7249f82e9a9ad8f15
+SIZE (xorg/lib/libXinerama-1.0.1.tar.bz2) = 206173
diff --git a/x11/libXinerama/pkg-plist b/x11/libXinerama/pkg-plist
index d5c1548b7e6f..9915dec27089 100644
--- a/x11/libXinerama/pkg-plist
+++ b/x11/libXinerama/pkg-plist
@@ -1,4 +1,3 @@
-include/X11/extensions/Xinerama.h
 lib/libXinerama.a
 lib/libXinerama.la
 lib/libXinerama.so
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index a8a57807f0ed..7fe491916ed8 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -6,29 +6,52 @@
 #
 
 PORTNAME=	libXp
-PORTVERSION=	6.0
+PORTVERSION=	1.0.0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://xorg.freedesktop.org/X11R6.7.0/src/ \
-		${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R6.7/tars
-DISTNAME=	X11R6.7.0-src1
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X print library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
-		${X11BASE}/include/X11/extensions/Print.h:${PORTSDIR}/x11/printext
-BUILD_DEPENDS=	${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+XORG_CAT=	lib
+USE_XORG=	x11 xext xextproto xau printproto:both
+USE_AUTOTOOLS=	libtool:15
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
-USE_IMAKE=	YES
-USE_X_PREFIX=	no
-PREFIX?=	${X11BASE}
-DIST_SUBDIR=	xorg
-INSTALLS_SHLIB=	yes
-WRKSRC=		${WRKDIR}/xc/lib/Xp
-EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/lib/Xp
+MAN3=	XpCancelDoc.3 \
+	XpCancelJob.3 \
+	XpCancelPage.3 \
+	XpCreateContext.3 \
+	XpDestroyContext.3 \
+	XpEndDoc.3 \
+	XpEndJob.3 \
+	XpEndPage.3 \
+	XpFreePrinterList.3 \
+	XpGetAttributes.3 \
+	XpGetContext.3 \
+	XpGetDocumentData.3 \
+	XpGetImageResolution.3 \
+	XpGetLocaleHinter.3 \
+	XpGetOneAttribute.3 \
+	XpGetPageDimensions.3 \
+	XpGetPdmStartParams.3 \
+	XpGetPrinterList.3 \
+	XpGetScreenOfContext.3 \
+	XpInputSelected.3 \
+	XpPutDocumentData.3 \
+	XpQueryExtension.3 \
+	XpQueryScreens.3 \
+	XpQueryVersion.3 \
+	XpRehashPrinterList.3 \
+	XpSelectInput.3 \
+	XpSetAttributes.3 \
+	XpSetContext.3 \
+	XpSetImageResolution.3 \
+	XpSetLocaleHinter.3 \
+	XpStartDoc.3 \
+	XpStartJob.3 \
+	XpStartPage.3 \
+	libXp.3
 
 .include <bsd.port.mk>
diff --git a/x11/libXp/distinfo b/x11/libXp/distinfo
index 59603c139556..24c0ab242f10 100644
--- a/x11/libXp/distinfo
+++ b/x11/libXp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SHA256 (xorg/X11R6.7.0-src1.tar.gz) = e2872ae9c773e76139cfe7c97bdfd1963e41bf3b307230fca711c9f005a90dbb
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/lib/libXp-1.0.0.tar.bz2) = 0f4ac39108c1ae8c443cdfac259b58fa
+SHA256 (xorg/lib/libXp-1.0.0.tar.bz2) = 7e64b1550ce85b05762e960459ac676a0406c786756b200ff29c57f84bce9cae
+SIZE (xorg/lib/libXp-1.0.0.tar.bz2) = 244470
diff --git a/x11/libXp/pkg-plist b/x11/libXp/pkg-plist
index ec3568cca799..ba86a7f4b48a 100644
--- a/x11/libXp/pkg-plist
+++ b/x11/libXp/pkg-plist
@@ -1,3 +1,5 @@
 lib/libXp.a
+lib/libXp.la
 lib/libXp.so
 lib/libXp.so.6
+libdata/pkgconfig/xp.pc
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 04f3733852d3..b2020c107131 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -6,28 +6,15 @@
 #
 
 PORTNAME=	libXpm
-PORTVERSION=	3.5.1
-PORTREVISION=	1
+PORTVERSION=	3.5.6
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Pixmap library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+XORG_CAT=	lib
+USE_XORG=	xproto x11
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+MAN1=		cxpm.1
 
 .include <bsd.port.mk>
diff --git a/x11/libXpm/distinfo b/x11/libXpm/distinfo
index a9cc51f58ecc..43dea7b5eacf 100644
--- a/x11/libXpm/distinfo
+++ b/x11/libXpm/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXpm-3.5.1.tar.bz2) = 733e20a60c3343531b50bcc48348fd3e
-SHA256 (libXpm-3.5.1.tar.bz2) = 7af7eb6f3066b35ad48475cfa862f112f963e205031eba09f1fa0f909d073031
-SIZE (libXpm-3.5.1.tar.bz2) = 226124
+MD5 (xorg/lib/libXpm-3.5.6.tar.bz2) = 37b7d1826c6a02107269632a93b8791f
+SHA256 (xorg/lib/libXpm-3.5.6.tar.bz2) = 2d5c5242b8417db6aa758e5be387de33385d9960ff21c801af7d6a4730b4fd0d
+SIZE (xorg/lib/libXpm-3.5.6.tar.bz2) = 371577
diff --git a/x11/libXpm/files/patch-xpm-sec.patch4 b/x11/libXpm/files/patch-xpm-sec.patch4
deleted file mode 100644
index 5bed68fa5367..000000000000
--- a/x11/libXpm/files/patch-xpm-sec.patch4
+++ /dev/null
@@ -1,473 +0,0 @@
-Index: xc/lib/Attrib.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/Attrib.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 Attrib.c
---- lib/Attrib.c	15 Feb 2001 07:59:10 -0000	1.1.1.1
-+++ lib/Attrib.c	31 Aug 2004 23:28:59 -0000
-@@ -35,7 +35,7 @@
- #include "XpmI.h"
- 
- /* 3.2 backward compatibility code */
--LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors,
-+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors,
- 				 XpmColor ***oldct));
- 
- LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors));
-@@ -46,11 +46,14 @@
- static int
- CreateOldColorTable(ct, ncolors, oldct)
-     XpmColor *ct;
--    int ncolors;
-+    unsigned int ncolors;
-     XpmColor ***oldct;
- {
-     XpmColor **colorTable, **color;
-     int a;
-+
-+    if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) 
-+	return XpmNoMemory;
- 
-     colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
-     if (!colorTable) {
-Index: xc/lib/CrDatFrI.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/CrDatFrI.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 CrDatFrI.c
---- lib/CrDatFrI.c	19 Jan 2002 11:08:43 -0000	1.1.1.2
-+++ lib/CrDatFrI.c	31 Aug 2004 23:28:59 -0000
-@@ -124,6 +124,8 @@
-      */
-     header_nlines = 1 + image->ncolors;
-     header_size = sizeof(char *) * header_nlines;
-+    if (header_size >= SIZE_MAX / sizeof(char *))
-+	return (XpmNoMemory);
-     header = (char **) XpmCalloc(header_size, sizeof(char *));
-     if (!header)
- 	return (XpmNoMemory);
-Index: xc/lib/WrFFrI.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/WrFFrI.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 WrFFrI.c
---- lib/WrFFrI.c	19 Jan 2002 11:08:43 -0000	1.1.1.2
-+++ lib/WrFFrI.c	31 Aug 2004 23:28:59 -0000
-@@ -248,6 +248,8 @@
-     unsigned int x, y, h;
- 
-     h = height - 1;
-+    if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) 
-+	return XpmNoMemory;    
-     p = buf = (char *) XpmMalloc(width * cpp + 3);
-     if (!buf)
- 	return (XpmNoMemory);
-Index: xc/lib/XpmI.h
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/XpmI.h,v
-retrieving revision 1.6
-diff -u -r1.6 XpmI.h
---- lib/XpmI.h	13 Feb 2004 22:40:56 -0000	1.6
-+++ lib/XpmI.h	31 Aug 2004 23:28:59 -0000
-@@ -86,6 +86,18 @@
- 		boundCheckingCalloc((long)(nelem),(long) (elsize))
- #endif
- 
-+#if defined(SCO) || defined(__USLC__)
-+#include <stdint.h>	/* For SIZE_MAX */
-+#endif
-+#include <limits.h>
-+#ifndef SIZE_MAX
-+# ifdef ULONG_MAX
-+#  define SIZE_MAX ULONG_MAX
-+# else 
-+#  define SIZE_MAX UINT_MAX
-+# endif
-+#endif
-+
- #define XPMMAXCMTLEN BUFSIZ
- typedef struct {
-     unsigned int type;
-@@ -187,9 +199,9 @@
- }      *xpmHashAtom;
- 
- typedef struct {
--    int size;
--    int limit;
--    int used;
-+    unsigned int size;
-+    unsigned int limit;
-+    unsigned int used;
-     xpmHashAtom *atomTable;
- }      xpmHashTable;
- 
-Index: xc/lib/create.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/create.c,v
-retrieving revision 1.3
-diff -u -r1.3 create.c
---- lib/create.c	13 Feb 2004 22:40:56 -0000	1.3
-+++ lib/create.c	31 Aug 2004 23:28:59 -0000
-@@ -1,3 +1,4 @@
-+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
- /*
-  * Copyright (C) 1989-95 GROUPE BULL
-  *
-@@ -816,6 +817,9 @@
- 
-     ErrorStatus = XpmSuccess;
- 
-+    if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) 
-+	return (XpmNoMemory);
-+
-     /* malloc pixels index tables */
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
-     if (!image_pixels)
-@@ -988,6 +992,8 @@
- 	return (XpmNoMemory);
- 
- #if !defined(FOR_MSW) && !defined(AMIGA)
-+    if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
-+	return XpmNoMemory;
-     /* now that bytes_per_line must have been set properly alloc data */
-     (*image_return)->data =
- 	(char *) XpmMalloc((*image_return)->bytes_per_line * height);
-@@ -2055,6 +2061,9 @@
- 	xpmGetCmt(data, &colors_cmt);
- 
-     /* malloc pixels index tables */
-+    if (ncolors >= SIZE_MAX / sizeof(Pixel)) 
-+	return XpmNoMemory;
-+
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
-     if (!image_pixels)
- 	RETURN(XpmNoMemory);
-@@ -2309,7 +2318,8 @@
- 	    }
- 	    obm = SelectObject(*dc, image->bitmap);
- #endif
--
-+	    if (ncolors > 256)
-+		return (XpmFileInvalid);
- 
- 	    bzero((char *)colidx, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
-@@ -2414,6 +2424,9 @@
- 	{
- 	    char *s;
- 	    char buf[BUFSIZ];
-+
-+	    if (cpp >= sizeof(buf))
-+		return (XpmFileInvalid);
- 
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
-Index: xc/lib/data.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/data.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 data.c
---- lib/data.c	19 Jan 2002 11:08:44 -0000	1.1.1.2
-+++ lib/data.c	31 Aug 2004 23:28:59 -0000
-@@ -375,7 +375,7 @@
- {
-     if (!data->type)
- 	*cmt = NULL;
--    else if (data->CommentLength) {
-+    else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) {
- 	*cmt = (char *) XpmMalloc(data->CommentLength + 1);
- 	strncpy(*cmt, data->Comment, data->CommentLength);
- 	(*cmt)[data->CommentLength] = '\0';
-Index: xc/lib/hashtab.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/hashtab.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 hashtab.c
---- lib/hashtab.c	15 Feb 2001 07:59:10 -0000	1.1.1.1
-+++ lib/hashtab.c	31 Aug 2004 23:28:59 -0000
-@@ -135,7 +135,7 @@
-     xpmHashTable *table;
- {
-     xpmHashAtom *atomTable = table->atomTable;
--    int size = table->size;
-+    unsigned int size = table->size;
-     xpmHashAtom *t, *p;
-     int i;
-     int oldSize = size;
-@@ -144,6 +144,8 @@
-     HASH_TABLE_GROWS
- 	table->size = size;
-     table->limit = size / 3;
-+    if (size >= SIZE_MAX / sizeof(*atomTable)) 
-+	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (XpmNoMemory);
-@@ -204,6 +206,8 @@
-     table->size = INITIAL_HASH_SIZE;
-     table->limit = table->size / 3;
-     table->used = 0;
-+    if (table->size >= SIZE_MAX / sizeof(*atomTable))
-+	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (XpmNoMemory);
-Index: xc/lib/parse.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/parse.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 parse.c
---- lib/parse.c	19 Jan 2002 11:08:44 -0000	1.1.1.2
-+++ lib/parse.c	31 Aug 2004 23:28:59 -0000
-@@ -1,3 +1,4 @@
-+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
- /*
-  * Copyright (C) 1989-95 GROUPE BULL
-  *
-@@ -44,6 +45,24 @@
- #include <ctype.h>
- #include <string.h>
- 
-+#ifdef HAS_STRLCAT
-+# define STRLCAT(dst, src, dstsize) { \
-+  	if (strlcat(dst, src, dstsize) >= (dstsize)) \
-+	    return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+  	if (strlcpy(dst, src, dstsize) >= (dstsize)) \
-+	    return (XpmFileInvalid); }
-+#else
-+# define STRLCAT(dst, src, dstsize) { \
-+	if ((strlen(dst) + strlen(src)) < (dstsize)) \
-+ 	    strcat(dst, src); \
-+	else return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+	if (strlen(src) < (dstsize)) \
-+ 	    strcpy(dst, src); \
-+	else return (XpmFileInvalid); }
-+#endif
-+
- LFUNC(ParsePixels, int, (xpmData *data, unsigned int width,
- 			 unsigned int height, unsigned int ncolors,
- 			 unsigned int cpp, XpmColor *colorTable,
-@@ -66,7 +85,7 @@
-     unsigned int *extensions;
- {
-     unsigned int l;
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ + 1];
- 
-     if (!data->format) {		/* XPM 2 or 3 */
- 
-@@ -175,10 +194,10 @@
-     XpmColor **colorTablePtr;
-     xpmHashTable *hashtable;
- {
--    unsigned int key = 0, l, a, b;
-+    unsigned int key = 0, l, a, b, len;
-     unsigned int curkey;		/* current color key */
-     unsigned int lastwaskey;		/* key read */
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ+1];
-     char curbuf[BUFSIZ];		/* current buffer */
-     char **sptr, *s;
-     XpmColor *color;
-@@ -186,6 +205,8 @@
-     char **defaults;
-     int ErrorStatus;
- 
-+    if (ncolors >= SIZE_MAX / sizeof(XpmColor))
-+	return (XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	return (XpmNoMemory);
-@@ -197,6 +218,10 @@
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp >= SIZE_MAX - 1) {
-+		xpmFreeColorTable(colorTable, ncolors);
-+		return (XpmNoMemory);
-+	    }
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -234,13 +259,14 @@
- 		}
- 		if (!lastwaskey && key < NKEYS) {	/* open new key */
- 		    if (curkey) {	/* flush string */
--			s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+			len = strlen(curbuf) + 1;
-+			s = (char *) XpmMalloc(len);
- 			if (!s) {
- 			    xpmFreeColorTable(colorTable, ncolors);
- 			    return (XpmNoMemory);
- 			}
- 			defaults[curkey] = s;
--			strcpy(s, curbuf);
-+			memcpy(s, curbuf, len);
- 		    }
- 		    curkey = key + 1;	/* set new key  */
- 		    *curbuf = '\0';	/* reset curbuf */
-@@ -251,9 +277,9 @@
- 			return (XpmFileInvalid);
- 		    }
- 		    if (!lastwaskey)
--			strcat(curbuf, " ");	/* append space */
-+			STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */
- 		    buf[l] = '\0';
--		    strcat(curbuf, buf);/* append buf */
-+		    STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */
- 		    lastwaskey = 0;
- 		}
- 	    }
-@@ -261,12 +287,13 @@
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmFileInvalid);
- 	    }
--	    s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = defaults[curkey] = (char *) XpmMalloc(len);
- 	    if (!s) {
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmNoMemory);
- 	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	}
-     } else {				/* XPM 1 */
- 	/* get to the beginning of the first string */
-@@ -279,6 +306,10 @@
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp >= SIZE_MAX - 1) {
-+		xpmFreeColorTable(colorTable, ncolors);
-+		return (XpmNoMemory);
-+	    }
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -307,16 +338,17 @@
- 	    *curbuf = '\0';		/* init curbuf */
- 	    while ((l = xpmNextWord(data, buf, BUFSIZ))) {
- 		if (*curbuf != '\0')
--		    strcat(curbuf, " ");/* append space */
-+		    STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */
- 		buf[l] = '\0';
--		strcat(curbuf, buf);	/* append buf */
-+		STRLCAT(curbuf, buf, sizeof(curbuf));	/* append buf */
- 	    }
--	    s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = (char *) XpmMalloc(len);
- 	    if (!s) {
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmNoMemory);
- 	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	    color->c_color = s;
- 	    *curbuf = '\0';		/* reset curbuf */
- 	    if (a < ncolors - 1)
-@@ -341,6 +373,9 @@
-     unsigned int *iptr, *iptr2;
-     unsigned int a, x, y;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+	width * height >= SIZE_MAX / sizeof(unsigned int)) 
-+	return XpmNoMemory;
- #ifndef FOR_MSW
-     iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
- #else
-@@ -364,6 +399,9 @@
- 	{
- 	    unsigned short colidx[256];
- 
-+	    if (ncolors > 256)
-+		return (XpmFileInvalid);
-+
- 	    bzero((char *)colidx, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
- 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -441,6 +479,9 @@
- 	{
- 	    char *s;
- 	    char buf[BUFSIZ];
-+
-+	    if (cpp >= sizeof(buf))
-+		return (XpmFileInvalid);
- 
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
-Index: xc/lib/scan.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/scan.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 scan.c
---- lib/scan.c	19 Jan 2002 11:08:44 -0000	1.1.1.2
-+++ lib/scan.c	31 Aug 2004 23:28:59 -0000
-@@ -107,7 +107,8 @@
- LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
- 				  XpmAttributes *attributes));
- 
--LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
-+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, 
-+			     unsigned int ncolors, 
- 			     Pixel *pixels, unsigned int mask,
- 			     unsigned int cpp, XpmAttributes *attributes));
- 
-@@ -232,11 +233,17 @@
-     else
- 	cpp = 0;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+	width * height >= SIZE_MAX / sizeof(unsigned int))
-+	RETURN(XpmNoMemory);
-     pmap.pixelindex =
- 	(unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
-     if (!pmap.pixelindex)
- 	RETURN(XpmNoMemory);
- 
-+    if (pmap.size >= SIZE_MAX / sizeof(Pixel)) 
-+	RETURN(XpmNoMemory);
-+
-     pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
-     if (!pmap.pixels)
- 	RETURN(XpmNoMemory);
-@@ -301,7 +308,8 @@
-      * get rgb values and a string of char, and possibly a name for each
-      * color
-      */
--
-+    if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor))
-+	RETURN(XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	RETURN(XpmNoMemory);
-@@ -360,6 +368,8 @@
- 
-     /* first get a character string */
-     a = 0;
-+    if (cpp >= SIZE_MAX - 1)
-+	return (XpmNoMemory);
-     if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
- 	return (XpmNoMemory);
-     *s++ = printable[c = a % MAXPRINTABLE];
-@@ -407,7 +417,7 @@
- ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
-     Display *display;
-     XpmColor *colors;
--    int ncolors;
-+    unsigned int ncolors;
-     Pixel *pixels;
-     unsigned int mask;
-     unsigned int cpp;
-@@ -451,6 +461,8 @@
-     }
- 
-     /* first get character strings and rgb values */
-+    if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
-+	return (XpmNoMemory);
-     xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
-     if (!xcolors)
- 	return (XpmNoMemory);
diff --git a/x11/libXpm/pkg-plist b/x11/libXpm/pkg-plist
index 2c6a7f8a0173..2f09596f91ed 100644
--- a/x11/libXpm/pkg-plist
+++ b/x11/libXpm/pkg-plist
@@ -1,3 +1,4 @@
+bin/cxpm
 include/X11/xpm.h
 lib/libXpm.a
 lib/libXpm.la
diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile
new file mode 100644
index 000000000000..2f6878d6898d
--- /dev/null
+++ b/x11/libXprintAppUtil/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	libXprintAppUtil
+# Date Created:				21 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libXprintAppUtil
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	The XprintAppUtil library
+
+XORG_CAT=	lib
+USE_XORG=	printproto x11 xau xp xprintutil xproto:both
+USE_AUTOTOOLS=	libtool:15
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11/libXprintAppUtil/distinfo b/x11/libXprintAppUtil/distinfo
new file mode 100644
index 000000000000..c7fcdbeff84c
--- /dev/null
+++ b/x11/libXprintAppUtil/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXprintAppUtil-1.0.1.tar.bz2) = d2de510570aa6714681109b2ba178365
+SHA256 (xorg/lib/libXprintAppUtil-1.0.1.tar.bz2) = 24606446003379dbf499ef57e9294ce622c0f7f8a8f10834db61dc59ef690aa5
+SIZE (xorg/lib/libXprintAppUtil-1.0.1.tar.bz2) = 208379
diff --git a/x11/libXprintAppUtil/pkg-descr b/x11/libXprintAppUtil/pkg-descr
new file mode 100644
index 000000000000..39649db329d0
--- /dev/null
+++ b/x11/libXprintAppUtil/pkg-descr
@@ -0,0 +1,5 @@
+This package contains libXprintAppUtil, a group of Xprint application
+utility routines for X.Org.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/libXprintAppUtil/pkg-plist b/x11/libXprintAppUtil/pkg-plist
new file mode 100644
index 000000000000..ccbbd7595dfa
--- /dev/null
+++ b/x11/libXprintAppUtil/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/XprintAppUtil/xpapputil.h
+lib/libXprintAppUtil.so.1
+lib/libXprintAppUtil.so
+lib/libXprintAppUtil.la
+lib/libXprintAppUtil.a
+libdata/pkgconfig/xprintapputil.pc
+@dirrm include/X11/XprintAppUtil
diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile
new file mode 100644
index 000000000000..b90e0d8c5941
--- /dev/null
+++ b/x11/libXprintUtil/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	libXprintUtil
+# Date Created:				21 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libXprintUtil
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	The XprintUtil library
+
+XORG_CAT=	lib
+USE_XORG=	printproto:both x11 xau xp xt
+USE_AUTOTOOLS=	libtool:15
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11/libXprintUtil/distinfo b/x11/libXprintUtil/distinfo
new file mode 100644
index 000000000000..5c4664f717b7
--- /dev/null
+++ b/x11/libXprintUtil/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXprintUtil-1.0.1.tar.bz2) = 22584f1aab1deba253949b562d1f0f45
+SHA256 (xorg/lib/libXprintUtil-1.0.1.tar.bz2) = 72b6ae0420b9601f55be147e8d068f670b951ae73a81423ba25be5875d826e6c
+SIZE (xorg/lib/libXprintUtil-1.0.1.tar.bz2) = 223325
diff --git a/x11/libXprintUtil/pkg-descr b/x11/libXprintUtil/pkg-descr
new file mode 100644
index 000000000000..0f4ee01be5e7
--- /dev/null
+++ b/x11/libXprintUtil/pkg-descr
@@ -0,0 +1,5 @@
+This package contains libXprintUtil, a group of Xprint application utility
+routines for X.Org.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/libXprintUtil/pkg-plist b/x11/libXprintUtil/pkg-plist
new file mode 100644
index 000000000000..c7663f7937b1
--- /dev/null
+++ b/x11/libXprintUtil/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/XprintUtil/xprintutil.h
+lib/libXprintUtil.a
+lib/libXprintUtil.la
+lib/libXprintUtil.so
+lib/libXprintUtil.so.1
+libdata/pkgconfig/xprintutil.pc
+@dirrm include/X11/XprintUtil
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 0b50160596e0..ba1db1581572 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -6,31 +6,31 @@
 #
 
 PORTNAME=	libXrandr
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Resize and Rotate extension library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
-		${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/randr.pc:${PORTSDIR}/x11/randrext \
-		${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
-		${X11BASE}/libdata/pkgconfig/render.pc:${PORTSDIR}/x11/renderext \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+XORG_CAT=	lib
+USE_XORG=	x11 randrproto:both xext xextproto xrender renderproto
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+MAN3=		Xrandr.3 \
+		XRRConfig.3 \
+		XRRConfigCurrentConfiguration.3 \
+		XRRConfigCurrentRate.3 \
+		XRRConfigRates.3 \
+		XRRConfigRotations.3 \
+		XRRConfigSizes.3 \
+		XRRConfigTimes.3 \
+		XRRFreeScreenConfigInfo.3 \
+		XRRGetScreenInfo.3 \
+		XRRQueryExtension.3 \
+		XRRQueryVersion.3 \
+		XRRRootToScreen.3 \
+		XRRScreenConfig.3 \
+		XRRSelectInput.3 \
+		XRRSetScreenConfig.3 \
+		XRRSetScreenConfigAndRate.3
 
 .include <bsd.port.mk>
diff --git a/x11/libXrandr/distinfo b/x11/libXrandr/distinfo
index a8099ad3ee8f..4b12f1fbaf10 100644
--- a/x11/libXrandr/distinfo
+++ b/x11/libXrandr/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXrandr-1.0.2.tar.bz2) = 82dcb782307f708ba0155bd952168796
-SHA256 (libXrandr-1.0.2.tar.bz2) = c0f1b4474ac1d6f42a5e9ab5295b3bc8ea184158f119f9d28b60b23fc611f2b6
-SIZE (libXrandr-1.0.2.tar.bz2) = 187231
+MD5 (xorg/lib/libXrandr-1.2.1.tar.bz2) = 5860360f5b038cc728f388f875ce525d
+SHA256 (xorg/lib/libXrandr-1.2.1.tar.bz2) = 2d2df642eb8e0527936cdf4ed1c096f69df53e9b95e2532c8ed0cabd06a45407
+SIZE (xorg/lib/libXrandr-1.2.1.tar.bz2) = 220679
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 145ee5ed6ab3..6b996ca1cdc6 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -6,30 +6,13 @@
 #
 
 PORTNAME=	libXrender
-PORTVERSION=	0.8.4
-PORTREVISION=	3
+PORTVERSION=	0.9.2
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Render extension library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
-		${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
-		${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/render.pc:${PORTSDIR}/x11/renderext \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+XORG_CAT=	lib
+USE_XORG=	x11 renderproto:both
 
 .include <bsd.port.mk>
diff --git a/x11/libXrender/distinfo b/x11/libXrender/distinfo
index 1dcfe0300dbe..f4a9c28b4f70 100644
--- a/x11/libXrender/distinfo
+++ b/x11/libXrender/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXrender-0.8.4.tar.bz2) = c745339dbe5f05cff8950b71a739e34c
-SHA256 (libXrender-0.8.4.tar.bz2) = d0d0b12311f4dfa44e9455fb2d3a4e1b314afc6683ab7972507cc390e88c07bb
-SIZE (libXrender-0.8.4.tar.bz2) = 205660
+MD5 (xorg/lib/libXrender-0.9.2.tar.bz2) = 2f1b2c6e8dcbcb6d760e59f445abd92c
+SHA256 (xorg/lib/libXrender-0.9.2.tar.bz2) = 0f749183ab1a0ece14d33c3299b3f70893122349c0bfa9d7bd0e66ce19d1802a
+SIZE (xorg/lib/libXrender-0.9.2.tar.bz2) = 246023
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 768b334db274..e4a52e9f8e3e 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -6,31 +6,20 @@
 #
 
 PORTNAME=	libXres
-PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTVERSION=	1.0.3
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Resource usage library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
-		${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/resourceext.pc:${PORTSDIR}/x11/resourceext \
-		${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
-		${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+XORG_CAT=	lib
+USE_XORG=	x11 xext xextproto resourceproto
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+MAN3=		XRes.3 \
+		XResQueryClients.3 \
+		XResQueryClientPixmapBytes.3 \
+		XResQueryClientResources.3 \
+		XResQueryExtension.3 \
+		XResQueryVersion.3
 
 .include <bsd.port.mk>
diff --git a/x11/libXres/distinfo b/x11/libXres/distinfo
index 5126723be037..71c6e58e9d51 100644
--- a/x11/libXres/distinfo
+++ b/x11/libXres/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXres-1.0.1.tar.bz2) = a2d27531a768b63fe42674a41a3883f9
-SHA256 (libXres-1.0.1.tar.bz2) = 2e10e71ff9d51d385c32d2691732d94e14df4f015911883db29fffe35c024427
-SIZE (libXres-1.0.1.tar.bz2) = 175509
+MD5 (xorg/lib/libXres-1.0.3.tar.bz2) = de66ffb657aba64c9d6dbdeabb757f3e
+SHA256 (xorg/lib/libXres-1.0.3.tar.bz2) = a6d5ba7573f5ec0f091095f01b51d1e671dd0f14acb5b8559cdf366e398a0230
+SIZE (xorg/lib/libXres-1.0.3.tar.bz2) = 218203
diff --git a/x11/libXres/files/patch-Makefile.in b/x11/libXres/files/patch-Makefile.in
deleted file mode 100644
index 70baaf9798e4..000000000000
--- a/x11/libXres/files/patch-Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.in.orig	Thu Jan 15 08:29:17 2004
-+++ Makefile.in	Sun Jan 22 20:04:25 2006
-@@ -168,3 +168,3 @@
- 
--libXRes_la_LIBADD = @RESOURCE_EXT_LIBS@ @X_LIBS@
-+libXRes_la_LIBADD = @RESOURCEEXT_LIBS@ @XRES_LIBS@
- 
diff --git a/x11/libXres/pkg-plist b/x11/libXres/pkg-plist
index eb751f99b93f..6e609b484d6c 100644
--- a/x11/libXres/pkg-plist
+++ b/x11/libXres/pkg-plist
@@ -2,5 +2,7 @@ include/X11/extensions/XRes.h
 lib/libXRes.a
 lib/libXRes.la
 lib/libXRes.so
-lib/libXRes.so.0
+lib/libXRes.so.1
 libdata/pkgconfig/xres.pc
+@dirrm share/X11/app-defaults
+@exec mkdir -p %D/share/X11/app-defaults 2>/dev/null
diff --git a/x11/libXtrans/Makefile b/x11/libXtrans/Makefile
index 66d7cdcef75a..132bdd2884e5 100644
--- a/x11/libXtrans/Makefile
+++ b/x11/libXtrans/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libXtrans
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xlibs.freedesktop.org/release/
 
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
new file mode 100644
index 000000000000..fb533e731e15
--- /dev/null
+++ b/x11/libXtst/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:   libXtst
+# Date Created:			8 Feb 2006
+# Whom:				Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libXtst
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X Test extension
+
+XORG_CAT=	lib
+USE_XORG=	x11 xext recordproto:both xextproto inputproto
+USE_AUTOTOOLS=	libtool:15
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11/libXtst/distinfo b/x11/libXtst/distinfo
new file mode 100644
index 000000000000..8979732ce83d
--- /dev/null
+++ b/x11/libXtst/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXtst-1.0.1.tar.bz2) = 0ba567531ff9ac1ff9da0653f8a161b3
+SHA256 (xorg/lib/libXtst-1.0.1.tar.bz2) = 7348de3c303075df4457b15b47e75096d909e9ffada80773c660bb956ceea882
+SIZE (xorg/lib/libXtst-1.0.1.tar.bz2) = 212511
diff --git a/x11/libXtst/pkg-descr b/x11/libXtst/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libXtst/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libXtst/pkg-plist b/x11/libXtst/pkg-plist
new file mode 100644
index 000000000000..03c03012321d
--- /dev/null
+++ b/x11/libXtst/pkg-plist
@@ -0,0 +1,6 @@
+lib/libXtst.a
+lib/libXtst.la
+lib/libXtst.so
+lib/libXtst.so.6
+libdata/pkgconfig/xtst.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index b81e24aa87a3..02f6ad9af1fd 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -6,26 +6,35 @@
 #
 
 PORTNAME=	libXv
-PORTVERSION=	2.2.2
+PORTVERSION=	1.0.3
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Video Extension library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext
-BUILD_DEPENDS=	${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
+XORG_CAT=	lib
+USE_XORG=	x11 xext xextproto videoproto:both
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack pkgconfig
+MAN3=	Xv.3 \
+	XvFreeAdaptorInfo.3 \
+	XvFreeEncodingInfo.3 \
+	XvGetPortAttribute.3 \
+	XvGetStill.3 \
+	XvGetVideo.3 \
+	XvGrabPort.3 \
+	XvPortNotify.3 \
+	XvPutStill.3 \
+	XvPutVideo.3 \
+	XvQueryAdaptors.3 \
+	XvQueryBestSize.3 \
+	XvQueryEncodings.3 \
+	XvQueryExtension.3 \
+	XvSelectPortNotify.3 \
+	XvSelectVideoNotify.3 \
+	XvSetPortAttribute.3 \
+	XvStopVideo.3 \
+	XvUngrabPort.3 \
+	XvVideoNotify.3
 
 .include <bsd.port.mk>
diff --git a/x11/libXv/distinfo b/x11/libXv/distinfo
index 6a52df98c64a..dee2747c6299 100644
--- a/x11/libXv/distinfo
+++ b/x11/libXv/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXv-2.2.2.tar.bz2) = cdd6a79bac8807da83c008dac42fdddb
-SHA256 (libXv-2.2.2.tar.bz2) = 1a2f74118f7d41b0adcc6373f7be70f3cc06e706cf6c87cecd3a9b3603a24cb0
-SIZE (libXv-2.2.2.tar.bz2) = 192104
+MD5 (xorg/lib/libXv-1.0.3.tar.bz2) = f1c4109fa804aeaf7188b66c5cdd9f57
+SHA256 (xorg/lib/libXv-1.0.3.tar.bz2) = f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b
+SIZE (xorg/lib/libXv-1.0.3.tar.bz2) = 231715
diff --git a/x11/libXv/pkg-plist b/x11/libXv/pkg-plist
index f33155ee28b9..9765424b3a75 100644
--- a/x11/libXv/pkg-plist
+++ b/x11/libXv/pkg-plist
@@ -2,5 +2,5 @@ include/X11/extensions/Xvlib.h
 lib/libXv.a
 lib/libXv.la
 lib/libXv.so
-lib/libXv.so.2
+lib/libXv.so.1
 libdata/pkgconfig/xv.pc
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
new file mode 100644
index 000000000000..2b51d6adc515
--- /dev/null
+++ b/x11/libXvMC/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:   libXvMC
+# Date Created:			8 Feb 206
+# Whom:				Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libXvMC
+PORTVERSION=	1.0.4
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X Video Extension Motion Compensation library
+
+XORG_CAT=	lib
+USE_XORG=	x11 xext xv xextproto videoproto
+
+.include <bsd.port.mk>
diff --git a/x11/libXvMC/distinfo b/x11/libXvMC/distinfo
new file mode 100644
index 000000000000..d29fc2e6aff9
--- /dev/null
+++ b/x11/libXvMC/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXvMC-1.0.4.tar.bz2) = b54600573daf9d1a29b952e8d35b389e
+SHA256 (xorg/lib/libXvMC-1.0.4.tar.bz2) = 1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb
+SIZE (xorg/lib/libXvMC-1.0.4.tar.bz2) = 225137
diff --git a/x11/libXvMC/pkg-descr b/x11/libXvMC/pkg-descr
new file mode 100644
index 000000000000..cbd30172204a
--- /dev/null
+++ b/x11/libXvMC/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the X Video Extension library.
+
+WWW: http://www.freedesktop.org/Software/xlibs
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libXvMC/pkg-plist b/x11/libXvMC/pkg-plist
new file mode 100644
index 000000000000..83c0a166cc5d
--- /dev/null
+++ b/x11/libXvMC/pkg-plist
@@ -0,0 +1,10 @@
+include/X11/extensions/XvMClib.h
+lib/libXvMC.a
+lib/libXvMC.la
+lib/libXvMC.so
+lib/libXvMC.so.1
+lib/libXvMCW.a
+lib/libXvMCW.la
+lib/libXvMCW.so
+lib/libXvMCW.so.1
+libdata/pkgconfig/xvmc.pc
diff --git a/x11/libXxf86/Makefile b/x11/libXxf86/Makefile
index 4f3df1af74e2..68ee8a7575fb 100644
--- a/x11/libXxf86/Makefile
+++ b/x11/libXxf86/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libXxf86
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xorg.freedesktop.org/X11R6.7.0/src/ \
 		${MASTER_SITE_XORG}
@@ -27,7 +28,7 @@ USE_IMAKE=	YES
 USE_X_PREFIX=	no
 PREFIX?=	${X11BASE}
 DIST_SUBDIR=	xorg
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/xc/lib
 EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/lib
 MAN3=		XDGA.3 \
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
new file mode 100644
index 000000000000..b93018a0efdd
--- /dev/null
+++ b/x11/libXxf86dga/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:   libXxf86dga
+# Date Created:			8 Feb 2006
+# Whom:				Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libXxf86dga
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X DGA Extension
+
+XORG_CAT=	lib
+USE_XORG=	xproto x11 xextproto xext xf86dgaproto:both
+
+MAN3=		XDGA.3 \
+		XDGAOpenFramebuffer.3 \
+		XDGAChangePixmapMode.3 \
+		XDGAQueryExtension.3 \
+		XDGACloseFramebuffer.3 \
+		XDGAQueryModes.3 \
+		XDGACopyArea.3 \
+		XDGAQueryVersion.3 \
+		XDGACopyTransparentArea.3 \
+		XDGASelectInput.3 \
+		XDGACreateColormap.3 \
+		XDGASetClientVersion.3 \
+		XDGAFillRectangle.3 \
+		XDGASetMode.3 \
+		XDGAGetViewportStatus.3 \
+		XDGASetViewport.3 \
+		XDGAInstallColormap.3 \
+		XDGASync.3 \
+		XDGAKeyEventToXKeyEvent.3 \
+		XF86DGA.3 \
+		XFree86-DGA.3
+
+.include <bsd.port.mk>
diff --git a/x11/libXxf86dga/distinfo b/x11/libXxf86dga/distinfo
new file mode 100644
index 000000000000..9a027810bbc8
--- /dev/null
+++ b/x11/libXxf86dga/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXxf86dga-1.0.1.tar.bz2) = 5b0e752c71a23e9d1290cad44a7c7c75
+SHA256 (xorg/lib/libXxf86dga-1.0.1.tar.bz2) = 8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9
+SIZE (xorg/lib/libXxf86dga-1.0.1.tar.bz2) = 231533
diff --git a/x11/libXxf86dga/pkg-descr b/x11/libXxf86dga/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libXxf86dga/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libXxf86dga/pkg-plist b/x11/libXxf86dga/pkg-plist
new file mode 100644
index 000000000000..6c9724d75e96
--- /dev/null
+++ b/x11/libXxf86dga/pkg-plist
@@ -0,0 +1,6 @@
+lib/libXxf86dga.a
+lib/libXxf86dga.la
+lib/libXxf86dga.so
+lib/libXxf86dga.so.1
+libdata/pkgconfig/xxf86dga.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
new file mode 100644
index 000000000000..2476778b3bea
--- /dev/null
+++ b/x11/libXxf86misc/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for:   libXxf86misc
+# Date Created:			8 Feb 2006
+# Whom:				Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libXxf86misc
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X XF86-Misc Extension
+
+XORG_CAT=	lib
+USE_XORG=	xproto x11 xextproto xext xf86miscproto:both
+
+MAN3=		XF86Misc.3 \
+		XF86MiscGetKbdSettings.3 \
+		XF86MiscGetMouseSettings.3 \
+		XF86MiscGetSaver.3 \
+		XF86MiscQueryExtension.3 \
+		XF86MiscQueryVersion.3 \
+		XF86MiscSetKbdSettings.3 \
+		XF86MiscSetMouseSettings.3 \
+		XF86MiscSetSaver.3
+
+.include <bsd.port.mk>
diff --git a/x11/libXxf86misc/distinfo b/x11/libXxf86misc/distinfo
new file mode 100644
index 000000000000..91cdedeaf6ab
--- /dev/null
+++ b/x11/libXxf86misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 7cee0df63903cef7f7a3fb68cdd99eef
+SHA256 (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289
+SIZE (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 222736
diff --git a/x11/libXxf86misc/pkg-descr b/x11/libXxf86misc/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libXxf86misc/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libXxf86misc/pkg-plist b/x11/libXxf86misc/pkg-plist
new file mode 100644
index 000000000000..55b4a93e17f4
--- /dev/null
+++ b/x11/libXxf86misc/pkg-plist
@@ -0,0 +1,6 @@
+lib/libXxf86misc.a
+lib/libXxf86misc.la
+lib/libXxf86misc.so
+lib/libXxf86misc.so.1
+libdata/pkgconfig/xxf86misc.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
new file mode 100644
index 000000000000..fc9f3e02e720
--- /dev/null
+++ b/x11/libXxf86vm/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for:   libXxf86vm
+# Date Created:			8 Feb 2006
+# Whom:				Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libXxf86vm
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X Vidmode Extension
+
+XORG_CAT=	lib
+USE_XORG=	xproto x11 xextproto xext xf86vidmodeproto:both
+
+MAN3=		XF86VM.3 \
+		XF86VidModeLockModeSwitch.3 \
+		XF86VidModeDeleteModeLine.3 \
+		XF86VidModeModModeLine.3 \
+		XF86VidModeGetAllModeLines.3 \
+		XF86VidModeQueryExtension.3 \
+		XF86VidModeGetDotClocks.3 \
+		XF86VidModeQueryVersion.3 \
+		XF86VidModeGetGamma.3 \
+		XF86VidModeSetClientVersion.3 \
+		XF86VidModeGetGammaRamp.3 \
+		XF86VidModeSetGamma.3 \
+		XF86VidModeGetGammaRampSize.3 \
+		XF86VidModeSetGammaRamp.3 \
+		XF86VidModeGetModeLine.3 \
+		XF86VidModeSetViewPort.3 \
+		XF86VidModeGetMonitor.3 \
+		XF86VidModeSwitchMode.3 \
+		XF86VidModeGetPermissions.3 \
+		XF86VidModeSwitchToMode.3 \
+		XF86VidModeGetViewPort.3 \
+		XF86VidModeValidateModeLine.3
+
+.include <bsd.port.mk>
diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo
new file mode 100644
index 000000000000..852a685b3d3a
--- /dev/null
+++ b/x11/libXxf86vm/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = 8de1ca6c55aaad7d8cae19b4f0b3da32
+SHA256 (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a
+SIZE (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = 227928
diff --git a/x11/libXxf86vm/pkg-descr b/x11/libXxf86vm/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libXxf86vm/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libXxf86vm/pkg-plist b/x11/libXxf86vm/pkg-plist
new file mode 100644
index 000000000000..ae0c9e9b2ed5
--- /dev/null
+++ b/x11/libXxf86vm/pkg-plist
@@ -0,0 +1,6 @@
+lib/libXxf86vm.a
+lib/libXxf86vm.la
+lib/libXxf86vm.so
+lib/libXxf86vm.so.1
+libdata/pkgconfig/xxf86vm.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile
index b27d81474ddd..44281ffe1248 100644
--- a/x11/libcapplet/Makefile
+++ b/x11/libcapplet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libcapplet
 PORTVERSION=	1.4.0.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://people.freebsd.org/~sobomax/
 DIST_SUBDIR=	gnome
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
new file mode 100644
index 000000000000..e39458f26443
--- /dev/null
+++ b/x11/libdmx/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:   libdmx
+# Date Created:			8 Feb 2006
+# Whom:				Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libdmx
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XKB file library
+
+XORG_CAT=	lib
+USE_XORG=	x11 xext xextproto dmxproto
+
+MAN3=		DMX.3 \
+		DMXAddInput.3 \
+		DMXAddScreen.3 \
+		DMXChangeDesktopAttributes.3 \
+		DMXChangeScreensAttributes.3 \
+		DMXForceWindowCreation.3 \
+		DMXGetDesktopAttributes.3 \
+		DMXGetInputAttributes.3 \
+		DMXGetInputCount.3 \
+		DMXGetScreenAttributes.3 \
+		DMXGetScreenCount.3 \
+		DMXGetWindowAttributes.3 \
+		DMXQueryExtension.3 \
+		DMXQueryVersion.3 \
+		DMXRemoveInput.3 \
+		DMXRemoveScreen.3 \
+		DMXSync.3
+
+.include <bsd.port.mk>
diff --git a/x11/libdmx/distinfo b/x11/libdmx/distinfo
new file mode 100644
index 000000000000..8131963fa474
--- /dev/null
+++ b/x11/libdmx/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libdmx-1.0.2.tar.bz2) = 4d866967210d06098fc9f302ed4c79b1
+SHA256 (xorg/lib/libdmx-1.0.2.tar.bz2) = fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4
+SIZE (xorg/lib/libdmx-1.0.2.tar.bz2) = 231083
diff --git a/x11/libdmx/pkg-descr b/x11/libdmx/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libdmx/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libdmx/pkg-plist b/x11/libdmx/pkg-plist
new file mode 100644
index 000000000000..1d6c42c745e2
--- /dev/null
+++ b/x11/libdmx/pkg-plist
@@ -0,0 +1,6 @@
+lib/libdmx.a
+lib/libdmx.la
+lib/libdmx.so
+lib/libdmx.so.1
+libdata/pkgconfig/dmx.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile
index 8df346204699..b5acfccfdeb6 100644
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libdnd
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://leb.net/offix/
 DISTNAME=	dnd.${PORTVERSION}
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 15344ddf3206..213b4b052d77 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libexo
 PORTVERSION=	0.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 xfce
 DISTNAME=	exo-${PORTVERSION}
 MASTER_SITES=	${MASTER_SITES_XFCE}
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index 290e6e867a78..326954f3ddcd 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -212,6 +212,5 @@ share/xfce4/helpers/xterm.desktop
 @dirrmtry share/xfce4/doc
 @dirrmtry share/xfce4/helpers
 @dirrmtry share/xfce4
-@dirrmtry share/pixmaps
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile
index 57bd3ecb6a86..525166550752 100644
--- a/x11/libgnome-java/Makefile
+++ b/x11/libgnome-java/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnome-java
 PORTVERSION=	2.12.6
+PORTREVISION=	1
 CATEGORIES=	x11 java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 663e96d9aa44..cbafeccedd90 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgnome
 PORTVERSION=	2.18.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index bfd82da029ec..1eb129280b30 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -102,57 +102,21 @@ share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
-@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/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
 @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/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 5d0a5fd25287..ec500c55f693 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnomekbd
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 414667325b79..6c64242effc7 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomemm
 PORTVERSION=	2.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index dadd8226120e..8c9236c06d14 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnomemm
 PORTVERSION=	2.18.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile
new file mode 100644
index 000000000000..1deca9732e07
--- /dev/null
+++ b/x11/liboldX/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	liboldX
+# Date Created:				Dec 16 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	liboldX
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Old X library
+
+XORG_CAT=	lib
+USE_XORG=	x11
+USE_AUTOTOOLS=	libtool:15
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11/liboldX/distinfo b/x11/liboldX/distinfo
new file mode 100644
index 000000000000..41328b8d15ac
--- /dev/null
+++ b/x11/liboldX/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/liboldX-1.0.1.tar.bz2) = 6b81ffe486d76c380d08f92285758d84
+SHA256 (xorg/lib/liboldX-1.0.1.tar.bz2) = 1091d301f5e28f84e5d755a5cde9d2f7edb82b799d051522751874571e10340f
+SIZE (xorg/lib/liboldX-1.0.1.tar.bz2) = 215694
diff --git a/x11/liboldX/pkg-descr b/x11/liboldX/pkg-descr
new file mode 100644
index 000000000000..76f5a9c988ea
--- /dev/null
+++ b/x11/liboldX/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the old X library.
+
+WWW: http://www.freedesktop.org/Software/xlibs
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11/liboldX/pkg-plist b/x11/liboldX/pkg-plist
new file mode 100644
index 000000000000..aa4938cc0f2d
--- /dev/null
+++ b/x11/liboldX/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/X10.h
+lib/liboldX.a
+lib/liboldX.la
+lib/liboldX.so
+lib/liboldX.so.6
+libdata/pkgconfig/oldx.pc
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index be0cf228f947..eb1d40346ef5 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libsx
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	libraries
diff --git a/x11/libsynaptics/Makefile b/x11/libsynaptics/Makefile
index 004fe88405f8..dde3974de581 100644
--- a/x11/libsynaptics/Makefile
+++ b/x11/libsynaptics/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libsynaptics
 PORTVERSION=	0.14.6b
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://qsynaptics.sourceforge.net/ \
 		http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 79c8b60c3653..9f0fd2fd204f 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxcb
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
@@ -21,11 +21,12 @@ BUILD_DEPENDS=	${LIB_PC_DEPENDS} \
 		dot:${PORTSDIR}/graphics/graphviz
 RUN_DEPENDS=	${LIB_PC_DEPENDS}
 
-USE_X_PREFIX=	yes
+PREFIX=		${X11BASE}
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
+USE_XORG=	xau xdmcp
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
@@ -54,7 +55,4 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src__xcb.h \
 		${FILESDIR}/extra-patch-src__xcb_auth.c
 .endif
 
-post-build:
-	DISPLAY= ${GMAKE} -C ${WRKSRC} check
-
 .include <bsd.port.post.mk>
diff --git a/x11/libxcb/files/patch-xcb.pc.in b/x11/libxcb/files/patch-xcb.pc.in
deleted file mode 100644
index c9ed7bfdd4e9..000000000000
--- a/x11/libxcb/files/patch-xcb.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- xcb.pc.in.orig	Wed Jan 24 16:34:02 2007
-+++ xcb.pc.in	Wed Jan 24 16:36:32 2007
-@@ -6,7 +6,7 @@
- Name: XCB
- Description: X-protocol C Binding
- Version: @PACKAGE_VERSION@
--Requires.private: @NEEDED@
-+Requires.private: pthread-stubs
- Libs: -L${libdir} -lxcb
- Libs.private: @LIBS@
- Cflags: -I${includedir}
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 0d68762392f3..7c11016034af 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libxfce4mcs
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITES_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index d21706f88e06..edee2b77ac5e 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -6,32 +6,13 @@
 #
 
 PORTNAME=	libxkbfile
-PORTVERSION=	1.0
+PORTVERSION=	1.0.4
 CATEGORIES=	x11
-MASTER_SITES=	http://xorg.freedesktop.org/X11R6.7.0/src/ \
-		${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R6.7/tars
-DISTNAME=	X11R6.7.0-src1
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XKB file library
 
-LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
-		${LIB_PC_DEPENDS}
-RUN_DEPENDS=	${LIB_PC_DEPENDS}
-
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_IMAKE=	yes
-USE_X_PREFIX=	no
-PREFIX?=	${X11BASE}
-DIST_SUBDIR=	xorg
-INSTALLS_SHLIB=	yes
-WRKSRC=		${WRKDIR}/xc/lib/xkbfile
-EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/lib/xkbfile
-
-post-patch:
-	${LN} -s ${WRKSRC}/exports/include/X11 ${WRKSRC}/
+XORG_CAT=	lib
+USE_XORG=	x11 kbproto:both
 
 .include <bsd.port.mk>
diff --git a/x11/libxkbfile/distinfo b/x11/libxkbfile/distinfo
index 59603c139556..a1594e5cb3b1 100644
--- a/x11/libxkbfile/distinfo
+++ b/x11/libxkbfile/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SHA256 (xorg/X11R6.7.0-src1.tar.gz) = e2872ae9c773e76139cfe7c97bdfd1963e41bf3b307230fca711c9f005a90dbb
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 12b4ceb5d42b520228b5fb40a96ae6c5
+SHA256 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae
+SIZE (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 273537
diff --git a/x11/libxkbfile/files/patch-Imakefile b/x11/libxkbfile/files/patch-Imakefile
deleted file mode 100644
index eb8b91160e09..000000000000
--- a/x11/libxkbfile/files/patch-Imakefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- Imakefile.orig	Thu Mar  4 09:47:14 2004
-+++ Imakefile	Sat May  8 14:39:42 2004
-@@ -5,24 +5,19 @@
- 
- XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.5 2003/10/15 21:23:38 herrb Exp $
- 
--#define DoNormalLib	NormalLibxkbfile
--#define DoSharedLib	SharedLibxkbfile
--#define DoExtraLib	SharedLibxkbfile
--#define DoDebugLib	DebugLibxkbfile
--#define DoProfileLib	ProfileLibxkbfile
-+#define DoNormalLib	YES
-+#define DoSharedLib	YES
-+#define DoExtraLib	YES
-+#define DoDebugLib	NO
-+#define DoProfileLib	NO
- #define HasSharedData	NO
- #define LibName		xkbfile
- #define SoRev		SOXKBFILEREV
-+SOXKBFILEREV = 		1.0
- #define IncSubdir	X11
- #define	IncSubSubdir	extensions
- 
--#ifdef SharedxkbfileReqs
--REQUIREDLIBS = SharedxkbfileReqs
--#endif
--
--#if !BuildXKBfilelib
--#define LibBuild	NO
--#endif
-+REQUIREDLIBS = $(LDPRELIB) $(XONLYLIB)
- 
-             SRCS = xkbtext.c xkbdraw.c xkbmisc.c xkbatom.c xkberrs.c \
- 		   cout.c xkbout.c xkmout.c \
diff --git a/x11/libxkbfile/pkg-plist b/x11/libxkbfile/pkg-plist
index f7de24f1a0e3..cf9ae09cec7d 100644
--- a/x11/libxkbfile/pkg-plist
+++ b/x11/libxkbfile/pkg-plist
@@ -5,5 +5,8 @@ include/X11/extensions/XKBrules.h
 include/X11/extensions/XKM.h
 include/X11/extensions/XKMformat.h
 lib/libxkbfile.a
+lib/libxkbfile.la
 lib/libxkbfile.so
 lib/libxkbfile.so.1
+libdata/pkgconfig/xkbfile.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile
new file mode 100644
index 000000000000..1807dabd57ab
--- /dev/null
+++ b/x11/libxkbui/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:   libxkbui
+# Date Created:			8 Feb 2006
+# Whom:				Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libxkbui
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XKB file library
+
+XORG_CAT=	lib
+USE_XORG=	x11 xt xkbfile kbproto
+
+.include <bsd.port.mk>
diff --git a/x11/libxkbui/distinfo b/x11/libxkbui/distinfo
new file mode 100644
index 000000000000..16afcb54a280
--- /dev/null
+++ b/x11/libxkbui/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libxkbui-1.0.2.tar.bz2) = 1143e456f7429e18e88f2eadb2f2b6b1
+SHA256 (xorg/lib/libxkbui-1.0.2.tar.bz2) = 20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214
+SIZE (xorg/lib/libxkbui-1.0.2.tar.bz2) = 221435
diff --git a/x11/libxkbui/pkg-descr b/x11/libxkbui/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libxkbui/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libxkbui/pkg-plist b/x11/libxkbui/pkg-plist
new file mode 100644
index 000000000000..e614a475159d
--- /dev/null
+++ b/x11/libxkbui/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/extensions/XKBui.h
+lib/libxkbui.a
+lib/libxkbui.la
+lib/libxkbui.so
+lib/libxkbui.so.1
+libdata/pkgconfig/xkbui.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index c5148c319dc7..c66d736635f4 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libxklavier
 PORTVERSION=	3.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -17,6 +17,8 @@ MASTER_SITE_SUBDIR=	gswitchit
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An utility library to make XKB stuff easier
 
+RUN_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
+
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gnomehack libxml2 glib20
@@ -25,7 +27,8 @@ USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
 CONFIGURE_ARGS=	--disable-doxygen \
-		--with-xkb-base=${X11BASE}/lib/X11/xkb \
+		--with-xkb-base=${X11BASE}/share/X11/xkb \
+		--with-xkb-bin-base=${X11BASE}/bin \
 		--with-xmodmap-base=${LOCALBASE}/share/gnome/xmodmap \
 		--disable-gtk-doc \
 		--with-html-dir=${GNOME_HTML_DIR}
diff --git a/x11/listres/Makefile b/x11/listres/Makefile
new file mode 100644
index 000000000000..782af42a2bca
--- /dev/null
+++ b/x11/listres/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	listres
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	listres
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	List resources in widgets
+
+XORG_CAT=	app
+USE_XORG=	x11 xt xmu xaw
+
+PLIST_FILES=	bin/listres
+
+MAN1=		listres.1
+
+.include <bsd.port.mk>
diff --git a/x11/listres/distinfo b/x11/listres/distinfo
new file mode 100644
index 000000000000..0670e158e3e4
--- /dev/null
+++ b/x11/listres/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/listres-1.0.1.tar.bz2) = 827a1ac5adf9aadd0c13b54a897e297b
+SHA256 (xorg/app/listres-1.0.1.tar.bz2) = 7156e58025e240a501d5b32244b923b283bb35014ea5a4081b70044af8aef7a3
+SIZE (xorg/app/listres-1.0.1.tar.bz2) = 76709
diff --git a/x11/listres/pkg-descr b/x11/listres/pkg-descr
new file mode 100644
index 000000000000..3a73d2ec5909
--- /dev/null
+++ b/x11/listres/pkg-descr
@@ -0,0 +1,5 @@
+This package contains listres, a program that generates a list of a
+widget's resource database.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/luit/Makefile b/x11/luit/Makefile
new file mode 100644
index 000000000000..d17bf9d77fc3
--- /dev/null
+++ b/x11/luit/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	luit
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	luit
+PORTVERSION=	1.0.2
+PORTREVISION=	1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Locale and ISO 2022 support for Unicode terminals.
+
+XORG_CAT=	app
+USE_XORG=	x11 fontenc
+
+PLIST_FILES=	bin/luit
+
+CONFIGURE_ARGS=	--with-localealiasfile=${LOCALBASE}/share/X11/locale/locale.alias
+
+MAN1=		luit.1
+
+.if !defined(WITH_SETUID_LUIT)
+pre-everything::
+	@${ECHO_MSG} "If you want to use xterm with locales in a secure manner, luit must be"
+	@${ECHO_MSG} "installed setuid.  If you want to do this, define WITH_SETUID_LUIT when"
+	@${ECHO_MSG} "installing this port (either in /etc/make.conf or on command line with"
+	@${ECHO_MSG} "install target)."
+.endif
+
+post-install:
+.if defined(WITH_SETUID_LUIT)
+	${CHOWN} root:wheel ${PREFIX}/bin/luit
+	${CHMOD} 04711 ${PREFIX}/bin/luit
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11/luit/distinfo b/x11/luit/distinfo
new file mode 100644
index 000000000000..092103b77a7f
--- /dev/null
+++ b/x11/luit/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/luit-1.0.2.tar.bz2) = aacda46598ce3af8ca16e2a8132db1b2
+SHA256 (xorg/app/luit-1.0.2.tar.bz2) = c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c
+SIZE (xorg/app/luit-1.0.2.tar.bz2) = 99235
diff --git a/x11/luit/files/patch-luit.c b/x11/luit/files/patch-luit.c
new file mode 100644
index 000000000000..8a6e7412f00f
--- /dev/null
+++ b/x11/luit/files/patch-luit.c
@@ -0,0 +1,175 @@
+--- luit-1.0.2/luit.c	Wed Nov  8 22:21:35 2006
++++ luit.c	Sun May 20 00:51:20 2007
+@@ -45,6 +45,8 @@
+ #include "charset.h"
+ #include "iso2022.h"
+ 
++static int p2c_waitpipe[2];
++static int c2p_waitpipe[2];
+ static Iso2022Ptr inputState = NULL, outputState = NULL;
+ 
+ static char *child_argv0 = NULL;
+@@ -434,17 +436,6 @@
+     return 0;
+ }
+         
+-static void
+-sigwinchHandler(int sig)
+-{
+-    sigwinch_queued = 1;
+-}
+-
+-static void
+-sigchldHandler(int sig)
+-{
+-    sigchld_queued = 1;
+-}
+ 
+ static int
+ condom(int argc, char **argv)
+@@ -455,7 +446,6 @@
+     char *path;
+     char **child_argv;
+     int rc;
+-    int val;
+ 
+     rc = parseArgs(argc, argv, child_argv0,
+                    &path, &child_argv);
+@@ -473,30 +463,9 @@
+         perror("Couldn't drop priviledges");
+         exit(1);
+     }
+-#ifdef SIGWINCH
+-    installHandler(SIGWINCH, sigwinchHandler);
+-#endif
+-    installHandler(SIGCHLD, sigchldHandler);
+-
+-    rc = copyTermios(0, pty);
+-    if(rc < 0)
+-        FatalError("Couldn't copy terminal settings\n");
+-
+-    rc = setRawTermios();
+-    if(rc < 0)
+-        FatalError("Couldn't set terminal to raw\n");
+-
+-    val = fcntl(0, F_GETFL, 0);
+-    if(val >= 0) {
+-        fcntl(0, F_SETFL, val | O_NONBLOCK);
+-    }
+-    val = fcntl(pty, F_GETFL, 0);
+-    if(val >= 0) {
+-        fcntl(pty, F_SETFL, val | O_NONBLOCK);
+-    }
+-
+-    setWindowSize(0, pty);
+ 
++    pipe(p2c_waitpipe);
++    pipe(c2p_waitpipe);
+     pid = fork();
+     if(pid < 0) {
+         perror("Couldn't fork");
+@@ -505,12 +474,12 @@
+ 
+     if(pid == 0) {
+         close(pty);
+-#ifdef SIGWINCH
+-        installHandler(SIGWINCH, SIG_DFL);
+-#endif
+-        installHandler(SIGCHLD, SIG_DFL);
++	close(p2c_waitpipe[1]);
++	close(c2p_waitpipe[0]);
+         child(line, path, child_argv);
+     } else {
++	close(p2c_waitpipe[0]);
++	close(c2p_waitpipe[1]);
+         free(child_argv);
+         free(path);
+         free(line);
+@@ -525,11 +494,11 @@
+ {
+     int tty;
+     int pgrp;
++    char tmp[10];
+ 
+     close(0);
+     close(1);
+     close(2);
+-
+     pgrp = setsid();
+     if(pgrp < 0) {
+         kill(getppid(), SIGABRT);
+@@ -541,6 +510,7 @@
+         kill(getppid(), SIGABRT);
+         exit(1);
+     }
++    write(c2p_waitpipe[1],"1",1);
+     
+     if(tty != 0)
+         dup2(tty, 0);
+@@ -552,22 +522,66 @@
+     if(tty > 2)
+         close(tty);
+     
++    read(p2c_waitpipe[0],tmp,1);
++    close(c2p_waitpipe[1]);
++    close(p2c_waitpipe[0]);
+     execvp(path, argv);
+     perror("Couldn't exec");
+     exit(1);
+ }
+ 
++static void
++sigwinchHandler(int sig) {
++    sigwinch_queued = 1;
++}
++
++static void
++sigchldHandler(int sig)
++{
++    sigchld_queued = 1;
++}
++
+ void
+ parent(int pid, int pty)
+ {
+     unsigned char buf[BUFFER_SIZE];
+     int i;
++    int val;
+     int rc;
++    char tmp[10];
+ 
++    read(c2p_waitpipe[0],tmp,1);
+     if(verbose) {
+         reportIso2022(outputState);
+     }
+ 
++#ifdef SIGWINCH
++    installHandler(SIGWINCH, sigwinchHandler);
++#endif
++    installHandler(SIGCHLD, sigchldHandler);
++
++    rc = copyTermios(0, pty);
++    if(rc < 0)
++        FatalError("Couldn't copy terminal settings\n");
++
++    rc = setRawTermios();
++    if(rc < 0)
++        FatalError("Couldn't set terminal to raw\n");
++
++    val = fcntl(0, F_GETFL, 0);
++    if(val >= 0) {
++        fcntl(0, F_SETFL, val | O_NONBLOCK);
++    }
++    val = fcntl(pty, F_GETFL, 0);
++    if(val >= 0) {
++        fcntl(pty, F_SETFL, val | O_NONBLOCK);
++    }
++
++    setWindowSize(0, pty);
++
++    write(p2c_waitpipe[1],"1",1);
++    close(c2p_waitpipe[0]);
++    close(p2c_waitpipe[1]);
+     for(;;) {
+         rc = waitForInput(0, pty);
+ 
diff --git a/x11/luit/pkg-descr b/x11/luit/pkg-descr
new file mode 100644
index 000000000000..0bed19e2c820
--- /dev/null
+++ b/x11/luit/pkg-descr
@@ -0,0 +1,5 @@
+This package contains luit, a filter than can be run between an arbitrary
+application and a UTF-8 terminal emulator.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/lupe/Makefile b/x11/lupe/Makefile
index 4777bc696612..37fb7a4e20dc 100644
--- a/x11/lupe/Makefile
+++ b/x11/lupe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lupe
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	x11 accessibility
 MASTER_SITES=	http://www.oersted.co.jp/~yav/soft/
 DISTNAME=	lupe008	
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index 3eed22e86425..f27350eddaed 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lxpanel
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lxde
diff --git a/x11/mgapdesk/Makefile b/x11/mgapdesk/Makefile
index efe69468bd8a..77f5bdfbdbc4 100644
--- a/x11/mgapdesk/Makefile
+++ b/x11/mgapdesk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mgapdesk
 PORTVERSION=	1.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.matrox.com/pub/mga/archive/linux/2001/powerdesk_1_00_7/
 DISTNAME=	${PORTNAME}-1_00-7beta_src
@@ -16,6 +16,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Matrox Powerdesk for *nix
 
+IGNORE=		needs an old XFree86/X.org header file to build
+
 USE_X_PREFIX=	YES
 USE_GNOME=	gtk12
 USE_GMAKE=	YES
diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile
new file mode 100644
index 000000000000..357153c18c84
--- /dev/null
+++ b/x11/mkcomposecache/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	mkcomposecache
+# Date Created:				30 Jan 2007
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mkcomposecache
+PORTVERSION=	1.2
+PORTREVISION=	1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Program to create Compose cache files
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+PLIST_FILES=	sbin/mkcomposecache
+
+MAN8=		mkcomposecache.8
+
+.include <bsd.port.mk>
diff --git a/x11/mkcomposecache/distinfo b/x11/mkcomposecache/distinfo
new file mode 100644
index 000000000000..3d45d86ba287
--- /dev/null
+++ b/x11/mkcomposecache/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/mkcomposecache-1.2.tar.bz2) = c8237b4aea1ae0c15441deab6b12c5c0
+SHA256 (xorg/app/mkcomposecache-1.2.tar.bz2) = 8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb
+SIZE (xorg/app/mkcomposecache-1.2.tar.bz2) = 65262
diff --git a/x11/mkcomposecache/pkg-descr b/x11/mkcomposecache/pkg-descr
new file mode 100644
index 000000000000..b3b220ae5a62
--- /dev/null
+++ b/x11/mkcomposecache/pkg-descr
@@ -0,0 +1,4 @@
+mkcomposecache is used for creating global (system-wide) Compose cache files.
+
+Compose cache files help with application startup times and memory usage,
+especially in locales with large Compose tables (e.g. all UTF-8 locales).
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 2417f2cd1907..87189a3e4dc5 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mlterm
 PORTVERSION=	2.9.3
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 9353ef4ba436..0556dcf92e89 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mrxvt-devel
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	materm
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 16909312a82c..6d8dfed6f60f 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mrxvt
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	materm
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index 4a90ff49a444..95f40bd33035 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	multi-aterm
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.nongnu.org/materm/
 
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index d4a229bf9398..34370c360929 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	multi-gnome-terminal
 PORTVERSION=	1.6.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	multignometerm
diff --git a/x11/mxico/Makefile b/x11/mxico/Makefile
index 18d3dd20b2c5..580cda88b601 100644
--- a/x11/mxico/Makefile
+++ b/x11/mxico/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	mxico
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://people.freebsd.org/~maho/mxico/
 
diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile
index 8240ef992585..3fa142366f7b 100644
--- a/x11/numlockx/Makefile
+++ b/x11/numlockx/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	numlockx
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://ktown.kde.org/~seli/numlockx/ \
 		http://caraldi.com/jbq/numlockx/
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index db8e93020d0d..f247e879474a 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nvidia-driver
 PORTVERSION=	1.0.${NVVERSION}
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
 MASTER_SITE_SUBDIR=	freebsd/1.0-${NVVERSION}
@@ -19,6 +20,7 @@ ONLY_FOR_ARCHS=	i386
 
 USE_X_PREFIX=	yes
 NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
+USE_GL=		gl
 INSTALLS_SHLIB=	yes
 SUB_FILES+=	pkg-message
 DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
@@ -62,13 +64,24 @@ LIB_DEPENDS+=	m.3:${PORTSDIR}/misc/compat5x
 
 .include <bsd.port.pre.mk>
 
+.if ${X_WINDOW_SYSTEM} == "xorg"
+MODULESDIR=	lib/xorg/modules
+XORG_SUB=	"@comment "
+XFREE86_SUB=	""
+.else
+MODULESDIR=	lib/modules
+XORG_SUB=	""
+XFREE86_SUB=	"@comment "
+.endif
+
 # XXX Should use ${PKG_INFO} XXX
 #
 XSERVVERSION!=	/usr/sbin/pkg_info -O x11-servers/XFree86-4-Server 2>/dev/null | ${GREP} Server- || /usr/sbin/pkg_info -O x11-servers/xorg-server 2>/dev/null | ${GREP} server- || true
-XLIBVERSION!=	/usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || /usr/sbin/pkg_info -O x11/xorg-libraries 2>/dev/null | ${GREP} libraries- || true
+XLIBVERSION!=	/usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || /usr/sbin/pkg_info -O graphics/libGL 2>/dev/null | ${GREP} libGL- || true
 
 PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \
-		LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION}
+		LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION} \
+		MODULESDIR=${MODULESDIR} XORG=${XORG_SUB} XFREE86=${XFREE86_SUB}
 
 .if !defined(WITHOUT_LINUX)
 # Add explicit X11 libraries dependency since USE_LINUX causes the port to
@@ -118,8 +131,17 @@ post-patch: .SILENT
 .else
 	${REINPLACE_CMD} -E 's/(lib).*/\1/' ${WRKSRC}/x11/Makefile
 .endif
+.if ${X_WINDOW_SYSTEM} == "xorg"
+	${REINPLACE_CMD} -e 's|lib/modules|lib/xorg/modules|' \
+		${WRKSRC}/x11/driver/Makefile \
+		${WRKSRC}/x11/extension/Makefile \
+		${WRKSRC}/x11/lib/Makefile
+.endif
 	${REINPLACE_CMD} '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile
 
+pre-install:
+	${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
+
 post-install:
 # pkg-plist is already overbloated, so use this hack instead of PLIST_SUB's
 .if ${NVVERSION} < 8174
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 876dae49fb4a..0a08c138aae7 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -1,13 +1,20 @@
 @comment I can't add the below files to the package because pkg_delete
 @comment will complain when removing this package:
-@comment     lib/modules/extensions/XXX-libglx.so.%%XLIBVERSION%%
-@comment     lib/modules/extensions/XXX-libGLcore.so.%%XLIBVERSION%%
+@comment     %%MODULESDIR%%/extensions/XXX-libglx.so.%%XLIBVERSION%%
+@comment     %%MODULESDIR%%/extensions/XXX-libGLcore.so.%%XLIBVERSION%%
 @comment     lib/XXX-libGL.a.%%XLIBVERSION%%
 @comment     lib/XXX-libGL.so.1.%%XLIBVERSION%%
 @comment They are however restored when this package is removed:
-@unexec mv -f %D/lib/modules/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/lib/modules/extensions/libglx.so
-@unexec mv -f %D/lib/modules/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%% %D/lib/modules/extensions/libGLcore.so
-@unexec mv -f %D/lib/XXX-libGL.a.%%%%.%%XLIBVERSION%% %D/lib/libGL.a
+%%XFREE86%%@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
+%%XFREE86%%@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la
+@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
+@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so
+%%XFREE86%%@exec mv -f %D/%%MODULESDIR%%/extensions/libGLcore.la %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%%
+%%XFREE86%%@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libGLcore.la
+@exec mv -f %D/%%MODULESDIR%%/extensions/libGLcore.so %D/%%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%%
+@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libGLcore.so
+%%XORG%%@unexec mv -f %D/lib/XXX-libGL.a.%%%%.%%XLIBVERSION%% %D/lib/libGL.a
+@exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%XLIBVERSION%%
 lib/libGL.so.1
 @unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%XLIBVERSION%% %D/lib/libGL.so.1
 @exec ln -sf %D/lib/libGL.so.1 %D/lib/libGL.so
@@ -27,13 +34,13 @@ lib/libnvidia-tls.so.1
 @exec ln -sf %D/lib/libnvidia-tls.so.1 %D/lib/libnvidia-tls.so
 @unexec rm -f %D/lib/libnvidia-tls.so
 lib/libXvMCNVIDIA.a
-lib/modules/libnvidia-wfb.so.1
-@exec ln -sf %D/lib/modules/libnvidia-wfb.so.1 %D/lib/modules/libwfb.so
-@unexec rm -f %D/lib/modules/libwfb.so
-lib/modules/drivers/nvidia_drv.o
-lib/modules/drivers/nvidia_drv.so
-lib/modules/extensions/libglx.so.1
-@exec ln -sf %D/lib/modules/extensions/libglx.so.1 %D/lib/modules/extensions/libglx.so
+%%MODULESDIR%%/libnvidia-wfb.so.1
+@exec ln -sf %D/%%MODULESDIR%%/libnvidia-wfb.so.1 %D/%%MODULESDIR%%/libwfb.so
+@unexec rm -f %D/%%MODULESDIR%%/libwfb.so
+%%MODULESDIR%%/drivers/nvidia_drv.o
+%%MODULESDIR%%/drivers/nvidia_drv.so
+%%MODULESDIR%%/extensions/libglx.so.1
+@exec ln -sf %D/%%MODULESDIR%%/extensions/libglx.so.1 %D/%%MODULESDIR%%/extensions/libglx.so
 %%PORTDOCS%%%%DOCSDIR%%/html/appendix-a.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appendix-b.html
 %%PORTDOCS%%%%DOCSDIR%%/html/appendix-c.html
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index 65db56ee34db..19488cd81d90 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nvidia-settings
 PORTVERSION=	1.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_NVIDIA:S,$,XFree86/${PORTNAME}/,} \
 		${MASTER_SITE_LOCAL:S,$,bland/,}
@@ -18,6 +18,7 @@ COMMENT=	Display Control Panel for X NVidia driver
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
+USE_GL=		gl
 
 PLIST_FILES=	bin/nvidia-settings
 MAN1=		nvidia-settings.1
diff --git a/x11/oclock/Makefile b/x11/oclock/Makefile
new file mode 100644
index 000000000000..e2b538981c19
--- /dev/null
+++ b/x11/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/oclock/distinfo b/x11/oclock/distinfo
new file mode 100644
index 000000000000..5e5130ac4adc
--- /dev/null
+++ b/x11/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/oclock/pkg-descr b/x11/oclock/pkg-descr
new file mode 100644
index 000000000000..fe9a1fb4a125
--- /dev/null
+++ b/x11/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/oclock/pkg-plist b/x11/oclock/pkg-plist
new file mode 100644
index 000000000000..098c45563a22
--- /dev/null
+++ b/x11/oclock/pkg-plist
@@ -0,0 +1,3 @@
+bin/oclock
+share/X11/app-defaults/Clock-color
+@dirrmtry share/X11/app-defaults
diff --git a/x11/oooqs/Makefile b/x11/oooqs/Makefile
index 8e77497bcfe6..c89fbe4498cb 100644
--- a/x11/oooqs/Makefile
+++ b/x11/oooqs/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	oooqs
 PORTVERSION=	2.0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	http://download.berlios.de/segfaultskde/
 
diff --git a/x11/oooqs2/Makefile b/x11/oooqs2/Makefile
index c8bb9a8e3236..1a8c530c477c 100644
--- a/x11/oooqs2/Makefile
+++ b/x11/oooqs2/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		oooqs2
 PORTVERSION=		1.0
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		x11
 MASTER_SITES=		http://download.berlios.de/segfaultskde/ \
 			http://download2.berlios.de/segfaultskde/ \
diff --git a/x11/p5-Clipboard/Makefile b/x11/p5-Clipboard/Makefile
index eb74aa02f793..4f604204b6dd 100644
--- a/x11/p5-Clipboard/Makefile
+++ b/x11/p5-Clipboard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Clipboard
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	x11 perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/K/KI/KING
diff --git a/x11/p5-X11-GUITest/Makefile b/x11/p5-X11-GUITest/Makefile
index 82c442d781a2..1b4db7cbcc43 100644
--- a/x11/p5-X11-GUITest/Makefile
+++ b/x11/p5-X11-GUITest/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	X11-GUITest
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	x11 perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
 		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
diff --git a/x11/p5-X11-IdleTime/Makefile b/x11/p5-X11-IdleTime/Makefile
index 465aa8b002aa..2b82af3b6ac3 100644
--- a/x11/p5-X11-IdleTime/Makefile
+++ b/x11/p5-X11-IdleTime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	X11-IdleTime
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	x11 perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	X11
diff --git a/x11/padkey/Makefile b/x11/padkey/Makefile
index dfd1078c6eb9..dc7649f31053 100644
--- a/x11/padkey/Makefile
+++ b/x11/padkey/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	padkey
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	x11 games
 MASTER_SITES=	http://www.liquidx.org/padkey/releases/dist/
 
diff --git a/x11/panoramixext/Makefile b/x11/panoramixext/Makefile
index dd18038b3917..4ba271ebb414 100644
--- a/x11/panoramixext/Makefile
+++ b/x11/panoramixext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	panoramixext
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
diff --git a/x11/peeper/Makefile b/x11/peeper/Makefile
index d4496ce794cf..cbe22c2f2e98 100644
--- a/x11/peeper/Makefile
+++ b/x11/peeper/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	peeper
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://peeper.sourceforge.net/
 
diff --git a/x11/portoseguro/Makefile b/x11/portoseguro/Makefile
index 3e1e871464f7..82dce4324a84 100644
--- a/x11/portoseguro/Makefile
+++ b/x11/portoseguro/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	portoseguro
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index a69ed7b6f583..4faf99eb2ee3 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	powershell
 PORTVERSION=	0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/printext/Makefile b/x11/printext/Makefile
index c30f81c78a07..2e2ba0a1dec7 100644
--- a/x11/printext/Makefile
+++ b/x11/printext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	printext
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xorg.freedesktop.org/X11R6.7.0/src/ \
 		${MASTER_SITE_XORG}
diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile
new file mode 100644
index 000000000000..82049577ad59
--- /dev/null
+++ b/x11/printproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	printproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	printproto
+PORTVERSION=	1.0.3
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Print extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/printproto/distinfo b/x11/printproto/distinfo
new file mode 100644
index 000000000000..638a4e42bbc3
--- /dev/null
+++ b/x11/printproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/printproto-1.0.3.tar.bz2) = 0f4e7982c6d4ec3b2cf38502dd1293a3
+SHA256 (xorg/proto/printproto-1.0.3.tar.bz2) = 8b375f8cda83dfc7d84be44af41eedd484d0e2499acbd19bdca5b4056dec7235
+SIZE (xorg/proto/printproto-1.0.3.tar.bz2) = 43560
diff --git a/x11/printproto/pkg-descr b/x11/printproto/pkg-descr
new file mode 100644
index 000000000000..c363d52f32fc
--- /dev/null
+++ b/x11/printproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Print extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/printproto/pkg-plist b/x11/printproto/pkg-plist
new file mode 100644
index 000000000000..44d872813219
--- /dev/null
+++ b/x11/printproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/Print.h
+include/X11/extensions/Printstr.h
+libdata/pkgconfig/printproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/props/Makefile b/x11/props/Makefile
index b8faa07cd9a7..06e4d83afd71 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	props
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fenner
diff --git a/x11/props/pkg-plist b/x11/props/pkg-plist
index 8d37084c15a7..acea2efedaf8 100644
--- a/x11/props/pkg-plist
+++ b/x11/props/pkg-plist
@@ -6,3 +6,5 @@ lib/X11/locale/C/props/en_CA
 lib/X11/locale/C/props/en_UK
 lib/X11/locale/C/props/en_US
 @dirrm lib/X11/locale/C/props
+@dirrm lib/X11/locale/C
+@dirrm lib/X11/locale
diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile
index 6f5548948b32..11a68cd69fce 100644
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	x11 devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/x11/qrash/Makefile b/x11/qrash/Makefile
index 2c4257d4e3da..b7d67d9b3714 100644
--- a/x11/qrash/Makefile
+++ b/x11/qrash/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qrash
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://qmg.org/files/demos/qmg/ \
 		ftp://qmg.org/pub/demos/qmg/ \
diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile
index 8cd426d83e66..abdea88f3501 100644
--- a/x11/qt4-inputmethods/Makefile
+++ b/x11/qt4-inputmethods/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	inputmethods
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	x11
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile
index 37028a719bb7..1b6abf32f8e7 100644
--- a/x11/qt4-opengl/Makefile
+++ b/x11/qt4-opengl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	x11
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/x11/randrext/Makefile b/x11/randrext/Makefile
index 0100ed2092d3..97e05ef65494 100644
--- a/x11/randrext/Makefile
+++ b/x11/randrext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	randrext
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile
new file mode 100644
index 000000000000..0815c2276944
--- /dev/null
+++ b/x11/randrproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	randrproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	randrproto
+PORTVERSION=	1.2.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Randr extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/randrproto/distinfo b/x11/randrproto/distinfo
new file mode 100644
index 000000000000..a44ea325d5f9
--- /dev/null
+++ b/x11/randrproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/randrproto-1.2.1.tar.bz2) = e2e45564f8ce22e00e1360e79c8ccdeb
+SHA256 (xorg/proto/randrproto-1.2.1.tar.bz2) = 102fd42f8f2562450f4e45c28bfb0390c2d30ffa6a805eead15d67018930f654
+SIZE (xorg/proto/randrproto-1.2.1.tar.bz2) = 54962
diff --git a/x11/randrproto/pkg-descr b/x11/randrproto/pkg-descr
new file mode 100644
index 000000000000..3b5914edab2a
--- /dev/null
+++ b/x11/randrproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Randr extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/randrproto/pkg-plist b/x11/randrproto/pkg-plist
new file mode 100644
index 000000000000..13c2f1d90c8c
--- /dev/null
+++ b/x11/randrproto/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/extensions/randr.h
+include/X11/extensions/randrproto.h
+libdata/pkgconfig/randrproto.pc
+%%DOCSDIR%%/randrproto.txt
+@dirrmtry include/X11/extensions
+@dirrm %%DOCSDIR%%
diff --git a/x11/recordproto/Makefile b/x11/recordproto/Makefile
new file mode 100644
index 000000000000..208c23a5f52d
--- /dev/null
+++ b/x11/recordproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	recordproto
+# Date Created:				06 Feb 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	recordproto
+PORTVERSION=	1.13.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	RECORD extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/recordproto/distinfo b/x11/recordproto/distinfo
new file mode 100644
index 000000000000..ea16d442c939
--- /dev/null
+++ b/x11/recordproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/recordproto-1.13.2.tar.bz2) = 0ed4706564a34fc2aff724aa16d3ff00
+SHA256 (xorg/proto/recordproto-1.13.2.tar.bz2) = 04e77a8b14f373a1825bbe0116cd0db8b2c5dee17b34ba9bddd27e576609cff9
+SIZE (xorg/proto/recordproto-1.13.2.tar.bz2) = 39340
diff --git a/x11/recordproto/pkg-descr b/x11/recordproto/pkg-descr
new file mode 100644
index 000000000000..129d2324260c
--- /dev/null
+++ b/x11/recordproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org RECORD extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/recordproto/pkg-plist b/x11/recordproto/pkg-plist
new file mode 100644
index 000000000000..7b90206b4504
--- /dev/null
+++ b/x11/recordproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/record.h
+include/X11/extensions/recordstr.h
+libdata/pkgconfig/recordproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/rendercheck/Makefile b/x11/rendercheck/Makefile
index 4e3610bb63df..36bd6c517bcb 100644
--- a/x11/rendercheck/Makefile
+++ b/x11/rendercheck/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	rendercheck
-PORTVERSION=	1.0.3
+PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://xapps.freedesktop.org/release/
 
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	A small program for testing basic Render extension conformance
 
-USE_XLIB=	yes
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
+XORG_CAT=	app
+USE_XORG=	xrender
+
+MAN1=		rendercheck.1
 
 .include <bsd.port.mk>
diff --git a/x11/rendercheck/distinfo b/x11/rendercheck/distinfo
index 425e4e9bffad..10f93f79f5c1 100644
--- a/x11/rendercheck/distinfo
+++ b/x11/rendercheck/distinfo
@@ -1,3 +1,3 @@
-MD5 (rendercheck-1.0.3.tar.bz2) = 2243292499588ea0708c8ec498a532bb
-SHA256 (rendercheck-1.0.3.tar.bz2) = d783108e140e0632276a10fe559679adfbfef188723cacb732fe7d0099e3bd3a
-SIZE (rendercheck-1.0.3.tar.bz2) = 63448
+MD5 (xorg/app/rendercheck-1.2.tar.bz2) = 76ffc65a3b708d380a66823a56b7be15
+SHA256 (xorg/app/rendercheck-1.2.tar.bz2) = 4e2a837b688ff6b50f3e17c2e3a2d6b836fb2eb75560a7c6f2818183d5e64677
+SIZE (xorg/app/rendercheck-1.2.tar.bz2) = 76245
diff --git a/x11/renderext/Makefile b/x11/renderext/Makefile
index ca4b5a2b099b..ec99459336bc 100644
--- a/x11/renderext/Makefile
+++ b/x11/renderext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	renderext
 PORTVERSION=	0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
diff --git a/x11/renderproto/Makefile b/x11/renderproto/Makefile
new file mode 100644
index 000000000000..f06f3af06d34
--- /dev/null
+++ b/x11/renderproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	renderproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	renderproto
+PORTVERSION=	0.9.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	RenderProto protocol headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/renderproto/distinfo b/x11/renderproto/distinfo
new file mode 100644
index 000000000000..00ced5d63ca5
--- /dev/null
+++ b/x11/renderproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/renderproto-0.9.2.tar.bz2) = 28fbe8a59ebd31f098b90ec64f3d133a
+SHA256 (xorg/proto/renderproto-0.9.2.tar.bz2) = 7754dfbbb1e3818f28720fa9647b8a593e9d54626a7896771c2bfac7f75e2726
+SIZE (xorg/proto/renderproto-0.9.2.tar.bz2) = 40056
diff --git a/x11/renderproto/pkg-descr b/x11/renderproto/pkg-descr
new file mode 100644
index 000000000000..813b21cb5def
--- /dev/null
+++ b/x11/renderproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org RenderProto protocol headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/renderproto/pkg-plist b/x11/renderproto/pkg-plist
new file mode 100644
index 000000000000..0b7b61817bdb
--- /dev/null
+++ b/x11/renderproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/render.h
+include/X11/extensions/renderproto.h
+libdata/pkgconfig/renderproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/resourceext/Makefile b/x11/resourceext/Makefile
index 7cfa50a222e8..7099a19b89a2 100644
--- a/x11/resourceext/Makefile
+++ b/x11/resourceext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	resourceext
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
diff --git a/x11/resourceproto/Makefile b/x11/resourceproto/Makefile
new file mode 100644
index 000000000000..be801f371f39
--- /dev/null
+++ b/x11/resourceproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	resourceproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	resourceproto
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Resource extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/resourceproto/distinfo b/x11/resourceproto/distinfo
new file mode 100644
index 000000000000..f326dfbb342f
--- /dev/null
+++ b/x11/resourceproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/resourceproto-1.0.2.tar.bz2) = b823b314e37eb19dae1f297951d2e933
+SHA256 (xorg/proto/resourceproto-1.0.2.tar.bz2) = 0c33d6fceef5483001459bdc934b5831502250b27f1f4ad370ab044f8ab53487
+SIZE (xorg/proto/resourceproto-1.0.2.tar.bz2) = 36859
diff --git a/x11/resourceproto/pkg-descr b/x11/resourceproto/pkg-descr
new file mode 100644
index 000000000000..28688a4db9e1
--- /dev/null
+++ b/x11/resourceproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Resource extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/resourceproto/pkg-plist b/x11/resourceproto/pkg-plist
new file mode 100644
index 000000000000..527067aaa442
--- /dev/null
+++ b/x11/resourceproto/pkg-plist
@@ -0,0 +1,3 @@
+include/X11/extensions/XResproto.h
+libdata/pkgconfig/resourceproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile
new file mode 100644
index 000000000000..3f6c75193467
--- /dev/null
+++ b/x11/rgb/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	rgb
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	rgb
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Uncompile an rgb corl-name database
+
+CONFIGURE_ARGS=	--with-rgb-db-dir=${PREFIX}/lib/X11/rgb
+
+XORG_CAT=	app
+USE_XORG=	x11 xproto
+
+PLIST_FILES=	bin/showrgb lib/X11/rgb.txt
+
+MAN1=		showrgb.1
+
+.include <bsd.port.mk>
diff --git a/x11/rgb/distinfo b/x11/rgb/distinfo
new file mode 100644
index 000000000000..43941f4519aa
--- /dev/null
+++ b/x11/rgb/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/rgb-1.0.1.tar.bz2) = 255222b3ab3af671289a6b4844e9f393
+SHA256 (xorg/app/rgb-1.0.1.tar.bz2) = f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad
+SIZE (xorg/app/rgb-1.0.1.tar.bz2) = 91473
diff --git a/x11/rgb/pkg-descr b/x11/rgb/pkg-descr
new file mode 100644
index 000000000000..949c3fd4e280
--- /dev/null
+++ b/x11/rgb/pkg-descr
@@ -0,0 +1,6 @@
+This package contains showrgb, a program that reads an rgb color-name
+database compiled for use with the dbm database routines and converts it
+back to source form, printing the result to standard output.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile
index 26c22bdbec58..fcdf95b774f0 100644
--- a/x11/rox-wallpaper/Makefile
+++ b/x11/rox-wallpaper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rox-wallpaper
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
diff --git a/x11/roxbg/Makefile b/x11/roxbg/Makefile
index ba6427dbdd72..2f1f9331ec11 100644
--- a/x11/roxbg/Makefile
+++ b/x11/roxbg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	roxbg
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	x11 deskutils
 MASTER_SITES=	http://vvelox.net/programs/unix/x11/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile
index 56c77cfc3ac2..50e51db66bed 100644
--- a/x11/rsibreak-kde4/Makefile
+++ b/x11/rsibreak-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rsibreak
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	http://www.rsibreak.org/images/e/e0/
 DISTFILES=	Rsibreak-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/x11/rsibreak-kde4/pkg-plist b/x11/rsibreak-kde4/pkg-plist
index 58acda366e65..1b9cf5a38a00 100644
--- a/x11/rsibreak-kde4/pkg-plist
+++ b/x11/rsibreak-kde4/pkg-plist
@@ -94,19 +94,3 @@ share/locale/tr/LC_MESSAGES/rsibreak.mo
 @dirrm share/doc/HTML/nl/rsibreak
 @dirrm share/doc/HTML/pt/rsibreak
 @dirrm share/doc/HTML/sv/rsibreak
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
diff --git a/x11/rsibreak/Makefile b/x11/rsibreak/Makefile
index 56c77cfc3ac2..50e51db66bed 100644
--- a/x11/rsibreak/Makefile
+++ b/x11/rsibreak/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rsibreak
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	http://www.rsibreak.org/images/e/e0/
 DISTFILES=	Rsibreak-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/x11/rsibreak/pkg-plist b/x11/rsibreak/pkg-plist
index 58acda366e65..1b9cf5a38a00 100644
--- a/x11/rsibreak/pkg-plist
+++ b/x11/rsibreak/pkg-plist
@@ -94,19 +94,3 @@ share/locale/tr/LC_MESSAGES/rsibreak.mo
 @dirrm share/doc/HTML/nl/rsibreak
 @dirrm share/doc/HTML/pt/rsibreak
 @dirrm share/doc/HTML/sv/rsibreak
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
diff --git a/x11/rstart/Makefile b/x11/rstart/Makefile
new file mode 100644
index 000000000000..258bc19dda44
--- /dev/null
+++ b/x11/rstart/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	rstart
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	rstart
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Sample implementation of a Remote Start client
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+MAN1=		rstart.1 rstartd.1
+
+.include <bsd.port.mk>
diff --git a/x11/rstart/distinfo b/x11/rstart/distinfo
new file mode 100644
index 000000000000..f648424763a9
--- /dev/null
+++ b/x11/rstart/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/rstart-1.0.2.tar.bz2) = 99aea04a27197056368a4431f30f9cdb
+SHA256 (xorg/app/rstart-1.0.2.tar.bz2) = 02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596
+SIZE (xorg/app/rstart-1.0.2.tar.bz2) = 92924
diff --git a/x11/rstart/pkg-descr b/x11/rstart/pkg-descr
new file mode 100644
index 000000000000..15df1d2064c3
--- /dev/null
+++ b/x11/rstart/pkg-descr
@@ -0,0 +1,5 @@
+This package contains rstart, a sample implementation of a Remote Start
+client.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/rstart/pkg-plist b/x11/rstart/pkg-plist
new file mode 100644
index 000000000000..39e8858e79fb
--- /dev/null
+++ b/x11/rstart/pkg-plist
@@ -0,0 +1,17 @@
+bin/rstart
+bin/rstartd
+lib/X11/rstart/config
+lib/X11/rstart/rstartd.real
+lib/X11/rstart/commands/x11r6/@List
+lib/X11/rstart/commands/x11r6/Terminal
+lib/X11/rstart/commands/x11r6/LoadMonitor
+lib/X11/rstart/commands/ListGenericCommands
+lib/X11/rstart/commands/@List
+lib/X11/rstart/commands/ListContexts
+lib/X11/rstart/contexts/default
+lib/X11/rstart/contexts/x11r6
+lib/X11/rstart/contexts/@List
+@dirrm lib/X11/rstart/contexts
+@dirrm lib/X11/rstart/commands/x11r6
+@dirrm lib/X11/rstart/commands
+@dirrm lib/X11/rstart
diff --git a/x11/ruby-gnome2-all/Makefile b/x11/ruby-gnome2-all/Makefile
index 61ff5c02acb1..8a197c283869 100644
--- a/x11/ruby-gnome2-all/Makefile
+++ b/x11/ruby-gnome2-all/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome2-all
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 ruby gnome
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index e1076d63308c..867ab8647c92 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11/ruby-gtktrayicon/Makefile b/x11/ruby-gtktrayicon/Makefile
index bcf5b6ee704b..975116bb76a1 100644
--- a/x11/ruby-gtktrayicon/Makefile
+++ b/x11/ruby-gtktrayicon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtktrayicon
 PORTVERSION=	0.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 gnome ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ruby-gnome2
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 4fe0d0978d66..6a3dd5e257bd 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	rxvt
 PORTVERSION=	2.7.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	x11
 MASTER_SITES=	\
 		http://slackware.osuosl.org/slackware_source/xap/rxvt/ \
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 6137128a46d8..c3597c38e17b 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rxvt-unicode
 PORTVERSION=	8.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Attic
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 7573694851d6..c89206ea62cb 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	rxvt
 PORTVERSION=	2.6.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	x11
 MASTER_SITES=	\
 		http://public.planetmirror.com/pub/rxvt/%SUBDIR%/ \
diff --git a/x11/scripts/Makefile b/x11/scripts/Makefile
new file mode 100644
index 000000000000..e6342c364759
--- /dev/null
+++ b/x11/scripts/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	scripts
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	scripts
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Various X related scripts
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+MAN1=		xon.1
+
+.include <bsd.port.mk>
diff --git a/x11/scripts/distinfo b/x11/scripts/distinfo
new file mode 100644
index 000000000000..2a6dde2a2289
--- /dev/null
+++ b/x11/scripts/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/scripts-1.0.1.tar.bz2) = 08c7f078fc351196c21db3a8206d482d
+SHA256 (xorg/app/scripts-1.0.1.tar.bz2) = 1b154b4359302ca499818c45396325aef9ff364d6ff4ce5c3769e4803994a136
+SIZE (xorg/app/scripts-1.0.1.tar.bz2) = 72301
diff --git a/x11/scripts/pkg-descr b/x11/scripts/pkg-descr
new file mode 100644
index 000000000000..b93ee760df89
--- /dev/null
+++ b/x11/scripts/pkg-descr
@@ -0,0 +1 @@
+This package contains scripts, a collection of various X related scripts.
diff --git a/x11/scripts/pkg-plist b/x11/scripts/pkg-plist
new file mode 100644
index 000000000000..1135a62d4315
--- /dev/null
+++ b/x11/scripts/pkg-plist
@@ -0,0 +1,4 @@
+bin/xauth_switch_to_sun-des-1
+bin/fontname.sh
+bin/fontprop.sh
+bin/xon
diff --git a/x11/scrnsaverproto/Makefile b/x11/scrnsaverproto/Makefile
new file mode 100644
index 000000000000..c622be384be5
--- /dev/null
+++ b/x11/scrnsaverproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	scrnsaverproto
+# Date Created:				21 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	scrnsaverproto
+PORTVERSION=	1.1.0
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	ScrnSaver extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/scrnsaverproto/distinfo b/x11/scrnsaverproto/distinfo
new file mode 100644
index 000000000000..fa64dda6cb0a
--- /dev/null
+++ b/x11/scrnsaverproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = 5d551850e6f4acdf49a13f4eb3a5bbfa
+SHA256 (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = db09abf73cc339c05c0488639731794372a4770cfca76c2645f503f9fccd478f
+SIZE (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = 38066
diff --git a/x11/scrnsaverproto/pkg-descr b/x11/scrnsaverproto/pkg-descr
new file mode 100644
index 000000000000..1c4a92a44911
--- /dev/null
+++ b/x11/scrnsaverproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org ScrnSaver extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/scrnsaverproto/pkg-plist b/x11/scrnsaverproto/pkg-plist
new file mode 100644
index 000000000000..61b64df0f8b2
--- /dev/null
+++ b/x11/scrnsaverproto/pkg-plist
@@ -0,0 +1,5 @@
+include/X11/extensions/saver.h	
+include/X11/extensions/saverproto.h	
+include/X11/extensions/scrnsaver.h	
+libdata/pkgconfig/scrnsaverproto.pc	
+@dirrmtry include/X11/extensions
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
new file mode 100644
index 000000000000..effe0637e665
--- /dev/null
+++ b/x11/sessreg/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	sessreg
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	sessreg
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Manage utmp/wtmp entries for non-init X clients
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+PLIST_FILES=	bin/sessreg
+
+MAN1=		sessreg.1
+
+.include <bsd.port.mk>
diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo
new file mode 100644
index 000000000000..34b2e135aba4
--- /dev/null
+++ b/x11/sessreg/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/sessreg-1.0.2.tar.bz2) = bee5d87d40615e67c84ab0b0c65049ba
+SHA256 (xorg/app/sessreg-1.0.2.tar.bz2) = c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86
+SIZE (xorg/app/sessreg-1.0.2.tar.bz2) = 94745
diff --git a/x11/sessreg/files/patch-sessreg.h b/x11/sessreg/files/patch-sessreg.h
new file mode 100644
index 000000000000..4c4683b11cfc
--- /dev/null
+++ b/x11/sessreg/files/patch-sessreg.h
@@ -0,0 +1,10 @@
+--- sessreg.h.orig	Wed Dec  6 16:33:46 2006
++++ sessreg.h	Wed Dec  6 16:34:00 2006
+@@ -55,6 +55,7 @@
+ 
+ #include "config.h"
+ 
++#include <sys/types.h>
+ #include <time.h>
+ #include <utmp.h>
+ 
diff --git a/x11/sessreg/pkg-descr b/x11/sessreg/pkg-descr
new file mode 100644
index 000000000000..64ada8d0511a
--- /dev/null
+++ b/x11/sessreg/pkg-descr
@@ -0,0 +1,5 @@
+This package contains sessreg, which is a simple program for managing
+utmp/wtmp entries for xdm sessions.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile
new file mode 100644
index 000000000000..70a9ca71f562
--- /dev/null
+++ b/x11/setxkbmap/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	setxkbmap
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	setxkbmap
+PORTVERSION=	1.0.3
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Set the keyboard using the X Keyboard Extension
+
+XORG_CAT=	app
+USE_XORG=	xkbfile x11
+
+CONFIGURE_ARGS=	--with-xkb-config-root=${X11BASE}/share/X11/xkb
+
+PLIST_FILES=	bin/setxkbmap
+
+MAN1=		setxkbmap.1
+
+.include <bsd.port.mk>
diff --git a/x11/setxkbmap/distinfo b/x11/setxkbmap/distinfo
new file mode 100644
index 000000000000..f872272e8521
--- /dev/null
+++ b/x11/setxkbmap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/setxkbmap-1.0.3.tar.bz2) = 2b53542095a35a8a5731164118643883
+SHA256 (xorg/app/setxkbmap-1.0.3.tar.bz2) = 086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508
+SIZE (xorg/app/setxkbmap-1.0.3.tar.bz2) = 86655
diff --git a/x11/setxkbmap/pkg-descr b/x11/setxkbmap/pkg-descr
new file mode 100644
index 000000000000..b4016ffb56c1
--- /dev/null
+++ b/x11/setxkbmap/pkg-descr
@@ -0,0 +1,5 @@
+This package contains setxkbmp, a program for setting the keyboard using
+the X Keyboard Extension.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/silo/Makefile b/x11/silo/Makefile
index b9eafd6fcad7..0038f31580aa 100644
--- a/x11/silo/Makefile
+++ b/x11/silo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	silo
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://doublef.nm.ru/silo/sources/
 
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index 9055f07d8d49..45d9f900ca57 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sisctrl
 PORTVERSION=	0.0.20051202
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.winischhofer.net/sis/
 
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index b4b651a09ca5..49f8695febe0 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slim
 PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_BERLIOS} \
 		http://depot.fsck.ch/mirror/distfiles/
diff --git a/x11/slock/Makefile b/x11/slock/Makefile
index 8629107e421f..032136f062eb 100644
--- a/x11/slock/Makefile
+++ b/x11/slock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=       slock
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.suckless.org/download/ CENKES
 
diff --git a/x11/smproxy/Makefile b/x11/smproxy/Makefile
new file mode 100644
index 000000000000..33b7cf2ac697
--- /dev/null
+++ b/x11/smproxy/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	smproxy
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	smproxy
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Session Manager Proxy
+
+XORG_CAT=	app
+USE_XORG=	xt xmu
+
+PLIST_FILES=	bin/smproxy
+
+MAN1=		smproxy.1
+
+.include <bsd.port.mk>
diff --git a/x11/smproxy/distinfo b/x11/smproxy/distinfo
new file mode 100644
index 000000000000..77a9c7b77116
--- /dev/null
+++ b/x11/smproxy/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/smproxy-1.0.2.tar.bz2) = 31da204a0255ba8c6a65386e65dc1c90
+SHA256 (xorg/app/smproxy-1.0.2.tar.bz2) = 76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2
+SIZE (xorg/app/smproxy-1.0.2.tar.bz2) = 87139
diff --git a/x11/smproxy/pkg-descr b/x11/smproxy/pkg-descr
new file mode 100644
index 000000000000..98f9ecdcda45
--- /dev/null
+++ b/x11/smproxy/pkg-descr
@@ -0,0 +1,5 @@
+This package contains smproxy, a Session Manager Proxy for the X Window
+System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/stalonetray/Makefile b/x11/stalonetray/Makefile
index f64739864105..401a7d8c2b98 100644
--- a/x11/stalonetray/Makefile
+++ b/x11/stalonetray/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stalonetray
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index 78322de5f1c5..85b79486de82 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	startup-notification
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://www.freedesktop.org/software/startup-notification/releases/
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index d88317869255..c1d6fe3a6bcd 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sxpc
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/x11/temperature.app/Makefile b/x11/temperature.app/Makefile
index 3e73979a11ea..418b37d3df10 100644
--- a/x11/temperature.app/Makefile
+++ b/x11/temperature.app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	temperature.app
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://www.fukt.bth.se/~per/temperature/
 DISTNAME=	Temperature.app-${PORTVERSION}
diff --git a/x11/terminal.app/Makefile b/x11/terminal.app/Makefile
index fbcf304cfd9e..f2442f974774 100644
--- a/x11/terminal.app/Makefile
+++ b/x11/terminal.app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	terminal.app
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	+cvs20051125.orig
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
diff --git a/x11/thinglaunch/Makefile b/x11/thinglaunch/Makefile
index e19513fe9e47..c15967fbebfc 100644
--- a/x11/thinglaunch/Makefile
+++ b/x11/thinglaunch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	thinglaunch
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://critical.ch/distfiles/ \
 		http://energy.critical.ch/distfiles/
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index c9ef86c7dc9b..4b81e8c6ea21 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tilda
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/tilda/pkg-plist b/x11/tilda/pkg-plist
index 004959b348d6..23066a1bcc1a 100644
--- a/x11/tilda/pkg-plist
+++ b/x11/tilda/pkg-plist
@@ -1,7 +1,6 @@
 bin/tilda
 share/applications/tilda.desktop
 share/pixmaps/tilda.png
-@dirrmtry share/pixmaps
 @dirrmtry share/applications
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/x11/tkXwin/Makefile b/x11/tkXwin/Makefile
index c5dc871e53cc..d4284ca1fe3c 100644
--- a/x11/tkXwin/Makefile
+++ b/x11/tkXwin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkXwin
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/tkgoodstuff/Makefile b/x11/tkgoodstuff/Makefile
index a37c6c745648..3376bc1d820d 100644
--- a/x11/tkgoodstuff/Makefile
+++ b/x11/tkgoodstuff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkgoodstuff
 PORTVERSION=	8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 tk80
 #
 # No longer published by original developer.  This port still works, although
diff --git a/x11/trapproto/Makefile b/x11/trapproto/Makefile
new file mode 100644
index 000000000000..c9fbcd9788c1
--- /dev/null
+++ b/x11/trapproto/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	trapproto
+# Date Created:				06 Feb 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	trapproto
+PORTVERSION=	3.4.3
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	DEC-XTRAP extension headers
+
+XORG_CAT=	proto
+
+USE_XORG=	xt:both
+
+.include <bsd.port.mk>
diff --git a/x11/trapproto/distinfo b/x11/trapproto/distinfo
new file mode 100644
index 000000000000..91d9f1b82a5a
--- /dev/null
+++ b/x11/trapproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/trapproto-3.4.3.tar.bz2) = 3b713239e5e6b269b31cb665563358df
+SHA256 (xorg/proto/trapproto-3.4.3.tar.bz2) = ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
+SIZE (xorg/proto/trapproto-3.4.3.tar.bz2) = 48785
diff --git a/x11/trapproto/pkg-descr b/x11/trapproto/pkg-descr
new file mode 100644
index 000000000000..a32dc1071b65
--- /dev/null
+++ b/x11/trapproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org DEC-XTRAP extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/trapproto/pkg-plist b/x11/trapproto/pkg-plist
new file mode 100644
index 000000000000..2b8601c4063b
--- /dev/null
+++ b/x11/trapproto/pkg-plist
@@ -0,0 +1,9 @@
+include/X11/extensions/xtrapbits.h
+include/X11/extensions/xtrapddmi.h
+include/X11/extensions/xtrapdi.h
+include/X11/extensions/xtrapemacros.h
+include/X11/extensions/xtraplib.h
+include/X11/extensions/xtraplibp.h
+include/X11/extensions/xtrapproto.h
+libdata/pkgconfig/trapproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index 61bcfc302476..6feb85453241 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	trayer
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/t/trayer
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index f8c522c6c185..5e0d52ce79a0 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tycoon
 PORTVERSION=	1.07o
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/desktop
diff --git a/x11/vdesk/Makefile b/x11/vdesk/Makefile
index 0db1337b2b1e..a0fac25a14e9 100644
--- a/x11/vdesk/Makefile
+++ b/x11/vdesk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vdesk
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://offog.org/files/
 
diff --git a/x11/videoproto/Makefile b/x11/videoproto/Makefile
new file mode 100644
index 000000000000..fef7e25c2993
--- /dev/null
+++ b/x11/videoproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	videoproto
+# Date Created:				09 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	videoproto
+PORTVERSION=	2.2.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Video extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/videoproto/distinfo b/x11/videoproto/distinfo
new file mode 100644
index 000000000000..a38e0b813efb
--- /dev/null
+++ b/x11/videoproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/videoproto-2.2.2.tar.bz2) = 44292d74a9a3c94b1ecb9d77a0da83e8
+SHA256 (xorg/proto/videoproto-2.2.2.tar.bz2) = ab088478830cd30c2fe34fb7f44ffd4d177af7711c225c24676d3e9e9f24780c
+SIZE (xorg/proto/videoproto-2.2.2.tar.bz2) = 42744
diff --git a/x11/videoproto/pkg-descr b/x11/videoproto/pkg-descr
new file mode 100644
index 000000000000..94edb581eb84
--- /dev/null
+++ b/x11/videoproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Video extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/videoproto/pkg-plist b/x11/videoproto/pkg-plist
new file mode 100644
index 000000000000..4aa2da55519b
--- /dev/null
+++ b/x11/videoproto/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/extensions/Xv.h
+include/X11/extensions/XvMC.h
+include/X11/extensions/XvMCproto.h
+include/X11/extensions/Xvproto.h
+include/X11/extensions/vldXvMC.h
+libdata/pkgconfig/videoproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/viewres/Makefile b/x11/viewres/Makefile
new file mode 100644
index 000000000000..ef09510911c0
--- /dev/null
+++ b/x11/viewres/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	viewres
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	viewres
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Graphical class browser for Xt
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		viewres.1
+
+.include <bsd.port.mk>
diff --git a/x11/viewres/distinfo b/x11/viewres/distinfo
new file mode 100644
index 000000000000..82ff7aa8c86c
--- /dev/null
+++ b/x11/viewres/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/viewres-1.0.1.tar.bz2) = cdbed540daf7975b56000420c9aa5bf9
+SHA256 (xorg/app/viewres-1.0.1.tar.bz2) = bf49cd45ffb197a6992b3b7c99c94161eaf7cf6a2b661d3905ac382bedce34b8
+SIZE (xorg/app/viewres-1.0.1.tar.bz2) = 84802
diff --git a/x11/viewres/pkg-descr b/x11/viewres/pkg-descr
new file mode 100644
index 000000000000..b447f4e61a28
--- /dev/null
+++ b/x11/viewres/pkg-descr
@@ -0,0 +1,5 @@
+This package contains viewres, a graphical class browser that displays
+a tree showing the widget class hierarchy of the Athena Widget Set.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/viewres/pkg-plist b/x11/viewres/pkg-plist
new file mode 100644
index 000000000000..2f510647f7a5
--- /dev/null
+++ b/x11/viewres/pkg-plist
@@ -0,0 +1,3 @@
+bin/viewres
+share/X11/app-defaults/Viewres
+@dirrmtry share/X11/app-defaults
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 50d7f2b9175a..9c4716520f85 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wbar
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.tecapli.com.ar/rodolfo/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 26e17b990e72..0f371c7f5994 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wdm
 PORTVERSION=	1.28
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://voins.program.ru/wdm/:wdm \
 		http://wolfram.schneider.org/bsd/gif/bsd/:pic_large \
diff --git a/x11/widgetfactory/Makefile b/x11/widgetfactory/Makefile
index 317da627e5c0..3743314338dc 100644
--- a/x11/widgetfactory/Makefile
+++ b/x11/widgetfactory/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	widgetfactory
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.stellingwerff.com/TheWidgetFactory/
 DISTNAME=	the${PORTNAME}-${PORTVERSION}
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index 4afe5aaeddb2..e8f337f19755 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmappl
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:main/}
 MASTER_SITE_SUBDIR=${PORTNAME}/:main
diff --git a/x11/wmblob/Makefile b/x11/wmblob/Makefile
index cef5bd182c47..568e9c3dc150 100644
--- a/x11/wmblob/Makefile
+++ b/x11/wmblob/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmblob
 PORTVERSION=	1.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://dockapps.org/files/155/541/
 
diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile
index 7c2674a602a5..ae4e6c589936 100644
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmbutton
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://greek0.net/~greek0/wmbutton/
 
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index 3c1ee35ea091..65689b3fba51 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmcliphist
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://linux.nawebu.cz/wmcliphist/
 
diff --git a/x11/wmctrl/Makefile b/x11/wmctrl/Makefile
index bf40d3bd91e2..fb5c79a78954 100644
--- a/x11/wmctrl/Makefile
+++ b/x11/wmctrl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmctrl
 PORTVERSION=	1.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://sweb.cz/tripie/utils/wmctrl/dist/
 
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index 1ae50d170758..f213401932b7 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	wmdrawer
 PORTVERSION=	0.10.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://people.easter-eggs.org/~valos/wmdrawer/:tarball \
 		http://wikitest.freebsd.org/wiki/common/:pixmap
diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index f5674486bf3f..03b6a04a8d90 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmfstatus
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.finik.net/files/
 
diff --git a/x11/wmmatrix/Makefile b/x11/wmmatrix/Makefile
index 5d4bb3d5448c..f15060308db4 100644
--- a/x11/wmmatrix/Makefile
+++ b/x11/wmmatrix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmmatrix
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
 DISTNAME=	wmMatrix-${PORTVERSION}
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index 3bdd02519f4e..2952984ef003 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmmenu
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.fcoutant.freesurf.fr/download/
 
diff --git a/x11/wmmsg/Makefile b/x11/wmmsg/Makefile
index 4ea344f1cff2..be6e7ed7246a 100644
--- a/x11/wmmsg/Makefile
+++ b/x11/wmmsg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmmsg
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://mirror.israel.net/pub/FreeBSD/distfiles/
 
diff --git a/x11/wmoldmenu2new/Makefile b/x11/wmoldmenu2new/Makefile
index 5d1c9a650c4d..4b43de499195 100644
--- a/x11/wmoldmenu2new/Makefile
+++ b/x11/wmoldmenu2new/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmoldmenu2new
 PORTVERSION=	20020609
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://largo.windowmaker.org/files/
 DISTNAME=	wm-oldmenu2new
diff --git a/x11/wmxss/Makefile b/x11/wmxss/Makefile
index 15448f5576fb..2cd3cda27394 100644
--- a/x11/wmxss/Makefile
+++ b/x11/wmxss/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmxss
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
 
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index a801829ba9b6..1ceea6168a3e 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	workrave
 PORTVERSION=	1.8.3
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	SF
 
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile
index 0817e457df48..7e87b29c11dc 100644
--- a/x11/wrapper/Makefile
+++ b/x11/wrapper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wrapper
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 DISTNAME=	# intentionally left blank
 EXTRACT_SUFX=	# intentionally left blank
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index cc404a76fbea..22f52306da9e 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wterm
 PORTVERSION=	6.2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
new file mode 100644
index 000000000000..627fd24d7605
--- /dev/null
+++ b/x11/x11perf/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	x11perf
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	x11perf
+PORTVERSION=	1.4.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X11 server performance test program
+
+XORG_CAT=	app
+USE_XORG=	x11 xmuu xrender xft xext
+
+MAN1=		Xmark.1 \
+		x11perf.1 \
+		x11perfcomp.1
+
+.include <bsd.port.mk>
diff --git a/x11/x11perf/distinfo b/x11/x11perf/distinfo
new file mode 100644
index 000000000000..62ad1a0226d0
--- /dev/null
+++ b/x11/x11perf/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/x11perf-1.4.1.tar.bz2) = fd06c8b8e3572a0e14af65a49e0dd7d1
+SHA256 (xorg/app/x11perf-1.4.1.tar.bz2) = c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064
+SIZE (xorg/app/x11perf-1.4.1.tar.bz2) = 126784
diff --git a/x11/x11perf/pkg-descr b/x11/x11perf/pkg-descr
new file mode 100644
index 000000000000..af297f6ae226
--- /dev/null
+++ b/x11/x11perf/pkg-descr
@@ -0,0 +1,4 @@
+This package contains x11perf, an X11 server performance test program.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/x11perf/pkg-plist b/x11/x11perf/pkg-plist
new file mode 100644
index 000000000000..dd7d17277145
--- /dev/null
+++ b/x11/x11perf/pkg-plist
@@ -0,0 +1,7 @@
+bin/x11perf
+bin/x11perfcomp
+lib/X11/x11perfcomp/fillblnk
+lib/X11/x11perfcomp/perfboth
+lib/X11/x11perfcomp/perfratio
+lib/X11/x11perfcomp/Xmark
+@dirrm lib/X11/x11perfcomp
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index ceb6eb5bb5c2..0f423b2d7823 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	x3270
 PORTVERSION=	3.3.5
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	p6
 CATEGORIES=	x11 net
 MASTER_SITES=	SFE
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index 5a823f3d9d3a..1cf58baddb45 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xaniroc
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.42.org/pub/orphan/
 DISTNAME=	${PORTNAME}	
diff --git a/x11/xantfarm/Makefile b/x11/xantfarm/Makefile
index 1e91a7e095cc..4841ffa5df58 100644
--- a/x11/xantfarm/Makefile
+++ b/x11/xantfarm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xantfarm
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.acme.com/software/xantfarm/
 DISTNAME=	${PORTNAME}_23oct1991
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
new file mode 100644
index 000000000000..65007f16644b
--- /dev/null
+++ b/x11/xauth/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xauth
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xauth
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X authority file utility
+
+XORG_CAT=	app
+USE_XORG=	x11 xau xext xmuu
+
+PLIST_FILES=	bin/xauth
+
+MAN1=		xauth.1
+
+.include <bsd.port.mk>
diff --git a/x11/xauth/distinfo b/x11/xauth/distinfo
new file mode 100644
index 000000000000..9573c12bf938
--- /dev/null
+++ b/x11/xauth/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xauth-1.0.2.tar.bz2) = 31b956edaeb453ddaa640420e97b25b2
+SHA256 (xorg/app/xauth-1.0.2.tar.bz2) = 569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17
+SIZE (xorg/app/xauth-1.0.2.tar.bz2) = 110215
diff --git a/x11/xauth/pkg-descr b/x11/xauth/pkg-descr
new file mode 100644
index 000000000000..5d60b7db4126
--- /dev/null
+++ b/x11/xauth/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org X authority file utility.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index bed57cf08042..8a3ab27288d0 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xautolock
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/screensavers
diff --git a/x11/xautomation/Makefile b/x11/xautomation/Makefile
index 803be8ad8e52..6e6eaa729dc0 100644
--- a/x11/xautomation/Makefile
+++ b/x11/xautomation/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xautomation
 PORTVERSION=	0.96
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://hoopajoo.net/static/projects/
 
diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile
index 5bc73835aa82..21dba0a6ba66 100644
--- a/x11/xballoon/Makefile
+++ b/x11/xballoon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xballoon
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/
 
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index c50574bd2a90..47d78ad3de38 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbanner
 PORTVERSION=	1.31
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/xutils
diff --git a/x11/xbelld/Makefile b/x11/xbelld/Makefile
index 1e0a5247eb12..8755679b6385 100644
--- a/x11/xbelld/Makefile
+++ b/x11/xbelld/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xbelld
 PORTVERSION=	0.2b2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.meowfishies.com/code/
 DISTNAME=	${PORTNAME}-0.2beta2
diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile
new file mode 100644
index 000000000000..5199eee6e1fe
--- /dev/null
+++ b/x11/xbiff/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xbiff
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xbiff
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Mailbox flag for X
+
+XORG_CAT=	app
+USE_XORG=	xbitmaps xext xaw
+MAN1=		xbiff.1
+PLIST_FILES=	bin/xbiff
+
+.include <bsd.port.mk>
diff --git a/x11/xbiff/distinfo b/x11/xbiff/distinfo
new file mode 100644
index 000000000000..fdbf55355a2c
--- /dev/null
+++ b/x11/xbiff/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xbiff-1.0.1.tar.bz2) = 404f5add4537d22dd109c33e518a5190
+SHA256 (xorg/app/xbiff-1.0.1.tar.bz2) = 9845b1fa8a1cfd408f01fd69b66808068e847cdc925d114c7723c17934a96503
+SIZE (xorg/app/xbiff-1.0.1.tar.bz2) = 83634
diff --git a/x11/xbiff/pkg-descr b/x11/xbiff/pkg-descr
new file mode 100644
index 000000000000..ad2c037510bc
--- /dev/null
+++ b/x11/xbiff/pkg-descr
@@ -0,0 +1,6 @@
+This package contains xbiff, which displays a little image of a mailbox in
+the X Window System. The flag on the mailbox is down when there is no mail,
+and the flag goes up when new mail arrives.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index fae9d56b568f..110812de9e9b 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xbindkeys
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://hocwp.free.fr/xbindkeys/
 
diff --git a/x11/xbindkeys_config/Makefile b/x11/xbindkeys_config/Makefile
index 4889fe3e0d61..5b0671133085 100644
--- a/x11/xbindkeys_config/Makefile
+++ b/x11/xbindkeys_config/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xbindkeys_config
 PORTVERSION=	0.1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
new file mode 100644
index 000000000000..debaed25a78d
--- /dev/null
+++ b/x11/xbitmaps/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	xbitmaps
+# Date Created:				17 Feb 2006
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xbitmaps
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org bitmaps data
+
+CONFLICTS=	XFree86-libraries-* xorg-libraries-6.*
+
+USE_GNOME=	gnomehack
+
+XORG_CAT=	data
+
+.include <bsd.port.mk>
diff --git a/x11/xbitmaps/distinfo b/x11/xbitmaps/distinfo
new file mode 100644
index 000000000000..a53229f90ba2
--- /dev/null
+++ b/x11/xbitmaps/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/data/xbitmaps-1.0.1.tar.bz2) = b28a9840cde3c38d7c09716372fea257
+SHA256 (xorg/data/xbitmaps-1.0.1.tar.bz2) = 5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867
+SIZE (xorg/data/xbitmaps-1.0.1.tar.bz2) = 55570
diff --git a/x11/xbitmaps/pkg-descr b/x11/xbitmaps/pkg-descr
new file mode 100644
index 000000000000..df006bcf2041
--- /dev/null
+++ b/x11/xbitmaps/pkg-descr
@@ -0,0 +1,2 @@
+This package contains xbitmaps, which provides static graphics needed by
+X.Org applications to draw screen elements.
diff --git a/x11/xbitmaps/pkg-plist b/x11/xbitmaps/pkg-plist
new file mode 100644
index 000000000000..a2c9f61cc2d6
--- /dev/null
+++ b/x11/xbitmaps/pkg-plist
@@ -0,0 +1,71 @@
+include/X11/bitmaps/1x1
+include/X11/bitmaps/2x2
+include/X11/bitmaps/black
+include/X11/bitmaps/boxes
+include/X11/bitmaps/calculator
+include/X11/bitmaps/cntr_ptr
+include/X11/bitmaps/cntr_ptrmsk
+include/X11/bitmaps/cross_weave
+include/X11/bitmaps/dimple1
+include/X11/bitmaps/dimple3
+include/X11/bitmaps/dot
+include/X11/bitmaps/dropbar7
+include/X11/bitmaps/dropbar8
+include/X11/bitmaps/escherknot
+include/X11/bitmaps/flagdown
+include/X11/bitmaps/flagup
+include/X11/bitmaps/flipped_gray
+include/X11/bitmaps/gray
+include/X11/bitmaps/gray1
+include/X11/bitmaps/gray3
+include/X11/bitmaps/grid16
+include/X11/bitmaps/grid2
+include/X11/bitmaps/grid4
+include/X11/bitmaps/grid8
+include/X11/bitmaps/hlines2
+include/X11/bitmaps/hlines3
+include/X11/bitmaps/icon
+include/X11/bitmaps/keyboard16
+include/X11/bitmaps/left_ptr
+include/X11/bitmaps/left_ptrmsk
+include/X11/bitmaps/letters
+include/X11/bitmaps/light_gray
+include/X11/bitmaps/mailempty
+include/X11/bitmaps/mailemptymsk
+include/X11/bitmaps/mailfull
+include/X11/bitmaps/mailfullmsk
+include/X11/bitmaps/mensetmanus
+include/X11/bitmaps/menu10
+include/X11/bitmaps/menu12
+include/X11/bitmaps/menu16
+include/X11/bitmaps/menu6
+include/X11/bitmaps/menu8
+include/X11/bitmaps/noletters
+include/X11/bitmaps/opendot
+include/X11/bitmaps/opendotMask
+include/X11/bitmaps/plaid
+include/X11/bitmaps/right_ptr
+include/X11/bitmaps/right_ptrmsk
+include/X11/bitmaps/root_weave
+include/X11/bitmaps/scales
+include/X11/bitmaps/sipb
+include/X11/bitmaps/star
+include/X11/bitmaps/starMask
+include/X11/bitmaps/stipple
+include/X11/bitmaps/target
+include/X11/bitmaps/terminal
+include/X11/bitmaps/tie_fighter
+include/X11/bitmaps/vlines2
+include/X11/bitmaps/vlines3
+include/X11/bitmaps/weird_size
+include/X11/bitmaps/wide_weave
+include/X11/bitmaps/wingdogs
+include/X11/bitmaps/woman
+include/X11/bitmaps/xfd_icon
+include/X11/bitmaps/xlogo11
+include/X11/bitmaps/xlogo16
+include/X11/bitmaps/xlogo32
+include/X11/bitmaps/xlogo64
+include/X11/bitmaps/xsnow
+libdata/pkgconfig/xbitmaps.pc
+@dirrmtry include/X11/bitmaps
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
new file mode 100644
index 000000000000..c42a2c7c3d57
--- /dev/null
+++ b/x11/xcalc/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xcalc
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcalc
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Scientific calculator for X
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		xcalc.1
+
+.include <bsd.port.mk>
diff --git a/x11/xcalc/distinfo b/x11/xcalc/distinfo
new file mode 100644
index 000000000000..a4c944349f8d
--- /dev/null
+++ b/x11/xcalc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xcalc-1.0.1.tar.bz2) = 07b948cf671fde88df1a59bfb0cab3b8
+SHA256 (xorg/app/xcalc-1.0.1.tar.bz2) = 17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248
+SIZE (xorg/app/xcalc-1.0.1.tar.bz2) = 93745
diff --git a/x11/xcalc/pkg-descr b/x11/xcalc/pkg-descr
new file mode 100644
index 000000000000..8183cbf9c0b9
--- /dev/null
+++ b/x11/xcalc/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xcalc, a scientific calculator desktop accessory
+for the X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xcalc/pkg-plist b/x11/xcalc/pkg-plist
new file mode 100644
index 000000000000..ebbcd5c8a67b
--- /dev/null
+++ b/x11/xcalc/pkg-plist
@@ -0,0 +1,4 @@
+bin/xcalc
+share/X11/app-defaults/XCalc
+share/X11/app-defaults/XCalc-color
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xcalib/Makefile b/x11/xcalib/Makefile
index 25a99b660f0f..ab4b631d1a01 100644
--- a/x11/xcalib/Makefile
+++ b/x11/xcalib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcalib
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 graphics
 MASTER_SITES=	http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist
index d9b578d7cb5f..97b109a1573c 100644
--- a/x11/xcb-proto/pkg-plist
+++ b/x11/xcb-proto/pkg-plist
@@ -17,6 +17,7 @@ libdata/pkgconfig/xcb-proto.pc
 %%DATADIR%%/xevie.xml
 %%DATADIR%%/xf86dri.xml
 %%DATADIR%%/xfixes.xml
+%%DATADIR%%/xinerama.xml
 %%DATADIR%%/xprint.xml
 %%DATADIR%%/xproto.xml
 %%DATADIR%%/xtest.xml
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index 8fc9127a8ee4..09a28e20b652 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcb
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.goof.com/pcg/marc/data/
 
diff --git a/x11/xclick/Makefile b/x11/xclick/Makefile
index 27cfeb4a114c..5ad86f05a49b 100644
--- a/x11/xclick/Makefile
+++ b/x11/xclick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xclick
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://members.shaw.ca/gehrehmee/ \
 		http://bg.rifetech.com/
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index 12e085f1ee78..d304ab9303d3 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xclip
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://people.debian.org/~kims/xclip/
 
diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile
new file mode 100644
index 000000000000..83492f24b0d6
--- /dev/null
+++ b/x11/xclipboard/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xclipboard
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xclipboard
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X clipboard client
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		xclipboard.1 xcutsel.1
+
+.include <bsd.port.mk>
diff --git a/x11/xclipboard/distinfo b/x11/xclipboard/distinfo
new file mode 100644
index 000000000000..eee5df66f41c
--- /dev/null
+++ b/x11/xclipboard/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xclipboard-1.0.1.tar.bz2) = 2c6ecedb10dc51adbb64c95f22fd99c2
+SHA256 (xorg/app/xclipboard-1.0.1.tar.bz2) = 3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc
+SIZE (xorg/app/xclipboard-1.0.1.tar.bz2) = 83681
diff --git a/x11/xclipboard/pkg-descr b/x11/xclipboard/pkg-descr
new file mode 100644
index 000000000000..3dbd7590b489
--- /dev/null
+++ b/x11/xclipboard/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xclipboard, an X clipboard client.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xclipboard/pkg-plist b/x11/xclipboard/pkg-plist
new file mode 100644
index 000000000000..1eb7294f7254
--- /dev/null
+++ b/x11/xclipboard/pkg-plist
@@ -0,0 +1,4 @@
+bin/xclipboard
+bin/xcutsel
+share/X11/app-defaults/XClipboard
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xclock/Makefile b/x11/xclock/Makefile
new file mode 100644
index 000000000000..23bfdc02bb29
--- /dev/null
+++ b/x11/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/xclock/distinfo b/x11/xclock/distinfo
new file mode 100644
index 000000000000..e30567695300
--- /dev/null
+++ b/x11/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/xclock/pkg-descr b/x11/xclock/pkg-descr
new file mode 100644
index 000000000000..c8261821a87a
--- /dev/null
+++ b/x11/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/xclock/pkg-plist b/x11/xclock/pkg-plist
new file mode 100644
index 000000000000..23774c3db023
--- /dev/null
+++ b/x11/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/xcmd/Makefile b/x11/xcmd/Makefile
index 47ad16eee9ea..4f4580d7aa2b 100644
--- a/x11/xcmd/Makefile
+++ b/x11/xcmd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcmd
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.breuninger.org/files/distfiles/
diff --git a/x11/xcmiscproto/Makefile b/x11/xcmiscproto/Makefile
new file mode 100644
index 000000000000..481facc39c45
--- /dev/null
+++ b/x11/xcmiscproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xcmiscproto
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcmiscproto
+PORTVERSION=	1.1.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XCMisc extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/xcmiscproto/distinfo b/x11/xcmiscproto/distinfo
new file mode 100644
index 000000000000..44a00f483a14
--- /dev/null
+++ b/x11/xcmiscproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = fde0b050901f024b19159cdacdcfbd20
+SHA256 (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab
+SIZE (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = 36750
diff --git a/x11/xcmiscproto/pkg-descr b/x11/xcmiscproto/pkg-descr
new file mode 100644
index 000000000000..2eb54f046456
--- /dev/null
+++ b/x11/xcmiscproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XCMisc extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xcmiscproto/pkg-plist b/x11/xcmiscproto/pkg-plist
new file mode 100644
index 000000000000..384401d8ac76
--- /dev/null
+++ b/x11/xcmiscproto/pkg-plist
@@ -0,0 +1,3 @@
+include/X11/extensions/xcmiscstr.h
+libdata/pkgconfig/xcmiscproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xcmsdb/Makefile b/x11/xcmsdb/Makefile
new file mode 100644
index 000000000000..fd4c90e38ca6
--- /dev/null
+++ b/x11/xcmsdb/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xcmsdb
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcmsdb
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Device Color Characterization utility for X
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+PLIST_FILES=	bin/xcmsdb
+
+MAN1=		xcmsdb.1
+
+.include <bsd.port.mk>
diff --git a/x11/xcmsdb/distinfo b/x11/xcmsdb/distinfo
new file mode 100644
index 000000000000..95d33176320c
--- /dev/null
+++ b/x11/xcmsdb/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xcmsdb-1.0.1.tar.bz2) = 8579d5f50ba7f0c4a5bf16b9670fea01
+SHA256 (xorg/app/xcmsdb-1.0.1.tar.bz2) = e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e
+SIZE (xorg/app/xcmsdb-1.0.1.tar.bz2) = 96423
diff --git a/x11/xcmsdb/pkg-descr b/x11/xcmsdb/pkg-descr
new file mode 100644
index 000000000000..4c1b31bb4e62
--- /dev/null
+++ b/x11/xcmsdb/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xcmsdb, a Device Color Characterization utility
+for the X Color Management System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xco/Makefile b/x11/xco/Makefile
index 977db85f3413..c1108c6d0ea2 100644
--- a/x11/xco/Makefile
+++ b/x11/xco/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xco
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 DISTNAME=	${PORTNAME}
 
diff --git a/x11/xcoloredit/Makefile b/x11/xcoloredit/Makefile
index 7b514db8d02d..d3cf70c17370 100644
--- a/x11/xcoloredit/Makefile
+++ b/x11/xcoloredit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcoloredit
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 4eb6c08341b0..6afc3bbdb013 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xcolors
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	markp
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 7dbc73724b98..c707e6c73ee0 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	xcolorsel
 PORTVERSION=	1.1a
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
-DISTNAME=	${PKGNAME}-src
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X utility to translate rgb values into X color names
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
new file mode 100644
index 000000000000..cc6795e93578
--- /dev/null
+++ b/x11/xconsole/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xconsole
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xconsole
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Monitor system console messages with X
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		xconsole.1
+
+.include <bsd.port.mk>
diff --git a/x11/xconsole/distinfo b/x11/xconsole/distinfo
new file mode 100644
index 000000000000..c8d887af52b2
--- /dev/null
+++ b/x11/xconsole/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xconsole-1.0.2.tar.bz2) = 8678ddd23573022d68dcd883ae239be8
+SHA256 (xorg/app/xconsole-1.0.2.tar.bz2) = 45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377
+SIZE (xorg/app/xconsole-1.0.2.tar.bz2) = 86486
diff --git a/x11/xconsole/pkg-descr b/x11/xconsole/pkg-descr
new file mode 100644
index 000000000000..119267f85533
--- /dev/null
+++ b/x11/xconsole/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xconsole, a utility for monitoring system console
+messages with X.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xconsole/pkg-plist b/x11/xconsole/pkg-plist
new file mode 100644
index 000000000000..df1f64464d17
--- /dev/null
+++ b/x11/xconsole/pkg-plist
@@ -0,0 +1,3 @@
+bin/xconsole
+share/X11/app-defaults/XConsole
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xcurs/Makefile b/x11/xcurs/Makefile
index 83a862ae5fb8..3466a9fd6f5d 100644
--- a/x11/xcurs/Makefile
+++ b/x11/xcurs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcurs
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 python
 MASTER_SITES=	http://varg.dyndns.org/psi/files/xcurs/ \
 		http://freebsd.nsu.ru/distfiles/
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
new file mode 100644
index 000000000000..57e5bcff4cbc
--- /dev/null
+++ b/x11/xcursorgen/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	xcursorgen
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcursorgen
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Create an X cursor file from a collection of PNG images
+
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+
+XORG_CAT=	app
+USE_XORG=	x11 xcursor
+
+PLIST_FILES=	bin/xcursorgen
+
+MAN1=		xcursorgen.1
+
+.include <bsd.port.mk>
diff --git a/x11/xcursorgen/distinfo b/x11/xcursorgen/distinfo
new file mode 100644
index 000000000000..21665c40bb99
--- /dev/null
+++ b/x11/xcursorgen/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xcursorgen-1.0.1.tar.bz2) = 39e1e62f5bd92603b0230b8b948c2fc4
+SHA256 (xorg/app/xcursorgen-1.0.1.tar.bz2) = 18d3e0d64853089c2154f1f867df087fc15f87e03e09fabc98ee5e265d8a53ef
+SIZE (xorg/app/xcursorgen-1.0.1.tar.bz2) = 82300
diff --git a/x11/xcursorgen/pkg-descr b/x11/xcursorgen/pkg-descr
new file mode 100644
index 000000000000..47fbf37de9a0
--- /dev/null
+++ b/x11/xcursorgen/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xcursorgen, a program for creating an X cursor file
+from a collection of PNG images.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index d0b6119b3bdc..1e57403b8f40 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcut
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://acsys.anu.edu.au/~tpot/%SUBDIR%/
diff --git a/x11/xdbedizzy/Makefile b/x11/xdbedizzy/Makefile
new file mode 100644
index 000000000000..6a5f604ce65e
--- /dev/null
+++ b/x11/xdbedizzy/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xdbedizzy
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xdbedizzy
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Demo of DBE creating a double buffered spinning scene
+
+XORG_CAT=	app
+USE_XORG=	xp xext xprintutil xp xau xext
+
+PLIST_FILES=	bin/xdbedizzy
+
+MAN1=		xdbedizzy.1
+
+.include <bsd.port.mk>
diff --git a/x11/xdbedizzy/distinfo b/x11/xdbedizzy/distinfo
new file mode 100644
index 000000000000..e8ed35d8d7a1
--- /dev/null
+++ b/x11/xdbedizzy/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xdbedizzy-1.0.2.tar.bz2) = ecef9cfd197d00980e0d69ee4126d890
+SHA256 (xorg/app/xdbedizzy-1.0.2.tar.bz2) = 74e882e9fee7ebeb274caf43071afff92531b8a41f34650376146a131166012d
+SIZE (xorg/app/xdbedizzy-1.0.2.tar.bz2) = 87631
diff --git a/x11/xdbedizzy/pkg-descr b/x11/xdbedizzy/pkg-descr
new file mode 100644
index 000000000000..686fb0ee2f75
--- /dev/null
+++ b/x11/xdbedizzy/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xdbedizzy, a demo of DBE creating a double buffered
+spinning scene.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 8be4d3d6efc3..9a2fd04b8324 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xdialog
 PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://thgodef.nerim.net/xdialog/
 DISTNAME=	${PORTNAME:S/x/X/}-${PORTVERSION}
diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile
new file mode 100644
index 000000000000..fbf4b6d49182
--- /dev/null
+++ b/x11/xditview/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xditview
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xditview
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Display ditroff output
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		xditview.1
+
+.include <bsd.port.mk>
diff --git a/x11/xditview/distinfo b/x11/xditview/distinfo
new file mode 100644
index 000000000000..d1ca40c41279
--- /dev/null
+++ b/x11/xditview/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xditview-1.0.1.tar.bz2) = e9a7192ef29453b8c810ddd556a463c0
+SHA256 (xorg/app/xditview-1.0.1.tar.bz2) = 177194e5f83b31c2f934e3a0b573e8ae359edf2ef1a2403ee8e1dad383558117
+SIZE (xorg/app/xditview-1.0.1.tar.bz2) = 102979
diff --git a/x11/xditview/pkg-descr b/x11/xditview/pkg-descr
new file mode 100644
index 000000000000..325a228281ca
--- /dev/null
+++ b/x11/xditview/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xditview, a program for displaying ditroff output
+on an X display.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xditview/pkg-plist b/x11/xditview/pkg-plist
new file mode 100644
index 000000000000..c070b4957cfb
--- /dev/null
+++ b/x11/xditview/pkg-plist
@@ -0,0 +1,7 @@
+bin/xditview
+include/X11/bitmaps/ldblarrow
+include/X11/bitmaps/rdblarrow
+share/X11/app-defaults/Xditview
+share/X11/app-defaults/Xditview-chrtr
+@dirrmtry share/X11/app-defaults
+@dirrmtry include/X11/bitmaps
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
new file mode 100644
index 000000000000..21228ae93803
--- /dev/null
+++ b/x11/xdm/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	xdm
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xdm
+PORTVERSION=	1.1.4
+PORTREVISION=	1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org X display manager
+
+XORG_CAT=	app
+USE_XORG=	xmu x11 xau xinerama xpm xdmcp xt xext xaw
+
+MAN1=		xdm.1
+
+.include <bsd.port.mk>
diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo
new file mode 100644
index 000000000000..422010e75603
--- /dev/null
+++ b/x11/xdm/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xdm-1.1.4.tar.bz2) = a2b4c280f3e324d081a0d9ed76a8a123
+SHA256 (xorg/app/xdm-1.1.4.tar.bz2) = 928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073
+SIZE (xorg/app/xdm-1.1.4.tar.bz2) = 386272
diff --git a/x11/xdm/files/patch-greeter-greet.c b/x11/xdm/files/patch-greeter-greet.c
new file mode 100644
index 000000000000..b8a221de6e37
--- /dev/null
+++ b/x11/xdm/files/patch-greeter-greet.c
@@ -0,0 +1,19 @@
+--- greeter/greet.c.orig	Sat Feb  3 01:25:25 2007
++++ greeter/greet.c	Wed Apr  4 14:03:31 2007
+@@ -612,6 +617,7 @@ greet_user_rtn GreetUser(
+     }
+     DeleteXloginResources (d, *dpy);
+     CloseGreet (d);
++    login = NULL;
+     Debug ("Greet loop finished\n");
+     /*
+      * Run system-wide initialization file
+@@ -697,6 +704,8 @@ static int pamconv(int num_msg,
+     m = *msg;
+     r = *response;
+ 
++    if (login == NULL) goto pam_error;
++
+     for (i = 0; i < num_msg; i++ , m++ , r++) {
+ 	char *username;
+ 	int promptId = 0;
diff --git a/x11/xdm/pkg-descr b/x11/xdm/pkg-descr
new file mode 100644
index 000000000000..83b0099172ed
--- /dev/null
+++ b/x11/xdm/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xdm, the X.Org X Display manager.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist
new file mode 100644
index 000000000000..d25049043c4f
--- /dev/null
+++ b/x11/xdm/pkg-plist
@@ -0,0 +1,23 @@
+bin/xdm
+bin/xdmshell
+lib/X11/xdm/pixmaps/xorg-bw.xpm
+lib/X11/xdm/pixmaps/xorg.xpm
+lib/X11/xdm/Xaccess
+lib/X11/xdm/GiveConsole
+lib/X11/xdm/TakeConsole
+lib/X11/xdm/Xsetup_0
+lib/X11/xdm/Xstartup
+lib/X11/xdm/Xreset
+lib/X11/xdm/Xwilling
+lib/X11/xdm/xdm-config
+lib/X11/xdm/Xresources
+lib/X11/xdm/Xservers
+lib/X11/xdm/Xsession
+lib/X11/xdm/libXdmGreet.so
+lib/X11/xdm/libXdmGreet.la
+lib/X11/xdm/libXdmGreet.a
+lib/X11/xdm/chooser
+share/X11/app-defaults/Chooser
+@dirrmtry share/X11/app-defaults
+@dirrm lib/X11/xdm/pixmaps
+@dirrm lib/X11/xdm
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
new file mode 100644
index 000000000000..5c9daf9d92fb
--- /dev/null
+++ b/x11/xdpyinfo/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xdpyinfo
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xdpyinfo
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Display information utility for X
+
+XORG_CAT=	app
+USE_XORG=	xext x11 xtst
+
+PLIST_FILES=	bin/xdpyinfo
+
+MAN1=		xdpyinfo.1
+
+.include <bsd.port.mk>
diff --git a/x11/xdpyinfo/distinfo b/x11/xdpyinfo/distinfo
new file mode 100644
index 000000000000..576b1d3adde6
--- /dev/null
+++ b/x11/xdpyinfo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xdpyinfo-1.0.1.tar.bz2) = 84cc4798fe62c1d8c67c3f38e8158f70
+SHA256 (xorg/app/xdpyinfo-1.0.1.tar.bz2) = 1ccdb5862f60bbc9712e21ee415699af88e260ced431ccfcfde8f95c34a45c61
+SIZE (xorg/app/xdpyinfo-1.0.1.tar.bz2) = 87678
diff --git a/x11/xdpyinfo/pkg-descr b/x11/xdpyinfo/pkg-descr
new file mode 100644
index 000000000000..6e6c88be7042
--- /dev/null
+++ b/x11/xdpyinfo/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xdpyinfo, which is a utility for displaying
+information about an X server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile
new file mode 100644
index 000000000000..1f6a3008c2ad
--- /dev/null
+++ b/x11/xdriinfo/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	xdriinfo
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xdriinfo
+PORTVERSION=	1.0.1
+PORTREVISION=	1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Query configuration information of DRI drivers
+
+USE_GL=		gl
+
+XORG_CAT=	app
+USE_XORG=	x11 glproto
+MAN1=		xdriinfo.1
+PLIST_FILES=	bin/xdriinfo
+
+.include <bsd.port.mk>
diff --git a/x11/xdriinfo/distinfo b/x11/xdriinfo/distinfo
new file mode 100644
index 000000000000..5610c99178bb
--- /dev/null
+++ b/x11/xdriinfo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xdriinfo-1.0.1.tar.bz2) = be3c5a9b242a57226b5bb5f22ec341ca
+SHA256 (xorg/app/xdriinfo-1.0.1.tar.bz2) = f693977bdaea7eb6b095a6b6bc60b8a62110ecdef4c455211346e592f59c3772
+SIZE (xorg/app/xdriinfo-1.0.1.tar.bz2) = 81557
diff --git a/x11/xdriinfo/pkg-descr b/x11/xdriinfo/pkg-descr
new file mode 100644
index 000000000000..933072d04bc2
--- /dev/null
+++ b/x11/xdriinfo/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xdriinfo, an utility that can be used to query
+configuration information of direct rendering devices.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index fd6b527766b9..56a667784883 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		xdtm
 PORTVERSION=		2.5.8
+PORTREVISION=	1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
new file mode 100644
index 000000000000..afffb6232202
--- /dev/null
+++ b/x11/xedit/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xedit
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xedit
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Simple text editor for X
+
+XORG_CAT=	app
+USE_XORG=	xt xaw xp xprintutil
+
+MAN1=		xedit.1
+
+.include <bsd.port.mk>
diff --git a/x11/xedit/distinfo b/x11/xedit/distinfo
new file mode 100644
index 000000000000..c99bb879f4cc
--- /dev/null
+++ b/x11/xedit/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xedit-1.0.2.tar.bz2) = c56160e93c24ddf17e69891ed50deb72
+SHA256 (xorg/app/xedit-1.0.2.tar.bz2) = 2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df
+SIZE (xorg/app/xedit-1.0.2.tar.bz2) = 455400
diff --git a/x11/xedit/pkg-descr b/x11/xedit/pkg-descr
new file mode 100644
index 000000000000..fb8c2034c470
--- /dev/null
+++ b/x11/xedit/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xedit, a simple text editor for the X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xedit/pkg-plist b/x11/xedit/pkg-plist
new file mode 100644
index 000000000000..af76d09fa139
--- /dev/null
+++ b/x11/xedit/pkg-plist
@@ -0,0 +1,24 @@
+bin/xedit
+lib/X11/xedit/lisp/progmodes/c.lsp
+lib/X11/xedit/lisp/progmodes/html.lsp
+lib/X11/xedit/lisp/progmodes/imake.lsp
+lib/X11/xedit/lisp/progmodes/lisp.lsp
+lib/X11/xedit/lisp/progmodes/make.lsp
+lib/X11/xedit/lisp/progmodes/man.lsp
+lib/X11/xedit/lisp/progmodes/patch.lsp
+lib/X11/xedit/lisp/progmodes/rpm.lsp
+lib/X11/xedit/lisp/progmodes/sgml.lsp
+lib/X11/xedit/lisp/progmodes/sh.lsp
+lib/X11/xedit/lisp/progmodes/xconf.lsp
+lib/X11/xedit/lisp/progmodes/xlog.lsp
+lib/X11/xedit/lisp/progmodes/xrdb.lsp
+lib/X11/xedit/lisp/lisp.lsp
+lib/X11/xedit/lisp/xedit.lsp
+lib/X11/xedit/lisp/syntax.lsp
+lib/X11/xedit/lisp/indent.lsp
+share/X11/app-defaults/Xedit-color
+share/X11/app-defaults/Xedit
+@dirrmtry share/X11/app-defaults
+@dirrm lib/X11/xedit/lisp/progmodes
+@dirrm lib/X11/xedit/lisp
+@dirrm lib/X11/xedit
diff --git a/x11/xev/Makefile b/x11/xev/Makefile
new file mode 100644
index 000000000000..1f265b8c37e0
--- /dev/null
+++ b/x11/xev/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xev
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xev
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Print contents of X events
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+PLIST_FILES=	bin/xev
+
+MAN1=		xev.1
+
+.include <bsd.port.mk>
diff --git a/x11/xev/distinfo b/x11/xev/distinfo
new file mode 100644
index 000000000000..0d51b68173fa
--- /dev/null
+++ b/x11/xev/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xev-1.0.2.tar.bz2) = e3008eb0655da3026c162a5597d70869
+SHA256 (xorg/app/xev-1.0.2.tar.bz2) = cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053
+SIZE (xorg/app/xev-1.0.2.tar.bz2) = 84097
diff --git a/x11/xev/pkg-descr b/x11/xev/pkg-descr
new file mode 100644
index 000000000000..eddd0caccffc
--- /dev/null
+++ b/x11/xev/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xev, which is a application that monitors X events.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xextensions/Makefile b/x11/xextensions/Makefile
index 3907fdea0c03..93ad2d68e191 100644
--- a/x11/xextensions/Makefile
+++ b/x11/xextensions/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xextensions
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://freedesktop.org/~ajax/xlibs-release/
 
diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile
new file mode 100644
index 000000000000..fcf8b6a457a3
--- /dev/null
+++ b/x11/xextproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xextproto
+# Date Created:				07 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xextproto
+PORTVERSION=	7.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XExt extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo
new file mode 100644
index 000000000000..3be185fe3d90
--- /dev/null
+++ b/x11/xextproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xextproto-7.0.2.tar.bz2) = 242388ab65dde3a3dd313eeee265e429
+SHA256 (xorg/proto/xextproto-7.0.2.tar.bz2) = 53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9
+SIZE (xorg/proto/xextproto-7.0.2.tar.bz2) = 68323
diff --git a/x11/xextproto/pkg-descr b/x11/xextproto/pkg-descr
new file mode 100644
index 000000000000..f9c9a9995397
--- /dev/null
+++ b/x11/xextproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XExt extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xextproto/pkg-plist b/x11/xextproto/pkg-plist
new file mode 100644
index 000000000000..e997f23be10d
--- /dev/null
+++ b/x11/xextproto/pkg-plist
@@ -0,0 +1,38 @@
+include/X11/extensions/MITMisc.h
+include/X11/extensions/XEVI.h
+include/X11/extensions/XEVIstr.h
+include/X11/extensions/XLbx.h
+include/X11/extensions/XShm.h
+include/X11/extensions/XTest.h
+include/X11/extensions/Xag.h
+include/X11/extensions/Xagsrv.h
+include/X11/extensions/Xagstr.h
+include/X11/extensions/Xcup.h
+include/X11/extensions/Xcupstr.h
+include/X11/extensions/Xdbe.h
+include/X11/extensions/Xdbeproto.h
+include/X11/extensions/Xext.h
+include/X11/extensions/dpms.h
+include/X11/extensions/dpmsstr.h
+include/X11/extensions/extutil.h
+include/X11/extensions/lbxbuf.h
+include/X11/extensions/lbxbufstr.h
+include/X11/extensions/lbxdeltastr.h
+include/X11/extensions/lbximage.h
+include/X11/extensions/lbxopts.h
+include/X11/extensions/lbxstr.h
+include/X11/extensions/lbxzlib.h
+include/X11/extensions/mitmiscstr.h
+include/X11/extensions/multibuf.h
+include/X11/extensions/multibufst.h
+include/X11/extensions/security.h
+include/X11/extensions/securstr.h
+include/X11/extensions/shape.h
+include/X11/extensions/shapestr.h
+include/X11/extensions/shmstr.h
+include/X11/extensions/sync.h
+include/X11/extensions/syncstr.h
+include/X11/extensions/xtestext1.h
+include/X11/extensions/xteststr.h
+libdata/pkgconfig/xextproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile
new file mode 100644
index 000000000000..e398a8780fcd
--- /dev/null
+++ b/x11/xeyes/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xeyes
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xeyes
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	A follow the mouse X demo
+
+XORG_CAT=	app
+USE_XORG=	x11 xt xext xmu
+
+PLIST_FILES=	bin/xeyes
+
+MAN1=		xeyes.1
+
+.include <bsd.port.mk>
diff --git a/x11/xeyes/distinfo b/x11/xeyes/distinfo
new file mode 100644
index 000000000000..bd62c4efe34d
--- /dev/null
+++ b/x11/xeyes/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xeyes-1.0.1.tar.bz2) = 033f14f7c4e30d1f4edbb22d5ef86883
+SHA256 (xorg/app/xeyes-1.0.1.tar.bz2) = 530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
+SIZE (xorg/app/xeyes-1.0.1.tar.bz2) = 81097
diff --git a/x11/xeyes/pkg-descr b/x11/xeyes/pkg-descr
new file mode 100644
index 000000000000..e7d7d4fd56a4
--- /dev/null
+++ b/x11/xeyes/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xeyes, which is a "follow the mouse" X demo application.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile
new file mode 100644
index 000000000000..3ee9a942aff2
--- /dev/null
+++ b/x11/xf86dga/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86dga
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86dga
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Test program for the XFree86-DGA extension
+
+XORG_CAT=	app
+USE_XORG=	x11 xxf86dga xt xaw7 xmu
+
+PLIST_FILES=	bin/dga
+
+MAN1=		dga.1
+
+.include <bsd.port.mk>
diff --git a/x11/xf86dga/distinfo b/x11/xf86dga/distinfo
new file mode 100644
index 000000000000..e9313a6086fa
--- /dev/null
+++ b/x11/xf86dga/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xf86dga-1.0.2.tar.bz2) = 66feef21fb4e769cc1e2f193ae461a8c
+SHA256 (xorg/app/xf86dga-1.0.2.tar.bz2) = 650633b83796e5a24d4c5ec30adfeb3958f75d9d0785060d5c42bab55ccc1857
+SIZE (xorg/app/xf86dga-1.0.2.tar.bz2) = 80170
diff --git a/x11/xf86dga/pkg-descr b/x11/xf86dga/pkg-descr
new file mode 100644
index 000000000000..2f3628cea264
--- /dev/null
+++ b/x11/xf86dga/pkg-descr
@@ -0,0 +1,5 @@
+This package contains dga, a simple test client for the XFree86-DGA
+extension.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86dgaproto/Makefile b/x11/xf86dgaproto/Makefile
new file mode 100644
index 000000000000..070a66a55cd6
--- /dev/null
+++ b/x11/xf86dgaproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86bigfontproto
+# Date Created:				06 Feb 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86dgaproto
+PORTVERSION=	2.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XFree86-DGA extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/xf86dgaproto/distinfo b/x11/xf86dgaproto/distinfo
new file mode 100644
index 000000000000..4d9afff2c34c
--- /dev/null
+++ b/x11/xf86dgaproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xf86dgaproto-2.0.2.tar.bz2) = 461aa291a23e8cf387b70f3efa71b05c
+SHA256 (xorg/proto/xf86dgaproto-2.0.2.tar.bz2) = 3ee1db2481ea222269bd201eef4d0e5d8ca4dbdb5eeb4852cf1efc42d4269b60
+SIZE (xorg/proto/xf86dgaproto-2.0.2.tar.bz2) = 40066
diff --git a/x11/xf86dgaproto/pkg-descr b/x11/xf86dgaproto/pkg-descr
new file mode 100644
index 000000000000..0d54abac204b
--- /dev/null
+++ b/x11/xf86dgaproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XFree86-DGA extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86dgaproto/pkg-plist b/x11/xf86dgaproto/pkg-plist
new file mode 100644
index 000000000000..6ffd6b28b310
--- /dev/null
+++ b/x11/xf86dgaproto/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/extensions/xf86dga.h
+include/X11/extensions/xf86dga1.h
+include/X11/extensions/xf86dga1str.h
+include/X11/extensions/xf86dgastr.h
+libdata/pkgconfig/xf86dgaproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile
new file mode 100644
index 000000000000..5050dc0d49f8
--- /dev/null
+++ b/x11/xf86driproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86bigfontproto
+# Date Created:				06 Feb 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86driproto
+PORTVERSION=	2.0.3
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XFree86-DRI extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/xf86driproto/distinfo b/x11/xf86driproto/distinfo
new file mode 100644
index 000000000000..8bc28ed9ccc2
--- /dev/null
+++ b/x11/xf86driproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xf86driproto-2.0.3.tar.bz2) = e4a282cfd708b8892fca4425fee9cd7b
+SHA256 (xorg/proto/xf86driproto-2.0.3.tar.bz2) = 111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6
+SIZE (xorg/proto/xf86driproto-2.0.3.tar.bz2) = 42828
diff --git a/x11/xf86driproto/pkg-descr b/x11/xf86driproto/pkg-descr
new file mode 100644
index 000000000000..8ccf4c7141ff
--- /dev/null
+++ b/x11/xf86driproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XFree86-DRI extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86driproto/pkg-plist b/x11/xf86driproto/pkg-plist
new file mode 100644
index 000000000000..ad29f350c9d3
--- /dev/null
+++ b/x11/xf86driproto/pkg-plist
@@ -0,0 +1,7 @@
+include/GL/internal/dri_interface.h
+include/X11/dri/xf86dri.h
+include/X11/dri/xf86dristr.h
+libdata/pkgconfig/xf86driproto.pc
+@dirrm include/X11/dri
+@dirrmtry include/GL/internal
+@dirrmtry include/GL
diff --git a/x11/xf86ext/Makefile b/x11/xf86ext/Makefile
index 0aeb7c4cfdf8..8e4bc9fbc934 100644
--- a/x11/xf86ext/Makefile
+++ b/x11/xf86ext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xf86ext
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xorg.freedesktop.org/X11R6.7.0/src/ \
 		${MASTER_SITE_XORG}
diff --git a/x11/xf86miscproto/Makefile b/x11/xf86miscproto/Makefile
new file mode 100644
index 000000000000..3b6abc2c0808
--- /dev/null
+++ b/x11/xf86miscproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86bigfontproto
+# Date Created:				06 Feb 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86miscproto
+PORTVERSION=	0.9.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XFree86-Misc extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/xf86miscproto/distinfo b/x11/xf86miscproto/distinfo
new file mode 100644
index 000000000000..8a92b725454e
--- /dev/null
+++ b/x11/xf86miscproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = acae8edeb05a406f7f60bcbb218a8f1d
+SHA256 (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6
+SIZE (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = 38464
diff --git a/x11/xf86miscproto/pkg-descr b/x11/xf86miscproto/pkg-descr
new file mode 100644
index 000000000000..59d4ff755432
--- /dev/null
+++ b/x11/xf86miscproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XFree86-Misc extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86miscproto/pkg-plist b/x11/xf86miscproto/pkg-plist
new file mode 100644
index 000000000000..148debce1918
--- /dev/null
+++ b/x11/xf86miscproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/xf86misc.h
+include/X11/extensions/xf86mscstr.h
+libdata/pkgconfig/xf86miscproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xf86rushproto/Makefile b/x11/xf86rushproto/Makefile
new file mode 100644
index 000000000000..95916a3433cc
--- /dev/null
+++ b/x11/xf86rushproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86rushproto
+# Date Created:				06 Feb 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86rushproto
+PORTVERSION=	1.1.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XFree86-Rush extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/xf86rushproto/distinfo b/x11/xf86rushproto/distinfo
new file mode 100644
index 000000000000..715738dd53c3
--- /dev/null
+++ b/x11/xf86rushproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xf86rushproto-1.1.2.tar.bz2) = b6a96ffdae084e27487a58314008b000
+SHA256 (xorg/proto/xf86rushproto-1.1.2.tar.bz2) = 07d9b237541f2d6313b5b28f5335d987a766b36c87b133f77cc48f31d969a3ae
+SIZE (xorg/proto/xf86rushproto-1.1.2.tar.bz2) = 37695
diff --git a/x11/xf86rushproto/pkg-descr b/x11/xf86rushproto/pkg-descr
new file mode 100644
index 000000000000..4add51bc469c
--- /dev/null
+++ b/x11/xf86rushproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XFree86-Rush extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86rushproto/pkg-plist b/x11/xf86rushproto/pkg-plist
new file mode 100644
index 000000000000..4371db2ff835
--- /dev/null
+++ b/x11/xf86rushproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/xf86rush.h
+include/X11/extensions/xf86rushstr.h
+libdata/pkgconfig/xf86rushproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xf86vidmodeproto/Makefile b/x11/xf86vidmodeproto/Makefile
new file mode 100644
index 000000000000..8c081362db1a
--- /dev/null
+++ b/x11/xf86vidmodeproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xf86vidmodeproto
+# Date Created:				06 Feb 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xf86vidmodeproto
+PORTVERSION=	2.2.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XFree86-VidModeExtension extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/xf86vidmodeproto/distinfo b/x11/xf86vidmodeproto/distinfo
new file mode 100644
index 000000000000..81b04a7cf261
--- /dev/null
+++ b/x11/xf86vidmodeproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = f00844a63d6e76b69eb0eb5e41eed843
+SHA256 (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = 07152f990cc79ec5931989decc4a90b1919147e98ff6fcfe39507a9d3fc4d96e
+SIZE (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = 39615
diff --git a/x11/xf86vidmodeproto/pkg-descr b/x11/xf86vidmodeproto/pkg-descr
new file mode 100644
index 000000000000..872e3328e990
--- /dev/null
+++ b/x11/xf86vidmodeproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XFree86-VidModeExtension extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86vidmodeproto/pkg-plist b/x11/xf86vidmodeproto/pkg-plist
new file mode 100644
index 000000000000..410f26100f65
--- /dev/null
+++ b/x11/xf86vidmodeproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/xf86vmode.h
+include/X11/extensions/xf86vmstr.h
+libdata/pkgconfig/xf86vidmodeproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index f10378724902..9e258e0e0455 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-clipman-plugin
 PORTVERSION=	0.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 9c43310a7ac3..7f05baac6584 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-quicklauncher-plugin
 PORTVERSION=	1.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index 584ee89e86f1..40317521b6c0 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-screenshooter-plugin
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 28920cd6bd5f..b591de6c5932 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-taskmanager
 PORTVERSION=	0.4.0.r2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://xfce4-taskmanager.nebulon.de/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
index e1508200583f..5d94718c415d 100644
--- a/x11/xfce4-xfapplet-plugin/Makefile
+++ b/x11/xfce4-xfapplet-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-xfapplet-plugin
 PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
diff --git a/x11/xfce4-xfapplet-plugin/pkg-plist b/x11/xfce4-xfapplet-plugin/pkg-plist
index b3d4bc3c1408..23ead8bf11a0 100644
--- a/x11/xfce4-xfapplet-plugin/pkg-plist
+++ b/x11/xfce4-xfapplet-plugin/pkg-plist
@@ -20,4 +20,3 @@ share/xfce4/panel-plugins/xfapplet.desktop
 @dirrmtry share/xfce4
 @dirrmtry libexec/xfce4/panel-plugins
 @dirrmtry libexec/xfce4
-@dirrmtry share/pixmaps
diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile
new file mode 100644
index 000000000000..9dae7d24052f
--- /dev/null
+++ b/x11/xfd/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	xfd
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xfd
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Display all characters in an X font
+
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+
+XORG_CAT=	app
+USE_XORG=	xft xt xaw
+
+MAN1=		xfd.1
+
+.include <bsd.port.mk>
diff --git a/x11/xfd/distinfo b/x11/xfd/distinfo
new file mode 100644
index 000000000000..9b2bde22a3c2
--- /dev/null
+++ b/x11/xfd/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xfd-1.0.1.tar.bz2) = c72abd90f50ef459bc14b39ec9fcc7f8
+SHA256 (xorg/app/xfd-1.0.1.tar.bz2) = 111baa16780429d6739ab69b7393a18d75a10b7615dcc8cd0b0878ab9a5e2e1e
+SIZE (xorg/app/xfd-1.0.1.tar.bz2) = 88927
diff --git a/x11/xfd/pkg-descr b/x11/xfd/pkg-descr
new file mode 100644
index 000000000000..9c764d197c92
--- /dev/null
+++ b/x11/xfd/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xfd, an applications used for displying all
+characters in an X font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xfd/pkg-plist b/x11/xfd/pkg-plist
new file mode 100644
index 000000000000..0665ed7eef79
--- /dev/null
+++ b/x11/xfd/pkg-plist
@@ -0,0 +1,3 @@
+bin/xfd
+share/X11/app-defaults/Xfd
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xfindproxy/Makefile b/x11/xfindproxy/Makefile
new file mode 100644
index 000000000000..13deb0d448a5
--- /dev/null
+++ b/x11/xfindproxy/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xfindproxy
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xfindproxy
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Locate available proxy services
+
+XORG_CAT=	app
+USE_XORG=	x11 ice xt xproxymngproto
+
+PLIST_FILES=	bin/xfindproxy
+
+MAN1=		xfindproxy.1
+
+.include <bsd.port.mk>
diff --git a/x11/xfindproxy/distinfo b/x11/xfindproxy/distinfo
new file mode 100644
index 000000000000..801363a7d820
--- /dev/null
+++ b/x11/xfindproxy/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xfindproxy-1.0.1.tar.bz2) = 5df3a162429bdd6ce5aea3ca5f6365b8
+SHA256 (xorg/app/xfindproxy-1.0.1.tar.bz2) = 6b585ceadd3e17b433e177d80837e485869d6704f1181b6f3457ae56ba1988ea
+SIZE (xorg/app/xfindproxy-1.0.1.tar.bz2) = 77645
diff --git a/x11/xfindproxy/pkg-descr b/x11/xfindproxy/pkg-descr
new file mode 100644
index 000000000000..63e6fd154be7
--- /dev/null
+++ b/x11/xfindproxy/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xfindproxy, a program for locating available
+proxy services.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index 090547d8ea98..a6473cff281d 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfishtank
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.uni-koeln.de/windows/xcontrib/
 
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index f6d647c02bf4..0757c79229fd 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfree86_xkb_xml
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile
new file mode 100644
index 000000000000..0a7f721ef5bd
--- /dev/null
+++ b/x11/xfwp/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xfwp
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xfwp
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X firewall proxy
+
+XORG_CAT=	app
+USE_XORG=	x11 ice xproxymngproto
+
+PLIST_FILES=	bin/xfwp
+
+MAN1=		xfwp.1
+
+.include <bsd.port.mk>
diff --git a/x11/xfwp/distinfo b/x11/xfwp/distinfo
new file mode 100644
index 000000000000..fa9c2835f8c8
--- /dev/null
+++ b/x11/xfwp/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xfwp-1.0.1.tar.bz2) = 0dbde8b3867032b9e4a383d46dfd7e48
+SHA256 (xorg/app/xfwp-1.0.1.tar.bz2) = cdd6ecb453c62086dd01808a26787641add419dd42469349f79d0adeb89a6d93
+SIZE (xorg/app/xfwp-1.0.1.tar.bz2) = 104576
diff --git a/x11/xfwp/pkg-descr b/x11/xfwp/pkg-descr
new file mode 100644
index 000000000000..e2cda8002b11
--- /dev/null
+++ b/x11/xfwp/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X firewall proxy (xfwp).
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile
new file mode 100644
index 000000000000..651fc44e01fb
--- /dev/null
+++ b/x11/xgamma/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xgamma
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xgamma
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Gamma correction through the X server.
+
+XORG_CAT=	app
+USE_XORG=	x11 xxf86vm
+
+PLIST_FILES=	bin/xgamma
+
+MAN1=		xgamma.1
+
+.include <bsd.port.mk>
diff --git a/x11/xgamma/distinfo b/x11/xgamma/distinfo
new file mode 100644
index 000000000000..e4d70f2270a7
--- /dev/null
+++ b/x11/xgamma/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xgamma-1.0.1.tar.bz2) = 45d8fa3c85d4bfda87251798fd605a45
+SHA256 (xorg/app/xgamma-1.0.1.tar.bz2) = 085330064fdb90a152d2d44474fa20bb81ccb6c587c144f5f9c323cb9cc31eee
+SIZE (xorg/app/xgamma-1.0.1.tar.bz2) = 74971
diff --git a/x11/xgamma/pkg-descr b/x11/xgamma/pkg-descr
new file mode 100644
index 000000000000..9f19276b41cc
--- /dev/null
+++ b/x11/xgamma/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xgamma, a tool for altering the gamma correction
+through the X server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xgc/Makefile b/x11/xgc/Makefile
new file mode 100644
index 000000000000..fd106632376c
--- /dev/null
+++ b/x11/xgc/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xgc
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xgc
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X graphics demo
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		xgc.1
+
+.include <bsd.port.mk>
diff --git a/x11/xgc/distinfo b/x11/xgc/distinfo
new file mode 100644
index 000000000000..6e43f4e242db
--- /dev/null
+++ b/x11/xgc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xgc-1.0.1.tar.bz2) = 72fc8dd68f585000c0a542eba0264571
+SHA256 (xorg/app/xgc-1.0.1.tar.bz2) = 7caddfc6c34f62a4ab2dba2ba34085f6b2343b36ec1bec3b522a2188170e1093
+SIZE (xorg/app/xgc-1.0.1.tar.bz2) = 128931
diff --git a/x11/xgc/pkg-descr b/x11/xgc/pkg-descr
new file mode 100644
index 000000000000..9d294688031a
--- /dev/null
+++ b/x11/xgc/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xgc, which is a program that demonstrates various
+features of the X graphics primitives.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xgc/pkg-plist b/x11/xgc/pkg-plist
new file mode 100644
index 000000000000..7e093927b895
--- /dev/null
+++ b/x11/xgc/pkg-plist
@@ -0,0 +1,3 @@
+bin/xgc
+share/X11/app-defaults/Xgc
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index e893d52109e9..75041aef7b93 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xgrab
 PORTVERSION=	2.41
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
@@ -18,13 +18,10 @@ MAINTAINER=	jmz@FreeBSD.org
 COMMENT=	An X11 image grabber
 
 BUILD_DEPENDS=	xrdb:${X_CLIENTS_PORT}
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.endif
 
 USE_X_PREFIX=	yes
 USE_IMAKE=	yes
+USE_DISPLAY=	yes
 
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
 		XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults  -f
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
new file mode 100644
index 000000000000..c8c84546ff78
--- /dev/null
+++ b/x11/xhost/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xhost
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xhost
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Server access control program for X
+
+XORG_CAT=	app
+USE_XORG=	x11 xmuu xau
+
+PLIST_FILES=	bin/xhost
+
+MAN1=		xhost.1
+
+.include <bsd.port.mk>
diff --git a/x11/xhost/distinfo b/x11/xhost/distinfo
new file mode 100644
index 000000000000..5e173eddbb7a
--- /dev/null
+++ b/x11/xhost/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xhost-1.0.1.tar.bz2) = 5300c9aafa58878c8f6e85379d5c199c
+SHA256 (xorg/app/xhost-1.0.1.tar.bz2) = b03b8c9a083064c35c2e7b76af2b0c28d756ced17d3c31549300fea057fd3822
+SIZE (xorg/app/xhost-1.0.1.tar.bz2) = 90034
diff --git a/x11/xhost/pkg-descr b/x11/xhost/pkg-descr
new file mode 100644
index 000000000000..7ef86f82225d
--- /dev/null
+++ b/x11/xhost/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xhost, a server access control program for the
+X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xidle/Makefile b/x11/xidle/Makefile
index 1c737d145528..40f1ce0fb3fb 100644
--- a/x11/xidle/Makefile
+++ b/x11/xidle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xidle
 PORTVERSION=	24102005
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	novel
diff --git a/x11/xineramaproto/Makefile b/x11/xineramaproto/Makefile
new file mode 100644
index 000000000000..54c0efcae56e
--- /dev/null
+++ b/x11/xineramaproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xineramaproto
+# Date Created:				06 Feb 2006
+# Whom:					Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xineramaproto
+PORTVERSION=	1.1.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Xinerama extension headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/xineramaproto/distinfo b/x11/xineramaproto/distinfo
new file mode 100644
index 000000000000..bab5c1b43688
--- /dev/null
+++ b/x11/xineramaproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xineramaproto-1.1.2.tar.bz2) = 1cc292c562962ad0ad3a253cae68c632
+SHA256 (xorg/proto/xineramaproto-1.1.2.tar.bz2) = e8a62b1cafbcfc3b9fed147612ed4320233d0c9d6de30c991c2cd0c691c40910
+SIZE (xorg/proto/xineramaproto-1.1.2.tar.bz2) = 38413
diff --git a/x11/xineramaproto/pkg-descr b/x11/xineramaproto/pkg-descr
new file mode 100644
index 000000000000..2ef9ec7ac930
--- /dev/null
+++ b/x11/xineramaproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Xinerama extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xineramaproto/pkg-plist b/x11/xineramaproto/pkg-plist
new file mode 100644
index 000000000000..10905a2ac56d
--- /dev/null
+++ b/x11/xineramaproto/pkg-plist
@@ -0,0 +1,5 @@
+include/X11/extensions/Xinerama.h
+include/X11/extensions/panoramiXext.h
+include/X11/extensions/panoramiXproto.h
+libdata/pkgconfig/xineramaproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
new file mode 100644
index 000000000000..d10a1865c772
--- /dev/null
+++ b/x11/xinit/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	xinit
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xinit
+PORTVERSION=	1.0.3
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X Window System initializer
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+PLIST_FILES=	bin/startx bin/xinit lib/X11/xinit/xinitrc
+PLIST_DIRS=	lib/X11/xinit
+
+MAN1=		startx.1 xinit.1
+
+.include <bsd.port.mk>
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
new file mode 100644
index 000000000000..70c1d87028e6
--- /dev/null
+++ b/x11/xinit/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xinit-1.0.3.tar.bz2) = f04a903cc0e18b3c338f58eb90f6caf8
+SHA256 (xorg/app/xinit-1.0.3.tar.bz2) = c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186
+SIZE (xorg/app/xinit-1.0.3.tar.bz2) = 97629
diff --git a/x11/xinit/pkg-descr b/x11/xinit/pkg-descr
new file mode 100644
index 000000000000..495f443cc3b3
--- /dev/null
+++ b/x11/xinit/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xinit, the X Window System initializer.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index 9c40419e1226..bcf6ece6fcc9 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xinput
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=utilities
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
new file mode 100644
index 000000000000..14882d8276f5
--- /dev/null
+++ b/x11/xkbcomp/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xkbcomp
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xkbcomp
+PORTVERSION=	1.0.3
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Compile XKB keyboard description
+
+XORG_CAT=	app
+USE_XORG=	x11 xkbfile
+
+PLIST_FILES=	bin/xkbcomp
+
+MAN1=		xkbcomp.1
+
+.include <bsd.port.mk>
diff --git a/x11/xkbcomp/distinfo b/x11/xkbcomp/distinfo
new file mode 100644
index 000000000000..89f85b369efc
--- /dev/null
+++ b/x11/xkbcomp/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xkbcomp-1.0.3.tar.bz2) = 2fbcae1323c266edf5b6c61751f2e343
+SHA256 (xorg/app/xkbcomp-1.0.3.tar.bz2) = 0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716
+SIZE (xorg/app/xkbcomp-1.0.3.tar.bz2) = 189992
diff --git a/x11/xkbcomp/pkg-descr b/x11/xkbcomp/pkg-descr
new file mode 100644
index 000000000000..fce557314593
--- /dev/null
+++ b/x11/xkbcomp/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xkbcomp, the X.Org keymap compiler.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile
index 294a1dcbb37f..d81112bd99b7 100644
--- a/x11/xkbctrl/Makefile
+++ b/x11/xkbctrl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xkbctrl
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	unsupported/test/Xkb/programs
diff --git a/x11/xkbevd/Makefile b/x11/xkbevd/Makefile
new file mode 100644
index 000000000000..d807980d4f91
--- /dev/null
+++ b/x11/xkbevd/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xkbevd
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xkbevd
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XKB event daemon
+
+XORG_CAT=	app
+USE_XORG=	xkbfile x11
+
+PLIST_FILES=	bin/xkbevd
+
+MAN1=		xkbevd.1
+
+.include <bsd.port.mk>
diff --git a/x11/xkbevd/distinfo b/x11/xkbevd/distinfo
new file mode 100644
index 000000000000..7f1a7af88f21
--- /dev/null
+++ b/x11/xkbevd/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xkbevd-1.0.2.tar.bz2) = 68f2a143716c23b566f8509d9498f516
+SHA256 (xorg/app/xkbevd-1.0.2.tar.bz2) = 4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b
+SIZE (xorg/app/xkbevd-1.0.2.tar.bz2) = 107794
diff --git a/x11/xkbevd/pkg-descr b/x11/xkbevd/pkg-descr
new file mode 100644
index 000000000000..d93652d67c0f
--- /dev/null
+++ b/x11/xkbevd/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xkbevd, the XKB event daemon.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xkbprint/Makefile b/x11/xkbprint/Makefile
new file mode 100644
index 000000000000..be4469df9ae5
--- /dev/null
+++ b/x11/xkbprint/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xkbprint
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xkbprint
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Utility for printing an XKB keyboard description
+
+XORG_CAT=	app
+USE_XORG=	xkbfile x11
+
+PLIST_FILES=	bin/xkbprint
+
+MAN1=		xkbprint.1
+
+.include <bsd.port.mk>
diff --git a/x11/xkbprint/distinfo b/x11/xkbprint/distinfo
new file mode 100644
index 000000000000..ce46307d7a44
--- /dev/null
+++ b/x11/xkbprint/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xkbprint-1.0.1.tar.bz2) = b98ae2d8b21c545b7b322d0b302efefa
+SHA256 (xorg/app/xkbprint-1.0.1.tar.bz2) = 008dffea5b213880cb3ebd40d0b9bf0cc10392fb0349831efdebf2a428dd2e17
+SIZE (xorg/app/xkbprint-1.0.1.tar.bz2) = 115206
diff --git a/x11/xkbprint/pkg-descr b/x11/xkbprint/pkg-descr
new file mode 100644
index 000000000000..ce84f5663f3d
--- /dev/null
+++ b/x11/xkbprint/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xkbprint, an utility for printing an XKB keyboard
+description.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index ffaa9c1f60e1..847b7a69b438 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xkbset
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.math.missouri.edu/~stephen/software/xkbset/
 
diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile
new file mode 100644
index 000000000000..6c81d07d8769
--- /dev/null
+++ b/x11/xkbutils/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xkbutils
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xkbutils
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XKB utility demos
+
+XORG_CAT=	app
+USE_XORG=	xkbfile x11 xaw
+
+.include <bsd.port.mk>
diff --git a/x11/xkbutils/distinfo b/x11/xkbutils/distinfo
new file mode 100644
index 000000000000..e044034538cb
--- /dev/null
+++ b/x11/xkbutils/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xkbutils-1.0.1.tar.bz2) = 84396a3dd75337caaae29d8fa5616fb1
+SHA256 (xorg/app/xkbutils-1.0.1.tar.bz2) = aaad73ed8db764978a18bc6ba774d38a4c1330c86622c0b47ae3ced09c175856
+SIZE (xorg/app/xkbutils-1.0.1.tar.bz2) = 65805
diff --git a/x11/xkbutils/pkg-descr b/x11/xkbutils/pkg-descr
new file mode 100644
index 000000000000..28b5236b5f9a
--- /dev/null
+++ b/x11/xkbutils/pkg-descr
@@ -0,0 +1 @@
+This package contains xkbutils, a collection of XKB utility demos.
diff --git a/x11/xkbutils/pkg-plist b/x11/xkbutils/pkg-plist
new file mode 100644
index 000000000000..d946aac18f93
--- /dev/null
+++ b/x11/xkbutils/pkg-plist
@@ -0,0 +1,3 @@
+bin/xkbvleds
+bin/xkbwatch
+bin/xkbbell
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
new file mode 100644
index 000000000000..cb6ad0d295f1
--- /dev/null
+++ b/x11/xkeyboard-config/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:	xkeyboard-config
+# Date Created:				Dec 20 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xkeyboard-config
+PORTVERSION=	0.9
+PORTREVISION=	2
+CATEGORIES=	x11
+MASTER_SITES=	http://xlibs.freedesktop.org/xkbdesc/
+DISTNAME=	xkeyboard-config-${PORTVERSION}
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X Keyboard Configuration Database
+
+BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+
+# XXX - sigh
+PREFIX=		${X11BASE}
+
+USE_BZIP2=	yes
+USE_ICONV=	yes
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+USE_PERL5_BUILD=yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--with-xkb-base=${PREFIX}/share/X11/xkb \
+			--with-xkb-rules-symlink=xorg
+
+post-install:
+	${MKDIR} /var/lib/xkb
+
+.include <bsd.port.mk>
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
new file mode 100644
index 000000000000..a350ba349705
--- /dev/null
+++ b/x11/xkeyboard-config/distinfo
@@ -0,0 +1,3 @@
+MD5 (xkeyboard-config-0.9.tar.bz2) = 52afe60101ace8532881e70f6c2dc020
+SHA256 (xkeyboard-config-0.9.tar.bz2) = bb84c40036c4eab0f88bf09951bf36c867d0196988636edfd6efa14d61be777d
+SIZE (xkeyboard-config-0.9.tar.bz2) = 471807
diff --git a/x11/xkeyboard-config/pkg-descr b/x11/xkeyboard-config/pkg-descr
new file mode 100644
index 000000000000..e1b900241aa0
--- /dev/null
+++ b/x11/xkeyboard-config/pkg-descr
@@ -0,0 +1,10 @@
+The non-arch keyboard configuration database for X Window.
+The goal is to provide the consistent, well-structured,
+frequently released open source of X keyboard configuration
+data for X Window System implementations (free, open source
+and commercial). The project is targetted to XKB-based systems.
+
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
new file mode 100644
index 000000000000..875d06fe90d5
--- /dev/null
+++ b/x11/xkeyboard-config/pkg-plist
@@ -0,0 +1,312 @@
+share/X11/xkb/compat.dir
+share/X11/xkb/compat/accessx
+share/X11/xkb/compat/basic
+share/X11/xkb/compat/complete
+share/X11/xkb/compat/default
+share/X11/xkb/compat/iso9995
+share/X11/xkb/compat/japan
+share/X11/xkb/compat/keypad
+share/X11/xkb/compat/ledcaps
+share/X11/xkb/compat/lednum
+share/X11/xkb/compat/ledscroll
+share/X11/xkb/compat/level5
+share/X11/xkb/compat/misc
+share/X11/xkb/compat/mousekeys
+share/X11/xkb/compat/norepeat
+share/X11/xkb/compat/pc
+share/X11/xkb/compat/pc98
+share/X11/xkb/compat/xfree86
+share/X11/xkb/compat/xtest
+share/X11/xkb/compat/README
+share/X11/xkb/compiled
+share/X11/xkb/geometry/digital_vndr/lk
+share/X11/xkb/geometry/digital_vndr/pc
+share/X11/xkb/geometry/digital_vndr/unix
+share/X11/xkb/geometry/sgi_vndr/indigo
+share/X11/xkb/geometry/sgi_vndr/indy
+share/X11/xkb/geometry/sgi_vndr/O2
+share/X11/xkb/geometry/amiga
+share/X11/xkb/geometry/ataritt
+share/X11/xkb/geometry/chicony
+share/X11/xkb/geometry/dell
+share/X11/xkb/geometry/everex
+share/X11/xkb/geometry/fujitsu
+share/X11/xkb/geometry/hp
+share/X11/xkb/geometry/keytronic
+share/X11/xkb/geometry/kinesis
+share/X11/xkb/geometry/macintosh
+share/X11/xkb/geometry/microsoft
+share/X11/xkb/geometry/nec
+share/X11/xkb/geometry/northgate
+share/X11/xkb/geometry/pc
+share/X11/xkb/geometry/sony
+share/X11/xkb/geometry/sun
+share/X11/xkb/geometry/thinkpad
+share/X11/xkb/geometry/winbook
+share/X11/xkb/geometry/README
+share/X11/xkb/geometry.dir
+share/X11/xkb/keycodes/digital_vndr/lk
+share/X11/xkb/keycodes/digital_vndr/pc
+share/X11/xkb/keycodes/sgi_vndr/indigo
+share/X11/xkb/keycodes/sgi_vndr/indy
+share/X11/xkb/keycodes/sgi_vndr/iris
+share/X11/xkb/keycodes/aliases
+share/X11/xkb/keycodes/amiga
+share/X11/xkb/keycodes/ataritt
+share/X11/xkb/keycodes/evdev
+share/X11/xkb/keycodes/fujitsu
+share/X11/xkb/keycodes/hp
+share/X11/xkb/keycodes/ibm
+share/X11/xkb/keycodes/macintosh
+share/X11/xkb/keycodes/powerpcps2
+share/X11/xkb/keycodes/sony
+share/X11/xkb/keycodes/sun
+share/X11/xkb/keycodes/xfree86
+share/X11/xkb/keycodes/xfree98
+share/X11/xkb/keycodes/README
+share/X11/xkb/keycodes.dir
+share/X11/xkb/keymap/digital_vndr/us
+share/X11/xkb/keymap/sgi_vndr/be
+share/X11/xkb/keymap/sgi_vndr/bg
+share/X11/xkb/keymap/sgi_vndr/ca
+share/X11/xkb/keymap/sgi_vndr/ch
+share/X11/xkb/keymap/sgi_vndr/cz
+share/X11/xkb/keymap/sgi_vndr/de
+share/X11/xkb/keymap/sgi_vndr/dk
+share/X11/xkb/keymap/sgi_vndr/dvorak
+share/X11/xkb/keymap/sgi_vndr/es
+share/X11/xkb/keymap/sgi_vndr/fi
+share/X11/xkb/keymap/sgi_vndr/fr
+share/X11/xkb/keymap/sgi_vndr/gb
+share/X11/xkb/keymap/sgi_vndr/hu
+share/X11/xkb/keymap/sgi_vndr/it
+share/X11/xkb/keymap/sgi_vndr/jp
+share/X11/xkb/keymap/sgi_vndr/no
+share/X11/xkb/keymap/sgi_vndr/pl
+share/X11/xkb/keymap/sgi_vndr/pt
+share/X11/xkb/keymap/sgi_vndr/ru
+share/X11/xkb/keymap/sgi_vndr/se
+share/X11/xkb/keymap/sgi_vndr/sk
+share/X11/xkb/keymap/sgi_vndr/th
+share/X11/xkb/keymap/sgi_vndr/us
+share/X11/xkb/keymap/sun_vndr/all
+share/X11/xkb/keymap/sun_vndr/de
+share/X11/xkb/keymap/sun_vndr/es
+share/X11/xkb/keymap/sun_vndr/fi
+share/X11/xkb/keymap/sun_vndr/fr
+share/X11/xkb/keymap/sun_vndr/no
+share/X11/xkb/keymap/sun_vndr/pl
+share/X11/xkb/keymap/sun_vndr/ru
+share/X11/xkb/keymap/sun_vndr/se
+share/X11/xkb/keymap/sun_vndr/uk
+share/X11/xkb/keymap/sun_vndr/us
+share/X11/xkb/keymap/amiga
+share/X11/xkb/keymap/ataritt
+share/X11/xkb/keymap/macintosh
+share/X11/xkb/keymap/sony
+share/X11/xkb/keymap/xfree86
+share/X11/xkb/keymap/xfree98
+share/X11/xkb/keymap/README
+share/X11/xkb/keymap.dir
+share/X11/xkb/rules/base
+share/X11/xkb/rules/base.lst
+share/X11/xkb/rules/base.xml
+share/X11/xkb/rules/sgi
+share/X11/xkb/rules/sun
+share/X11/xkb/rules/xfree98
+share/X11/xkb/rules/xkb.dtd
+share/X11/xkb/rules/xorg
+share/X11/xkb/rules/xorg.lst
+share/X11/xkb/rules/xorg.xml
+share/X11/xkb/rules/README
+share/X11/xkb/semantics.dir
+share/X11/xkb/semantics/basic
+share/X11/xkb/semantics/complete
+share/X11/xkb/semantics/default
+share/X11/xkb/semantics/xtest
+share/X11/xkb/symbols/digital_vndr/lk
+share/X11/xkb/symbols/digital_vndr/pc
+share/X11/xkb/symbols/digital_vndr/us
+share/X11/xkb/symbols/digital_vndr/vt
+share/X11/xkb/symbols/fujitsu_vndr/jp
+share/X11/xkb/symbols/fujitsu_vndr/us
+share/X11/xkb/symbols/hp_vndr/us
+share/X11/xkb/symbols/macintosh_vndr/apple
+share/X11/xkb/symbols/macintosh_vndr/ch
+share/X11/xkb/symbols/macintosh_vndr/de
+share/X11/xkb/symbols/macintosh_vndr/dk
+share/X11/xkb/symbols/macintosh_vndr/es
+share/X11/xkb/symbols/macintosh_vndr/fi
+share/X11/xkb/symbols/macintosh_vndr/fr
+share/X11/xkb/symbols/macintosh_vndr/gb
+share/X11/xkb/symbols/macintosh_vndr/is
+share/X11/xkb/symbols/macintosh_vndr/it
+share/X11/xkb/symbols/macintosh_vndr/nl
+share/X11/xkb/symbols/macintosh_vndr/no
+share/X11/xkb/symbols/macintosh_vndr/pt
+share/X11/xkb/symbols/macintosh_vndr/se
+share/X11/xkb/symbols/macintosh_vndr/us
+share/X11/xkb/symbols/nec_vndr/jp
+share/X11/xkb/symbols/sgi_vndr/jp
+share/X11/xkb/symbols/sony_vndr/us
+share/X11/xkb/symbols/sun_vndr/cs
+share/X11/xkb/symbols/sun_vndr/cz
+share/X11/xkb/symbols/sun_vndr/de
+share/X11/xkb/symbols/sun_vndr/dk
+share/X11/xkb/symbols/sun_vndr/es
+share/X11/xkb/symbols/sun_vndr/fi
+share/X11/xkb/symbols/sun_vndr/fr
+share/X11/xkb/symbols/sun_vndr/gb
+share/X11/xkb/symbols/sun_vndr/gr
+share/X11/xkb/symbols/sun_vndr/hu
+share/X11/xkb/symbols/sun_vndr/it
+share/X11/xkb/symbols/sun_vndr/jp
+share/X11/xkb/symbols/sun_vndr/ko
+share/X11/xkb/symbols/sun_vndr/lt
+share/X11/xkb/symbols/sun_vndr/lv
+share/X11/xkb/symbols/sun_vndr/nl
+share/X11/xkb/symbols/sun_vndr/no
+share/X11/xkb/symbols/sun_vndr/pl
+share/X11/xkb/symbols/sun_vndr/pt
+share/X11/xkb/symbols/sun_vndr/ru
+share/X11/xkb/symbols/sun_vndr/se
+share/X11/xkb/symbols/sun_vndr/solaris
+share/X11/xkb/symbols/sun_vndr/sw
+share/X11/xkb/symbols/sun_vndr/tr
+share/X11/xkb/symbols/sun_vndr/tuv
+share/X11/xkb/symbols/sun_vndr/tw
+share/X11/xkb/symbols/sun_vndr/us
+share/X11/xkb/symbols/sun_vndr/usb
+share/X11/xkb/symbols/xfree68_vndr/amiga
+share/X11/xkb/symbols/xfree68_vndr/ataritt
+share/X11/xkb/symbols/ad
+share/X11/xkb/symbols/af
+share/X11/xkb/symbols/al
+share/X11/xkb/symbols/am
+share/X11/xkb/symbols/ara
+share/X11/xkb/symbols/az
+share/X11/xkb/symbols/be
+share/X11/xkb/symbols/bd
+share/X11/xkb/symbols/bg
+share/X11/xkb/symbols/br
+share/X11/xkb/symbols/ba
+share/X11/xkb/symbols/bt
+share/X11/xkb/symbols/by
+share/X11/xkb/symbols/ca
+share/X11/xkb/symbols/cd
+share/X11/xkb/symbols/ch
+share/X11/xkb/symbols/cs
+share/X11/xkb/symbols/cz
+share/X11/xkb/symbols/de
+share/X11/xkb/symbols/dk
+share/X11/xkb/symbols/ee
+share/X11/xkb/symbols/epo
+share/X11/xkb/symbols/es
+share/X11/xkb/symbols/fi
+share/X11/xkb/symbols/fo
+share/X11/xkb/symbols/fr
+share/X11/xkb/symbols/gb
+share/X11/xkb/symbols/ge
+share/X11/xkb/symbols/gh
+share/X11/xkb/symbols/gr
+share/X11/xkb/symbols/hr
+share/X11/xkb/symbols/hu
+share/X11/xkb/symbols/ie
+share/X11/xkb/symbols/il
+share/X11/xkb/symbols/in
+share/X11/xkb/symbols/iq
+share/X11/xkb/symbols/ir
+share/X11/xkb/symbols/is
+share/X11/xkb/symbols/it
+share/X11/xkb/symbols/jp
+share/X11/xkb/symbols/kg
+share/X11/xkb/symbols/kh
+share/X11/xkb/symbols/kr
+share/X11/xkb/symbols/kz
+share/X11/xkb/symbols/la
+share/X11/xkb/symbols/latam
+share/X11/xkb/symbols/latin
+share/X11/xkb/symbols/lk
+share/X11/xkb/symbols/lt
+share/X11/xkb/symbols/lv
+share/X11/xkb/symbols/mao
+share/X11/xkb/symbols/mk
+share/X11/xkb/symbols/mm
+share/X11/xkb/symbols/mn
+share/X11/xkb/symbols/mt
+share/X11/xkb/symbols/mv
+share/X11/xkb/symbols/nbsp
+share/X11/xkb/symbols/ng
+share/X11/xkb/symbols/nl
+share/X11/xkb/symbols/no
+share/X11/xkb/symbols/np
+share/X11/xkb/symbols/pc
+share/X11/xkb/symbols/pk
+share/X11/xkb/symbols/pl
+share/X11/xkb/symbols/pt
+share/X11/xkb/symbols/ro
+share/X11/xkb/symbols/ru
+share/X11/xkb/symbols/se
+share/X11/xkb/symbols/si
+share/X11/xkb/symbols/sk
+share/X11/xkb/symbols/sy
+share/X11/xkb/symbols/th
+share/X11/xkb/symbols/tj
+share/X11/xkb/symbols/tr
+share/X11/xkb/symbols/ua
+share/X11/xkb/symbols/us
+share/X11/xkb/symbols/uz
+share/X11/xkb/symbols/vn
+share/X11/xkb/symbols/za
+share/X11/xkb/symbols/altwin
+share/X11/xkb/symbols/capslock
+share/X11/xkb/symbols/compose
+share/X11/xkb/symbols/ctrl
+share/X11/xkb/symbols/group
+share/X11/xkb/symbols/inet
+share/X11/xkb/symbols/keypad
+share/X11/xkb/symbols/level3
+share/X11/xkb/symbols/level5
+share/X11/xkb/symbols/srvr_ctrl
+share/X11/xkb/symbols/eurosign
+share/X11/xkb/symbols.dir
+share/X11/xkb/types.dir
+share/X11/xkb/types/basic
+share/X11/xkb/types/cancel
+share/X11/xkb/types/caps
+share/X11/xkb/types/complete
+share/X11/xkb/types/default
+share/X11/xkb/types/extra
+share/X11/xkb/types/iso9995
+share/X11/xkb/types/level5
+share/X11/xkb/types/mousekeys
+share/X11/xkb/types/numpad
+share/X11/xkb/types/pc
+share/X11/xkb/types/README
+@exec mkdir -p /var/lib/xkb
+@dirrm share/X11/xkb/compat
+@dirrm share/X11/xkb/geometry/digital_vndr
+@dirrm share/X11/xkb/geometry/sgi_vndr
+@dirrm share/X11/xkb/geometry
+@dirrm share/X11/xkb/keycodes/digital_vndr
+@dirrm share/X11/xkb/keycodes/sgi_vndr
+@dirrm share/X11/xkb/keycodes
+@dirrm share/X11/xkb/keymap/digital_vndr
+@dirrm share/X11/xkb/keymap/sgi_vndr
+@dirrm share/X11/xkb/keymap/sun_vndr
+@dirrm share/X11/xkb/keymap
+@dirrm share/X11/xkb/rules
+@dirrm share/X11/xkb/semantics
+@dirrm share/X11/xkb/symbols/digital_vndr
+@dirrm share/X11/xkb/symbols/fujitsu_vndr
+@dirrm share/X11/xkb/symbols/hp_vndr
+@dirrm share/X11/xkb/symbols/macintosh_vndr
+@dirrm share/X11/xkb/symbols/nec_vndr
+@dirrm share/X11/xkb/symbols/sgi_vndr
+@dirrm share/X11/xkb/symbols/sony_vndr
+@dirrm share/X11/xkb/symbols/sun_vndr
+@dirrm share/X11/xkb/symbols/xfree68_vndr
+@dirrm share/X11/xkb/symbols
+@dirrm share/X11/xkb/types
+@dirrm share/X11/xkb
+@dirrmtry /var/lib/xkb
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index 7275cd2d7005..7e1a89e736f6 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xkeycaps
 PORTVERSION=	2.46
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xkeycaps/
 EXTRACT_SUFX=	.tar.Z
@@ -16,6 +16,7 @@ MAINTAINER=	jmz@FreeBSD.org
 COMMENT=	Graphically display and edit the keyboard mapping
 
 USE_IMAKE=	yes
+USE_XORG=	xbitmaps
 MAN1=		xkeycaps.1
 PLIST_FILES=	bin/xkeycaps
 
diff --git a/x11/xkeywrap/Makefile b/x11/xkeywrap/Makefile
index f320d10b3c13..ca088c06985c 100644
--- a/x11/xkeywrap/Makefile
+++ b/x11/xkeywrap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xkeywrap
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA014157/myfreesoft/
 
diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile
new file mode 100644
index 000000000000..2abf419eb3d9
--- /dev/null
+++ b/x11/xkill/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xkill
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xkill
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Utility for killing a client by its X resource
+
+XORG_CAT=	app
+USE_XORG=	x11 xmuu
+
+PLIST_FILES=	bin/xkill
+
+MAN1=		xkill.1
+
+.include <bsd.port.mk>
diff --git a/x11/xkill/distinfo b/x11/xkill/distinfo
new file mode 100644
index 000000000000..31c0d15973af
--- /dev/null
+++ b/x11/xkill/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xkill-1.0.1.tar.bz2) = f66d76abb0f75514ca32272e23cca757
+SHA256 (xorg/app/xkill-1.0.1.tar.bz2) = 77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de
+SIZE (xorg/app/xkill-1.0.1.tar.bz2) = 77172
diff --git a/x11/xkill/pkg-descr b/x11/xkill/pkg-descr
new file mode 100644
index 000000000000..38143a4052c7
--- /dev/null
+++ b/x11/xkill/pkg-descr
@@ -0,0 +1,5 @@
+This package contians xkill, which is a utility for forcing the X server
+to close connections to clients.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xload/Makefile b/x11/xload/Makefile
new file mode 100644
index 000000000000..f376cf09c397
--- /dev/null
+++ b/x11/xload/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xload
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xload
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	System load average display for X
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		xload.1
+
+.include <bsd.port.mk>
diff --git a/x11/xload/distinfo b/x11/xload/distinfo
new file mode 100644
index 000000000000..0d0380a2025c
--- /dev/null
+++ b/x11/xload/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xload-1.0.1.tar.bz2) = ba013813f9c21eb015559466f8d02a44
+SHA256 (xorg/app/xload-1.0.1.tar.bz2) = 8d51184d6b18eea2f64e0c5b88cd95edff8353ce6529e780f95b1f2347babbf2
+SIZE (xorg/app/xload-1.0.1.tar.bz2) = 87468
diff --git a/x11/xload/pkg-descr b/x11/xload/pkg-descr
new file mode 100644
index 000000000000..800b8523dcf0
--- /dev/null
+++ b/x11/xload/pkg-descr
@@ -0,0 +1,5 @@
+This pckage contains xload, the X Window System system load average
+display application.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xload/pkg-plist b/x11/xload/pkg-plist
new file mode 100644
index 000000000000..7aa1f18cb26a
--- /dev/null
+++ b/x11/xload/pkg-plist
@@ -0,0 +1,3 @@
+bin/xload
+share/X11/app-defaults/XLoad
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 502c5b982dca..5a58229e6814 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -7,7 +7,7 @@
 
 VERSION=	4.1
 REVISION=	16
-PORTREVISION=	0
+PORTREVISION=	1
 
 PORTNAME=	xloadimage
 PORTVERSION=	${VERSION}.${REVISION}
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 4ab2ffce6945..05e72a0fe887 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xlockmore
 PORTVERSION=	5.23
+PORTREVISION=	1
 CATEGORIES?=	x11
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
 		http://www.tux.org/~bagleyd/latest/
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
new file mode 100644
index 000000000000..c599b449df1a
--- /dev/null
+++ b/x11/xlogo/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xlogo
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xlogo
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Displays the X Window System logo.
+
+XORG_CAT=	app
+USE_XORG=	xrender xft xext xt xaw xp xprintutil
+
+MAN1=		xlogo.1
+
+.include <bsd.port.mk>
diff --git a/x11/xlogo/distinfo b/x11/xlogo/distinfo
new file mode 100644
index 000000000000..a1d249922a91
--- /dev/null
+++ b/x11/xlogo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xlogo-1.0.1.tar.bz2) = 4c5482552f38a7d42398a694cc9b2ee6
+SHA256 (xorg/app/xlogo-1.0.1.tar.bz2) = de59f9be3d45fe93f445f39bec3cea09753a671e56863ce77e3a797d2df526b2
+SIZE (xorg/app/xlogo-1.0.1.tar.bz2) = 87107
diff --git a/x11/xlogo/pkg-descr b/x11/xlogo/pkg-descr
new file mode 100644
index 000000000000..c93a929dc517
--- /dev/null
+++ b/x11/xlogo/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xlogo, which displays the X Window System logo.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xlogo/pkg-plist b/x11/xlogo/pkg-plist
new file mode 100644
index 000000000000..22312613f56e
--- /dev/null
+++ b/x11/xlogo/pkg-plist
@@ -0,0 +1,4 @@
+bin/xlogo
+share/X11/app-defaults/XLogo
+share/X11/app-defaults/XLogo-color
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xlogout/Makefile b/x11/xlogout/Makefile
index 7e15f10644c4..e32b2837ef93 100644
--- a/x11/xlogout/Makefile
+++ b/x11/xlogout/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xlogout
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tu-darmstadt.de/pub/X11/other/
 EXTRACT_SUFX=	.tar.Z
diff --git a/x11/xlsatoms/Makefile b/x11/xlsatoms/Makefile
new file mode 100644
index 000000000000..1ba6c2505936
--- /dev/null
+++ b/x11/xlsatoms/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xlsatoms
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xlsatoms
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	List interned atoms defined on a server
+
+XORG_CAT=	app
+USE_XORG=	x11 xmuu
+
+PLIST_FILES=	bin/xlsatoms
+
+MAN1=		xlsatoms.1
+
+.include <bsd.port.mk>
diff --git a/x11/xlsatoms/distinfo b/x11/xlsatoms/distinfo
new file mode 100644
index 000000000000..34c95c27736d
--- /dev/null
+++ b/x11/xlsatoms/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xlsatoms-1.0.1.tar.bz2) = 69adcda848479acc3b82b3928812d191
+SHA256 (xorg/app/xlsatoms-1.0.1.tar.bz2) = 456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a
+SIZE (xorg/app/xlsatoms-1.0.1.tar.bz2) = 74852
diff --git a/x11/xlsatoms/pkg-descr b/x11/xlsatoms/pkg-descr
new file mode 100644
index 000000000000..7f7540df4f4d
--- /dev/null
+++ b/x11/xlsatoms/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xlsatoms, an application for listing interned
+atoms defined on server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile
new file mode 100644
index 000000000000..4d87441eaf3c
--- /dev/null
+++ b/x11/xlsclients/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xlsclients
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xlsclients
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	List client applications running on a display
+
+XORG_CAT=	app
+USE_XORG=	x11 xmuu
+
+PLIST_FILES=	bin/xlsclients
+
+MAN1=		xlsclients.1
+
+.include <bsd.port.mk>
diff --git a/x11/xlsclients/distinfo b/x11/xlsclients/distinfo
new file mode 100644
index 000000000000..baa6753a1493
--- /dev/null
+++ b/x11/xlsclients/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xlsclients-1.0.1.tar.bz2) = 44473b880d26bfbe8b3d4d72b183cba7
+SHA256 (xorg/app/xlsclients-1.0.1.tar.bz2) = 988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698
+SIZE (xorg/app/xlsclients-1.0.1.tar.bz2) = 75484
diff --git a/x11/xlsclients/pkg-descr b/x11/xlsclients/pkg-descr
new file mode 100644
index 000000000000..ea77ec583455
--- /dev/null
+++ b/x11/xlsclients/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xlsclients, which is a utility for listing information
+about the client applications running on a display.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index 63031a65f474..26fd0d89e7ca 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xlupe
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11 accessibility
 MASTER_SITES=	http://www.core.de/~coto/projects/xlupe/
 
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
new file mode 100644
index 000000000000..b5edabcbd966
--- /dev/null
+++ b/x11/xmag/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xmag
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xmag
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X application for screen magnifying
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		xmag.1
+
+.include <bsd.port.mk>
diff --git a/x11/xmag/distinfo b/x11/xmag/distinfo
new file mode 100644
index 000000000000..d1457369ab63
--- /dev/null
+++ b/x11/xmag/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xmag-1.0.1.tar.bz2) = 058d168d1c7c991b8d12158433ea5f63
+SHA256 (xorg/app/xmag-1.0.1.tar.bz2) = 1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02
+SIZE (xorg/app/xmag-1.0.1.tar.bz2) = 93719
diff --git a/x11/xmag/pkg-descr b/x11/xmag/pkg-descr
new file mode 100644
index 000000000000..585549a3d1b2
--- /dev/null
+++ b/x11/xmag/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xmag, a screen magnifying application for the
+X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xmag/pkg-plist b/x11/xmag/pkg-plist
new file mode 100644
index 000000000000..77c5b31d9246
--- /dev/null
+++ b/x11/xmag/pkg-plist
@@ -0,0 +1,3 @@
+bin/xmag
+share/X11/app-defaults/Xmag
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xman/Makefile b/x11/xman/Makefile
new file mode 100644
index 000000000000..4b31fda28156
--- /dev/null
+++ b/x11/xman/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xman
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xman
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Manual page display program for X
+
+XORG_CAT=	app
+USE_XORG=	xt xaw xp xprintutil
+
+MAN1=		xman.1
+
+.include <bsd.port.mk>
diff --git a/x11/xman/distinfo b/x11/xman/distinfo
new file mode 100644
index 000000000000..150dd47e8a83
--- /dev/null
+++ b/x11/xman/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xman-1.0.2.tar.bz2) = 855f2dbfa2aff58b8b9cd6a1c1120fad
+SHA256 (xorg/app/xman-1.0.2.tar.bz2) = 00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2
+SIZE (xorg/app/xman-1.0.2.tar.bz2) = 138214
diff --git a/x11/xman/pkg-descr b/x11/xman/pkg-descr
new file mode 100644
index 000000000000..ca408e1c319e
--- /dev/null
+++ b/x11/xman/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xman, a manual page display program for the X
+Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xman/pkg-plist b/x11/xman/pkg-plist
new file mode 100644
index 000000000000..9d163bb9b93f
--- /dev/null
+++ b/x11/xman/pkg-plist
@@ -0,0 +1,4 @@
+bin/xman
+share/X11/app-defaults/Xman
+share/X11/xman.help
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile
index 2a0f87f66047..4e9e985c855d 100644
--- a/x11/xmangekyou/Makefile
+++ b/x11/xmangekyou/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmangekyou
 PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA014157/myfreesoft/ \
 		ftp://ftp.vector.co.jp/pack/unix/art/anime/
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index 371c927e1a4b..337248b0fd2d 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmascot
 PORTVERSION=	2.6a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://cclub-flying.dsl.gr.jp/products/xmascot/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile
new file mode 100644
index 000000000000..050a3ab2cfd0
--- /dev/null
+++ b/x11/xmessage/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xmessage
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xmessage
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Display message or query in a X window
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		xmessage.1
+
+.include <bsd.port.mk>
diff --git a/x11/xmessage/distinfo b/x11/xmessage/distinfo
new file mode 100644
index 000000000000..022e7a0291ce
--- /dev/null
+++ b/x11/xmessage/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xmessage-1.0.1.tar.bz2) = b3674c3a00a089764d86aa94e257ccec
+SHA256 (xorg/app/xmessage-1.0.1.tar.bz2) = b921aef62c2a2f5c32048502cd96630e9d42493cd39d1841fde247274f24bbda
+SIZE (xorg/app/xmessage-1.0.1.tar.bz2) = 83465
diff --git a/x11/xmessage/pkg-descr b/x11/xmessage/pkg-descr
new file mode 100644
index 000000000000..965f1f9264a3
--- /dev/null
+++ b/x11/xmessage/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xmessage, an application for displaying messages
+or queries in a X window.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xmessage/pkg-plist b/x11/xmessage/pkg-plist
new file mode 100644
index 000000000000..da5f545d8ae9
--- /dev/null
+++ b/x11/xmessage/pkg-plist
@@ -0,0 +1,4 @@
+bin/xmessage
+share/X11/app-defaults/Xmessage
+share/X11/app-defaults/Xmessage-color
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile
new file mode 100644
index 000000000000..bb368e9ba004
--- /dev/null
+++ b/x11/xmh/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xmh
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xmh
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Send and read mail with an X interface to MH
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		xmh.1
+
+.include <bsd.port.mk>
diff --git a/x11/xmh/distinfo b/x11/xmh/distinfo
new file mode 100644
index 000000000000..b69bd773657a
--- /dev/null
+++ b/x11/xmh/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xmh-1.0.1.tar.bz2) = 656bcbdd41818a8b5a9f7dba77a3eeba
+SHA256 (xorg/app/xmh-1.0.1.tar.bz2) = 9471fb455ce0bfc582b865722ab7417c587c9fea82342181e9cd0a9629c2c6fa
+SIZE (xorg/app/xmh-1.0.1.tar.bz2) = 153114
diff --git a/x11/xmh/pkg-descr b/x11/xmh/pkg-descr
new file mode 100644
index 000000000000..a7c2f0ee184c
--- /dev/null
+++ b/x11/xmh/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xmh, a graphical user interface to the MH Message
+Handling System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xmh/pkg-plist b/x11/xmh/pkg-plist
new file mode 100644
index 000000000000..a73c42462001
--- /dev/null
+++ b/x11/xmh/pkg-plist
@@ -0,0 +1,6 @@
+bin/xmh
+include/X11/bitmaps/black6
+include/X11/bitmaps/box6
+share/X11/app-defaults/Xmh
+@dirrmtry share/X11/app-defaults
+@dirrmtry include/X11/bitmaps
diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile
new file mode 100644
index 000000000000..4674c0dff9bb
--- /dev/null
+++ b/x11/xmodmap/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xmodmap
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xmodmap
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Utility for modifying keymaps and pointer button mappings in X
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+PLIST_FILES=	bin/xmodmap
+
+MAN1=		xmodmap.1
+
+.include <bsd.port.mk>
diff --git a/x11/xmodmap/distinfo b/x11/xmodmap/distinfo
new file mode 100644
index 000000000000..d199a6bd64b5
--- /dev/null
+++ b/x11/xmodmap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xmodmap-1.0.2.tar.bz2) = ea78b3e32e27c3662f86ea68b3aec22f
+SHA256 (xorg/app/xmodmap-1.0.2.tar.bz2) = 4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44
+SIZE (xorg/app/xmodmap-1.0.2.tar.bz2) = 94755
diff --git a/x11/xmodmap/pkg-descr b/x11/xmodmap/pkg-descr
new file mode 100644
index 000000000000..45ddab88b0bd
--- /dev/null
+++ b/x11/xmodmap/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xmodmap, which is a program for editing and displaying
+the keyboard modifier map and keymap table in X.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xmold/Makefile b/x11/xmold/Makefile
index f1fbde176607..92f3f5cdd7d0 100644
--- a/x11/xmold/Makefile
+++ b/x11/xmold/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmold
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://cclub.cc.tut.ac.jp/pub/xwin/
 DISTNAME=	${PORTNAME}
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index 7db6c35c4768..67a16d10cf41 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmon
 PORTVERSION=	1.5.6
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	devel_tools
diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile
new file mode 100644
index 000000000000..9bd0d42e3336
--- /dev/null
+++ b/x11/xmore/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xmore
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xmore
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Plain text display program for X
+
+XORG_CAT=	app
+USE_XORG=	xt xaw xp xprintutil
+
+MAN1=		xmore.1
+
+.include <bsd.port.mk>
diff --git a/x11/xmore/distinfo b/x11/xmore/distinfo
new file mode 100644
index 000000000000..eedec05a47fb
--- /dev/null
+++ b/x11/xmore/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xmore-1.0.1.tar.bz2) = d36e918dce779a9d207b7a266f4e87c8
+SHA256 (xorg/app/xmore-1.0.1.tar.bz2) = 653566be73c474bc45f1a6631e14b008445c74557a8f6f46effee1ac3e8f2527
+SIZE (xorg/app/xmore-1.0.1.tar.bz2) = 92060
diff --git a/x11/xmore/pkg-descr b/x11/xmore/pkg-descr
new file mode 100644
index 000000000000..6c19ace2cbb3
--- /dev/null
+++ b/x11/xmore/pkg-descr
@@ -0,0 +1,5 @@
+This package contains the xmore plain text display program for the X Window
+System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xmore/pkg-plist b/x11/xmore/pkg-plist
new file mode 100644
index 000000000000..c8f4c3abbcd3
--- /dev/null
+++ b/x11/xmore/pkg-plist
@@ -0,0 +1,3 @@
+bin/xmore
+share/X11/app-defaults/XMore
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile
index d1985db59952..8e19697416bb 100644
--- a/x11/xmotd/Makefile
+++ b/x11/xmotd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmotd
 DISTVERSION=	1.17.3b
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ee.ryerson.ca/~elf/pub/
 
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 611a47551a0d..ba90479f4bc4 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmove
 PORTVERSION=	2.0b2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cs.columbia.edu/pub/xmove/
 DISTNAME=	${PORTNAME}.${PORTVERSION:S/b/beta/}
diff --git a/x11/xmsg/Makefile b/x11/xmsg/Makefile
index aba395376498..3fb6a4425fc0 100644
--- a/x11/xmsg/Makefile
+++ b/x11/xmsg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmsg
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.generalconcepts.com/resources/software/
 
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile
index 44dfe4e55e48..2e027bd6b20d 100644
--- a/x11/xmx/Makefile
+++ b/x11/xmx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmx
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cs.brown.edu/pub/xmx/
 EXTRACT_SUFX=	.tar.Z
diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index 1d252d1bb96a..bb939ee834e0 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xnee
 PORTVERSION=	2.05
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile
index 5599cec47c7a..2c66402de325 100644
--- a/x11/xnodecor/Makefile
+++ b/x11/xnodecor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xnodecor
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.42.org/pub/wmx/contrib/
 DISTFILES=	xnodecor.c
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
new file mode 100644
index 000000000000..1df59bb8865f
--- /dev/null
+++ b/x11/xorg-apps/Makefile
@@ -0,0 +1,118 @@
+# New ports collection makefile for:    xorg-apps
+# Date created:				Jun 22 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xorg-apps
+PORTVERSION=	7.2
+CATEGORIES=	x11
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.org apps meta-port
+
+PREFIX?=	${X11BASE}
+
+RUN_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
+		appres:${PORTSDIR}/x11/appres \
+		beforelight:${PORTSDIR}/x11/beforelight \
+		bitmap:${PORTSDIR}/x11/bitmap \
+		editres:${PORTSDIR}/x11/editres \
+		fonttosfnt:${PORTSDIR}/x11-fonts/fonttosfnt \
+		fslsfonts:${PORTSDIR}/x11-fonts/fslsfonts \
+		fstobdf:${PORTSDIR}/x11/fstobdf \
+		iceauth:${PORTSDIR}/x11/iceauth \
+		ico:${PORTSDIR}/x11/ico \
+		listres:${PORTSDIR}/x11/listres \
+		luit:${PORTSDIR}/x11/luit \
+		${PREFIX}/sbin/mkcomposecache:${PORTSDIR}/x11/mkcomposecache \
+		oclock:${PORTSDIR}/x11/oclock \
+		showrgb:${PORTSDIR}/x11/rgb \
+		rstart:${PORTSDIR}/x11/rstart \
+		xon:${PORTSDIR}/x11/scripts \
+		sessreg:${PORTSDIR}/x11/sessreg \
+		setxkbmap:${PORTSDIR}/x11/setxkbmap \
+		showfont:${PORTSDIR}/x11-fonts/showfont \
+		smproxy:${PORTSDIR}/x11/smproxy \
+		twm:${PORTSDIR}/x11-wm/twm \
+		viewres:${PORTSDIR}/x11/viewres \
+		x11perf:${PORTSDIR}/x11/x11perf \
+		xauth:${PORTSDIR}/x11/xauth \
+		xbiff:${PORTSDIR}/x11/xbiff \
+		xcalc:${PORTSDIR}/x11/xcalc \
+		xclipboard:${PORTSDIR}/x11/xclipboard \
+		xclock:${PORTSDIR}/x11/xclock \
+		xcmsdb:${PORTSDIR}/x11/xcmsdb \
+		xconsole:${PORTSDIR}/x11/xconsole \
+		xcursorgen:${PORTSDIR}/x11/xcursorgen \
+		xdbedizzy:${PORTSDIR}/x11/xdbedizzy \
+		xditview:${PORTSDIR}/x11/xditview \
+		xdm:${PORTSDIR}/x11/xdm \
+		xdpyinfo:${PORTSDIR}/x11/xdpyinfo \
+		xdriinfo:${PORTSDIR}/x11/xdriinfo \
+		xedit:${PORTSDIR}/x11/xedit \
+		xev:${PORTSDIR}/x11/xev \
+		xeyes:${PORTSDIR}/x11/xeyes \
+		dga:${PORTSDIR}/x11/xf86dga \
+		xfd:${PORTSDIR}/x11/xfd \
+		xfindproxy:${PORTSDIR}/x11/xfindproxy \
+		xfontsel:${PORTSDIR}/x11-fonts/xfontsel \
+		xfs:${PORTSDIR}/x11-fonts/xfs \
+		xfsinfo:${PORTSDIR}/x11-fonts/xfsinfo \
+		xfwp:${PORTSDIR}/x11/xfwp \
+		xgamma:${PORTSDIR}/x11/xgamma \
+		xgc:${PORTSDIR}/x11/xgc \
+		xhost:${PORTSDIR}/x11/xhost \
+		xinit:${PORTSDIR}/x11/xinit \
+		xkbcomp:${PORTSDIR}/x11/xkbcomp \
+		xkbevd:${PORTSDIR}/x11/xkbevd \
+		xkbprint:${PORTSDIR}/x11/xkbprint \
+		xkbvleds:${PORTSDIR}/x11/xkbutils \
+		xkill:${PORTSDIR}/x11/xkill \
+		xload:${PORTSDIR}/x11/xload \
+		xlogo:${PORTSDIR}/x11/xlogo \
+		xlsatoms:${PORTSDIR}/x11/xlsatoms \
+		xlsclients:${PORTSDIR}/x11/xlsclients \
+		xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts \
+		xmag:${PORTSDIR}/x11/xmag \
+		xman:${PORTSDIR}/x11/xman \
+		xmessage:${PORTSDIR}/x11/xmessage \
+		xmh:${PORTSDIR}/x11/xmh \
+		xmodmap:${PORTSDIR}/x11/xmodmap \
+		xmore:${PORTSDIR}/x11/xmore \
+		xphelloworld:${PORTSDIR}/x11/xphelloworld \
+		xplsprinters:${PORTSDIR}/x11/xplsprinters \
+		xpr:${PORTSDIR}/x11/xpr \
+		xprehashprinterlist:${PORTSDIR}/x11/xprehashprinterlist \
+		xprop:${PORTSDIR}/x11/xprop \
+		xrandr:${PORTSDIR}/x11/xrandr \
+		xrdb:${PORTSDIR}/x11/xrdb \
+		xrefresh:${PORTSDIR}/x11/xrefresh \
+		xrx:${PORTSDIR}/x11/xrx \
+		xset:${PORTSDIR}/x11/xset \
+		xsetmode:${PORTSDIR}/x11/xsetmode \
+		xsetpointer:${PORTSDIR}/x11/xsetpointer \
+		xsetroot:${PORTSDIR}/x11/xsetroot \
+		xsm:${PORTSDIR}/x11/xsm \
+		xstdcmap:${PORTSDIR}/x11/xstdcmap \
+		xtrapchar:${PORTSDIR}/x11/xtrap \
+		xvidtune:${PORTSDIR}/x11/xvidtune \
+		xvinfo:${PORTSDIR}/x11/xvinfo \
+		xwd:${PORTSDIR}/x11/xwd \
+		xwininfo:${PORTSDIR}/x11/xwininfo \
+		xwud:${PORTSDIR}/x11/xwud \
+		xterm:${PORTSDIR}/x11/xterm
+
+NO_BUILD=	yes
+
+do-install:
+		${MKDIR} ${PREFIX}/libdata/xorg
+		${TOUCH} ${PREFIX}/libdata/xorg/apps
+
+.include <bsd.port.mk>
diff --git a/x11/xorg-apps/pkg-descr b/x11/xorg-apps/pkg-descr
new file mode 100644
index 000000000000..bbe7fcfb5556
--- /dev/null
+++ b/x11/xorg-apps/pkg-descr
@@ -0,0 +1,6 @@
+This meta-package installs all X.Org applications.
+
+WWW: http://www.x.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11/xorg-apps/pkg-plist b/x11/xorg-apps/pkg-plist
new file mode 100644
index 000000000000..459b6c97f220
--- /dev/null
+++ b/x11/xorg-apps/pkg-plist
@@ -0,0 +1,2 @@
+libdata/xorg/apps
+@dirrmtry libdata/xorg
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
new file mode 100644
index 000000000000..cd59bc22f74e
--- /dev/null
+++ b/x11/xorg-cf-files/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xorg-cf-files
+# Date created:				Nov 18 2006
+# Whom:					Dave Grochowski
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xorg-cf-files
+PORTVERSION=	1.0.2
+PORTREVISION=	2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.org cf files for use with imake builds
+
+XORG_CAT=	util
+
+.include <bsd.port.mk>
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
new file mode 100644
index 000000000000..06ed7fc59d3d
--- /dev/null
+++ b/x11/xorg-cf-files/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = 5f62dd5545b782c74f6e4e70d0e6552c
+SHA256 (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = e34613aec2d3d56e1917bd8469f228b9654558f41e335d7e8e49020779fa9597
+SIZE (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = 264638
diff --git a/x11/xorg-cf-files/files/patch-FreeBSD.cf b/x11/xorg-cf-files/files/patch-FreeBSD.cf
new file mode 100644
index 000000000000..524dee86e0ae
--- /dev/null
+++ b/x11/xorg-cf-files/files/patch-FreeBSD.cf
@@ -0,0 +1,64 @@
+--- FreeBSD.cf.orig	Sat Aug 14 17:03:36 2004
++++ FreeBSD.cf	Fri Sep 10 19:52:31 2004
+@@ -78,6 +78,7 @@
+ #define HasIssetugid		YES
+ #define HasPoll			YES
+ #endif
++#define BuildHtmlManPages	NO
+ 
+ #if OSMajorVersion >= 4
+ #define HasGetIfAddrs		YES
+@@ -117,14 +118,8 @@
+ # if (OSRelVersion < 500043)
+ #  define NeedUIThrStubs	YES
+ # endif
+-# if (OSRelVersion >= 502102)
+-#  define ThreadsLibraries	-lpthread
+-# elif (OSRelVersion >= 500016)
+-#  define ThreadsLibraries	-lc_r
+-# else
+-#  define ThreadsLibraries	-pthread
+-# endif
+-# define SystemMTDefines	-D_THREAD_SAFE
++# define ThreadsLibraries	-lpthread
++# define SystemMTDefines	
+ #endif
+ 
+ /* This fixes linking C programs against libGLU on FreeBSD 3.x */
+@@ -338,7 +333,7 @@
+ #ifndef LibraryRpathLoadFlags
+ # if UseRpath
+ #  if UseElfFormat
+-#   define LibraryRpathLoadFlags	-rpath $(USRLIBDIRPATH)
++#   define LibraryRpathLoadFlags	-Wl,-rpath $(USRLIBDIRPATH)
+ #  else
+ #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
+ #  endif
+@@ -466,14 +461,14 @@
+ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
+ #ifndef DefaultGcc2i386Opt
+ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
++#define DefaultGcc2i386Opt
+ #endif
+ #endif
+ 
+ #ifdef i386Architecture
+ # define OptimizedCDebugFlags DefaultGcc2i386Opt
+ #else
+-# define OptimizedCDebugFlags -O
++# define OptimizedCDebugFlags
+ #endif
+ 
+ #ifndef PreIncDir
+@@ -493,6 +493,10 @@
+ #define SystemManDirectory	/usr/share/man
+ #endif
+ 
++#ifndef UseConfDirForAppDefaults
++#define UseConfDirForAppDefaults	NO
++#endif
++
+ #define InstKmemFlags	-g kmem -m 2755
+ 
+ /*
diff --git a/x11/xorg-cf-files/files/patch-Imake.rules b/x11/xorg-cf-files/files/patch-Imake.rules
new file mode 100644
index 000000000000..6542cdc94180
--- /dev/null
+++ b/x11/xorg-cf-files/files/patch-Imake.rules
@@ -0,0 +1,29 @@
+--- Imake.rules.orig	Tue Dec 18 05:00:37 2001
++++ Imake.rules	Mon Jan 21 02:34:48 2002
+@@ -1399,7 +1399,7 @@
+ dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency		@@\
+ 	RemoveFiles(dest.suffix.html dest.suffix-html)			@@\
+ 	RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \		@@\
+-	  > dest.suffix-html) && $(MV) dest.suffix-html $@		@@\
++	  > dest.suffix-html) && $(MV) dest.suffix-html dest.suffix.html	@@\
+ 									@@\
+ install.man:: dest.suffix.html						@@\
+ 	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
+@@ -1644,7 +1644,7 @@
+ 	MakeDir(Concat($(DESTDIR),npath/mdir))				@@\
+ 	@MakeFlagsToShellFlags(i,set +e); \				@@\
+ 	if [ -d Concat($(DESTDIR),opath/cdir) ]; then \			@@\
+-	  RELPATH=`echo opath/cdir | \					@@\
++	  RELPATH=`cd opath/cdir; pwd | \				@@\
+ 		sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\
+ 	  cd Concat($(DESTDIR),opath/cdir); \				@@\
+ 	  if [ -d rdir -a ! -h rdir ]; then \ 				@@\
+@@ -1691,7 +1691,7 @@
+ 	MakeDir(Concat($(DESTDIR),npath))				@@\
+ 	@MakeFlagsToShellFlags(i,set +e); \				@@\
+ 	if [ -d Concat($(DESTDIR),opath) ]; then \			@@\
+-	  RELPATH=`echo opath | \					@@\
++	  RELPATH=`cd opath; pwd | \					@@\
+ 		sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \		@@\
+ 	  cd Concat($(DESTDIR),opath); \				@@\
+ 	  if [ -f lfile -a ! -h lfile ]; then \ 			@@\
diff --git a/x11/xorg-cf-files/files/patch-Imake.tmpl b/x11/xorg-cf-files/files/patch-Imake.tmpl
new file mode 100644
index 000000000000..442fb64463b3
--- /dev/null
+++ b/x11/xorg-cf-files/files/patch-Imake.tmpl
@@ -0,0 +1,20 @@
+--- Imake.tmpl.orig	Tue Jul 27 20:24:29 2004
++++ Imake.tmpl	Fri Sep 10 18:45:12 2004
+@@ -1798,7 +1798,7 @@
+        CXXOPTIONS = CplusplusOptions
+       CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
+        CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
+-         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
++         CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+ #endif
+          COMPRESS = CompressCmd
+           GZIPCMD = GzipCmd
+@@ -2038,7 +2038,7 @@
+  */
+       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
+        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
+         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+          LDPRELIB = LdPreLib $(INSTALLED_LIBS)
+         LDPOSTLIB = LdPostLib
diff --git a/x11/xorg-cf-files/files/patch-Library.tmpl b/x11/xorg-cf-files/files/patch-Library.tmpl
new file mode 100644
index 000000000000..1bb60edbd009
--- /dev/null
+++ b/x11/xorg-cf-files/files/patch-Library.tmpl
@@ -0,0 +1,11 @@
+--- Library.tmpl.orig	Thu Jan 18 01:22:30 2001
++++ Library.tmpl	Mon Jun  4 19:30:34 2001
+@@ -67,7 +67,7 @@
+ STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
+ CDEBUGFLAGS = LibraryCDebugFlags
+ CLIBDEBUGFLAGS = LibraryDebugOpt
+-     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++     CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
+    PICFLAGS = LargePositionIndependentCFlags
+ # endif
diff --git a/x11/xorg-cf-files/pkg-descr b/x11/xorg-cf-files/pkg-descr
new file mode 100644
index 000000000000..e0bb5bcf11a3
--- /dev/null
+++ b/x11/xorg-cf-files/pkg-descr
@@ -0,0 +1 @@
+X.org cf files for use with imake based builds.
diff --git a/x11/xorg-cf-files/pkg-plist b/x11/xorg-cf-files/pkg-plist
new file mode 100644
index 000000000000..05bc2a4a748d
--- /dev/null
+++ b/x11/xorg-cf-files/pkg-plist
@@ -0,0 +1,122 @@
+lib/X11/config/Amoeba.cf
+lib/X11/config/DGUX.cf
+lib/X11/config/DragonFly.cf
+lib/X11/config/FreeBSD.cf
+lib/X11/config/Imake.cf
+lib/X11/config/Imake.rules
+lib/X11/config/Imake.tmpl
+lib/X11/config/Library.tmpl
+lib/X11/config/Mips.cf
+lib/X11/config/Motif.rules
+lib/X11/config/Motif.tmpl
+lib/X11/config/NetBSD.cf
+lib/X11/config/Oki.cf
+lib/X11/config/OpenBSD.cf
+lib/X11/config/OpenBSDLib.rules
+lib/X11/config/OpenBSDLib.tmpl
+lib/X11/config/QNX4.cf
+lib/X11/config/QNX4.rules
+lib/X11/config/Server.tmpl
+lib/X11/config/ServerLib.tmpl
+lib/X11/config/Threads.tmpl
+lib/X11/config/Win32.cf
+lib/X11/config/Win32.rules
+lib/X11/config/WinLib.tmpl
+lib/X11/config/X11.rules
+lib/X11/config/X11.tmpl
+lib/X11/config/apollo.cf
+lib/X11/config/bsd.cf
+lib/X11/config/bsdLib.rules
+lib/X11/config/bsdLib.tmpl
+lib/X11/config/bsdi.cf
+lib/X11/config/bsdiLib.rules
+lib/X11/config/bsdiLib.tmpl
+lib/X11/config/cde.rules
+lib/X11/config/cde.tmpl
+lib/X11/config/convex.cf
+lib/X11/config/cray.cf
+lib/X11/config/cross.def
+lib/X11/config/cross.rules
+lib/X11/config/cygwin.cf
+lib/X11/config/cygwin.rules
+lib/X11/config/cygwin.tmpl
+lib/X11/config/darwin.cf
+lib/X11/config/darwinLib.rules
+lib/X11/config/darwinLib.tmpl
+lib/X11/config/date.def
+lib/X11/config/dmx.cf
+lib/X11/config/fujitsu.cf
+lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
+lib/X11/config/host.def
+lib/X11/config/hp.cf
+lib/X11/config/hpLib.rules
+lib/X11/config/hpLib.tmpl
+lib/X11/config/ibm.cf
+lib/X11/config/ibmLib.rules
+lib/X11/config/ibmLib.tmpl
+lib/X11/config/isc.cf
+lib/X11/config/linux.cf
+lib/X11/config/lnxLib.rules
+lib/X11/config/lnxLib.tmpl
+lib/X11/config/lnxdoc.rules
+lib/X11/config/lnxdoc.tmpl
+lib/X11/config/luna.cf
+lib/X11/config/lynx.cf
+lib/X11/config/macII.cf
+lib/X11/config/mach.cf
+lib/X11/config/mingw.cf
+lib/X11/config/mingw.rules
+lib/X11/config/mingw.tmpl
+lib/X11/config/minix.cf
+lib/X11/config/moto.cf
+lib/X11/config/ncr.cf
+lib/X11/config/nec.cf
+lib/X11/config/necLib.rules
+lib/X11/config/necLib.tmpl
+lib/X11/config/noop.rules
+lib/X11/config/nto.cf
+lib/X11/config/nto.rules
+lib/X11/config/oldlib.rules
+lib/X11/config/os2.cf
+lib/X11/config/os2.rules
+lib/X11/config/os2Lib.rules
+lib/X11/config/os2Lib.tmpl
+lib/X11/config/osf1.cf
+lib/X11/config/osfLib.rules
+lib/X11/config/osfLib.tmpl
+lib/X11/config/pegasus.cf
+lib/X11/config/sco.cf
+lib/X11/config/sco5.cf
+lib/X11/config/scoLib.rules
+lib/X11/config/sequent.cf
+lib/X11/config/sequentLib.rules
+lib/X11/config/sgi.cf
+lib/X11/config/sgiLib.rules
+lib/X11/config/sgiLib.tmpl
+lib/X11/config/site.def
+lib/X11/config/sony.cf
+lib/X11/config/sun.cf
+lib/X11/config/sunLib.rules
+lib/X11/config/sunLib.tmpl
+lib/X11/config/sv3Lib.rules
+lib/X11/config/sv3Lib.tmpl
+lib/X11/config/sv4Lib.rules
+lib/X11/config/sv4Lib.tmpl
+lib/X11/config/svr3.cf
+lib/X11/config/svr4.cf
+lib/X11/config/ultrix.cf
+lib/X11/config/usl.cf
+lib/X11/config/version.def
+lib/X11/config/x386.cf
+lib/X11/config/xf86.rules
+lib/X11/config/xf86.tmpl
+lib/X11/config/xf86site.def
+lib/X11/config/xfree86.cf
+lib/X11/config/xorg.cf
+lib/X11/config/xorg.tmpl
+lib/X11/config/xorgsite.def
+lib/X11/config/xorgversion.def
+@dirrm lib/X11/config
diff --git a/x11/xorg-docs/Makefile b/x11/xorg-docs/Makefile
new file mode 100644
index 000000000000..81f6c429fd16
--- /dev/null
+++ b/x11/xorg-docs/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xorg-docs
+# Date Created:				Nov 2 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xorg-docs
+PORTVERSION=	1.3
+PORTEPOCH=	1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.org documentation files
+
+CONFLICTS=	XFree86-documents-* xorg-documents-*
+
+XORG_CAT=	doc
+
+.include <bsd.port.mk>
diff --git a/x11/xorg-docs/distinfo b/x11/xorg-docs/distinfo
new file mode 100644
index 000000000000..5744a5a00b44
--- /dev/null
+++ b/x11/xorg-docs/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/doc/xorg-docs-1.3.tar.bz2) = 792d41a7a9f2e652b2ede4538c4bdf14
+SHA256 (xorg/doc/xorg-docs-1.3.tar.bz2) = 589072096406e67d467de3ec83a66da1ae65bf51a8fd25c8958b0fc54a78d9a1
+SIZE (xorg/doc/xorg-docs-1.3.tar.bz2) = 8248288
diff --git a/x11/xorg-docs/pkg-descr b/x11/xorg-docs/pkg-descr
new file mode 100644
index 000000000000..f9e4211b2729
--- /dev/null
+++ b/x11/xorg-docs/pkg-descr
@@ -0,0 +1,4 @@
+The documentation in this package is from xc/doc in the monolithic
+source tree.  It is expected that most of the documentation included
+here will be converted to a new format and then moved to the appropriate
+package.
diff --git a/x11/xorg-docs/pkg-plist b/x11/xorg-docs/pkg-plist
new file mode 100644
index 000000000000..ef07c6d420fc
--- /dev/null
+++ b/x11/xorg-docs/pkg-plist
@@ -0,0 +1,112 @@
+man/man7/Consortium.7
+man/man7/security.7
+man/man7/Standards.7
+man/man7/X.7
+man/man7/XOrgFoundation.7
+man/man7/Xprint.7
+man/man7/XProjectTeam.7
+share/X11/doc/hardcopy/BDF/bdf.PS.gz
+share/X11/doc/hardcopy/CTEXT/ctext.PS.gz
+share/X11/doc/hardcopy/FSProtocol/fsproto.PS.gz
+share/X11/doc/hardcopy/i18n/Framework.PS.gz
+share/X11/doc/hardcopy/i18n/LocaleDB.PS.gz
+share/X11/doc/hardcopy/i18n/Trans.PS.gz
+share/X11/doc/hardcopy/ICCCM/icccm.idx.PS.gz
+share/X11/doc/hardcopy/ICCCM/icccm.PS.gz
+share/X11/doc/hardcopy/ICE/ICElib.PS.gz
+share/X11/doc/hardcopy/ICE/ice.PS.gz
+share/X11/doc/hardcopy/man/man.PS.gz
+share/X11/doc/hardcopy/rstart/rstart.PS.gz
+share/X11/doc/hardcopy/RX/RX.PS.gz
+share/X11/doc/hardcopy/saver/saver.PS.gz
+share/X11/doc/hardcopy/SM/SMlib.PS.gz
+share/X11/doc/hardcopy/SM/xsmp.PS.gz
+share/X11/doc/hardcopy/X11/xlib.idx.PS.gz
+share/X11/doc/hardcopy/X11/xlib.PS.gz
+share/X11/doc/hardcopy/Xaw/widgets.PS.gz
+share/X11/doc/hardcopy/Xaw/widg.idx.PS.gz
+share/X11/doc/hardcopy/XDMCP/xdmcp.PS.gz
+share/X11/doc/hardcopy/Xext/AppGroup.PS.gz
+share/X11/doc/hardcopy/Xext/bigreq.PS.gz
+share/X11/doc/hardcopy/Xext/buffer.PS.gz
+share/X11/doc/hardcopy/Xext/dbelib.PS.gz
+share/X11/doc/hardcopy/Xext/dbe.PS.gz
+share/X11/doc/hardcopy/Xext/DPMSLib.PS.gz
+share/X11/doc/hardcopy/Xext/DPMS.PS.gz
+share/X11/doc/hardcopy/Xext/evi.PS.gz
+share/X11/doc/hardcopy/Xext/lbxalg.PS.gz
+share/X11/doc/hardcopy/Xext/lbx.html
+share/X11/doc/hardcopy/Xext/lbx.PS.gz
+share/X11/doc/hardcopy/Xext/lbxTOC.html
+share/X11/doc/hardcopy/Xext/mit-shm.PS.gz
+share/X11/doc/hardcopy/Xext/recordlib.PS.gz
+share/X11/doc/hardcopy/Xext/record.PS.gz
+share/X11/doc/hardcopy/Xext/security.PS.gz
+share/X11/doc/hardcopy/Xext/shapelib.PS.gz
+share/X11/doc/hardcopy/Xext/shape.PS.gz
+share/X11/doc/hardcopy/Xext/synclib.PS.gz
+share/X11/doc/hardcopy/Xext/sync.PS.gz
+share/X11/doc/hardcopy/Xext/tog-cup.PS.gz
+share/X11/doc/hardcopy/Xext/xc-misc.PS.gz
+share/X11/doc/hardcopy/Xext/xtestlib.PS.gz
+share/X11/doc/hardcopy/Xext/xtest.PS.gz
+share/X11/doc/hardcopy/xfs/design.PS.gz
+share/X11/doc/hardcopy/Xi/lib.PS.gz
+share/X11/doc/hardcopy/Xi/port.PS.gz
+share/X11/doc/hardcopy/Xi/proto.PS.gz
+share/X11/doc/hardcopy/XIM/xim.PS.gz
+share/X11/doc/hardcopy/XKB/XKBlib.ps.gz
+share/X11/doc/hardcopy/XKB/XKBproto.ps.gz
+share/X11/doc/hardcopy/XLFD/xlfd.PS.gz
+share/X11/doc/hardcopy/Xmu/xmu.PS.gz
+share/X11/doc/hardcopy/XPRINT/dtprint_fspec.PS.gz
+share/X11/doc/hardcopy/XPRINT/xp_library.PS.gz
+share/X11/doc/hardcopy/XPRINT/xp_proto.PS.gz
+share/X11/doc/hardcopy/XPRINT/Xprint_FAQ.html
+share/X11/doc/hardcopy/XPRINT/Xprint_FAQ.txt
+share/X11/doc/hardcopy/XPRINT/Xprint_FAQ.xml
+share/X11/doc/hardcopy/XPRINT/Xprint_old_FAQ.txt
+share/X11/doc/hardcopy/XProtocol/proto.idx.PS.gz
+share/X11/doc/hardcopy/XProtocol/proto.PS.gz
+share/X11/doc/hardcopy/Xserver/analysis.PS.gz
+share/X11/doc/hardcopy/Xserver/appgroup.PS.gz
+share/X11/doc/hardcopy/Xserver/ddx.PS.gz
+share/X11/doc/hardcopy/Xserver/fontlib.PS.gz
+share/X11/doc/hardcopy/Xserver/secint.PS.gz
+share/X11/doc/hardcopy/Xserver/Xprt.PS.gz
+share/X11/doc/hardcopy/Xt/intr.idx.PS.gz
+share/X11/doc/hardcopy/Xt/intrinsics.PS.gz
+share/X11/doc/hardcopy/xtrans/Xtrans.PS.gz
+share/X11/doc/hardcopy/Xv/video
+share/X11/doc/hardcopy/Xv/xv-protocol-v2.PS
+share/X11/doc/MAINTAINERS
+@dirrm share/X11/doc/hardcopy/BDF
+@dirrm share/X11/doc/hardcopy/CTEXT
+@dirrm share/X11/doc/hardcopy/FSProtocol
+@dirrm share/X11/doc/hardcopy/i18n
+@dirrm share/X11/doc/hardcopy/ICCCM
+@dirrm share/X11/doc/hardcopy/ICE
+@dirrm share/X11/doc/hardcopy/man
+@dirrm share/X11/doc/hardcopy/rstart
+@dirrm share/X11/doc/hardcopy/RX
+@dirrm share/X11/doc/hardcopy/saver
+@dirrm share/X11/doc/hardcopy/SM
+@dirrm share/X11/doc/hardcopy/X11
+@dirrm share/X11/doc/hardcopy/Xaw
+@dirrm share/X11/doc/hardcopy/XDMCP
+@dirrm share/X11/doc/hardcopy/Xext
+@dirrm share/X11/doc/hardcopy/xfs
+@dirrm share/X11/doc/hardcopy/Xi
+@dirrm share/X11/doc/hardcopy/XIM
+@dirrm share/X11/doc/hardcopy/XKB
+@dirrm share/X11/doc/hardcopy/XLFD
+@dirrm share/X11/doc/hardcopy/Xmu
+@dirrm share/X11/doc/hardcopy/XPRINT
+@dirrm share/X11/doc/hardcopy/XProtocol
+@dirrm share/X11/doc/hardcopy/Xserver
+@dirrm share/X11/doc/hardcopy/Xt
+@dirrm share/X11/doc/hardcopy/xtrans
+@dirrm share/X11/doc/hardcopy/Xv
+@dirrm share/X11/doc/hardcopy
+@dirrm share/X11/doc
+@dirrmtry share/X11
diff --git a/x11/xorg-edit/Makefile b/x11/xorg-edit/Makefile
index 1d00f8ca4593..45ee2a83cbc3 100644
--- a/x11/xorg-edit/Makefile
+++ b/x11/xorg-edit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xorg-edit
 PORTVERSION=	07.04.23
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index f12e21d94428..9761d40f4203 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -6,72 +6,71 @@
 #
 
 PORTNAME=	xorg-libraries
-PORTVERSION=	6.9.0
-PORTREVISION=	1
+PORTVERSION=	7.2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src3.tar.gz
-
-PATCHFILES=	x11r6.9.0-cidfonts.diff
-PATCH_SITES=	${MASTER_SITE_XORG}
-PATCH_SITE_SUBDIR=	X11R${PORTVERSION}/patches
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X11 libraries and headers from X.Org
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-
-CONFLICTS=	Mesa-* XFree86-libraries-* \
-		libX11-* libGL-* libGLU-* libICE-* libSM-* libXau-* libXaw-* \
-		libXcursor-* libXdmcp-* libXext-* libXfont-* libXi-* \
-		libXinerama-* libXmu-* libXp-* libXpm-* libXrandr-* \
-		libXrender-* libXres-* libXt-* libXv-* libXxf86-* libxkbfile-* \
-		panoramixext-* printext-* randrext-* renderext-* resourceext-* \
-		xextensions-* xf86ext-* xlibs-* xpm-* xproto-*
-
-EXTRA_PATCHES=	${CF_PATCHES}
+COMMENT=	X.org libraries meta-port
 
-XBUILD_DIRS=	lib nls programs/Xserver/include \
-		programs/Xserver/hw/xfree86/parser
-XINSTALL_DIRS=	include lib nls programs/Xserver/include \
-		programs/Xserver/hw/xfree86/parser
+NO_BUILD=	yes
 
-INSTALLS_SHLIB=	yes
+PREFIX?=	${X11BASE}
 
-post-patch:
-	${CP} ${FILESDIR}/nls-Compose-microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251
-	${MKDIR} ${WRKSRC}/lib/XThrStub
-	${CP} ${FILESDIR}/XThrStub-Imakefile ${WRKSRC}/lib/XThrStub/Imakefile
+# Needs: libGL
 
-post-install:
-	${MKDIR} ${PREFIX}/libdata/pkgconfig
-	${INSTALL_DATA} ${WRKSRC}/lib/Xcursor/xcursor.pc \
-		${PREFIX}/libdata/pkgconfig
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
+		${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
+		${X11BASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \
+		${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \
+		${X11BASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \
+		${X11BASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \
+		${X11BASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \
+		${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \
+		${X11BASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw \
+		${X11BASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \
+		${X11BASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor \
+		${X11BASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage \
+		${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
+		${X11BASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie \
+		${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
+		${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \
+		${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
+		${X11BASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \
+		${X11BASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \
+		${X11BASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \
+		${X11BASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \
+		${X11BASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \
+		${X11BASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \
+		${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \
+		${X11BASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \
+		${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \
+		${X11BASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \
+		${X11BASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \
+		${X11BASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \
+		${X11BASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \
+		${X11BASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \
+		${X11BASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm \
+		${X11BASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \
+		${X11BASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \
+		${X11BASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \
+		${X11BASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \
+		${X11BASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \
+		${X11BASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \
+		${X11BASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
+		${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \
+		${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \
+		${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-
-# BuildXF86DRI is false for FreeBSD < 4.1
-.if ${OSVERSION} < 410000
-PLIST_SUB+=	OSMESA:="@comment "
-.else
-PLIST_SUB+=	OSMESA:=""
+.if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING)
+pre-everything::
+	@test -L /usr/X11R6 || ( echo "Read ${PORTSDIR}/UPDATING for the procedure to upgrade to xorg 7.2." && /usr/bin/false )
 .endif
 
-.if ${OSVERSION} >= 500043
-PLIST_SUB+=	XTHRSTUB:="@comment "
-.else
-PLIST_SUB+=	XTHRSTUB:=""
-.endif
+do-install:
+		${MKDIR} ${PREFIX}/libdata/xorg
+		${TOUCH} ${PREFIX}/libdata/xorg/libraries
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xorg-libraries/distinfo b/x11/xorg-libraries/distinfo
deleted file mode 100644
index 432332001999..000000000000
--- a/x11/xorg-libraries/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
-MD5 (xorg/x11r6.9.0-cidfonts.diff) = 7c0c53f1c7ffd97b429eda1eefdff9cb
-SHA256 (xorg/x11r6.9.0-cidfonts.diff) = c694b6cfe3c41eb36d566765f70b244307e7aa569f84cd8979e36b7d723aa487
-SIZE (xorg/x11r6.9.0-cidfonts.diff) = 2998
diff --git a/x11/xorg-libraries/files/XThrStub-Imakefile b/x11/xorg-libraries/files/XThrStub-Imakefile
deleted file mode 100644
index 83e850325c9a..000000000000
--- a/x11/xorg-libraries/files/XThrStub-Imakefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#define DoNormalLib NormalLibXThrStub
-#define DoSharedLib SharedLibXThrStub
-#define DoExtraLib SharedLibXThrStub
-#define DoDebugLib DebugLibXThrStub
-#define DoProfileLib ProfileLibXThrStub
-#define LibName XThrStub
-#define SoRev SOXTHRSTUBREV
-#define LibHeaders NO
-
-#include <Threads.tmpl>
-
-#ifdef SharedXThrStubReqs
-REQUIREDLIBS = SharedXThrStubReqs
-#endif
-
-#if NeedUIThrStubs
-STUBSRCS = UIThrStubs.c
-STUBOBJS = UIThrStubs.o
-#endif
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-      DEFINES = $(ALLOC_DEFINES)
-     INCLUDES = 
-         SRCS = $(STUBSRCS)
-         OBJS = $(STUBOBJS)
-     LINTLIBS = $(LINTXLIB)
-
-#include <Library.tmpl>
-
-DependTarget()
-
-LinkSourceFile(UIThrStubs.c,$(XTOP)/lib/X11)
diff --git a/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251 b/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251
deleted file mode 100644
index b7218bdbc7d9..000000000000
--- a/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251
+++ /dev/null
@@ -1,15 +0,0 @@
-XCOMM
-XCOMM microsoft-cp1251 Compose Sequence
-XCOMM
-XCOMM Sequence Definition
-XCOMM
-XCOMM $XFree86$
-XCOMM
-XCOMM This file currently has no entries.  It appears that a compose file (even
-XCOMM just an empty one) is required for the appropriate keysyms to work for
-XCOMM this encoding.
-XCOMM
-XCOMM <Multi_key> Means <Compose>
-XCOMM Special Character
-
-XCOMM End of Sequence Definition
diff --git a/x11/xorg-libraries/files/patch-Compose-Imakefile b/x11/xorg-libraries/files/patch-Compose-Imakefile
deleted file mode 100644
index d1b90e4a9fc0..000000000000
--- a/x11/xorg-libraries/files/patch-Compose-Imakefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- nls/Compose/Imakefile.orig	Mon Jun  3 22:19:43 2002
-+++ nls/Compose/Imakefile	Sat Jan 11 01:00:46 2003
-@@ -54,6 +54,7 @@
- ComposeTarget(koi8-r)
- ComposeTarget(koi8-u)
- ComposeTarget(koi8-c)
-+ComposeTarget(microsoft-cp1251)
- ComposeTarget(mulelao-1)
- ComposeTarget(vi_VN.tcvn)
- ComposeTarget(vi_VN.viscii)
diff --git a/x11/xorg-libraries/files/patch-GL-GL-Imakefile b/x11/xorg-libraries/files/patch-GL-GL-Imakefile
deleted file mode 100644
index 69f1eb2c40d7..000000000000
--- a/x11/xorg-libraries/files/patch-GL-GL-Imakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: lib/GL/GL/Imakefile
-===================================================================
-RCS file: /cvs/xorg/xc/lib/GL/GL/Imakefile,v
-retrieving revision 1.5
-diff -u -r1.5 Imakefile
---- lib/GL/GL/Imakefile	23 Jul 2004 05:25:39 -0000	1.5
-+++ lib/GL/GL/Imakefile	29 Dec 2004 20:51:25 -0000
-@@ -209,8 +209,12 @@
-        POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS) $(DRMPOBJS)
- 
- #if LocalThreads
-+#if NeedUIThrStubs
-+  THREADOBJS = $(LDPRELIB) $(XTHRSTUBLIB)
-+#else
-   THREADOBJS = $(THREADS_LIBS)
- #endif
-+#endif
- 
- #include <Library.tmpl>
- 
diff --git a/x11/xorg-libraries/files/patch-GL-Imakefile b/x11/xorg-libraries/files/patch-GL-Imakefile
deleted file mode 100644
index 7d2bb0b12e03..000000000000
--- a/x11/xorg-libraries/files/patch-GL-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/Imakefile.orig	Fri May 28 00:23:23 2004
-+++ lib/GL/Imakefile	Fri May 28 00:23:52 2004
-@@ -110,7 +110,7 @@
- #if BuildXF86DRI && GlxUseBuiltInDRIDriver
- SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
- #else
--SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
-+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
- #endif
- 
- MakeSubdirs($(SUBDIRS))
diff --git a/x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile b/x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile
deleted file mode 100644
index 21c89aa6217c..000000000000
--- a/x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/dri/drm/Imakefile.orig	Sat Dec 24 01:07:33 2005
-+++ lib/GL/dri/drm/Imakefile	Sat Dec 24 01:08:59 2005
-@@ -16,7 +16,7 @@
- 		-I$(XF86OSSRC)/$(OS_SUBDIR)/drm \
- 		-I$(DRMSRCDIR)/$(OS_SUBDIR)-core \
- 		-I$(DRMSRCDIR)/$(OS_SUBDIR2)-core \
--		-I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core
-+		-I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core -I$(LOCALBASE)/include
-          SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
-          OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o
- 
diff --git a/x11/xorg-libraries/files/patch-GL-glx-Imakefile b/x11/xorg-libraries/files/patch-GL-glx-Imakefile
deleted file mode 100644
index 20affa22736f..000000000000
--- a/x11/xorg-libraries/files/patch-GL-glx-Imakefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/GL/glx/Imakefile.orig	Sat Dec 24 00:52:20 2005
-+++ lib/GL/glx/Imakefile	Sat Dec 24 00:54:30 2005
-@@ -212,6 +212,7 @@
- 		-I$(MESASRCDIR)/src/mesa/drivers/x11 \
- 		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
- 		-I$(XF86OSSRC) \
-+		-I$(LOCALBASE)/include \
- 		-I$(DRMSRCDIR)/shared-core \
- 		$(DRI_INCS)
- 
diff --git a/x11/xorg-libraries/files/patch-X11-Imakefile b/x11/xorg-libraries/files/patch-X11-Imakefile
deleted file mode 100644
index f8bba66d39ed..000000000000
--- a/x11/xorg-libraries/files/patch-X11-Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/X11/Imakefile.orig	Wed Dec 29 13:44:54 2004
-+++ lib/X11/Imakefile	Wed Dec 29 13:46:19 2004
-@@ -126,8 +126,7 @@
-          K5INCL = Krb5Includes
-          K5DEFS = Krb5Defines
- #endif
--#if (defined(FreeBSDArchitecture) && OSRelVersion < 500016) || \
--	defined(OpenBSDArchitecture)
-+#if (defined(OpenBSDArchitecture))
- THRSTUBSRCS = UIThrStubs.c
- THRSTUBOBJS = UIThrStubs.o
- #endif
diff --git a/x11/xorg-libraries/files/patch-Xau-Imakefile b/x11/xorg-libraries/files/patch-Xau-Imakefile
deleted file mode 100644
index 70119d9dadd9..000000000000
--- a/x11/xorg-libraries/files/patch-Xau-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xau/Imakefile.orig	Wed Apr 14 19:40:56 2004
-+++ lib/Xau/Imakefile	Wed Apr 14 19:42:08 2004
-@@ -11,6 +11,8 @@
- #define DoDebugLib DebugLibXau
- #define DoProfileLib ProfileLibXau
- #define LibName Xau
-+#define DoSharedLib YES
-+SOXAUTHREV = 0.0
- #define SoRev SOXAUTHREV
- #define IncSubdir X11
- 
diff --git a/x11/xorg-libraries/files/patch-Xcomposite-Imakefile b/x11/xorg-libraries/files/patch-Xcomposite-Imakefile
deleted file mode 100644
index 5aab74346231..000000000000
--- a/x11/xorg-libraries/files/patch-Xcomposite-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xcomposite/Imakefile.orig	Fri Oct  1 17:42:38 2004
-+++ lib/Xcomposite/Imakefile	Fri Oct  1 17:43:22 2004
-@@ -61,7 +61,7 @@
- 	RemoveFile($@)
- 	sh ../Xcursor/config-subst $(SUBSTVARS) < xcomposite.pc.in > $@
- 
--InstallNonExecFile(xcomposite.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xcomposite.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xcomposite.pc)
diff --git a/x11/xorg-libraries/files/patch-Xcursor-Imakefile b/x11/xorg-libraries/files/patch-Xcursor-Imakefile
deleted file mode 100644
index 2d12831b0b09..000000000000
--- a/x11/xorg-libraries/files/patch-Xcursor-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xcursor/Imakefile.orig	Fri May 28 11:20:24 2004
-+++ lib/Xcursor/Imakefile	Fri May 28 11:20:43 2004
-@@ -87,7 +87,7 @@
- 	RemoveFile($@)
- 	sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@
- 
--InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xcursor.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xcursor.pc)
diff --git a/x11/xorg-libraries/files/patch-Xdamage-Imakefile b/x11/xorg-libraries/files/patch-Xdamage-Imakefile
deleted file mode 100644
index 316b3ba332fe..000000000000
--- a/x11/xorg-libraries/files/patch-Xdamage-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xdamage/Imakefile.orig	Fri Oct  1 17:42:44 2004
-+++ lib/Xdamage/Imakefile	Fri Oct  1 17:44:54 2004
-@@ -61,7 +61,7 @@
- 	RemoveFile($@)
- 	sh ../Xcursor/config-subst $(SUBSTVARS) < xdamage.pc.in > $@
- 
--InstallNonExecFile(xdamage.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xdamage.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xdamage.pc)
diff --git a/x11/xorg-libraries/files/patch-Xdmcp-Imakefile b/x11/xorg-libraries/files/patch-Xdmcp-Imakefile
deleted file mode 100644
index 02d5c2928f99..000000000000
--- a/x11/xorg-libraries/files/patch-Xdmcp-Imakefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/Xdmcp/Imakefile.orig	Thu May 27 23:35:23 2004
-+++ lib/Xdmcp/Imakefile	Thu May 27 23:36:09 2004
-@@ -6,12 +6,13 @@
- XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.4 1999/04/17 09:08:12 dawes Exp $
- 
- #define DoNormalLib NormalLibXdmcp
--#define DoSharedLib SharedLibXdmcp
-+#define DoSharedLib YES
- #define DoExtraLib SharedLibXdmcp
- #define DoDebugLib DebugLibXdmcp
- #define DoProfileLib ProfileLibXdmcp
- #define LibName Xdmcp
- #define SoRev SOXDMCPREV
-+SOXDMCPREV = 0.0
- #define IncSubdir X11
- 
- #if HasXdmAuth
diff --git a/x11/xorg-libraries/files/patch-Xevie-Imakefile b/x11/xorg-libraries/files/patch-Xevie-Imakefile
deleted file mode 100644
index 5c5dcc066606..000000000000
--- a/x11/xorg-libraries/files/patch-Xevie-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xevie/Imakefile.orig	Fri Oct  1 17:42:49 2004
-+++ lib/Xevie/Imakefile	Fri Oct  1 17:44:51 2004
-@@ -66,7 +66,7 @@
- 	RemoveFile($@)
- 	sh ../Xcursor/config-subst $(SUBSTVARS) < xevie.pc.in > $@
- 
--InstallNonExecFile(xevie.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xevie.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xevie.pc)
diff --git a/x11/xorg-libraries/files/patch-Xfixes-Imakefile b/x11/xorg-libraries/files/patch-Xfixes-Imakefile
deleted file mode 100644
index eba3ba644ed9..000000000000
--- a/x11/xorg-libraries/files/patch-Xfixes-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xfixes/Imakefile.orig	Fri Oct  1 17:42:54 2004
-+++ lib/Xfixes/Imakefile	Fri Oct  1 17:44:58 2004
-@@ -68,7 +68,7 @@
- 	RemoveFile($@)
- 	sh ../Xcursor/config-subst $(SUBSTVARS) < xfixes.pc.in > $@
- 
--InstallNonExecFile(xfixes.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xfixes.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xfixes.pc)
diff --git a/x11/xorg-libraries/files/patch-XlcDL.c b/x11/xorg-libraries/files/patch-XlcDL.c
deleted file mode 100644
index e58113dd791d..000000000000
--- a/x11/xorg-libraries/files/patch-XlcDL.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/X11/XlcDL.c.orig	Mon Aug 15 21:55:16 2005
-+++ lib/X11/XlcDL.c	Mon Aug 15 21:56:02 2005
-@@ -56,11 +56,13 @@
- #include "XlcPublic.h"
- #include "XlcPubI.h"
- 
-+#if !defined(__FreeBSD__)
- #if defined(_LP64)  && defined(__sparcv9)
- # define	_MACH64_NAME		"sparcv9"
- #else
- # undef _MACH64_NAME
- #endif /* defined(_LP64)  && defined(__sparcv9) */
-+#endif
- 
- #ifdef _MACH64_NAME
- #  define	_MACH64_NAME_LEN	(sizeof (_MACH64_NAME) - 1)
diff --git a/x11/xorg-libraries/files/patch-Xrender-Imakefile b/x11/xorg-libraries/files/patch-Xrender-Imakefile
deleted file mode 100644
index 804b06c709ea..000000000000
--- a/x11/xorg-libraries/files/patch-Xrender-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xrender/Imakefile.orig	Sat Oct 16 15:41:02 2004
-+++ lib/Xrender/Imakefile	Sat Oct 16 15:42:35 2004
-@@ -161,7 +161,7 @@
- 	RemoveFile($@)
- 	sh ../Xcursor/config-subst $(SUBSTVARS) < xrender.pc.in > $@
- 
--InstallNonExecFile(xrender.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xrender.pc,$(PROJECTROOT)/libdata/pkgconfig)
- 
- clean::
- 	RemoveFile(xrender.pc)
diff --git a/x11/xorg-libraries/files/patch-dps-Imakefile b/x11/xorg-libraries/files/patch-dps-Imakefile
deleted file mode 100644
index f85503bf79c0..000000000000
--- a/x11/xorg-libraries/files/patch-dps-Imakefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- lib/dps/Imakefile.orig	Mon May 24 12:06:58 2004
-+++ lib/dps/Imakefile	Fri Sep 10 22:12:26 2004
-@@ -201,8 +201,6 @@
- 
- includes:: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS)
- 
--$(DPSOPSCFILES) $(PSOPSCFILES): HostProgramTargetName($(PSWRAP))
--
- SRCS = \
- 	${COMMONSOURCEFILES} \
- 	${XSOURCEFILES} \
-@@ -224,16 +222,11 @@
- 
- .SUFFIXES: .psw .h
- 
--.psw.c : HostProgramTargetName($(PSWRAP))
-+.psw.c :
- 	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
- 
--.psw.h : HostProgramTargetName($(PSWRAP))
-+.psw.h :
- 	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
--
--HostProgramTargetName($(PSWRAP)):
--	@echo "checking $@ over in $(PSWRAPSRC) first..."; \
--	test -d $(PSWRAPSRC) && cd $(PSWRAPSRC) && $(MAKE) pswraponly; \
--	echo "okay, continuing in $(CURRENT_DIR)"
- 
- includes :: $(HEADERS)
- depend :: $(DPSOPSCFILES) $(PSOPSCFILES)
diff --git a/x11/xorg-libraries/files/patch-lib-Imakefile b/x11/xorg-libraries/files/patch-lib-Imakefile
deleted file mode 100644
index 9db3ac355f73..000000000000
--- a/x11/xorg-libraries/files/patch-lib-Imakefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/Imakefile.orig	Wed Sep  1 18:10:28 2004
-+++ lib/Imakefile	Wed Dec 29 13:43:31 2004
-@@ -36,6 +36,10 @@
- XKBUILIBDIR = xkbui
- #endif
- 
-+#if BuildThreadStubLibrary && BuildLibraries
-+THRSTUBLIBDIR = XThrStub
-+#endif
-+
- #if BuildXInputLib
- XINPUTLIBDIR = Xi
- #endif
-@@ -223,7 +227,7 @@
- #endif
- 
- 
--LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(X11LIBDIR) \
-+LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(THRSTUBLIBDIR) $(X11LIBDIR) \
-              $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \
-              $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \
-              $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \
diff --git a/x11/xorg-libraries/pkg-plist b/x11/xorg-libraries/pkg-plist
index 367766260eff..80a1d8f053b2 100644
--- a/x11/xorg-libraries/pkg-plist
+++ b/x11/xorg-libraries/pkg-plist
@@ -1,783 +1,2 @@
-bin/xcursor-config
-include/DPS/ColorSB.h
-include/DPS/ColorSBP.h
-include/DPS/DPSScrollW.h
-include/DPS/DPSScrollWP.h
-include/DPS/FontCreatP.h
-include/DPS/FontCreato.h
-include/DPS/FontSB.h
-include/DPS/FontSBP.h
-include/DPS/FontSamplP.h
-include/DPS/FontSample.h
-include/DPS/PSres.h
-include/DPS/XDPS.h
-include/DPS/XDPSlib.h
-include/DPS/XDPSproto.h
-include/DPS/dpsNXargs.h
-include/DPS/dpsXclient.h
-include/DPS/dpsXcommon.h
-include/DPS/dpsXpreview.h
-include/DPS/dpsXshare.h
-include/DPS/dpsXuserpath.h
-include/DPS/dpsclient.h
-include/DPS/dpsconfig.h
-include/DPS/dpsexcept.h
-include/DPS/dpsfriends.h
-include/DPS/dpsops.h
-include/DPS/psops.h
-include/GL/GLwDrawA.h
-include/GL/GLwDrawAP.h
-include/GL/GLwMDrawA.h
-include/GL/GLwMDrawAP.h
-include/GL/gl.h
-include/GL/glext.h
-include/GL/glu.h
-include/GL/glx.h
-include/GL/glxext.h
-include/GL/glxint.h
-include/GL/glxmd.h
-include/GL/glxproto.h
-include/GL/glxtokens.h
-include/GL/osmesa.h
-include/X11/CallbackI.h
-include/X11/Composite.h
-include/X11/CompositeP.h
-include/X11/ConstrainP.h
-include/X11/Constraint.h
-include/X11/ConvertI.h
-include/X11/Core.h
-include/X11/CoreP.h
-include/X11/CreateI.h
-include/X11/DECkeysym.h
-include/X11/EventI.h
-include/X11/HPkeysym.h
-include/X11/HookObjI.h
-include/X11/ICE/ICE.h
-include/X11/ICE/ICEconn.h
-include/X11/ICE/ICElib.h
-include/X11/ICE/ICEmsg.h
-include/X11/ICE/ICEproto.h
-include/X11/ICE/ICEutil.h
-include/X11/ImUtil.h
-include/X11/InitialI.h
-include/X11/IntrinsicI.h
-include/X11/Intrinsic.h
-include/X11/IntrinsicP.h
-include/X11/Object.h
-include/X11/ObjectP.h
-include/X11/PassivGraI.h
-include/X11/RectObj.h
-include/X11/RectObjP.h
-include/X11/ResourceI.h
-include/X11/SM/SM.h
-include/X11/SM/SMlib.h
-include/X11/SM/SMproto.h
-include/X11/SelectionI.h
-include/X11/Shell.h
-include/X11/ShellI.h
-include/X11/ShellP.h
-include/X11/StringDefs.h
-include/X11/Sunkeysym.h
-include/X11/ThreadsI.h
-include/X11/TranslateI.h
-include/X11/VarargsI.h
-include/X11/Vendor.h
-include/X11/VendorP.h
-include/X11/X.h
-include/X11/X10.h
-include/X11/XF86keysym.h
-include/X11/XKBlib.h
-include/X11/XWDFile.h
-include/X11/Xalloca.h
-include/X11/Xarch.h
-include/X11/Xatom.h
-include/X11/Xauth.h
-include/X11/Xaw/AllWidgets.h
-include/X11/Xaw/AsciiSink.h
-include/X11/Xaw/AsciiSinkP.h
-include/X11/Xaw/AsciiSrc.h
-include/X11/Xaw/AsciiSrcP.h
-include/X11/Xaw/AsciiText.h
-include/X11/Xaw/AsciiTextP.h
-include/X11/Xaw/Box.h
-include/X11/Xaw/BoxP.h
-include/X11/Xaw/Cardinals.h
-include/X11/Xaw/Command.h
-include/X11/Xaw/CommandP.h
-include/X11/Xaw/Dialog.h
-include/X11/Xaw/DialogP.h
-include/X11/Xaw/Form.h
-include/X11/Xaw/FormP.h
-include/X11/Xaw/Grip.h
-include/X11/Xaw/GripP.h
-include/X11/Xaw/Label.h
-include/X11/Xaw/LabelP.h
-include/X11/Xaw/List.h
-include/X11/Xaw/ListP.h
-include/X11/Xaw/MenuButtoP.h
-include/X11/Xaw/MenuButton.h
-include/X11/Xaw/MultiSink.h
-include/X11/Xaw/MultiSinkP.h
-include/X11/Xaw/MultiSrc.h
-include/X11/Xaw/MultiSrcP.h
-include/X11/Xaw/Paned.h
-include/X11/Xaw/PanedP.h
-include/X11/Xaw/Panner.h
-include/X11/Xaw/PannerP.h
-include/X11/Xaw/Porthole.h
-include/X11/Xaw/PortholeP.h
-include/X11/Xaw/Print.h
-include/X11/Xaw/PrintSP.h
-include/X11/Xaw/Repeater.h
-include/X11/Xaw/RepeaterP.h
-include/X11/Xaw/Reports.h
-include/X11/Xaw/Scrollbar.h
-include/X11/Xaw/ScrollbarP.h
-include/X11/Xaw/Simple.h
-include/X11/Xaw/SimpleMenP.h
-include/X11/Xaw/SimpleMenu.h
-include/X11/Xaw/SimpleP.h
-include/X11/Xaw/Sme.h
-include/X11/Xaw/SmeBSB.h
-include/X11/Xaw/SmeBSBP.h
-include/X11/Xaw/SmeLine.h
-include/X11/Xaw/SmeLineP.h
-include/X11/Xaw/SmeP.h
-include/X11/Xaw/StripCharP.h
-include/X11/Xaw/StripChart.h
-include/X11/Xaw/Template.c
-include/X11/Xaw/Template.h
-include/X11/Xaw/TemplateP.h
-include/X11/Xaw/Text.h
-include/X11/Xaw/TextP.h
-include/X11/Xaw/TextSink.h
-include/X11/Xaw/TextSinkP.h
-include/X11/Xaw/TextSrc.h
-include/X11/Xaw/TextSrcP.h
-include/X11/Xaw/Tip.h
-include/X11/Xaw/TipP.h
-include/X11/Xaw/Toggle.h
-include/X11/Xaw/ToggleP.h
-include/X11/Xaw/Tree.h
-include/X11/Xaw/TreeP.h
-include/X11/Xaw/VendorEP.h
-include/X11/Xaw/Viewport.h
-include/X11/Xaw/ViewportP.h
-include/X11/Xaw/XawImP.h
-include/X11/Xaw/XawInit.h
-include/X11/Xcms.h
-include/X11/Xcursor/Xcursor.h
-include/X11/Xdefs.h
-include/X11/Xdmcp.h
-include/X11/Xfuncproto.h
-include/X11/Xfuncs.h
-include/X11/Xlib.h
-include/X11/XlibConf.h
-include/X11/Xlibint.h
-include/X11/Xlocale.h
-include/X11/Xmd.h
-include/X11/Xmu/Atoms.h
-include/X11/Xmu/CharSet.h
-include/X11/Xmu/CloseHook.h
-include/X11/Xmu/Converters.h
-include/X11/Xmu/CurUtil.h
-include/X11/Xmu/CvtCache.h
-include/X11/Xmu/DisplayQue.h
-include/X11/Xmu/Drawing.h
-include/X11/Xmu/Editres.h
-include/X11/Xmu/EditresP.h
-include/X11/Xmu/Error.h
-include/X11/Xmu/ExtAgent.h
-include/X11/Xmu/Initer.h
-include/X11/Xmu/Lookup.h
-include/X11/Xmu/Misc.h
-include/X11/Xmu/StdCmap.h
-include/X11/Xmu/StdSel.h
-include/X11/Xmu/SysUtil.h
-include/X11/Xmu/WidgetNode.h
-include/X11/Xmu/WinUtil.h
-include/X11/Xmu/Xct.h
-include/X11/Xmu/Xmu.h
-include/X11/Xos.h
-include/X11/Xos_r.h
-include/X11/Xosdefs.h
-include/X11/Xpoll.h
-include/X11/XprintAppUtil/xpapputil.h
-include/X11/XprintUtil/xprintutil.h
-include/X11/Xproto.h
-include/X11/Xprotostr.h
-include/X11/Xregion.h
-include/X11/Xresource.h
-include/X11/Xthreads.h
-include/X11/Xutil.h
-include/X11/ap_keysym.h
-include/X11/bitmaps/1x1
-include/X11/bitmaps/2x2
-include/X11/bitmaps/black
-include/X11/bitmaps/boxes
-include/X11/bitmaps/calculator
-include/X11/bitmaps/cntr_ptr
-include/X11/bitmaps/cntr_ptrmsk
-include/X11/bitmaps/cross_weave
-include/X11/bitmaps/dimple1
-include/X11/bitmaps/dimple3
-include/X11/bitmaps/dot
-include/X11/bitmaps/dropbar7
-include/X11/bitmaps/dropbar8
-include/X11/bitmaps/escherknot
-include/X11/bitmaps/flagdown
-include/X11/bitmaps/flagup
-include/X11/bitmaps/flipped_gray
-include/X11/bitmaps/gray
-include/X11/bitmaps/gray1
-include/X11/bitmaps/gray3
-include/X11/bitmaps/grid16
-include/X11/bitmaps/grid2
-include/X11/bitmaps/grid4
-include/X11/bitmaps/grid8
-include/X11/bitmaps/hlines2
-include/X11/bitmaps/hlines3
-include/X11/bitmaps/icon
-include/X11/bitmaps/keyboard16
-include/X11/bitmaps/left_ptr
-include/X11/bitmaps/left_ptrmsk
-include/X11/bitmaps/letters
-include/X11/bitmaps/light_gray
-include/X11/bitmaps/mailempty
-include/X11/bitmaps/mailemptymsk
-include/X11/bitmaps/mailfull
-include/X11/bitmaps/mailfullmsk
-include/X11/bitmaps/mensetmanus
-include/X11/bitmaps/menu10
-include/X11/bitmaps/menu12
-include/X11/bitmaps/menu16
-include/X11/bitmaps/menu6
-include/X11/bitmaps/menu8
-include/X11/bitmaps/noletters
-include/X11/bitmaps/opendot
-include/X11/bitmaps/opendotMask
-include/X11/bitmaps/plaid
-include/X11/bitmaps/right_ptr
-include/X11/bitmaps/right_ptrmsk
-include/X11/bitmaps/root_weave
-include/X11/bitmaps/scales
-include/X11/bitmaps/sipb
-include/X11/bitmaps/star
-include/X11/bitmaps/starMask
-include/X11/bitmaps/stipple
-include/X11/bitmaps/target
-include/X11/bitmaps/terminal
-include/X11/bitmaps/tie_fighter
-include/X11/bitmaps/vlines2
-include/X11/bitmaps/vlines3
-include/X11/bitmaps/weird_size
-include/X11/bitmaps/wide_weave
-include/X11/bitmaps/wingdogs
-include/X11/bitmaps/woman
-include/X11/bitmaps/xfd_icon
-include/X11/bitmaps/xlogo11
-include/X11/bitmaps/xlogo16
-include/X11/bitmaps/xlogo32
-include/X11/bitmaps/xlogo64
-include/X11/bitmaps/xsnow
-include/X11/cursorfont.h
-include/X11/extensions/MITMisc.h
-include/X11/extensions/Print.h
-include/X11/extensions/Printstr.h
-include/X11/extensions/XEVI.h
-include/X11/extensions/XEVIstr.h
-include/X11/extensions/XI.h
-include/X11/extensions/XInput.h
-include/X11/extensions/XIproto.h
-include/X11/extensions/XKB.h
-include/X11/extensions/XKBbells.h
-include/X11/extensions/XKBconfig.h
-include/X11/extensions/XKBfile.h
-include/X11/extensions/XKBgeom.h
-include/X11/extensions/XKBproto.h
-include/X11/extensions/XKBrules.h
-include/X11/extensions/XKBsrv.h
-include/X11/extensions/XKBstr.h
-include/X11/extensions/XKBui.h
-include/X11/extensions/XKM.h
-include/X11/extensions/XKMformat.h
-include/X11/extensions/XLbx.h
-include/X11/extensions/XRes.h
-include/X11/extensions/XResproto.h
-include/X11/extensions/XShm.h
-include/X11/extensions/XTest.h
-include/X11/extensions/Xag.h
-include/X11/extensions/Xagsrv.h
-include/X11/extensions/Xagstr.h
-include/X11/extensions/Xcomposite.h
-include/X11/extensions/Xcup.h
-include/X11/extensions/Xcupstr.h
-include/X11/extensions/Xdamage.h
-include/X11/extensions/Xdbe.h
-include/X11/extensions/Xdbeproto.h
-include/X11/extensions/Xevie.h
-include/X11/extensions/Xeviestr.h
-include/X11/extensions/Xext.h
-include/X11/extensions/Xfixes.h
-include/X11/extensions/Xinerama.h
-include/X11/extensions/Xrandr.h
-include/X11/extensions/Xrender.h
-include/X11/extensions/Xv.h
-include/X11/extensions/XvMC.h
-include/X11/extensions/XvMClib.h
-include/X11/extensions/XvMCproto.h
-include/X11/extensions/Xvlib.h
-include/X11/extensions/Xvproto.h
-include/X11/extensions/bigreqstr.h
-include/X11/extensions/composite.h
-include/X11/extensions/compositeproto.h
-include/X11/extensions/damageproto.h
-include/X11/extensions/damagewire.h
-include/X11/extensions/dpms.h
-include/X11/extensions/dpmsstr.h
-include/X11/extensions/extutil.h
-include/X11/extensions/lbxbuf.h
-include/X11/extensions/lbxbufstr.h
-include/X11/extensions/lbxdeltastr.h
-include/X11/extensions/lbximage.h
-include/X11/extensions/lbxopts.h
-include/X11/extensions/lbxstr.h
-include/X11/extensions/lbxzlib.h
-include/X11/extensions/mitmiscstr.h
-include/X11/extensions/multibuf.h
-include/X11/extensions/multibufst.h
-include/X11/extensions/panoramiXext.h
-include/X11/extensions/panoramiXproto.h
-include/X11/extensions/randr.h
-include/X11/extensions/randrproto.h
-include/X11/extensions/record.h
-include/X11/extensions/recordstr.h
-include/X11/extensions/render.h
-include/X11/extensions/renderproto.h
-include/X11/extensions/saver.h
-include/X11/extensions/saverproto.h
-include/X11/extensions/scrnsaver.h
-include/X11/extensions/security.h
-include/X11/extensions/securstr.h
-include/X11/extensions/shape.h
-include/X11/extensions/shapestr.h
-include/X11/extensions/shmstr.h
-include/X11/extensions/sync.h
-include/X11/extensions/syncstr.h
-include/X11/extensions/xcmiscstr.h
-include/X11/extensions/xevieplaceholder.h
-include/X11/extensions/xf86bigfont.h
-include/X11/extensions/xf86bigfstr.h
-include/X11/extensions/xf86dga.h
-include/X11/extensions/xf86dga1.h
-include/X11/extensions/xf86dga1str.h
-include/X11/extensions/xf86dgastr.h
-include/X11/extensions/xf86misc.h
-include/X11/extensions/xf86mscstr.h
-include/X11/extensions/xf86vmode.h
-include/X11/extensions/xf86vmstr.h
-include/X11/extensions/xfixesproto.h
-include/X11/extensions/xfixeswire.h
-include/X11/extensions/xtestext1.h
-include/X11/extensions/xteststr.h
-include/X11/extensions/xtrapbits.h
-include/X11/extensions/xtrapddmi.h
-include/X11/extensions/xtrapdi.h
-include/X11/extensions/xtrapemacros.h
-include/X11/extensions/xtraplib.h
-include/X11/extensions/xtraplibp.h
-include/X11/extensions/xtrapproto.h
-include/X11/extensions/vldXvMC.h
-include/X11/fonts/FS.h
-include/X11/fonts/FSlib.h
-include/X11/fonts/FSproto.h
-include/X11/fonts/bdfint.h
-include/X11/fonts/bitmap.h
-include/X11/fonts/bufio.h
-include/X11/fonts/fntfil.h
-include/X11/fonts/fntfilio.h
-include/X11/fonts/fntfilst.h
-include/X11/fonts/font.h
-include/X11/fonts/fontenc.h
-include/X11/fonts/fontencc.h
-include/X11/fonts/fontmisc.h
-include/X11/fonts/fontmod.h
-include/X11/fonts/fontshow.h
-include/X11/fonts/fontstruct.h
-include/X11/fonts/fontutil.h
-include/X11/fonts/fontxlfd.h
-include/X11/fonts/fsmasks.h
-include/X11/fonts/pcf.h
-include/X11/keysym.h
-include/X11/keysymdef.h
-include/X11/misc.h
-include/X11/os.h
-include/X11/xpm.h
-include/xf86Optrec.h
-include/xf86Parser.h
-lib/X11/XErrorDB
-lib/X11/XKeysymDB
-lib/X11/Xcms.txt
-lib/X11/locale/C/XI18N_OBJS
-lib/X11/locale/C/XLC_LOCALE
-lib/X11/locale/armscii-8/Compose
-lib/X11/locale/armscii-8/XI18N_OBJS
-lib/X11/locale/armscii-8/XLC_LOCALE
-lib/X11/locale/compose.dir
-lib/X11/locale/el_GR.UTF-8/Compose
-lib/X11/locale/en_US.UTF-8/Compose
-lib/X11/locale/en_US.UTF-8/XI18N_OBJS
-lib/X11/locale/en_US.UTF-8/XLC_LOCALE
-lib/X11/locale/georgian-academy/Compose
-lib/X11/locale/georgian-academy/XI18N_OBJS
-lib/X11/locale/georgian-academy/XLC_LOCALE
-lib/X11/locale/georgian-ps/Compose
-lib/X11/locale/georgian-ps/XI18N_OBJS
-lib/X11/locale/georgian-ps/XLC_LOCALE
-lib/X11/locale/ibm-cp1133/Compose
-lib/X11/locale/ibm-cp1133/XI18N_OBJS
-lib/X11/locale/ibm-cp1133/XLC_LOCALE
-lib/X11/locale/iscii-dev/XI18N_OBJS
-lib/X11/locale/iscii-dev/XLC_LOCALE
-lib/X11/locale/isiri-3342/XI18N_OBJS
-lib/X11/locale/isiri-3342/XLC_LOCALE
-lib/X11/locale/iso8859-1/Compose
-lib/X11/locale/iso8859-1/XI18N_OBJS
-lib/X11/locale/iso8859-1/XLC_LOCALE
-lib/X11/locale/iso8859-10/Compose
-lib/X11/locale/iso8859-10/XI18N_OBJS
-lib/X11/locale/iso8859-10/XLC_LOCALE
-lib/X11/locale/iso8859-11/XI18N_OBJS
-lib/X11/locale/iso8859-11/XLC_LOCALE
-lib/X11/locale/iso8859-13/Compose
-lib/X11/locale/iso8859-13/XI18N_OBJS
-lib/X11/locale/iso8859-13/XLC_LOCALE
-lib/X11/locale/iso8859-14/Compose
-lib/X11/locale/iso8859-14/XI18N_OBJS
-lib/X11/locale/iso8859-14/XLC_LOCALE
-lib/X11/locale/iso8859-15/Compose
-lib/X11/locale/iso8859-15/XI18N_OBJS
-lib/X11/locale/iso8859-15/XLC_LOCALE
-lib/X11/locale/iso8859-2/Compose
-lib/X11/locale/iso8859-2/XI18N_OBJS
-lib/X11/locale/iso8859-2/XLC_LOCALE
-lib/X11/locale/iso8859-3/Compose
-lib/X11/locale/iso8859-3/XI18N_OBJS
-lib/X11/locale/iso8859-3/XLC_LOCALE
-lib/X11/locale/iso8859-4/Compose
-lib/X11/locale/iso8859-4/XI18N_OBJS
-lib/X11/locale/iso8859-4/XLC_LOCALE
-lib/X11/locale/iso8859-5/Compose
-lib/X11/locale/iso8859-5/XI18N_OBJS
-lib/X11/locale/iso8859-5/XLC_LOCALE
-lib/X11/locale/iso8859-6/Compose
-lib/X11/locale/iso8859-6/XI18N_OBJS
-lib/X11/locale/iso8859-6/XLC_LOCALE
-lib/X11/locale/iso8859-7/Compose
-lib/X11/locale/iso8859-7/XI18N_OBJS
-lib/X11/locale/iso8859-7/XLC_LOCALE
-lib/X11/locale/iso8859-8/Compose
-lib/X11/locale/iso8859-8/XI18N_OBJS
-lib/X11/locale/iso8859-8/XLC_LOCALE
-lib/X11/locale/iso8859-9/Compose
-lib/X11/locale/iso8859-9/XI18N_OBJS
-lib/X11/locale/iso8859-9/XLC_LOCALE
-lib/X11/locale/iso8859-9e/Compose
-lib/X11/locale/iso8859-9e/XI18N_OBJS
-lib/X11/locale/iso8859-9e/XLC_LOCALE
-lib/X11/locale/ja.JIS/Compose
-lib/X11/locale/ja.JIS/XI18N_OBJS
-lib/X11/locale/ja.JIS/XLC_LOCALE
-lib/X11/locale/ja.SJIS/Compose
-lib/X11/locale/ja.SJIS/XI18N_OBJS
-lib/X11/locale/ja.SJIS/XLC_LOCALE
-lib/X11/locale/ja/Compose
-lib/X11/locale/ja/XI18N_OBJS
-lib/X11/locale/ja/XLC_LOCALE
-lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
-lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
-lib/X11/locale/ko/Compose
-lib/X11/locale/ko/XI18N_OBJS
-lib/X11/locale/ko/XLC_LOCALE
-lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
-lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
-lib/X11/locale/koi8-c/Compose
-lib/X11/locale/koi8-c/XI18N_OBJS
-lib/X11/locale/koi8-c/XLC_LOCALE
-lib/X11/locale/koi8-r/Compose
-lib/X11/locale/koi8-r/XI18N_OBJS
-lib/X11/locale/koi8-r/XLC_LOCALE
-lib/X11/locale/koi8-u/Compose
-lib/X11/locale/koi8-u/XI18N_OBJS
-lib/X11/locale/koi8-u/XLC_LOCALE
-lib/X11/locale/lib/common/ximcp.so.2
-lib/X11/locale/lib/common/xlcDef.so.2
-lib/X11/locale/lib/common/xlcUTF8Load.so.2
-lib/X11/locale/lib/common/xlibi18n.so.2
-lib/X11/locale/lib/common/xlocale.so.2
-lib/X11/locale/lib/common/xomGeneric.so.2
-lib/X11/locale/locale.alias
-lib/X11/locale/locale.dir
-lib/X11/locale/microsoft-cp1251/Compose
-lib/X11/locale/microsoft-cp1251/XI18N_OBJS
-lib/X11/locale/microsoft-cp1251/XLC_LOCALE
-lib/X11/locale/microsoft-cp1255/XI18N_OBJS
-lib/X11/locale/microsoft-cp1255/XLC_LOCALE
-lib/X11/locale/microsoft-cp1256/XI18N_OBJS
-lib/X11/locale/microsoft-cp1256/XLC_LOCALE
-lib/X11/locale/mulelao-1/Compose
-lib/X11/locale/mulelao-1/XI18N_OBJS
-lib/X11/locale/mulelao-1/XLC_LOCALE
-lib/X11/locale/nokhchi-1/XI18N_OBJS
-lib/X11/locale/nokhchi-1/XLC_LOCALE
-lib/X11/locale/pt_BR.UTF-8/Compose
-lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
-lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
-lib/X11/locale/tatar-cyr/XI18N_OBJS
-lib/X11/locale/tatar-cyr/XLC_LOCALE
-lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
-lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
-lib/X11/locale/th_TH/XI18N_OBJS
-lib/X11/locale/th_TH/XLC_LOCALE
-lib/X11/locale/tscii-0/XI18N_OBJS
-lib/X11/locale/tscii-0/XLC_LOCALE
-lib/X11/locale/vi_VN.tcvn/Compose
-lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
-lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
-lib/X11/locale/vi_VN.viscii/Compose
-lib/X11/locale/vi_VN.viscii/XI18N_OBJS
-lib/X11/locale/vi_VN.viscii/XLC_LOCALE
-lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_CN.gb18030/Compose
-lib/X11/locale/zh_CN.gb18030/XI18N_OBJS
-lib/X11/locale/zh_CN.gb18030/XLC_LOCALE
-lib/X11/locale/zh_CN.gbk/Compose
-lib/X11/locale/zh_CN.gbk/XI18N_OBJS
-lib/X11/locale/zh_CN.gbk/XLC_LOCALE
-lib/X11/locale/zh_CN/Compose
-lib/X11/locale/zh_CN/XI18N_OBJS
-lib/X11/locale/zh_CN/XLC_LOCALE
-lib/X11/locale/zh_HK.big5/Compose
-lib/X11/locale/zh_HK.big5/XI18N_OBJS
-lib/X11/locale/zh_HK.big5/XLC_LOCALE
-lib/X11/locale/zh_HK.big5hkscs/Compose
-lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
-lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
-lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_TW.big5/Compose
-lib/X11/locale/zh_TW.big5/XI18N_OBJS
-lib/X11/locale/zh_TW.big5/XLC_LOCALE
-lib/X11/locale/zh_TW/Compose
-lib/X11/locale/zh_TW/XI18N_OBJS
-lib/X11/locale/zh_TW/XLC_LOCALE
-lib/libFS.a
-lib/libFS.so
-lib/libFS.so.6
-lib/libGL.a
-lib/libGL.so
-lib/libGL.so.1
-lib/libGLU.a
-lib/libGLU.so
-lib/libGLU.so.1
-lib/libGLw.a
-lib/libGLw.so
-lib/libGLw.so.1
-lib/libICE.a
-lib/libICE.so
-lib/libICE.so.6
-%%OSMESA:%%lib/libOSMesa.a
-%%OSMESA:%%lib/libOSMesa.so
-%%OSMESA:%%lib/libOSMesa.so.4
-lib/libSM.a
-lib/libSM.so
-lib/libSM.so.6
-lib/libX11.a
-lib/libX11.so
-lib/libX11.so.6
-lib/libXRes.a
-lib/libXRes.so
-lib/libXRes.so.1
-lib/libXTrap.a
-lib/libXTrap.so
-lib/libXTrap.so.6
-%%XTHRSTUB:%%lib/libXThrStub.so
-%%XTHRSTUB:%%lib/libXThrStub.so.6
-lib/libXau.a
-lib/libXau.so
-lib/libXau.so.0
-lib/libXaw.a
-lib/libXaw.so
-lib/libXaw.so.6
-lib/libXaw.so.7
-lib/libXaw.so.8
-lib/libXcomposite.a
-lib/libXcomposite.so
-lib/libXcomposite.so.1
-lib/libXcursor.a
-lib/libXcursor.so
-lib/libXcursor.so.1
-lib/libXdamage.a
-lib/libXdamage.so
-lib/libXdamage.so.1
-lib/libXdmcp.a
-lib/libXdmcp.so
-lib/libXdmcp.so.0
-lib/libXevie.a
-lib/libXevie.so
-lib/libXevie.so.1
-lib/libXext.a
-lib/libXext.so
-lib/libXext.so.6
-lib/libXfixes.a
-lib/libXfixes.so
-lib/libXfixes.so.3
-lib/libXfont.a
-lib/libXfont.so
-lib/libXfont.so.1
-lib/libXi.a
-lib/libXi.so
-lib/libXi.so.6
-lib/libXinerama.a
-lib/libXinerama.so
-lib/libXinerama.so.1
-lib/libXmu.a
-lib/libXmu.so
-lib/libXmu.so.6
-lib/libXmuu.a
-lib/libXmuu.so
-lib/libXmuu.so.1
-lib/libXp.a
-lib/libXp.so
-lib/libXp.so.6
-lib/libXpm.a
-lib/libXpm.so
-lib/libXpm.so.4
-lib/libXprintAppUtil.a
-lib/libXprintUtil.a
-lib/libXrandr.a
-lib/libXrandr.so
-lib/libXrandr.so.2
-lib/libXrender.a
-lib/libXrender.so
-lib/libXrender.so.1
-lib/libXss.a
-lib/libXss.so
-lib/libXss.so.1
-lib/libXt.a
-lib/libXt.so
-lib/libXt.so.6
-lib/libXtst.a
-lib/libXtst.so
-lib/libXtst.so.6
-lib/libXv.a
-lib/libXv.so
-lib/libXv.so.1
-lib/libXvMC.a
-lib/libXvMC.so
-lib/libXvMC.so.1
-lib/libXxf86dga.a
-lib/libXxf86dga.so
-lib/libXxf86dga.so.1
-lib/libXxf86misc.a
-lib/libXxf86misc.so
-lib/libXxf86misc.so.1
-lib/libXxf86vm.a
-lib/libXxf86vm.so
-lib/libXxf86vm.so.1
-lib/libdps.a
-lib/libdps.so
-lib/libdps.so.1
-lib/libfntstubs.a
-lib/libfontenc.a
-lib/libfontenc.so
-lib/libfontenc.so.1
-lib/liboldX.a
-lib/liboldX.so
-lib/liboldX.so.6
-lib/libxf86config.a
-lib/libxkbfile.a
-lib/libxkbfile.so
-lib/libxkbfile.so.1
-lib/libxkbui.a
-lib/libxkbui.so
-lib/libxkbui.so.1
-libdata/pkgconfig/xcomposite.pc
-libdata/pkgconfig/xcursor.pc
-libdata/pkgconfig/xdamage.pc
-libdata/pkgconfig/xevie.pc
-libdata/pkgconfig/xfixes.pc
-libdata/pkgconfig/xrender.pc
-@dirrm include/X11/extensions
-@dirrm include/X11/ICE
-@dirrm include/X11/SM
-@dirrm include/X11/Xmu
-@dirrm include/X11/XprintUtil
-@dirrm include/X11/XprintAppUtil
-@dirrm include/X11/Xaw
-@dirrm include/X11/Xcursor
-@dirrm include/GL
-@dirrm include/DPS
-@dirrm lib/X11/locale/lib/common
-@dirrm lib/X11/locale/lib
-@dirrm lib/X11/locale/C
-@dirrm lib/X11/locale/armscii-8
-@dirrm lib/X11/locale/en_US.UTF-8
-@dirrm lib/X11/locale/georgian-academy
-@dirrm lib/X11/locale/georgian-ps
-@dirrm lib/X11/locale/ibm-cp1133
-@dirrm lib/X11/locale/iscii-dev
-@dirrm lib/X11/locale/isiri-3342
-@dirrm lib/X11/locale/iso8859-1
-@dirrm lib/X11/locale/iso8859-2
-@dirrm lib/X11/locale/iso8859-3
-@dirrm lib/X11/locale/iso8859-4
-@dirrm lib/X11/locale/iso8859-5
-@dirrm lib/X11/locale/iso8859-6
-@dirrm lib/X11/locale/iso8859-7
-@dirrm lib/X11/locale/iso8859-8
-@dirrm lib/X11/locale/iso8859-9
-@dirrm lib/X11/locale/iso8859-10
-@dirrm lib/X11/locale/iso8859-11
-@dirrm lib/X11/locale/iso8859-13
-@dirrm lib/X11/locale/ja
-@dirrm lib/X11/locale/iso8859-14
-@dirrm lib/X11/locale/iso8859-15
-@dirrm lib/X11/locale/iso8859-9e
-@dirrm lib/X11/locale/ja.JIS
-@dirrm lib/X11/locale/ja.SJIS
-@dirrm lib/X11/locale/ja_JP.UTF-8
-@dirrm lib/X11/locale/ko
-@dirrm lib/X11/locale/ko_KR.UTF-8
-@dirrm lib/X11/locale/koi8-r
-@dirrm lib/X11/locale/koi8-u
-@dirrm lib/X11/locale/koi8-c
-@dirrm lib/X11/locale/microsoft-cp1251
-@dirrm lib/X11/locale/microsoft-cp1255
-@dirrm lib/X11/locale/microsoft-cp1256
-@dirrm lib/X11/locale/mulelao-1
-@dirrm lib/X11/locale/nokhchi-1
-@dirrm lib/X11/locale/pt_BR.UTF-8
-@dirrm lib/X11/locale/tatar-cyr
-@dirrm lib/X11/locale/th_TH
-@dirrm lib/X11/locale/th_TH.UTF-8
-@dirrm lib/X11/locale/tscii-0
-@dirrm lib/X11/locale/vi_VN.tcvn
-@dirrm lib/X11/locale/vi_VN.viscii
-@dirrm lib/X11/locale/zh_CN
-@dirrm lib/X11/locale/zh_CN.gb18030
-@dirrm lib/X11/locale/zh_CN.gbk
-@dirrm lib/X11/locale/zh_CN.UTF-8
-@dirrm lib/X11/locale/zh_HK.big5
-@dirrm lib/X11/locale/zh_HK.big5hkscs
-@dirrm lib/X11/locale/zh_HK.UTF-8
-@dirrm lib/X11/locale/zh_TW
-@dirrm lib/X11/locale/zh_TW.big5
-@dirrm lib/X11/locale/zh_TW.UTF-8
-@dirrm lib/X11/locale/el_GR.UTF-8
-@dirrmtry include/X11/bitmaps
-@dirrmtry include/X11/fonts
-@dirrmtry lib/X11/locale
+libdata/xorg/libraries
+@dirrmtry libdata/xorg
diff --git a/x11/xorg-libraries/scripts/configure b/x11/xorg-libraries/scripts/configure
deleted file mode 100644
index b7f6be7fa513..000000000000
--- a/x11/xorg-libraries/scripts/configure
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer NO"				>> $LOCALDEF
-echo "#define BuildXft1Library NO"			>> $LOCALDEF
-echo "#define BuildXftLibrary NO"			>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11/xorg-protos/Makefile b/x11/xorg-protos/Makefile
new file mode 100644
index 000000000000..2cfa35154d01
--- /dev/null
+++ b/x11/xorg-protos/Makefile
@@ -0,0 +1,56 @@
+# New ports collection makefile for:    xorg-protos
+# Date created:				Sep 29 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xorg-protos
+PORTVERSION=	7.2
+CATEGORIES=	x11
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.org protos meta-port
+
+USE_X_PREFIX=	yes
+
+BUILD_DEPENDS=	${PREFIX}/include/X11/extensions/bigreqstr.h:${PORTSDIR}/x11/bigreqsproto \
+		${PREFIX}/include/X11/extensions/composite.h:${PORTSDIR}/x11/compositeproto \
+		${PREFIX}/include/X11/extensions/damageproto.h:${PORTSDIR}/x11/damageproto \
+		${PREFIX}/include/X11/extensions/dmxproto.h:${PORTSDIR}/x11/dmxproto \
+		${PREFIX}/include/X11/extensions/xfixesproto.h:${PORTSDIR}/x11/fixesproto \
+		${PREFIX}/include/X11/extensions/fontcache.h:${PORTSDIR}/x11-fonts/fontcacheproto \
+		${PREFIX}/include/X11/fonts/FS.h:${PORTSDIR}/x11-fonts/fontsproto \
+		${PREFIX}/include/GL/glxproto.h:${PORTSDIR}/x11/glproto \
+		${PREFIX}/include/X11/extensions/XIproto.h:${PORTSDIR}/x11/inputproto \
+		${PREFIX}/include/X11/extensions/XKB.h:${PORTSDIR}/x11/kbproto \
+		${PREFIX}/include/X11/extensions/Print.h:${PORTSDIR}/x11/printproto \
+		${PREFIX}/include/X11/extensions/randr.h:${PORTSDIR}/x11/randrproto \
+		${PREFIX}/include/X11/extensions/recordstr.h:${PORTSDIR}/x11/recordproto \
+		${PREFIX}/include/X11/extensions/render.h:${PORTSDIR}/x11/renderproto \
+		${PREFIX}/include/X11/extensions/XResproto.h:${PORTSDIR}/x11/resourceproto \
+		${PREFIX}/include/X11/extensions/saver.h:${PORTSDIR}/x11/scrnsaverproto \
+		${PREFIX}/include/X11/extensions/xtrapproto.h:${PORTSDIR}/x11/trapproto \
+		${PREFIX}/include/X11/extensions/Xv.h:${PORTSDIR}/x11/videoproto \
+		${PREFIX}/include/X11/extensions/xcmiscstr.h:${PORTSDIR}/x11/xcmiscproto \
+		${PREFIX}/include/X11/extensions/MITMisc.h:${PORTSDIR}/x11/xextproto \
+		${PREFIX}/include/X11/extensions/xf86bigfont.h:${PORTSDIR}/x11-fonts/xf86bigfontproto \
+		${PREFIX}/include/X11/extensions/xf86dga.h:${PORTSDIR}/x11/xf86dgaproto \
+		${PREFIX}/include/GL/internal/dri_interface.h:${PORTSDIR}/x11/xf86driproto \
+		${PREFIX}/include/X11/extensions/xf86misc.h:${PORTSDIR}/x11/xf86miscproto \
+		${PREFIX}/include/X11/extensions/xf86rush.h:${PORTSDIR}/x11/xf86rushproto \
+		${PREFIX}/include/X11/extensions/xf86vmode.h:${PORTSDIR}/x11/xf86vidmodeproto \
+		${PREFIX}/include/X11/extensions/panoramiXproto.h:${PORTSDIR}/x11/xineramaproto \
+		${PREFIX}/include/X11/DECkeysym.h:${PORTSDIR}/x11/xproto \
+		${PREFIX}/include/X11/PM/PM.h:${PORTSDIR}/x11/xproxymanagementprotocol
+
+NO_BUILD=	yes
+
+do-install:
+		${MKDIR} ${PREFIX}/libdata/xorg
+		${TOUCH} ${PREFIX}/libdata/xorg/protos
+
+.include <bsd.port.mk>
diff --git a/x11/xorg-protos/pkg-descr b/x11/xorg-protos/pkg-descr
new file mode 100644
index 000000000000..4c499da5f573
--- /dev/null
+++ b/x11/xorg-protos/pkg-descr
@@ -0,0 +1,6 @@
+This meta-package installs all X.Org protocol headers.
+
+WWW: http://www.x.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11/xorg-protos/pkg-plist b/x11/xorg-protos/pkg-plist
new file mode 100644
index 000000000000..9bd1d3f01034
--- /dev/null
+++ b/x11/xorg-protos/pkg-plist
@@ -0,0 +1,2 @@
+libdata/xorg/protos
+@dirrmtry libdata/xorg
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index e84d9f6895f8..95893fb3ca47 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -6,48 +6,43 @@
 #
 
 PORTNAME=	xorg
-PORTVERSION=	6.9.0
+PORTVERSION=	7.2
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org distribution metaport
+COMMENT=	X.Org complete distribution metaport
 
-LIB_DEPENDS=	X11.6:${PORTSDIR}/x11/xorg-libraries
-RUN_DEPENDS=	xvinfo:${PORTSDIR}/x11/xorg-clients \
-		${X11BASE}/share/doc/X11/ddx.txt:${PORTSDIR}/x11/xorg-documents \
-		${X11BASE}/man/man1/Xserver.1.gz:${PORTSDIR}/x11/xorg-manpages \
-		${FONT100DPI}:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
-		${FONT75DPI}:${PORTSDIR}/x11-fonts/xorg-fonts-75dpi \
-		${FONTCYR}:${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic \
-		${FONTDEFAULT}:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
-		${FONTTT}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
-		${FONTT1}:${PORTSDIR}/x11-fonts/xorg-fonts-type1 \
-		${X11BASE}/bin/xfs:${PORTSDIR}/x11-servers/xorg-fontserver \
-		${X11BASE}/bin/Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \
-		${X11BASE}/bin/Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
-		${X11BASE}/bin/Xprt:${PORTSDIR}/x11-servers/xorg-printserver
+NO_BUILD=	yes
+PREFIX?=	${X11BASE}
 
-.include <bsd.port.pre.mk>
+RUN_DEPENDS+=	${X11BASE}/lib/dri/r128_dri.so:${PORTSDIR}/graphics/dri
 
-.if ${ARCH} != ia64
-RUN_DEPENDS+=	${X11BASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
-.endif
+# data
+RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
+		${X11BASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
 
-.if ${ARCH} == i386 || ${ARCH} == alpha || ${ARCH} == amd64
-RUN_DEPENDS+=	${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/dri
-.endif
+# doc
+RUN_DEPENDS+=	${X11BASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs
 
-FONT100DPI=	${X11BASE}/lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
-FONT75DPI=	${X11BASE}/lib/X11/fonts/75dpi/UTBI__10-ISO8859-1.pcf.gz
-FONTCYR=	${X11BASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz
-FONTDEFAULT=	${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz
-FONTTT=		${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-FONTT1=		${X11BASE}/lib/X11/fonts/Type1/UTBI____.afm
+# app, lib, font, driver, proto
+RUN_DEPENDS+=	${X11BASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \
+		${X11BASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \
+		${X11BASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \
+		${X11BASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \
+		${X11BASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos \
+		${X11BASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 
-NO_BUILD=	yes
+.if defined(COMPLETE_BUILD) || defined(PACKAGE_BUILDING)
+RUN_DEPEND+=	Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \
+		Xdmx:${PORTSDIR}/x11-servers/xorg-dmx \
+		Xprt:${PORTSDIR}/x11-servers/xorg-printserver \
+		Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
+.endif
+
+do-install:	# empty
 
 pre-everything::
 	@${ECHO_MSG} "This is a meta-port, meaning that it just depends on its subparts of the port."
@@ -56,17 +51,18 @@ pre-everything::
 	@${ECHO_MSG} "upgrade X.Org.  If you simply type 'make install' it may use over 2GB to build"
 	@${ECHO_MSG} "all of the subports.  You can install the ports singly if you are low on space."
 
+.include <bsd.port.pre.mk>
+
 .if make(package)
 .if !defined(DEPENDS_TARGET:Mpackage) || empty(DEPENDS_TARGET:Mpackage)
 DEPENDS_TARGET="package"
 .endif
 .endif
 
-do-install:	# empty
-
 .if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
+IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
 	distribution. See The X Window System and Virtual Consoles chapter\
 	of FAQ for more information
 .endif
+
 .include <bsd.port.post.mk>
diff --git a/x11/xphelloworld/Makefile b/x11/xphelloworld/Makefile
new file mode 100644
index 000000000000..42b37579e71b
--- /dev/null
+++ b/x11/xphelloworld/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	xphelloworld
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xphelloworld
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Sends a test page to an Xprint printer
+
+XORG_CAT=	app
+USE_XORG=	x11 xaw8 xprintutil xp xprintapputil xt
+
+PLIST_FILES=	bin/xphelloworld \
+		bin/xpsimplehelloworld \
+		bin/xpxthelloworld
+
+MAN1=		xphelloworld.1 \
+		xpsimplehelloworld.1 \
+		xpxthelloworld.1
+
+.include <bsd.port.mk>
diff --git a/x11/xphelloworld/distinfo b/x11/xphelloworld/distinfo
new file mode 100644
index 000000000000..86bca85f8672
--- /dev/null
+++ b/x11/xphelloworld/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xphelloworld-1.0.1.tar.bz2) = 5c7fd1e35dd63089229e357c46e4f407
+SHA256 (xorg/app/xphelloworld-1.0.1.tar.bz2) = b1ca08e3ba4e5b135ee9d8675e717a6f88eafa53b031b2b821d2760897e35426
+SIZE (xorg/app/xphelloworld-1.0.1.tar.bz2) = 73111
diff --git a/x11/xphelloworld/pkg-descr b/x11/xphelloworld/pkg-descr
new file mode 100644
index 000000000000..4a69cd4b1984
--- /dev/null
+++ b/x11/xphelloworld/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xphelloworld, an utility that sends a test page to
+an Xprint printer.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xplsprinters/Makefile b/x11/xplsprinters/Makefile
new file mode 100644
index 000000000000..004d78f26dea
--- /dev/null
+++ b/x11/xplsprinters/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xplsprinters
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xplsprinters
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Shows a list of Xprint printers
+
+XORG_CAT=	app
+USE_XORG=	xp xprintutil x11
+
+PLIST_FILES=	bin/xplsprinters
+
+MAN1=		xplsprinters.1
+
+.include <bsd.port.mk>
diff --git a/x11/xplsprinters/distinfo b/x11/xplsprinters/distinfo
new file mode 100644
index 000000000000..2415797714dc
--- /dev/null
+++ b/x11/xplsprinters/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xplsprinters-1.0.1.tar.bz2) = c1558277f4a010473ff0744845c49537
+SHA256 (xorg/app/xplsprinters-1.0.1.tar.bz2) = adc60a1808e0974b75a0e7f95022f23411a0e2e9f83e84c441cba5f28f8db072
+SIZE (xorg/app/xplsprinters-1.0.1.tar.bz2) = 77212
diff --git a/x11/xplsprinters/pkg-descr b/x11/xplsprinters/pkg-descr
new file mode 100644
index 000000000000..f12de05c9af6
--- /dev/null
+++ b/x11/xplsprinters/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xplsprinters, a program for showing a list of Xprint
+printers and it's attributes.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xpr/Makefile b/x11/xpr/Makefile
new file mode 100644
index 000000000000..2ffa20de640e
--- /dev/null
+++ b/x11/xpr/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xpr
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xpr
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Utility for printing an X window dump
+
+XORG_CAT=	app
+USE_XORG=	xmuu x11
+
+PLIST_FILES=	bin/xdpr bin/xpr
+
+MAN1=		xdpr.1 xpr.1
+
+.include <bsd.port.mk>
diff --git a/x11/xpr/distinfo b/x11/xpr/distinfo
new file mode 100644
index 000000000000..f058ba16c643
--- /dev/null
+++ b/x11/xpr/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xpr-1.0.2.tar.bz2) = 6b3a6896081f628bf5a2c9129417c86f
+SHA256 (xorg/app/xpr-1.0.2.tar.bz2) = c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf
+SIZE (xorg/app/xpr-1.0.2.tar.bz2) = 117849
diff --git a/x11/xpr/pkg-descr b/x11/xpr/pkg-descr
new file mode 100644
index 000000000000..759cb9d1eb9f
--- /dev/null
+++ b/x11/xpr/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xpr, an utility for printing an X window dump.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xprehashprinterlist/Makefile b/x11/xprehashprinterlist/Makefile
new file mode 100644
index 000000000000..bc93bd596eb8
--- /dev/null
+++ b/x11/xprehashprinterlist/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xprehashprinterlist
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xprehashprinterlist
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Recomputes the list of available printers.
+
+XORG_CAT=	app
+USE_XORG=	xp x11
+
+PLIST_FILES=	bin/xprehashprinterlist
+
+MAN1=		xprehashprinterlist.1
+
+.include <bsd.port.mk>
diff --git a/x11/xprehashprinterlist/distinfo b/x11/xprehashprinterlist/distinfo
new file mode 100644
index 000000000000..c0dbbdc5077c
--- /dev/null
+++ b/x11/xprehashprinterlist/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xprehashprinterlist-1.0.1.tar.bz2) = 99ee20a9af25375895f5d7ebc1004163
+SHA256 (xorg/app/xprehashprinterlist-1.0.1.tar.bz2) = ba67e9256f703d614ab891b1d676fc26e7479094b957370cbb363c78b2f20259
+SIZE (xorg/app/xprehashprinterlist-1.0.1.tar.bz2) = 75613
diff --git a/x11/xprehashprinterlist/pkg-descr b/x11/xprehashprinterlist/pkg-descr
new file mode 100644
index 000000000000..02941e073eaf
--- /dev/null
+++ b/x11/xprehashprinterlist/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xprehashprinterlist, a program that recomputes the
+list of available printers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile
index 896a854c4381..48761548c8c7 100644
--- a/x11/xprompt/Makefile
+++ b/x11/xprompt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xprompt
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mph
diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile
new file mode 100644
index 000000000000..cef614ec73b1
--- /dev/null
+++ b/x11/xprop/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xprop
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xprop
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Property displayer for X
+
+XORG_CAT=	app
+USE_XORG=	xmuu x11
+
+PLIST_FILES=	bin/xprop
+
+MAN1=		xprop.1
+
+.include <bsd.port.mk>
diff --git a/x11/xprop/distinfo b/x11/xprop/distinfo
new file mode 100644
index 000000000000..590dca6cee33
--- /dev/null
+++ b/x11/xprop/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xprop-1.0.2.tar.bz2) = 5b6f02a3b1cda0cadc35f84814fe53d4
+SHA256 (xorg/app/xprop-1.0.2.tar.bz2) = 88b1e65703c68f14ac6cb735737d1a0e52751a18fdc8a39d2d1e5eaa07875ca0
+SIZE (xorg/app/xprop-1.0.2.tar.bz2) = 99762
diff --git a/x11/xprop/pkg-descr b/x11/xprop/pkg-descr
new file mode 100644
index 000000000000..a8f57ccded0d
--- /dev/null
+++ b/x11/xprop/pkg-descr
@@ -0,0 +1,5 @@
+This package contains the xprop utility, which is for displaying window
+and font properties in an X server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index 153091c2e726..3a303dd58cb8 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -6,21 +6,12 @@
 #
 
 PORTNAME=	xproto
-PORTVERSION=	6.6.2
+PORTVERSION=	7.0.10
 CATEGORIES=	x11
-MASTER_SITES=	http://xlibs.freedesktop.org/release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 protocol headers
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE=	yes
-NO_BUILD=	yes
-USE_GNOME=	gnomehack
+XORG_CAT=	proto
 
 .include <bsd.port.mk>
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index c5e1732f9a7b..02bf99a09908 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xproto-6.6.2.tar.bz2) = fc419f3028cc2959b979a7e7464105f9
-SHA256 (xproto-6.6.2.tar.bz2) = 9c2bcfad5cd25c7fafcc86adccd14e0b859c444f351b449354c6524963a75e69
-SIZE (xproto-6.6.2.tar.bz2) = 86759
+MD5 (xorg/proto/xproto-7.0.10.tar.bz2) = 2ed80e90992e7455eaac4c3e977ebd01
+SHA256 (xorg/proto/xproto-7.0.10.tar.bz2) = 6d659920262d41e48714184f94ff9cd2608515e0f3d2f074892fe0c048784df4
+SIZE (xorg/proto/xproto-7.0.10.tar.bz2) = 142954
diff --git a/x11/xproto/pkg-plist b/x11/xproto/pkg-plist
index c86647e1e120..77c7571fa2ab 100644
--- a/x11/xproto/pkg-plist
+++ b/x11/xproto/pkg-plist
@@ -1,5 +1,9 @@
+include/X11/DECkeysym.h
+include/X11/HPkeysym.h
+include/X11/Sunkeysym.h
 include/X11/X.h
 include/X11/XF86keysym.h
+include/X11/XWDFile.h
 include/X11/Xalloca.h
 include/X11/Xarch.h
 include/X11/Xatom.h
@@ -14,6 +18,10 @@ include/X11/Xpoll.h
 include/X11/Xproto.h
 include/X11/Xprotostr.h
 include/X11/Xthreads.h
+include/X11/Xw32defs.h
+include/X11/Xwindows.h
+include/X11/Xwinsock.h
+include/X11/ap_keysym.h
 include/X11/keysym.h
 include/X11/keysymdef.h
 libdata/pkgconfig/xproto.pc
diff --git a/x11/xproxymanagementprotocol/Makefile b/x11/xproxymanagementprotocol/Makefile
new file mode 100644
index 000000000000..06c625b5eeb6
--- /dev/null
+++ b/x11/xproxymanagementprotocol/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:   xproxymanagementprotocol
+# Date Created:			Jun 21 2006
+# Whom:				Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xproxymanagementprotocol
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X Proxy Management Protocol headers
+
+XORG_CAT=	proto
+
+.include <bsd.port.mk>
diff --git a/x11/xproxymanagementprotocol/distinfo b/x11/xproxymanagementprotocol/distinfo
new file mode 100644
index 000000000000..f7807bd4334d
--- /dev/null
+++ b/x11/xproxymanagementprotocol/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = d28007a50976204960fc1fc07b4ca093
+SHA256 (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = c45176d002c85c142ac52774680f5325d330c5ecc32d4d6a056d85ee039a0cbc
+SIZE (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = 37007
diff --git a/x11/xproxymanagementprotocol/pkg-descr b/x11/xproxymanagementprotocol/pkg-descr
new file mode 100644
index 000000000000..4a2f4dd1c837
--- /dev/null
+++ b/x11/xproxymanagementprotocol/pkg-descr
@@ -0,0 +1,6 @@
+This package contains X Proxy Management Protocol headers.
+
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11/xproxymanagementprotocol/pkg-plist b/x11/xproxymanagementprotocol/pkg-plist
new file mode 100644
index 000000000000..19895969c0e2
--- /dev/null
+++ b/x11/xproxymanagementprotocol/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/PM/PM.h
+include/X11/PM/PMproto.h
+libdata/pkgconfig/xproxymngproto.pc
+@dirrm include/X11/PM
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
new file mode 100644
index 000000000000..d1b9a6beaa31
--- /dev/null
+++ b/x11/xrandr/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xrandr
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xrandr
+PORTVERSION=	1.2.0
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Primitive command line interface to the RandR extension
+
+XORG_CAT=	app
+USE_XORG=	xrandr xrender x11
+
+PLIST_FILES=	bin/xrandr
+
+MAN1=		xrandr.1
+
+.include <bsd.port.mk>
diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo
new file mode 100644
index 000000000000..bf9c8ce2ab4b
--- /dev/null
+++ b/x11/xrandr/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xrandr-1.2.0.tar.bz2) = 9e74e6919cf731ec10ce26fd6a4483fa
+SHA256 (xorg/app/xrandr-1.2.0.tar.bz2) = 7bf3bd3cf46a6a29e35b9dd1c8d3d14494be76da0d24c6ef5dab36974445004d
+SIZE (xorg/app/xrandr-1.2.0.tar.bz2) = 92498
diff --git a/x11/xrandr/pkg-descr b/x11/xrandr/pkg-descr
new file mode 100644
index 000000000000..ef0f6e48a64e
--- /dev/null
+++ b/x11/xrandr/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xrandr, a primitive command line interface to
+the RandR extension.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
new file mode 100644
index 000000000000..7927276ea3b2
--- /dev/null
+++ b/x11/xrdb/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xrdb
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xrdb
+PORTVERSION=	1.0.3
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X server resource database utility
+
+XORG_CAT=	app
+USE_XORG=	xmuu x11
+
+PLIST_FILES=	bin/xrdb
+
+MAN1=		xrdb.1
+
+.include <bsd.port.mk>
diff --git a/x11/xrdb/distinfo b/x11/xrdb/distinfo
new file mode 100644
index 000000000000..91eb1b10a9d4
--- /dev/null
+++ b/x11/xrdb/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xrdb-1.0.3.tar.bz2) = 380b2ef545306354cc150834de567be7
+SHA256 (xorg/app/xrdb-1.0.3.tar.bz2) = a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c
+SIZE (xorg/app/xrdb-1.0.3.tar.bz2) = 99840
diff --git a/x11/xrdb/pkg-descr b/x11/xrdb/pkg-descr
new file mode 100644
index 000000000000..fadb6f4194a0
--- /dev/null
+++ b/x11/xrdb/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xrdb, a X server resource database utility.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile
new file mode 100644
index 000000000000..2214a510b18c
--- /dev/null
+++ b/x11/xrefresh/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xrefresh
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xrefresh
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Refresh all or part of an X screen
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+PLIST_FILES=	bin/xrefresh
+
+MAN1=		xrefresh.1
+
+.include <bsd.port.mk>
diff --git a/x11/xrefresh/distinfo b/x11/xrefresh/distinfo
new file mode 100644
index 000000000000..c17a1d26377c
--- /dev/null
+++ b/x11/xrefresh/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xrefresh-1.0.2.tar.bz2) = 1228f890f86148e4e6ae22aa73118cbb
+SHA256 (xorg/app/xrefresh-1.0.2.tar.bz2) = 522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5
+SIZE (xorg/app/xrefresh-1.0.2.tar.bz2) = 80590
diff --git a/x11/xrefresh/pkg-descr b/x11/xrefresh/pkg-descr
new file mode 100644
index 000000000000..da1d4e7969ed
--- /dev/null
+++ b/x11/xrefresh/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xrefresh, which is a simple X program that causes
+all or part of your screen to be repainted.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile
index 375132de1f3d..1c9738659931 100644
--- a/x11/xrestop/Makefile
+++ b/x11/xrestop/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xrestop
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://projects.o-hand.com/sources/${PORTNAME}/
 
diff --git a/x11/xrootconsole/Makefile b/x11/xrootconsole/Makefile
index 618c6c6802a7..5dd59e9fb05b 100644
--- a/x11/xrootconsole/Makefile
+++ b/x11/xrootconsole/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xrootconsole
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11/xrsh/Makefile b/x11/xrsh/Makefile
index a2733851aeda..767f028a4699 100644
--- a/x11/xrsh/Makefile
+++ b/x11/xrsh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xrsh
 PORTVERSION=	5.92
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://jjd.com/
 DISTNAME=	${PORTNAME}
diff --git a/x11/xrsi/Makefile b/x11/xrsi/Makefile
index 755228db80c5..53a6f4307515 100644
--- a/x11/xrsi/Makefile
+++ b/x11/xrsi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xrsi
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xrsi
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
new file mode 100644
index 000000000000..a1278ea72541
--- /dev/null
+++ b/x11/xrx/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	xrx
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xrx
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	RX helper program
+
+XORG_CAT=	app
+USE_XORG=	x11 xt xext xtrans xproxymngproto xau xaw
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool:15
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+
+MAN1=		xrx.1 libxrx.1
+
+.include <bsd.port.mk>
diff --git a/x11/xrx/distinfo b/x11/xrx/distinfo
new file mode 100644
index 000000000000..86280543a985
--- /dev/null
+++ b/x11/xrx/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xrx-1.0.1.tar.bz2) = 5f65e24f8a225e255beb2059e33d6b37
+SHA256 (xorg/app/xrx-1.0.1.tar.bz2) = a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4
+SIZE (xorg/app/xrx-1.0.1.tar.bz2) = 265332
diff --git a/x11/xrx/pkg-descr b/x11/xrx/pkg-descr
new file mode 100644
index 000000000000..d1065916a218
--- /dev/null
+++ b/x11/xrx/pkg-descr
@@ -0,0 +1,6 @@
+This package contains xrx, an RX helper program which can be used with
+any web browser to interpret documents in the RX MIME type format and
+start remote applications.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xrx/pkg-plist b/x11/xrx/pkg-plist
new file mode 100644
index 000000000000..7fa9e3aa3093
--- /dev/null
+++ b/x11/xrx/pkg-plist
@@ -0,0 +1,9 @@
+bin/xrx
+lib/libxrx.so.0
+lib/libxrx.so
+lib/libxrx.la
+lib/libxrx.a
+lib/libxrxnest.so.0
+lib/libxrxnest.so
+lib/libxrxnest.la
+lib/libxrxnest.a
diff --git a/x11/xscreensaver-gnome-hacks/Makefile b/x11/xscreensaver-gnome-hacks/Makefile
index f5ce6d1aff66..da281e49fcd7 100644
--- a/x11/xscreensaver-gnome-hacks/Makefile
+++ b/x11/xscreensaver-gnome-hacks/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xscreensaver-gnome-hacks
-PORTREVISION=	1
+PORTREVISION=	2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Screensaver modules for use with xscreensaver and gnome-screensaver
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index fbaa4031c7a8..ea4ee9766cc9 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	xscreensaver-gnome
 PORTVERSION=	4.24
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 316072c63e5c..58871d231409 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -452,23 +452,5 @@ share/xscreensaver/config/zoom.xml
 @dirrm share/gnome/xscreensaver/glade
 @dirrm share/gnome/xscreensaver
 @dirrm bin/xscreensaver-hacks
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@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/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @cwd %%X11BASE%%
 lib/X11/app-defaults/XScreenSaver
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index b659e92bda4b..6b2e2d956d4d 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xscreensaver-kde
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile
index c04d2302fa47..2ec699a05b14 100644
--- a/x11/xscreensaver.app/Makefile
+++ b/x11/xscreensaver.app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XScreenSaver.App
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xscreensaverapp
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 5502d35e0e88..1fe1099e1b16 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xscreensaver
 PORTVERSION=	5.01
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
 		http://dougbarton.us/Downloads/
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 1490260c8f67..baa352122080 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -434,7 +434,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/glade/screensaver-snap.png
 %%DATADIR%%/glade/xscreensaver-demo.glade2
 @dirrmtry bin/xscreensaver-hacks
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
diff --git a/x11/xsel/Makefile b/x11/xsel/Makefile
index 5bbb58eea185..8a09c153b93b 100644
--- a/x11/xsel/Makefile
+++ b/x11/xsel/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xsel
 PORTVERSION=	0.04.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://www.niksula.cs.hut.fi/~vherva/xsel/
 DISTFILES=	xsel.c xsel.man
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
new file mode 100644
index 000000000000..f26644fda9eb
--- /dev/null
+++ b/x11/xset/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xset
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xset
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	User preference utility for X
+
+XORG_CAT=	app
+USE_XORG=	xmuu
+
+PLIST_FILES=	bin/xset
+
+MAN1=		xset.1
+
+.include <bsd.port.mk>
diff --git a/x11/xset/distinfo b/x11/xset/distinfo
new file mode 100644
index 000000000000..bf8a79c6e067
--- /dev/null
+++ b/x11/xset/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xset-1.0.2.tar.bz2) = 1b781a0802c7b8fb9619a6665607b3f0
+SHA256 (xorg/app/xset-1.0.2.tar.bz2) = ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9
+SIZE (xorg/app/xset-1.0.2.tar.bz2) = 92940
diff --git a/x11/xset/pkg-descr b/x11/xset/pkg-descr
new file mode 100644
index 000000000000..bdbb142c16df
--- /dev/null
+++ b/x11/xset/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xset, an application used to set various user preference
+options related to the display in the X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xsetmode/Makefile b/x11/xsetmode/Makefile
new file mode 100644
index 000000000000..58297f54fd72
--- /dev/null
+++ b/x11/xsetmode/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xsetmode
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xsetmode
+PORTVERSION=	1.0.0
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Set the mode for an X Input Device
+
+XORG_CAT=	app
+USE_XORG=	xi x11
+
+PLIST_FILES=	bin/xsetmode
+
+MAN1=		xsetmode.1
+
+.include <bsd.port.mk>
diff --git a/x11/xsetmode/distinfo b/x11/xsetmode/distinfo
new file mode 100644
index 000000000000..b7aeefe65495
--- /dev/null
+++ b/x11/xsetmode/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xsetmode-1.0.0.tar.bz2) = d074e79d380b031d2f60e4cd56538c93
+SHA256 (xorg/app/xsetmode-1.0.0.tar.bz2) = 988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa
+SIZE (xorg/app/xsetmode-1.0.0.tar.bz2) = 73757
diff --git a/x11/xsetmode/pkg-descr b/x11/xsetmode/pkg-descr
new file mode 100644
index 000000000000..83bdd9a4f63f
--- /dev/null
+++ b/x11/xsetmode/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xsetmode, which is a program for setting the mode
+of an X Input device to either absolute och relative.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xsetpointer/Makefile b/x11/xsetpointer/Makefile
new file mode 100644
index 000000000000..0f73574a928b
--- /dev/null
+++ b/x11/xsetpointer/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xsetpointer
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xsetpointer
+PORTVERSION=	1.0.0
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Set an X Input device as the main pointer
+
+XORG_CAT=	app
+USE_XORG=	xi x11
+
+PLIST_FILES=	bin/xsetpointer
+
+MAN1=		xsetpointer.1
+
+.include <bsd.port.mk>
diff --git a/x11/xsetpointer/distinfo b/x11/xsetpointer/distinfo
new file mode 100644
index 000000000000..cef7fe3428f3
--- /dev/null
+++ b/x11/xsetpointer/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xsetpointer-1.0.0.tar.bz2) = c94ea103e27e370e4e5030e50c5d5d69
+SHA256 (xorg/app/xsetpointer-1.0.0.tar.bz2) = 7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a
+SIZE (xorg/app/xsetpointer-1.0.0.tar.bz2) = 73861
diff --git a/x11/xsetpointer/pkg-descr b/x11/xsetpointer/pkg-descr
new file mode 100644
index 000000000000..e755bb22bf9c
--- /dev/null
+++ b/x11/xsetpointer/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xsetpointer, which sets an X Input device
+as the main pointer.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xsetroot/Makefile b/x11/xsetroot/Makefile
new file mode 100644
index 000000000000..bfc0700ee62e
--- /dev/null
+++ b/x11/xsetroot/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xsetroot
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xsetroot
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	root window parameter setting utility for X
+
+XORG_CAT=	app
+USE_XORG=	xmuu x11 xbitmaps
+MAN1=		xsetroot.1
+PLIST_FILES=	bin/xsetroot
+
+.include <bsd.port.mk>
diff --git a/x11/xsetroot/distinfo b/x11/xsetroot/distinfo
new file mode 100644
index 000000000000..b682db4c3cbf
--- /dev/null
+++ b/x11/xsetroot/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xsetroot-1.0.1.tar.bz2) = fc7eeb7130bb54345671a9dbaab567ac
+SHA256 (xorg/app/xsetroot-1.0.1.tar.bz2) = 897d77acd3f4a366472386139827eaac24cc423c811ef0e65e0d5eca099a3155
+SIZE (xorg/app/xsetroot-1.0.1.tar.bz2) = 77709
diff --git a/x11/xsetroot/pkg-descr b/x11/xsetroot/pkg-descr
new file mode 100644
index 000000000000..d09e4b06de32
--- /dev/null
+++ b/x11/xsetroot/pkg-descr
@@ -0,0 +1,6 @@
+This package contains xsetroot, a root window paramteter setting utility
+for the X Window System, which allows you to change the appearance of the
+background ("root") window in X.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile
index 895877943f20..a345fab1f7b3 100644
--- a/x11/xskyroot/Makefile
+++ b/x11/xskyroot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xskyroot
 PORTVERSION=	920428
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/news/fj.sources/V10/
 DISTFILES=	1079.gz
diff --git a/x11/xsm/Makefile b/x11/xsm/Makefile
new file mode 100644
index 000000000000..ef4ac255f415
--- /dev/null
+++ b/x11/xsm/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xsm
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xsm
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X Session Manager
+
+XORG_CAT=	app
+USE_XORG=	xt xaw
+
+MAN1=		xsm.1
+
+.include <bsd.port.mk>
diff --git a/x11/xsm/distinfo b/x11/xsm/distinfo
new file mode 100644
index 000000000000..91adfc3d9533
--- /dev/null
+++ b/x11/xsm/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xsm-1.0.1.tar.bz2) = cce867ff7d0df9c0b9e682591779952c
+SHA256 (xorg/app/xsm-1.0.1.tar.bz2) = 2f2535b5394d59be0a4bb15c12ea1b19b873a0096446ecc4c71aa81f0d99b29a
+SIZE (xorg/app/xsm-1.0.1.tar.bz2) = 116875
diff --git a/x11/xsm/pkg-descr b/x11/xsm/pkg-descr
new file mode 100644
index 000000000000..9b70d0df901c
--- /dev/null
+++ b/x11/xsm/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org X Session Manager (xsm).
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xsm/pkg-plist b/x11/xsm/pkg-plist
new file mode 100644
index 000000000000..321ab1b91c47
--- /dev/null
+++ b/x11/xsm/pkg-plist
@@ -0,0 +1,5 @@
+bin/xsm
+lib/X11/xsm/system.xsm
+share/X11/app-defaults/XSm
+@dirrmtry share/X11/app-defaults
+@dirrm lib/X11/xsm
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 200cea61d3dc..201fedf2b7b3 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xsnow
 PORTVERSION=	1.42
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.euronet.nl/~rja/Xsnow/
 
diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile
index 8821b395853b..945d9393247b 100644
--- a/x11/xstarroll/Makefile
+++ b/x11/xstarroll/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xstarroll
 PORTVERSION=	1.1b
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/
diff --git a/x11/xstdcmap/Makefile b/x11/xstdcmap/Makefile
new file mode 100644
index 000000000000..329840c28e7e
--- /dev/null
+++ b/x11/xstdcmap/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xstdcmap
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xstdcmap
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X standard colormap utility
+
+XORG_CAT=	app
+USE_XORG=	xmu x11
+
+PLIST_FILES=	bin/xstdcmap
+
+MAN1=		xstdcmap.1
+
+.include <bsd.port.mk>
diff --git a/x11/xstdcmap/distinfo b/x11/xstdcmap/distinfo
new file mode 100644
index 000000000000..56af4c388351
--- /dev/null
+++ b/x11/xstdcmap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xstdcmap-1.0.1.tar.bz2) = 86ab558441edfb86f853639e4290a754
+SHA256 (xorg/app/xstdcmap-1.0.1.tar.bz2) = 0d920660137dee514599f63b5a8c8ce14d2474607e28e32c973cafb360f7e738
+SIZE (xorg/app/xstdcmap-1.0.1.tar.bz2) = 76310
diff --git a/x11/xstdcmap/pkg-descr b/x11/xstdcmap/pkg-descr
new file mode 100644
index 000000000000..9383874205a6
--- /dev/null
+++ b/x11/xstdcmap/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xstdcmap, an X standard colormap utility.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile
index b005f706cbbf..b4106d7d8376 100644
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xstroke
 PORTVERSION=	0.5.12
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.handhelds.org/projects/xstroke/release-0.5/ \
 		http://www.handhelds.org/download/projects/xstroke/release-0.5/
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index b41a83046935..e985a66f1e11 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtacy
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ultranet.com/~jjohnson/ \
 		${MASTER_SITE_SUNSITE}
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index eb5e7ec9e95e..c9588001b41f 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xterm
 PORTVERSION=	225
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/ \
 		http://voodoo.bawue.com/download/
diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile
index d6708b2161c5..71e376087ff7 100644
--- a/x11/xtermcontrol/Makefile
+++ b/x11/xtermcontrol/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtermcontrol
 PORTVERSION=	2.8
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.thrysoee.dk/xtermcontrol/
 
diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile
index f7011428fcff..ff1c3e134114 100644
--- a/x11/xtermset/Makefile
+++ b/x11/xtermset/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtermset
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	clts
diff --git a/x11/xtestpicture/Makefile b/x11/xtestpicture/Makefile
index 747ae7c3bb26..f79f74dfcf51 100644
--- a/x11/xtestpicture/Makefile
+++ b/x11/xtestpicture/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtestpicture
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
 
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index 3328b7d29efa..b3c41c993a29 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtoolwait
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
new file mode 100644
index 000000000000..509a9a060033
--- /dev/null
+++ b/x11/xtrans/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	xtrans
+# Date Created:				08 Aug 2005
+# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xtrans
+PORTVERSION=	1.0.3
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Abstract network code for X
+
+XORG_CAT=	lib
+
+.include <bsd.port.mk>
diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
new file mode 100644
index 000000000000..be976168456e
--- /dev/null
+++ b/x11/xtrans/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/xtrans-1.0.3.tar.bz2) = bb196907ea1e182dcb396eb22f7d2c1a
+SHA256 (xorg/lib/xtrans-1.0.3.tar.bz2) = e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085
+SIZE (xorg/lib/xtrans-1.0.3.tar.bz2) = 102657
diff --git a/x11/xtrans/pkg-descr b/x11/xtrans/pkg-descr
new file mode 100644
index 000000000000..90b6ad875d03
--- /dev/null
+++ b/x11/xtrans/pkg-descr
@@ -0,0 +1,6 @@
+This package contains xtrans, a library of code that is shared among X
+packages to handle network protocol transport in a modular fashion,
+allowing a single place to add new transport types.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xtrans/pkg-plist b/x11/xtrans/pkg-plist
new file mode 100644
index 000000000000..55608d359f26
--- /dev/null
+++ b/x11/xtrans/pkg-plist
@@ -0,0 +1,13 @@
+include/X11/Xtrans/Xtrans.c
+include/X11/Xtrans/Xtrans.h
+include/X11/Xtrans/Xtransdnet.c
+include/X11/Xtrans/Xtransint.h
+include/X11/Xtrans/Xtranslcl.c
+include/X11/Xtrans/Xtransos2.c
+include/X11/Xtrans/Xtranssock.c
+include/X11/Xtrans/Xtranstli.c
+include/X11/Xtrans/Xtransutil.c
+include/X11/Xtrans/transport.c
+libdata/pkgconfig/xtrans.pc
+share/aclocal/xtrans.m4
+@dirrm include/X11/Xtrans
diff --git a/x11/xtrap/Makefile b/x11/xtrap/Makefile
new file mode 100644
index 000000000000..c222d0301ec3
--- /dev/null
+++ b/x11/xtrap/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for:	xtrap
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xtrap
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	XTrap sample clients for X
+
+XORG_CAT=	app
+USE_XORG=	xtrap
+
+MAN1=		xtrap.1 \
+		xtrapchar.1 \
+		xtrapin.1 \
+		xtrapinfo.1 \
+		xtrapout.1 \
+		xtrapproto.1 \
+		xtrapreset.1 \
+		xtrapstats.1
+
+.include <bsd.port.mk>
diff --git a/x11/xtrap/distinfo b/x11/xtrap/distinfo
new file mode 100644
index 000000000000..6b3d08ed63b0
--- /dev/null
+++ b/x11/xtrap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xtrap-1.0.2.tar.bz2) = 97a62a011a11f03b46d72851aa298fa8
+SHA256 (xorg/app/xtrap-1.0.2.tar.bz2) = 8f513da45b0c65dff4a3d477e5600a98d677571d7ed283f52c905987dcae0fbc
+SIZE (xorg/app/xtrap-1.0.2.tar.bz2) = 95471
diff --git a/x11/xtrap/pkg-descr b/x11/xtrap/pkg-descr
new file mode 100644
index 000000000000..fae5d2a9e846
--- /dev/null
+++ b/x11/xtrap/pkg-descr
@@ -0,0 +1,6 @@
+This package contains a set of XTrap sample clients.  XTrap is an X Server
+extension which facilitates the capturing of server protocol and
+synthesizing core input events.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xtrap/pkg-plist b/x11/xtrap/pkg-plist
new file mode 100644
index 000000000000..e07601e621c1
--- /dev/null
+++ b/x11/xtrap/pkg-plist
@@ -0,0 +1,7 @@
+bin/xtrapchar
+bin/xtrapproto
+bin/xtrapin
+bin/xtrapout
+bin/xtrapstats
+bin/xtrapreset
+bin/xtrapinfo
diff --git a/x11/xtrlock/Makefile b/x11/xtrlock/Makefile
index bba5f4bdefe9..2d88e468350c 100644
--- a/x11/xtrlock/Makefile
+++ b/x11/xtrlock/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xtrlock
 PORTVERSION=	2.0.12
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/x/xtrlock/
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index 2012ae63b5c4..acd5960c41db 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xvattr
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile
new file mode 100644
index 000000000000..6dee29c6e96f
--- /dev/null
+++ b/x11/xvidtune/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xvidtune
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xvidtune
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Video mode tuner for X
+
+XORG_CAT=	app
+USE_XORG=	xxf86vm xt xaw
+
+MAN1=		xvidtune.1
+
+.include <bsd.port.mk>
diff --git a/x11/xvidtune/distinfo b/x11/xvidtune/distinfo
new file mode 100644
index 000000000000..b04774c7a092
--- /dev/null
+++ b/x11/xvidtune/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xvidtune-1.0.1.tar.bz2) = e0744594f4e5969b20df28d897781318
+SHA256 (xorg/app/xvidtune-1.0.1.tar.bz2) = 6d0feb42c2f1d6011d97c776b9d580fd589cdf3cfe246cd99437c406a2740d36
+SIZE (xorg/app/xvidtune-1.0.1.tar.bz2) = 87986
diff --git a/x11/xvidtune/pkg-descr b/x11/xvidtune/pkg-descr
new file mode 100644
index 000000000000..a3a12fbb41d8
--- /dev/null
+++ b/x11/xvidtune/pkg-descr
@@ -0,0 +1 @@
+This package contains xvidtune, a video mode tuner for the X Window System.
diff --git a/x11/xvidtune/pkg-plist b/x11/xvidtune/pkg-plist
new file mode 100644
index 000000000000..6ec758b41e0c
--- /dev/null
+++ b/x11/xvidtune/pkg-plist
@@ -0,0 +1,3 @@
+bin/xvidtune
+share/X11/app-defaults/Xvidtune
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xvinfo/Makefile b/x11/xvinfo/Makefile
new file mode 100644
index 000000000000..2ce5daba6c65
--- /dev/null
+++ b/x11/xvinfo/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xvinfo
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xvinfo
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Print out X-Video extension adaptor information
+
+XORG_CAT=	app
+USE_XORG=	xv x11
+
+PLIST_FILES=	bin/xvinfo
+
+MAN1=		xvinfo.1
+
+.include <bsd.port.mk>
diff --git a/x11/xvinfo/distinfo b/x11/xvinfo/distinfo
new file mode 100644
index 000000000000..5fa630b6b907
--- /dev/null
+++ b/x11/xvinfo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xvinfo-1.0.1.tar.bz2) = 0a5bd8e43de6eb8ff5b5bc673204401d
+SHA256 (xorg/app/xvinfo-1.0.1.tar.bz2) = 439b3c7ad96fc7b1ef9156c716e10b607883a9a58b777f8dc02f03284eb33fb3
+SIZE (xorg/app/xvinfo-1.0.1.tar.bz2) = 74829
diff --git a/x11/xvinfo/pkg-descr b/x11/xvinfo/pkg-descr
new file mode 100644
index 000000000000..cf1f2dd785d1
--- /dev/null
+++ b/x11/xvinfo/pkg-descr
@@ -0,0 +1,6 @@
+This package contains xvinfo, an application for printing out the
+capabilities of any video adaptors associated with the display that
+are accessible through the X-Video extension.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index 7a584820712e..3757ddbdfa40 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xvkbd
 PORTVERSION=	2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://homepage3.nifty.com/tsato/xvkbd/
 
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index abdb96fc8823..d79e1e1e8791 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	xwatchwin
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile
new file mode 100644
index 000000000000..f210903a732b
--- /dev/null
+++ b/x11/xwd/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xwd
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xwd
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Dump an image of an X window
+
+XORG_CAT=	app
+USE_XORG=	xmuu x11
+
+PLIST_FILES=	bin/xwd
+
+MAN1=		xwd.1
+
+.include <bsd.port.mk>
diff --git a/x11/xwd/distinfo b/x11/xwd/distinfo
new file mode 100644
index 000000000000..450cba2ddf56
--- /dev/null
+++ b/x11/xwd/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xwd-1.0.1.tar.bz2) = 911addfb7fa402217ddac63e5c1d97c7
+SHA256 (xorg/app/xwd-1.0.1.tar.bz2) = c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131
+SIZE (xorg/app/xwd-1.0.1.tar.bz2) = 97079
diff --git a/x11/xwd/pkg-descr b/x11/xwd/pkg-descr
new file mode 100644
index 000000000000..235d83ffbc47
--- /dev/null
+++ b/x11/xwd/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xwd, which is an X Window System window dumping utility.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
new file mode 100644
index 000000000000..ef0e33221cdb
--- /dev/null
+++ b/x11/xwininfo/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xwininfo
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xwininfo
+PORTVERSION=	1.0.2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Window information utility for X
+
+XORG_CAT=	app
+USE_XORG=	xmuu xext x11
+
+PLIST_FILES=	bin/xwininfo
+
+MAN1=		xwininfo.1
+
+.include <bsd.port.mk>
diff --git a/x11/xwininfo/distinfo b/x11/xwininfo/distinfo
new file mode 100644
index 000000000000..56c05096d87f
--- /dev/null
+++ b/x11/xwininfo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xwininfo-1.0.2.tar.bz2) = e5dbc8866a55958297f5f38205b6be1e
+SHA256 (xorg/app/xwininfo-1.0.2.tar.bz2) = 9fdfd3259b335531cdba831872ec0e32c5f6df01e14b87c3187b494be75b7b66
+SIZE (xorg/app/xwininfo-1.0.2.tar.bz2) = 91625
diff --git a/x11/xwininfo/pkg-descr b/x11/xwininfo/pkg-descr
new file mode 100644
index 000000000000..ec1faf4f16d4
--- /dev/null
+++ b/x11/xwininfo/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xwininfo, which is a utility for displaying
+information about windows in X.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index 648a409f4fd6..8d48dc9d6cb3 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xwit
 PORTVERSION=	3.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://downloads.planetmirror.com/pub/x11/contrib/utilities/ \
 		http://www.netsw.org/x11/tools/internal/
diff --git a/x11/xwud/Makefile b/x11/xwud/Makefile
new file mode 100644
index 000000000000..34e7c66542dc
--- /dev/null
+++ b/x11/xwud/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xwud
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xwud
+PORTVERSION=	1.0.1
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Image displayer for X
+
+XORG_CAT=	app
+USE_XORG=	x11
+
+PLIST_FILES=	bin/xwud
+
+MAN1=		xwud.1
+
+.include <bsd.port.mk>
diff --git a/x11/xwud/distinfo b/x11/xwud/distinfo
new file mode 100644
index 000000000000..540f453341e1
--- /dev/null
+++ b/x11/xwud/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xwud-1.0.1.tar.bz2) = 6e3c5d0297d88e890b6f5df31f73dd60
+SHA256 (xorg/app/xwud-1.0.1.tar.bz2) = d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c
+SIZE (xorg/app/xwud-1.0.1.tar.bz2) = 83104
diff --git a/x11/xwud/pkg-descr b/x11/xwud/pkg-descr
new file mode 100644
index 000000000000..61d21c52571c
--- /dev/null
+++ b/x11/xwud/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xwud, an image displayer for the X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile
index cebc63b051e4..09e74a7e7fbf 100644
--- a/x11/xxkb/Makefile
+++ b/x11/xxkb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xxkb
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xxkb
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index ee14e2e46d70..0eabd5434b15 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xzoom
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	x11 accessibility
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	libs/X
diff --git a/x11/yakuake-kde4/Makefile b/x11/yakuake-kde4/Makefile
index ad036ba5574f..bee2571037de 100644
--- a/x11/yakuake-kde4/Makefile
+++ b/x11/yakuake-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yakuake
 PORTVERSION=	2.7.5
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 DISTNAME=	29153-${PORTNAME}-${PORTVERSION}
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index ad036ba5574f..bee2571037de 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yakuake
 PORTVERSION=	2.7.5
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 DISTNAME=	29153-${PORTNAME}-${PORTVERSION}
diff --git a/x11/yalias/Makefile b/x11/yalias/Makefile
index f270dcacec50..e7af4017482e 100644
--- a/x11/yalias/Makefile
+++ b/x11/yalias/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yalias
 PORTVERSION=	0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://offog.org/files/ \
 		ftp://ftp.i-scream.org/pub/offog.org/files/ \
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 3fd2aed9c7df..b014892f06f4 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	yelp
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 1a13b80ea5a8..c2846177fdc2 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -119,67 +119,27 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 @dirrm share/gnome/yelp
 @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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@dirrmtry share/locale/tg/LC_MESSAGES
-@dirrmtry share/locale/tg
-@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/nds@NFE/LC_MESSAGES
 @dirrmtry share/locale/nds@NFE
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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/zenity/Makefile b/x11/zenity/Makefile
index c7d353d07bb9..52154a0a7da8 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	zenity
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 336291cbe3d9..2a2cab637a6f 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -184,57 +184,21 @@ share/locale/zh_TW/LC_MESSAGES/zenity.mo
 @dirrm share/gnome/help/zenity/C/figures
 @dirrm share/gnome/help/zenity/C
 @dirrm share/gnome/help/zenity
-@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/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
-@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/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/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@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